wbrawner/distribution
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2584 from fewtarius/dev

Browse source 
GCC and Python update (requires a clean)
This commit is contained in:
fewtarius 2023-12-26 20:39:09 -05:00 committed by GitHub
commit 39a52a7771
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
47 changed files with 542 additions and 159 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
config/blocklist
View file

@ -5,11 +5,10 @@ dolphin-sa # Wayland patch is now broken upstream
duckstation-lr #Libretro support removed from upstream.
duckstation-sa #Patches need to be reworked.
rpcs3-sa #Need to update to llvm 16
gzdoom-sa #will break build patch
ryujinx-sa #broken on JELOS after build 1.1740.
melonds-sa #Broken OpenGL renderer upstream
mupen64plus-sa-ui-console #Causes segfaults
nanoboyadvance-sa #SDL version removed after this commit
mupen64plus-sa-ui-console #Causes segfaults
kronos-sa #using the release version of kronos had better results.
retroarch #pinning to release versions for stability.
vita3k-sa #Patch updates needed.

2
packages/audio/libcdio/package.mk
View file

@ -7,7 +7,7 @@ PKG_VERSION="2.1.0"
PKG_SHA256="8550e9589dbd594bfac93b81ecf129b1dc9d0d51e90f9696f1b2f9b2af32712b"
PKG_LICENSE="GPLv3"
PKG_SITE="https://www.gnu.org/software/libcdio/"
PKG_URL="http://ftpmirror.gnu.org/libcdio/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
PKG_URL="http://ftp.gnu.org/gnu/libcdio/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
PKG_DEPENDS_TARGET="toolchain"
PKG_LONGDESC="A CD-ROM reading and control library."
PKG_BUILD_FLAGS="+pic"

2
packages/compress/cpio/package.mk
View file

@ -6,6 +6,6 @@ PKG_NAME="cpio"
PKG_VERSION="2.14"
PKG_LICENSE="GPL"
PKG_SITE="http://www.gnu.org/software/cpio/"
PKG_URL="http://ftpmirror.gnu.org/cpio/${PKG_NAME}-${PKG_VERSION}.tar.gz"
PKG_URL="http://ftp.gnu.org/gnu/cpio/${PKG_NAME}-${PKG_VERSION}.tar.gz"
PKG_DEPENDS_HOST="toolchain"
PKG_LONGDESC="A program to manage archives of files."

2
packages/devel/autoconf-archive/package.mk
View file

@ -7,7 +7,7 @@ PKG_NAME="autoconf-archive"
PKG_VERSION="2023.02.20"
PKG_LICENSE="GPL"
PKG_SITE="https://www.gnu.org/software/autoconf-archive/"
PKG_URL="http://ftpmirror.gnu.org/autoconf-archive/${PKG_NAME}-${PKG_VERSION}.tar.xz"
PKG_URL="http://ftp.gnu.org/gnu/autoconf-archive/${PKG_NAME}-${PKG_VERSION}.tar.xz"
PKG_DEPENDS_HOST="ccache:host"
PKG_LONGDESC="autoconf-archive is an package of m4 macros"

2
packages/devel/autoconf/package.mk
View file

@ -6,7 +6,7 @@ PKG_VERSION="2.71"
PKG_SHA256="f14c83cfebcc9427f2c3cea7258bd90df972d92eb26752da4ddad81c87a0faa4"
PKG_LICENSE="GPL"
PKG_SITE="http://sources.redhat.com/autoconf/"
PKG_URL="http://ftpmirror.gnu.org/autoconf/${PKG_NAME}-${PKG_VERSION}.tar.xz"
PKG_URL="http://ftp.gnu.org/gnu/autoconf/${PKG_NAME}-${PKG_VERSION}.tar.xz"
PKG_DEPENDS_HOST="ccache:host m4:host gettext:host"
PKG_LONGDESC="A GNU tool for automatically configuring source code."

2
packages/devel/automake/package.mk
View file

@ -6,7 +6,7 @@ PKG_VERSION="1.16.5"
PKG_SHA256="f01d58cd6d9d77fbdca9eb4bbd5ead1988228fdb73d6f7a201f5f8d6b118b469"
PKG_LICENSE="GPL"
PKG_SITE="http://sources.redhat.com/automake/"
PKG_URL="http://ftpmirror.gnu.org/automake/${PKG_NAME}-${PKG_VERSION}.tar.xz"
PKG_URL="http://ftp.gnu.org/gnu/automake/${PKG_NAME}-${PKG_VERSION}.tar.xz"
PKG_DEPENDS_HOST="ccache:host autoconf:host"
PKG_LONGDESC="A GNU tool for automatically creating Makefiles."
PKG_BUILD_FLAGS="-parallel"

2
packages/devel/bison/package.mk
View file

@ -7,7 +7,7 @@ PKG_VERSION="3.8.2"
PKG_SHA256="9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2"
PKG_LICENSE="GPL"
PKG_SITE="http://www.gnu.org/software/bison/"
PKG_URL="http://ftpmirror.gnu.org/bison/${PKG_NAME}-${PKG_VERSION}.tar.xz"
PKG_URL="http://ftp.gnu.org/gnu/bison/${PKG_NAME}-${PKG_VERSION}.tar.xz"
PKG_DEPENDS_HOST="ccache:host m4:host"
PKG_LONGDESC="A general-purpose parser generator."
PKG_BUILD_FLAGS="-parallel"

27
packages/devel/crossguid/patches/crossguid-0001-pr67-include-missing-cstdint.patch Normal file
View file

@ -0,0 +1,27 @@
From 1eb9bea38c320b2b588635cffceaaa2a8d434780 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 25 Jan 2023 22:09:26 -0800
Subject: [PATCH] include missing <cstdint>
gcc 13 moved some includes around and as a result <cstdint> is no longer transitively
included [1]. Explicitly include it for uint{32,64}_t.
[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
include/crossguid/guid.hpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/crossguid/guid.hpp b/include/crossguid/guid.hpp
index 61e0f17..70966f2 100644
--- a/include/crossguid/guid.hpp
+++ b/include/crossguid/guid.hpp
@@ -29,6 +29,7 @@ THE SOFTWARE.
#include <jni.h>
#endif
+#include <cstdint>
#include <functional>
#include <iostream>
#include <array>

2
packages/devel/glib/package.mk
View file

@ -4,7 +4,7 @@
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
PKG_NAME="glib"
PKG_VERSION="2.78.1"
PKG_VERSION="2.78.3"
PKG_LICENSE="LGPL"
PKG_SITE="https://www.gtk.org/"
PKG_URL="https://download.gnome.org/sources/glib/$(get_pkg_version_maj_min)/${PKG_NAME}-${PKG_VERSION}.tar.xz"

2
packages/devel/libtool/package.mk
View file

@ -7,7 +7,7 @@ PKG_VERSION="2.4.7"
PKG_SHA256="04e96c2404ea70c590c546eba4202a4e12722c640016c12b9b2f1ce3d481e9a8"
PKG_LICENSE="GPL"
PKG_SITE="http://www.gnu.org/software/libtool/"
PKG_URL="http://ftpmirror.gnu.org/libtool/${PKG_NAME}-${PKG_VERSION}.tar.gz"
PKG_URL="http://ftp.gnu.org/gnu/libtool/${PKG_NAME}-${PKG_VERSION}.tar.gz"
PKG_DEPENDS_HOST="ccache:host autoconf:host automake:host intltool:host"
PKG_DEPENDS_TARGET="toolchain"
PKG_LONGDESC="A generic library support script."

2
packages/devel/m4/package.mk
View file

@ -6,7 +6,7 @@ PKG_VERSION="1.4.19"
PKG_SHA256="b306a91c0fd93bc4280cfc2e98cb7ab3981ff75a187bea3293811f452c89a8c8"
PKG_LICENSE="GPL"
PKG_SITE="http://www.gnu.org/software/m4/"
PKG_URL="http://ftpmirror.gnu.org/m4/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
PKG_URL="http://ftp.gnu.org/gnu/m4/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
PKG_DEPENDS_HOST="ccache:host"
PKG_LONGDESC="The m4 macro processor."

2
packages/devel/make/package.mk
View file

@ -7,7 +7,7 @@ PKG_NAME="make"
PKG_VERSION="4.4.1"
PKG_LICENSE="GPLv3"
PKG_SITE="https://www.gnu.org/software/make/"
PKG_URL="http://ftpmirror.gnu.org/make/${PKG_NAME}-${PKG_VERSION}.tar.gz"
PKG_URL="http://ftp.gnu.org/gnu/make/${PKG_NAME}-${PKG_VERSION}.tar.gz"
PKG_DEPENDS_HOST=""
PKG_LONGDESC="Utility to maintain groups of programs."
PKG_BUILD_FLAGS="+local-cc"

2
packages/devel/mpc/package.mk
View file

@ -7,7 +7,7 @@ PKG_VERSION="1.3.1"
PKG_SHA256="ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8"
PKG_LICENSE="LGPL"
PKG_SITE="https://www.multiprecision.org"
PKG_URL="http://ftpmirror.gnu.org/mpc/${PKG_NAME}-${PKG_VERSION}.tar.gz"
PKG_URL="http://ftp.gnu.org/gnu/mpc/${PKG_NAME}-${PKG_VERSION}.tar.gz"
PKG_DEPENDS_HOST="ccache:host gmp:host mpfr:host"
PKG_LONGDESC="A C library for the arithmetic of complex numbers with arbitrarily high precision and correct rounding of the result."

2
packages/devel/mpfr/package.mk
View file

@ -7,7 +7,7 @@ PKG_NAME="mpfr"
PKG_VERSION="4.2.1"
PKG_LICENSE="LGPL"
PKG_SITE="http://www.mpfr.org/"
PKG_URL="http://ftpmirror.gnu.org/mpfr/${PKG_NAME}-${PKG_VERSION}.tar.xz"
PKG_URL="http://ftp.gnu.org/gnu/mpfr/${PKG_NAME}-${PKG_VERSION}.tar.xz"
PKG_DEPENDS_HOST="ccache:host gmp:host"
PKG_LONGDESC="A C library for multiple-precision floating-point computations with exact rounding."

2
packages/devel/parallel/package.mk
View file

@ -5,6 +5,6 @@ PKG_NAME="parallel"
PKG_VERSION="20231022"
PKG_LICENSE="GPLv3"
PKG_SITE="https://www.gnu.org/software/parallel/"
PKG_URL="http://ftpmirror.gnu.org/parallel/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
PKG_URL="http://ftp.gnu.org/gnu/parallel/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
PKG_DEPENDS_HOST=""
PKG_LONGDESC="GNU parallel is a shell tool for executing jobs in parallel using one or more computers."

2
packages/devel/readline/package.mk
View file

@ -6,7 +6,7 @@ PKG_NAME="readline"
PKG_VERSION="8.2"
PKG_LICENSE="MIT"
PKG_SITE="http://www.gnu.org/software/readline/"
PKG_URL="http://ftpmirror.gnu.org/readline/${PKG_NAME}-${PKG_VERSION}.tar.gz"
PKG_URL="http://ftp.gnu.org/gnu/readline/${PKG_NAME}-${PKG_VERSION}.tar.gz"
PKG_DEPENDS_TARGET="toolchain ncurses"
PKG_LONGDESC="The GNU Readline library provides a set of functions for use by applications that allow users to edit command lines as they are typed in."
PKG_BUILD_FLAGS="+pic"

12
packages/emulators/libretro/citra-lr/patches/001-fix-missing-include.patch Normal file
View file

@ -0,0 +1,12 @@
diff --git a/src/core/frontend/mic.cpp b/src/core/frontend/mic.cpp
index c9dbc9c..0d8c976 100644
--- a/src/core/frontend/mic.cpp
+++ b/src/core/frontend/mic.cpp
@@ -4,6 +4,7 @@
#include <array>
#include "core/frontend/mic.h"
+#include <string>
#ifdef HAVE_CUBEB
#include "audio_core/cubeb_input.h"

18
packages/emulators/libretro/duckstation-lr/patches/001-fix-gcc12-compile.patch → packages/emulators/libretro/duckstation-lr/patches/001-fix-gcc13-compile.patch
View file

@ -1,6 +1,16 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS)
diff --git a/src/common/log.h b/src/common/log.h
index 1223ce03..0c6b0856 100644
--- a/src/common/log.h
+++ b/src/common/log.h
@@ -1,6 +1,8 @@
#pragma once
#include "types.h"
#include <cinttypes>
+#include <cstdint>
+#include <cstdarg>
#include <mutex>
enum LOGLEVEL
diff --git a/src/core/cpu_core.h b/src/core/cpu_core.h
index c9199153..5d82b5c0 100644
--- a/src/core/cpu_core.h
@ -12,7 +22,7 @@ index c9199153..5d82b5c0 100644
+
+ static constexpr u32 GTERegisterOffset(u32 index) { return offsetof(State, gte_regs.r32) + (sizeof(u32) * index); }
};
extern State g_state;
diff --git a/src/core/cpu_recompiler_code_generator.cpp b/src/core/cpu_recompiler_code_generator.cpp
index 68492b03..e550844e 100644

9
packages/emulators/libretro/easyrpg-lr/libspeexdsp/package.mk
View file

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="libspeexdsp"
PKG_VERSION="095fd36e189554bbcbfd9884630a53d7792409dc"
PKG_VERSION="738e17905e1ca2a1fa932ddd9c2a85d089f4e845"
PKG_REV="1"
PKG_ARCH="any"
PKG_SITE="https://github.com/xiph/speexdsp"
@ -28,11 +28,6 @@ PKG_DEPENDS_TARGET="toolchain"
PKG_PRIORITY="optional"
PKG_SHORTDESC="Speex audio processing library"
GET_HANDLER_SUPPORT="git"
PKG_TOOLCHAIN="configure"
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
pre_configure_target() {
./autogen.sh
}
PKG_TOOLCHAIN="autotools"

4
packages/emulators/libretro/lrps2-lr/package.mk
View file

@ -48,6 +48,10 @@ PKG_CMAKE_OPTS_TARGET=" \
pre_configure_target() {
export LDFLAGS="${LDFLAGS} -laio"
# Fixes for GCC 13, thanks to Arch <https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=libretro-lrps2-git#n50>
sed -i '/include <vector>/a #include <string>' ${PKG_BUILD}/pcsx2/CDVD/CDVDdiscReader.h
sed -i '/include <thread>/a #include <system_error>' ${PKG_BUILD}/pcsx2/CDVD/CDVDdiscThread.cpp
sed -i '/include <vector>/a #include <cstdint>' ${PKG_BUILD}/pcsx2/MemoryPatchDatabase.h
}
makeinstall_target() {

13
packages/emulators/libretro/parallel-n64-lr/patches/001-gcc-10.patch
View file

@ -1,13 +0,0 @@
diff -rupN parallel-n64.orig/mupen64plus-core/src/r4300/r4300.c parallel-n64.new/mupen64plus-core/src/r4300/r4300.c
--- parallel-n64.orig/mupen64plus-core/src/r4300/r4300.c 2021-01-24 13:07:25.028974337 -0500
+++ parallel-n64.new/mupen64plus-core/src/r4300/r4300.c 2021-01-24 13:07:53.761102557 -0500
@@ -50,8 +50,8 @@
unsigned int r4300emu = 0;
unsigned int count_per_op = COUNT_PER_OP_DEFAULT;
unsigned int llbit;
-int stop;
#if NEW_DYNAREC < NEW_DYNAREC_ARM
+int stop;
int64_t reg[32], hi, lo;
uint32_t next_interrupt;
struct precomp_instr *PC;

51
packages/emulators/libretro/parallel-n64-lr/patches/001-gcc-13.patch Normal file
View file

@ -0,0 +1,51 @@
diff --git a/mupen64plus-core/src/r4300/r4300.c b/mupen64plus-core/src/r4300/r4300.c
index 744198d6..73cb1f27 100644
--- a/mupen64plus-core/src/r4300/r4300.c
+++ b/mupen64plus-core/src/r4300/r4300.c
@@ -50,8 +50,8 @@
unsigned int r4300emu = 0;
unsigned int count_per_op = COUNT_PER_OP_DEFAULT;
unsigned int llbit;
-int stop;
#if NEW_DYNAREC < NEW_DYNAREC_ARM
+int stop;
int64_t reg[32], hi, lo;
uint32_t next_interrupt;
struct precomp_instr *PC;
diff --git a/mupen64plus-rsp-paraLLEl/rsp_disasm.cpp b/mupen64plus-rsp-paraLLEl/rsp_disasm.cpp
index 9b1f6eda..bbb84e74 100644
--- a/mupen64plus-rsp-paraLLEl/rsp_disasm.cpp
+++ b/mupen64plus-rsp-paraLLEl/rsp_disasm.cpp
@@ -1,5 +1,6 @@
#include "rsp_disasm.hpp"
#include <assert.h>
+#include <cstdint>
namespace RSP
{
@@ -582,4 +583,4 @@ std::string disassemble(uint32_t pc, uint32_t instr)
return "???";
}
-}
\ No newline at end of file
+}
diff --git a/mupen64plus-rsp-paraLLEl/rsp_disasm.hpp b/mupen64plus-rsp-paraLLEl/rsp_disasm.hpp
index 22c464b2..a5133e2e 100644
--- a/mupen64plus-rsp-paraLLEl/rsp_disasm.hpp
+++ b/mupen64plus-rsp-paraLLEl/rsp_disasm.hpp
@@ -2,6 +2,7 @@
#define RSP_DISASM_HPP_
#include <string>
+#include <cstdint>
namespace RSP
{
@@ -9,4 +10,4 @@ std::string disassemble(uint32_t pc, uint32_t instr);
const char *register_name(unsigned reg_index);
}
-#endif
\ No newline at end of file
+#endif

4
packages/emulators/standalone/dolphin-sa/package.mk
View file

@ -47,6 +47,10 @@ then
PKG_CMAKE_OPTS_TARGET+=" -DENABLE_VULKAN=ON"
fi
pre_configure_target() {
sed -i 's~#include <cstdlib>~#include <cstdlib>\n#include <cstdint>~g' ${PKG_BUILD}/Externals/VulkanMemoryAllocator/include/vk_mem_alloc.h
}
PKG_CMAKE_OPTS_TARGET+=" -DENABLE_HEADLESS=ON \
-DENABLE_EVDEV=ON \
-DUSE_DISCORD_PRESENCE=OFF \

13
packages/emulators/standalone/gzdoom-sa/package.mk
View file

@ -3,12 +3,12 @@
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
PKG_NAME="gzdoom-sa"
PKG_VERSION="d05ea1965ad1f070859806a3a67aaf5ea6c46234"
PKG_VERSION="a368588db6f8485072429f264aca2d9c411fe9b2"
PKG_LICENSE="GPLv3"
PKG_SITE="https://github.com/ZDoom/gzdoom"
PKG_URL="${PKG_SITE}.git"
PKG_DEPENDS_HOST="toolchain SDL2:host zmusic:host"
PKG_DEPENDS_TARGET="toolchain SDL2 gzdoom-sa:host zmusic"
PKG_DEPENDS_HOST="toolchain SDL2:host zmusic:host libwebp:host"
PKG_DEPENDS_TARGET="toolchain SDL2 gzdoom-sa:host zmusic libvpx libwebp"
PKG_LONGDESC="GZDoom is a modder-friendly OpenGL and Vulkan source port based on the DOOM engine"
GET_HANDLER_SUPPORT="git"
PKG_TOOLCHAIN="cmake-make"
@ -30,6 +30,13 @@ makeinstall_host() {
}
pre_configure_target() {
### Enable GLES on devices that don't support OpenGL.
if [ ! "${OPENGL_SUPPORT}" = "yes" ]
then
sed -i 's~#define USE_GLAD_LOADER 0~#define USE_GLAD_LOADER 1~g' ${PKG_BUILD}/src/common/rendering/gles/gles_system.h
fi
PKG_CMAKE_OPTS_TARGET+=" -DNO_GTK=ON \
-DFORCE_CROSSCOMPILE=ON \
-DIMPORT_EXECUTABLES=${PKG_BUILD}/.${HOST_NAME}/ImportExecutables.cmake \

128
packages/emulators/standalone/gzdoom-sa/patches/000-fix-build.patch
View file

@ -1,22 +1,21 @@
diff -rupN gzdoom.orig/specs/udmf_zdoom.txt gzdoom/specs/udmf_zdoom.txt
--- gzdoom.orig/specs/udmf_zdoom.txt 2023-06-13 15:19:18.519118273 +0000
+++ gzdoom/specs/udmf_zdoom.txt 2023-06-13 15:21:45.870418615 +0000
@@ -211,8 +211,11 @@ Note: All <bool> fields default to false
diff --git a/specs/udmf_zdoom.txt b/specs/udmf_zdoom.txt
index ebc831d57..f2d7974a8 100644
--- a/specs/udmf_zdoom.txt
+++ b/specs/udmf_zdoom.txt
@@ -218,6 +218,9 @@ Note: All <bool> fields default to false unless mentioned otherwise.
useowncolors_bottom = <bool>; // Set to 1 to use the colors set in the sidedef. Default is using the colors from the owning sector.
uppercolor_bottom = <int>; // Material color of the top of the lower tier.
lowercolor_bottom = <int>; // Material color of the bottom of the lower tier. (Hardware rendering only.)
+ colorscalefactor_top = <float> // scales the material color by the given factor. Default is 1.
+ colorscalefactor_mid = <float> // scales the material color by the given factor. Default is 1.
+ colorscalefactor_bottom = <float> // scales the material color by the given factor. Default is 1.
+ colorscalefactor_top = <float> // scales the material color by the given factor. Default is 1.
+ colorscalefactor_mid = <float> // scales the material color by the given factor. Default is 1.
+ colorscalefactor_bottom = <float> // scales the material color by the given factor. Default is 1.
- useowncoloradd_top = <bool>; // Controls where the advanced colorization properties are taken from.
+ useowncoloradd_top = <bool>; // Controls where the advanced colorization properties are taken from.
useowncoloradd_top = <bool>; // Controls where the advanced colorization properties are taken from.
useowncoloradd_mid = <bool>; // 0: From the containing sector, 1: from the given part of the linedef itself
useowncoloradd_bottom = <bool>; // Default for all 3 is 0.
coloradd_top = <int>; // Additive material color to apply to top section of sidedef. Default is black (0x000000)
diff -rupN gzdoom.orig/src/common/console/keydef.h gzdoom/src/common/console/keydef.h
--- gzdoom.orig/src/common/console/keydef.h 2023-06-13 15:18:27.077967916 +0000
+++ gzdoom/src/common/console/keydef.h 2023-06-13 15:21:45.874418704 +0000
diff --git a/src/common/console/keydef.h b/src/common/console/keydef.h
index 108806774..971ab398f 100644
--- a/src/common/console/keydef.h
+++ b/src/common/console/keydef.h
@@ -75,8 +75,13 @@ enum EKeyCodes
KEY_JOY6,
KEY_JOY7,
@ -33,10 +32,11 @@ diff -rupN gzdoom.orig/src/common/console/keydef.h gzdoom/src/common/console/key
KEY_LASTJOYBUTTON = 0x187,
KEY_JOYPOV1_UP = 0x188,
KEY_JOYPOV1_RIGHT = 0x189,
diff -rupN gzdoom.orig/src/common/menu/menu.cpp gzdoom/src/common/menu/menu.cpp
--- gzdoom.orig/src/common/menu/menu.cpp 2023-06-13 15:19:18.527118451 +0000
+++ gzdoom/src/common/menu/menu.cpp 2023-06-13 15:21:45.878418792 +0000
@@ -692,15 +692,12 @@ bool M_Responder (event_t *ev)
diff --git a/src/common/menu/menu.cpp b/src/common/menu/menu.cpp
index 448b196a1..62f4819aa 100644
--- a/src/common/menu/menu.cpp
+++ b/src/common/menu/menu.cpp
@@ -687,15 +687,12 @@ bool M_Responder (event_t *ev)
ch = ev->data1;
switch (ch)
{
@ -54,7 +54,7 @@ diff -rupN gzdoom.orig/src/common/menu/menu.cpp gzdoom/src/common/menu/menu.cpp
case KEY_PAD_B:
mkey = MKEY_Back;
break;
@@ -724,6 +721,7 @@ bool M_Responder (event_t *ev)
@@ -719,6 +716,7 @@ bool M_Responder (event_t *ev)
case KEY_PAD_LTHUMB_UP:
case KEY_JOYAXIS2MINUS:
case KEY_JOYPOV1_UP:
@ -62,7 +62,7 @@ diff -rupN gzdoom.orig/src/common/menu/menu.cpp gzdoom/src/common/menu/menu.cpp
mkey = MKEY_Up;
break;
@@ -731,6 +729,7 @@ bool M_Responder (event_t *ev)
@@ -726,6 +724,7 @@ bool M_Responder (event_t *ev)
case KEY_PAD_LTHUMB_DOWN:
case KEY_JOYAXIS2PLUS:
case KEY_JOYPOV1_DOWN:
@ -70,7 +70,7 @@ diff -rupN gzdoom.orig/src/common/menu/menu.cpp gzdoom/src/common/menu/menu.cpp
mkey = MKEY_Down;
break;
@@ -738,6 +737,7 @@ bool M_Responder (event_t *ev)
@@ -733,6 +732,7 @@ bool M_Responder (event_t *ev)
case KEY_PAD_LTHUMB_LEFT:
case KEY_JOYAXIS1MINUS:
case KEY_JOYPOV1_LEFT:
@ -78,7 +78,7 @@ diff -rupN gzdoom.orig/src/common/menu/menu.cpp gzdoom/src/common/menu/menu.cpp
mkey = MKEY_Left;
break;
@@ -745,6 +745,7 @@ bool M_Responder (event_t *ev)
@@ -740,6 +740,7 @@ bool M_Responder (event_t *ev)
case KEY_PAD_LTHUMB_RIGHT:
case KEY_JOYAXIS1PLUS:
case KEY_JOYPOV1_RIGHT:
@ -86,10 +86,11 @@ diff -rupN gzdoom.orig/src/common/menu/menu.cpp gzdoom/src/common/menu/menu.cpp
mkey = MKEY_Right;
break;
}
diff -rupN gzdoom.orig/src/common/platform/posix/sdl/i_gui.cpp gzdoom/src/common/platform/posix/sdl/i_gui.cpp
--- gzdoom.orig/src/common/platform/posix/sdl/i_gui.cpp 2023-06-13 15:18:27.085968095 +0000
+++ gzdoom/src/common/platform/posix/sdl/i_gui.cpp 2023-06-13 15:21:45.878418792 +0000
@@ -68,7 +68,7 @@ bool I_SetCursor(FGameTexture *cursorpic
diff --git a/src/common/platform/posix/sdl/i_gui.cpp b/src/common/platform/posix/sdl/i_gui.cpp
index 9290f063f..62df74a35 100644
--- a/src/common/platform/posix/sdl/i_gui.cpp
+++ b/src/common/platform/posix/sdl/i_gui.cpp
@@ -68,7 +68,7 @@ bool I_SetCursor(FGameTexture *cursorpic)
SDL_FreeCursor (cursor);
cursor = SDL_CreateColorCursor (cursorSurface, 0, 0);
SDL_SetCursor (cursor);
@ -98,67 +99,23 @@ diff -rupN gzdoom.orig/src/common/platform/posix/sdl/i_gui.cpp gzdoom/src/common
}
else
{
diff -rupN gzdoom.orig/src/common/platform/posix/sdl/sdlglvideo.cpp gzdoom/src/common/platform/posix/sdl/sdlglvideo.cpp
--- gzdoom.orig/src/common/platform/posix/sdl/sdlglvideo.cpp 2023-06-13 15:19:18.527118451 +0000
+++ gzdoom/src/common/platform/posix/sdl/sdlglvideo.cpp 2023-06-13 15:22:11.590995370 +0000
@@ -394,9 +394,7 @@ SDLVideo::SDLVideo ()
diff --git a/src/gamedata/doomfont.h b/src/gamedata/doomfont.h
index fedeb513c..23b2c0759 100644
--- a/src/gamedata/doomfont.h
+++ b/src/gamedata/doomfont.h
@@ -57,7 +57,7 @@ void InitDoomFonts()
}
// Fail gracefully if we somehow reach here after linking against a SDL2 library older than 2.0.6.
- SDL_version sdlver;
- SDL_GetVersion(&sdlver);
- if (!(sdlver.patch >= 6))
+ if (!SDL_VERSION_ATLEAST(2, 0, 6))
{
I_FatalError("Only SDL 2.0.6 or later is supported.");
}
diff -rupN gzdoom.orig/src/common/rendering/gles/gles_system.cpp gzdoom/src/common/rendering/gles/gles_system.cpp
--- gzdoom.orig/src/common/rendering/gles/gles_system.cpp 2023-06-13 15:19:18.535118630 +0000
+++ gzdoom/src/common/rendering/gles/gles_system.cpp 2023-06-13 15:49:15.910885661 +0000
@@ -10,7 +10,7 @@ CVAR(Bool, gles_force_glsl_v100, false,
CVAR(Int, gles_max_lights_per_surface, 32, 0);
EXTERN_CVAR(Bool, gl_customshader);
-
+#define __ANDROID__
#if USE_GLES2
PFNGLMAPBUFFERRANGEEXTPROC glMapBufferRange = NULL;
@@ -182,6 +182,7 @@ namespace OpenGLESRenderer
#if USE_GLES2
gles.depthStencilAvailable = CheckExtension("GL_OES_packed_depth_stencil");
gles.npotAvailable = CheckExtension("GL_OES_texture_npot");
+ gles.useMappedBuffers = true;
gles.depthClampAvailable = CheckExtension("GL_EXT_depth_clamp");
#else
gles.depthStencilAvailable = true;
diff -rupN gzdoom.orig/src/common/rendering/gles/gles_system.h gzdoom/src/common/rendering/gles/gles_system.h
--- gzdoom.orig/src/common/rendering/gles/gles_system.h 2023-06-13 15:19:18.535118630 +0000
+++ gzdoom/src/common/rendering/gles/gles_system.h 2023-06-13 15:21:45.886418973 +0000
@@ -23,7 +23,7 @@
#include <sys/stat.h>
#include <fcntl.h>
-#define USE_GLES2 0
+#define USE_GLES2 1
#if (USE_GLES2)
#include "glad/glad.h"
diff -rupN gzdoom.orig/src/gamedata/doomfont.h gzdoom/src/gamedata/doomfont.h
--- gzdoom.orig/src/gamedata/doomfont.h 2023-06-13 15:19:18.555119077 +0000
+++ gzdoom/src/gamedata/doomfont.h 2023-06-13 15:21:45.918419689 +0000
@@ -56,7 +56,7 @@ void InitDoomFonts()
}
else if (fileSystem.CheckNumForName("STCFN033", ns_graphics) >= 0)
else if (fileSystem.CheckNumForName("STCFN033", FileSys::ns_graphics) >= 0)
{
- OriginalSmallFont = new FFont("OriginalSmallFont", "STCFN%.3d", "defsmallfont", HU_FONTSTART, HU_FONTSIZE, HU_FONTSTART, -1, -1, false, true, true);
+ OriginalSmallFont = new FFont("OriginalSmallFont", "STCFN%.3d", "defsmallfont", HU_FONTSTART, HU_FONTSIZE, HU_FONTSTART, -1, -1, false, true);
}
diff -rupN gzdoom.orig/wadsrc/static/language.def gzdoom/wadsrc/static/language.def
--- gzdoom.orig/wadsrc/static/language.def 2023-06-13 15:19:18.583119704 +0000
+++ gzdoom/wadsrc/static/language.def 2023-06-13 15:21:45.958420587 +0000
diff --git a/wadsrc/static/language.def b/wadsrc/static/language.def
index da8ddfb4a..a0e3cc60d 100644
--- a/wadsrc/static/language.def
+++ b/wadsrc/static/language.def
@@ -99,6 +99,9 @@ STARTUP3 = "";
STARTUP4 = "";
STARTUP5 = "";
@ -169,10 +126,11 @@ diff -rupN gzdoom.orig/wadsrc/static/language.def gzdoom/wadsrc/static/language.
// Placeholder definitions for strings that are in the game content table where the labels are needed even when that file is not loaded.
// Level names
diff -rupN gzdoom.orig/wadsrc/static/menudef.txt gzdoom/wadsrc/static/menudef.txt
--- gzdoom.orig/wadsrc/static/menudef.txt 2023-06-13 15:19:18.583119704 +0000
+++ gzdoom/wadsrc/static/menudef.txt 2023-06-13 15:21:45.958420587 +0000
@@ -662,6 +662,7 @@ OptionMenu "OtherControlsMenu" protected
diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt
index 0f384a427..b95961679 100644
--- a/wadsrc/static/menudef.txt
+++ b/wadsrc/static/menudef.txt
@@ -667,6 +667,7 @@ OptionMenu "OtherControlsMenu" protected
Control "$CNTRLMNU_ADJUST_GAMMA" , "bumpgamma"
StaticText ""
@ -180,7 +138,7 @@ diff -rupN gzdoom.orig/wadsrc/static/menudef.txt gzdoom/wadsrc/static/menudef.tx
Control "$CNTRLMNU_OPEN_HELP" , "menu_help"
Control "$CNTRLMNU_OPEN_SAVE" , "menu_save"
Control "$CNTRLMNU_OPEN_LOAD" , "menu_load"
@@ -1776,7 +1777,7 @@ OptionMenu "CompatMapMenu" protected
@@ -1778,7 +1779,7 @@ OptionMenu "CompatMapMenu" protected
Option "$CMPTMNU_PUSHWINDOW", "compat_pushwindow", "YesNo"
Option "$CMPTMNU_CHECKSWITCHRANGE", "compat_checkswitchrange", "YesNo"
Option "$CMPTMNU_RAILINGHACK", "compat_railing", "YesNo"

322
packages/emulators/standalone/nanoboyadvance-sa/patches/001-rework-dma-interleave.patch Normal file
View file

@ -0,0 +1,322 @@
From 5d199dd8742f858b83beb55abd7cd0da45d3721e Mon Sep 17 00:00:00 2001
From: fleroviux <fleroviux@gmail.com>
Date: Mon, 13 Feb 2023 23:11:05 +0100
Subject: [PATCH] Bus: rework DMA interleave to be more robust and simpler
---
src/nba/CMakeLists.txt | 1 +
src/nba/include/nba/common/scope_exit.hpp | 24 +++++++++++++++++++++++
src/nba/include/nba/save_state.hpp | 7 ++-----
src/nba/src/bus/bus.cpp | 16 +++++++++++++--
src/nba/src/bus/bus.hpp | 8 +++-----
src/nba/src/bus/io.cpp | 2 +-
src/nba/src/bus/serialization.cpp | 6 ++----
src/nba/src/bus/timing.cpp | 11 ++---------
src/nba/src/core.cpp | 4 +++-
src/nba/src/hw/dma/dma.cpp | 16 +++++++--------
10 files changed, 60 insertions(+), 35 deletions(-)
create mode 100644 src/nba/include/nba/common/scope_exit.hpp
diff --git a/src/nba/CMakeLists.txt b/src/nba/CMakeLists.txt
index 9c9c6e8ab..887bcac7a 100644
--- a/src/nba/CMakeLists.txt
+++ b/src/nba/CMakeLists.txt
@@ -91,6 +91,7 @@ set(HEADERS_PUBLIC
include/nba/common/crc32.hpp
include/nba/common/meta.hpp
include/nba/common/punning.hpp
+ include/nba/common/scope_exit.hpp
include/nba/device/audio_device.hpp
include/nba/device/input_device.hpp
include/nba/device/video_device.hpp
diff --git a/src/nba/include/nba/common/scope_exit.hpp b/src/nba/include/nba/common/scope_exit.hpp
new file mode 100644
index 000000000..888c3703c
--- /dev/null
+++ b/src/nba/include/nba/common/scope_exit.hpp
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2023 fleroviux
+ *
+ * Licensed under GPLv3 or any later version.
+ * Refer to the included LICENSE file.
+ */
+
+#pragma once
+
+namespace nba {
+
+template<typename Functor>
+struct ScopeExit {
+ ScopeExit(Functor&& fn) : fn{fn} {}
+
+ ScopeExit(ScopeExit&& other) = delete;
+ ScopeExit(ScopeExit const& other) = delete;
+
+ ~ScopeExit() { fn.operator()(); }
+
+ Functor fn;
+};
+
+} // namespace nba
\ No newline at end of file
diff --git a/src/nba/include/nba/save_state.hpp b/src/nba/include/nba/save_state.hpp
index 5e3c1dd00..7e8865dba 100644
--- a/src/nba/include/nba/save_state.hpp
+++ b/src/nba/include/nba/save_state.hpp
@@ -16,7 +16,7 @@ namespace nba {
struct SaveState {
static constexpr u32 kMagicNumber = 0x5353424E; // NBSS
- static constexpr u32 kCurrentVersion = 3;
+ static constexpr u32 kCurrentVersion = 4;
u32 magic;
u32 version;
@@ -76,10 +76,7 @@ struct SaveState {
u8 countdown;
} prefetch;
- struct DMA {
- bool active;
- bool openbus;
- } dma;
+ int last_access;
} bus;
// TODO: keep track of IRQ delay:
diff --git a/src/nba/src/bus/bus.cpp b/src/nba/src/bus/bus.cpp
index 2a6b53a86..ef9f50ed4 100644
--- a/src/nba/src/bus/bus.cpp
+++ b/src/nba/src/bus/bus.cpp
@@ -7,6 +7,7 @@
#include <algorithm>
#include <nba/common/punning.hpp>
+#include <nba/common/scope_exit.hpp>
#include <stdexcept>
#include "arm/arm7tdmi.hpp"
@@ -32,7 +33,7 @@ void Bus::Reset() {
hw.rcnt[1] = 0;
hw.postflg = 0;
prefetch = {};
- dma = {};
+ last_access = 0;
UpdateWaitStateTable();
}
@@ -77,6 +78,13 @@ auto Bus::Read(u32 address, int access) -> T {
auto page = address >> 24;
auto is_u32 = std::is_same_v<T, u32>;
+ // Set last_access to access right before returning.
+ auto _ = ScopeExit{[&]() {
+ last_access = access;
+ }};
+
+ if(!(access & Dma) && hw.dma.IsRunning()) hw.dma.Run();
+
switch (page) {
// BIOS
case 0x00: {
@@ -170,6 +178,8 @@ void Bus::Write(u32 address, int access, T value) {
auto page = address >> 24;
auto is_u32 = std::is_same_v<T, u32>;
+ if(!(access & Dma) && hw.dma.IsRunning()) hw.dma.Run();
+
switch (page) {
// EWRAM (external work RAM)
case 0x02: {
@@ -255,6 +265,8 @@ void Bus::Write(u32 address, int access, T value) {
break;
}
}
+
+ last_access = access;
}
auto Bus::ReadBIOS(u32 address) -> u32 {
@@ -279,7 +291,7 @@ auto Bus::ReadOpenBus(u32 address) -> u32 {
Log<Trace>("Bus: illegal memory read: 0x{:08X}", address);
- if (hw.dma.IsRunning() || dma.openbus) {
+ if(last_access & Dma) {
return hw.dma.GetOpenBusValue() >> shift;
}
diff --git a/src/nba/src/bus/bus.hpp b/src/nba/src/bus/bus.hpp
index 8c1bc64af..472ae5dc6 100644
--- a/src/nba/src/bus/bus.hpp
+++ b/src/nba/src/bus/bus.hpp
@@ -30,7 +30,8 @@ struct Bus {
enum Access {
Nonsequential = 0,
Sequential = 1,
- Code = 2
+ Code = 2,
+ Dma = 4
};
void Reset();
@@ -109,10 +110,7 @@ struct Bus {
int duty;
} prefetch;
- struct DMA {
- bool active = false;
- bool openbus = false;
- } dma;
+ int last_access;
template<typename T>
auto Read(u32 address, int access) -> T;
diff --git a/src/nba/src/bus/io.cpp b/src/nba/src/bus/io.cpp
index ab5175e9e..51a7fcf1a 100644
--- a/src/nba/src/bus/io.cpp
+++ b/src/nba/src/bus/io.cpp
@@ -551,7 +551,7 @@ void Bus::Hardware::WriteByte(u32 address, u8 value) {
haltcnt = HaltControl::Stop;
} else {
haltcnt = HaltControl::Halt;
- bus->Idle();
+ bus->Step(1);
}
}
break;
diff --git a/src/nba/src/bus/serialization.cpp b/src/nba/src/bus/serialization.cpp
index 48d31d1ed..50283cad8 100644
--- a/src/nba/src/bus/serialization.cpp
+++ b/src/nba/src/bus/serialization.cpp
@@ -44,8 +44,7 @@ void Bus::LoadState(SaveState const& state) {
prefetch.duty = wait32[int(Access::Sequential)][prefetch.last_address >> 24];
}
- dma.active = state.bus.dma.active;
- dma.openbus = state.bus.dma.openbus;
+ last_access = state.bus.last_access;
}
void Bus::CopyState(SaveState& state) {
@@ -73,8 +72,7 @@ void Bus::CopyState(SaveState& state) {
state.bus.prefetch.count = prefetch.count;
state.bus.prefetch.countdown = prefetch.countdown;
- state.bus.dma.active = dma.active;
- state.bus.dma.openbus = dma.openbus;
+ state.bus.last_access = last_access;
}
} // namespace nba::core
\ No newline at end of file
diff --git a/src/nba/src/bus/timing.cpp b/src/nba/src/bus/timing.cpp
index ecdf105f8..c1e92ae6a 100644
--- a/src/nba/src/bus/timing.cpp
+++ b/src/nba/src/bus/timing.cpp
@@ -11,6 +11,8 @@
namespace nba::core {
void Bus::Idle() {
+ if(hw.dma.IsRunning()) hw.dma.Run();
+
Step(1);
}
@@ -85,15 +87,6 @@ void Bus::StopPrefetch() {
}
void Bus::Step(int cycles) {
- dma.openbus = false;
-
- if (hw.dma.IsRunning() && !dma.active) {
- dma.active = true;
- hw.dma.Run();
- dma.active = false;
- dma.openbus = true;
- }
-
scheduler.AddCycles(cycles);
if (prefetch.active) {
diff --git a/src/nba/src/core.cpp b/src/nba/src/core.cpp
index 3749778cb..6d0257544 100644
--- a/src/nba/src/core.cpp
+++ b/src/nba/src/core.cpp
@@ -81,7 +81,7 @@ void Core::Run(int cycles) {
while (scheduler.GetTimestampNow() < limit) {
if (bus.hw.haltcnt == HaltControl::Halt && irq.HasServableIRQ()) {
- bus.Idle();
+ bus.Step(1);
bus.hw.haltcnt = HaltControl::Run;
}
@@ -96,6 +96,8 @@ void Core::Run(int cycles) {
}
cpu.Run();
} else {
+ if(dma.IsRunning()) dma.Run();
+
bus.Step(scheduler.GetRemainingCycleCount());
}
}
diff --git a/src/nba/src/hw/dma/dma.cpp b/src/nba/src/hw/dma/dma.cpp
index 8bb07a3c7..db5bb4b72 100644
--- a/src/nba/src/hw/dma/dma.cpp
+++ b/src/nba/src/hw/dma/dma.cpp
@@ -151,13 +151,13 @@ bool DMA::HasVideoTransferDMA() {
}
void DMA::Run() {
- bus.Idle();
+ bus.Step(1);
do {
RunChannel();
} while (IsRunning());
- bus.Idle();
+ bus.Step(1);
}
void DMA::RunChannel() {
@@ -186,15 +186,15 @@ void DMA::RunChannel() {
auto src_addr = channel.latch.src_addr;
auto dst_addr = channel.latch.dst_addr;
- auto access_src = Bus::Access::Sequential;
- auto access_dst = Bus::Access::Sequential;
+ auto access_src = Bus::Access::Sequential | Bus::Access::Dma;
+ auto access_dst = Bus::Access::Sequential | Bus::Access::Dma;
if (!did_access_rom) {
if (src_addr >= 0x08000000) {
- access_src = Bus::Access::Nonsequential;
+ access_src = Bus::Access::Nonsequential | Bus::Access::Dma;
did_access_rom = true;
} else if (dst_addr >= 0x08000000) {
- access_dst = Bus::Access::Nonsequential;
+ access_dst = Bus::Access::Nonsequential | Bus::Access::Dma;
did_access_rom = true;
}
}
@@ -212,7 +212,7 @@ void DMA::RunChannel() {
} else {
value = channel.latch.bus;
}
- bus.Idle();
+ bus.Step(1);
}
bus.WriteHalf(dst_addr, value, access_dst);
@@ -221,7 +221,7 @@ void DMA::RunChannel() {
channel.latch.bus = bus.ReadWord(src_addr, access_src);
latch = channel.latch.bus;
} else {
- bus.Idle();
+ bus.Step(1);
}
bus.WriteWord(dst_addr, channel.latch.bus, access_dst);

2
packages/emulators/standalone/rpcs3-sa/package.mk
View file

@ -16,6 +16,7 @@ PKG_GIT_CLONE_BRANCH="master"
PKG_GIT_CLONE_SINGLE="yes"
pre_configure_host() {
sed -i '/include <string>/a #include <cstdint>' ${PKG_BUILD}/llvm/include/llvm/Support/Signals.h
# path changes in future commits.
# PKG_CMAKE_SCRIPT="${PKG_BUILD}/3rdparty/llvm/llvm/llvm/CMakeLists.txt"
PKG_CMAKE_SCRIPT="${PKG_BUILD}/llvm/CMakeLists.txt"
@ -33,6 +34,7 @@ pre_configure_host() {
}
pre_configure_target() {
sed -i '/include <string>/a #include <cstdint>' ${PKG_BUILD}/llvm/include/llvm/Support/Signals.h
PKG_CMAKE_OPTS_TARGET=(-DUSE_NATIVE_INSTRUCTIONS=OFF \
-DBUILD_LLVM_SUBMODULE=ON \
-DCMAKE_C_FLAGS="${CFLAGS}" \

2
packages/graphics/libwebp/package.mk
View file

@ -2,7 +2,7 @@
# Copyright (C) 2023-present JELOS (https://github.com/JustEnoughLinuxOS)
PKG_NAME="libwebp"
PKG_VERSION="89c5b917463c07bfb5b6390b81d258c49d5fe8c6"
PKG_VERSION="e78e924f84ddcd41fc5d55583bc32f4ddc4100a3"
PKG_LICENSE="BSD"
PKG_SITE="https://github.com/webmproject/libwebp"
PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz"

14
packages/lang/Python3/package.mk
View file

@ -1,10 +1,10 @@
# SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
PKG_NAME="Python3"
# When changing PKG_VERSION remember to sync PKG_PYTHON_VERSION!
PKG_VERSION="3.11.6"
PKG_VERSION="3.11.7"
PKG_SHA256="18e1aa7e66ff3a58423d59ed22815a6954e53342122c45df20c96877c062b9b7"
PKG_LICENSE="OSS"
PKG_SITE="https://www.python.org/"
PKG_URL="https://www.python.org/ftp/python/${PKG_VERSION}/${PKG_NAME::-1}-${PKG_VERSION}.tar.xz"
@ -42,7 +42,7 @@ PKG_CONFIGURE_OPTS_HOST="ac_cv_prog_HAS_HG=/bin/false
--with-doc-strings
--with-system-ffi
--without-pymalloc
--without-ensurepip
--with-ensurepip=no
"
PKG_CONFIGURE_OPTS_TARGET="ac_cv_prog_HAS_HG=/bin/false
@ -79,11 +79,11 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_prog_HAS_HG=/bin/false
--with-libmpdec=none
--with-doc-strings
--with-system-ffi
--disable-static
--enable-shared
--without-pymalloc
--without-ensurepip
--enable-ipv6
--disable-static
--enable-shared
--with-build-python=${TOOLCHAIN}/bin/python
"
@ -91,6 +91,10 @@ pre_configure_host() {
export PYTHON_MODULES_INCLUDE="${HOST_INCDIR}"
export PYTHON_MODULES_LIB="${HOST_LIBDIR}"
export DISABLED_EXTENSIONS="readline _curses _curses_panel ${PKG_PY_DISABLED_MODULES}"
# control patch Python3-0300-generate-legacy-pyc-bytecode
# this needs to be set when building host based py file
# do not set this for py compiles being done for target use
export DONT_BUILD_LEGACY_PYC=1
}
post_make_host() {

11
packages/lang/Python3/patches/Python3-0300-generate-legacy-pyc-bytecode.patch
View file

@ -19,18 +19,19 @@ generates legacy bytecode.
https://www.python.org/dev/peps/pep-3147/#case-4-legacy-pyc-files-and-source-less-imports
---
Lib/py_compile.py | 4 ++++
1 file changed, 4 insertions(+)
Lib/py_compile.py | 5 +++++
1 file changed, 5 insertions(+)
--- a/Lib/py_compile.py
+++ b/Lib/py_compile.py
@@ -121,6 +121,10 @@ def compile(file, cfile=None, dfile=None
@@ -121,6 +121,11 @@ def compile(file, cfile=None, dfile=None
the resulting file would be regular and thus not the same type of file as
it was previously.
"""
+
+ if cfile:
+ cfile = file + 'c'
+ if os.environ.get('DONT_BUILD_LEGACY_PYC') is None:
+ if cfile:
+ cfile = file + 'c'
+
if invalidation_mode is None:
invalidation_mode = _get_default_invalidation_mode()

5
packages/lang/gcc/package.mk
View file

@ -4,10 +4,10 @@
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
PKG_NAME="gcc"
PKG_VERSION="12.3.0"
PKG_VERSION="13.2.0"
PKG_LICENSE="GPL-2.0-or-later"
PKG_SITE="https://gcc.gnu.org/"
PKG_URL="https://ftpmirror.gnu.org/gcc/${PKG_NAME}-${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
PKG_URL="https://ftp.gnu.org/gnu/gcc/${PKG_NAME}-${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
PKG_DEPENDS_BOOTSTRAP="ccache:host autoconf:host binutils:host gmp:host mpfr:host mpc:host zstd:host"
PKG_DEPENDS_TARGET="toolchain"
PKG_DEPENDS_HOST="ccache:host autoconf:host binutils:host gmp:host mpfr:host mpc:host zstd:host glibc"
@ -68,6 +68,7 @@ PKG_CONFIGURE_OPTS_BOOTSTRAP="${GCC_COMMON_CONFIGURE_OPTS} \
--disable-threads \
--without-headers \
--with-newlib \
--disable-werror \
${GCC_OPTS}"
PKG_CONFIGURE_OPTS_HOST="${GCC_COMMON_CONFIGURE_OPTS} \

2
packages/lang/llvm/package.mk
View file

@ -3,7 +3,7 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="llvm"
PKG_VERSION="16.0.6"
PKG_VERSION="17.0.6"
PKG_LICENSE="Apache-2.0"
PKG_SITE="http://llvm.org/"
PKG_URL="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PKG_VERSION}/llvm-project-${PKG_VERSION}.src.tar.xz"

2
packages/security/nettle/package.mk
View file

@ -7,7 +7,7 @@ PKG_NAME="nettle"
PKG_VERSION="3.9.1"
PKG_LICENSE="GPL2"
PKG_SITE="http://www.lysator.liu.se/~nisse/nettle"
PKG_URL="http://ftpmirror.gnu.org/gnu/nettle/nettle-${PKG_VERSION}.tar.gz"
PKG_URL="http://ftp.gnu.org/gnu/nettle/nettle-${PKG_VERSION}.tar.gz"
PKG_DEPENDS_HOST="gmp:host openssl:host"
PKG_DEPENDS_TARGET="toolchain gmp openssl"
PKG_LONGDESC="A low-level cryptographic library."

2
packages/sysutils/bash/package.mk
View file

@ -7,7 +7,7 @@ PKG_NAME="bash"
PKG_VERSION="5.2.21"
PKG_LICENSE="GPL"
PKG_SITE="http://www.gnu.org/software/bash/"
PKG_URL="http://ftpmirror.gnu.org/bash/${PKG_NAME}-${PKG_VERSION}.tar.gz"
PKG_URL="http://ftp.gnu.org/gnu/bash/${PKG_NAME}-${PKG_VERSION}.tar.gz"
PKG_DEPENDS_TARGET="toolchain ncurses readline"
PKG_LONGDESC="The GNU Bourne Again shell."

2
packages/sysutils/diffutils/package.mk
View file

@ -5,7 +5,7 @@ PKG_NAME="diffutils"
PKG_VERSION="3.9"
PKG_LICENSE="GPL"
PKG_SITE="http://www.gnu.org/software/diffutils/"
PKG_URL="http://ftpmirror.gnu.org/diffutils/${PKG_NAME}-${PKG_VERSION}.tar.xz"
PKG_URL="http://ftp.gnu.org/gnu/diffutils/${PKG_NAME}-${PKG_VERSION}.tar.xz"
PKG_DEPENDS_TARGET="toolchain"
PKG_LONGDESC="A package of several programs related to finding differences between files."
PKG_TOOLCHAIN="autotools"

2
packages/sysutils/grep/package.mk
View file

@ -6,7 +6,7 @@ PKG_NAME="grep"
PKG_VERSION="3.9"
PKG_LICENSE="GPL"
PKG_SITE="http://www.gnu.org/software/grep/"
PKG_URL="http://ftpmirror.gnu.org/grep/${PKG_NAME}-${PKG_VERSION}.tar.xz"
PKG_URL="http://ftp.gnu.org/gnu/grep/${PKG_NAME}-${PKG_VERSION}.tar.xz"
PKG_DEPENDS_HOST="ccache:host"
PKG_LONGDESC="Grep searches one or more input files for lines containing a match to a specified pattern. By default, Grep outputs the matching lines."

2
packages/sysutils/parted/package.mk
View file

@ -8,7 +8,7 @@ PKG_NAME="parted"
PKG_VERSION="3.6"
PKG_LICENSE="GPL"
PKG_SITE="http://www.gnu.org/software/parted/"
PKG_URL="http://ftpmirror.gnu.org/parted/${PKG_NAME}-${PKG_VERSION}.tar.xz"
PKG_URL="http://ftp.gnu.org/gnu/parted/${PKG_NAME}-${PKG_VERSION}.tar.xz"
PKG_DEPENDS_HOST="toolchain:host util-linux:host"
PKG_DEPENDS_TARGET="toolchain util-linux parted:host"
PKG_DEPENDS_INIT="toolchain util-linux:init parted"

2
packages/sysutils/patch/package.mk
View file

@ -6,7 +6,7 @@ PKG_VERSION="2.7.6"
PKG_SHA256="ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd"
PKG_LICENSE="GPL"
PKG_SITE="http://savannah.gnu.org/projects/patch/"
PKG_URL="http://ftpmirror.gnu.org/patch/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_URL="http://ftp.gnu.org/gnu/patch/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS_TARGET="toolchain"
PKG_LONGDESC="Patch takes a patch file containing a difference listing produced by the diff."

2
packages/sysutils/screen/package.mk
View file

@ -5,7 +5,7 @@ PKG_NAME="screen"
PKG_VERSION="4.9.1"
PKG_LICENSE="GPL"
PKG_SITE="http://www.gnu.org/software/screen/"
PKG_URL="http://ftpmirror.gnu.org/screen/${PKG_NAME}-${PKG_VERSION}.tar.gz"
PKG_URL="http://ftp.gnu.org/gnu/screen/${PKG_NAME}-${PKG_VERSION}.tar.gz"
PKG_DEPENDS_TARGET="toolchain ncurses"
PKG_LONGDESC="Screen is a window manager that multiplexes a physical terminal between several processes"

2
packages/sysutils/sed/package.mk
View file

@ -6,7 +6,7 @@ PKG_NAME="sed"
PKG_VERSION="4.9"
PKG_LICENSE="GPL"
PKG_SITE="http://www.gnu.org/software/sed/"
PKG_URL="http://ftpmirror.gnu.org/sed/${PKG_NAME}-${PKG_VERSION}.tar.xz"
PKG_URL="http://ftp.gnu.org/gnu/sed/${PKG_NAME}-${PKG_VERSION}.tar.xz"
PKG_DEPENDS_HOST="ccache:host"
PKG_LONGDESC="The sed (Stream EDitor) editor is a stream or batch (non-interactive) editor."

2
packages/textproc/libidn2/package.mk
View file

@ -5,7 +5,7 @@ PKG_NAME="libidn2"
PKG_VERSION="2.3.4"
PKG_LICENSE="LGPL3"
PKG_SITE="https://www.gnu.org/software/libidn/"
PKG_URL="http://ftpmirror.gnu.org/gnu/libidn/libidn2-${PKG_VERSION}.tar.gz"
PKG_URL="http://ftp.gnu.org/gnu/libidn/libidn2-${PKG_VERSION}.tar.gz"
PKG_DEPENDS_TARGET="toolchain"
PKG_LONGDESC="Free software implementation of IDNA2008, Punycode and TR46."

5
packages/textproc/nlohmann-json/package.mk
View file

@ -2,8 +2,7 @@
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="nlohmann-json"
PKG_VERSION="3.11.2"
PKG_SHA256="d69f9deb6a75e2580465c6c4c5111b89c4dc2fa94e3a85fcd2ffcd9a143d9273"
PKG_VERSION="3.11.3"
PKG_LICENSE="MIT"
PKG_SITE="https://nlohmann.github.io/json/"
PKG_URL="https://github.com/nlohmann/json/archive/v${PKG_VERSION}.tar.gz"
@ -11,4 +10,4 @@ PKG_DEPENDS_TARGET="toolchain"
PKG_LONGDESC="JSON for Modern C++"
PKG_TOOLCHAIN="cmake"
PKG_CMAKE_OPTS_TARGET="-DBUILD_TESTING:BOOL=OFF"
PKG_CMAKE_OPTS_TARGET="-DJSON_BuildTests=OFF"

2
packages/textproc/textviewer/package.mk
View file

@ -3,7 +3,7 @@
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
PKG_NAME="textviewer"
PKG_VERSION="16d4c69d4686e9cc210ab5964d909dfedc8866f4"
PKG_VERSION="fcbda2d1708e9e2c650abc589ea8e7f1fe1d04d8"
PKG_LICENSE="MIT"
PKG_SITE="https://github.com/JustEnoughLinuxOS/TvTextViewer"
PKG_URL="${PKG_SITE}.git"

2
packages/tools/mtools/package.mk
View file

@ -7,7 +7,7 @@ PKG_VERSION="4.0.43"
PKG_SHA256="541e179665dc4e272b9602f2074243591a157da89cc47064da8c5829dbd2b339"
PKG_LICENSE="GPL"
PKG_SITE="http://www.gnu.org/software/mtools/"
PKG_URL="http://ftpmirror.gnu.org/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
PKG_URL="http://ftp.gnu.org/gnu/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
PKG_DEPENDS_HOST="toolchain:host"
PKG_LONGDESC="mtools: A collection of utilities to access MS-DOS disks"
PKG_TOOLCHAIN="autotools"

2
packages/ui/emulationstation/package.mk
View file

@ -3,7 +3,7 @@
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
PKG_NAME="emulationstation"
PKG_VERSION="3accc12"
PKG_VERSION="99b7b72818f3fd702b0d11d3e530810568405a3a"
PKG_GIT_CLONE_BRANCH="main"
PKG_REV="1"
PKG_ARCH="any"

2
packages/web/libmicrohttpd/package.mk
View file

@ -6,7 +6,7 @@ PKG_NAME="libmicrohttpd"
PKG_VERSION="0.9.77"
PKG_LICENSE="LGPLv2.1"
PKG_SITE="http://www.gnu.org/software/libmicrohttpd/"
PKG_URL="http://ftpmirror.gnu.org/libmicrohttpd/${PKG_NAME}-${PKG_VERSION}.tar.gz"
PKG_URL="http://ftp.gnu.org/gnu/libmicrohttpd/${PKG_NAME}-${PKG_VERSION}.tar.gz"
PKG_DEPENDS_TARGET="toolchain gnutls"
PKG_LONGDESC="A small C library that is supposed to make it easy to run an HTTP server as part of another application."

2
packages/web/wget/package.mk
View file

@ -6,7 +6,7 @@ PKG_NAME="wget"
PKG_VERSION="1.21.4"
PKG_LICENSE="GPL"
PKG_SITE="http://www.gnu.org/software/wget/"
PKG_URL="http://ftpmirror.gnu.org/wget/${PKG_NAME}-${PKG_VERSION}.tar.gz"
PKG_URL="http://ftp.gnu.org/gnu/wget/${PKG_NAME}-${PKG_VERSION}.tar.gz"
PKG_DEPENDS_HOST="ccache:host"
PKG_DEPENDS_TARGET="toolchain gnutls"
PKG_LONGDESC="GNU Wget is a free software package for retrieving files using HTTP, HTTPS, FTP and FTPS"