Merge pull request #956 from brooksytech/dev

Bump packages and some cleanup
2023-01-17 08:44:52 -08:00 · 2023-01-17 08:44:52 -08:00 · adbd5ffd4d
commit adbd5ffd4d
parent e3a3a816a4 d5c8ec4477
13 changed files with 120 additions and 161 deletions
--- a/packages/games/emulators/dolphinsa/package.mk
+++ b/packages/games/emulators/dolphinsa/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech)

 PKG_NAME="dolphinsa"
-PKG_VERSION="9d81c84db0bec5c8e8b193efaa43688396e7c638"
+PKG_VERSION="10fd76889854e2367c39d902d70abf70e1d920f6"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/dolphin-emu/dolphin"
 PKG_URL="${PKG_SITE}.git"
--- a/packages/games/emulators/dolphinsa/patches/wayland/000-add-wayland.patch
+++ b/packages/games/emulators/dolphinsa/patches/wayland/000-add-wayland.patch
@ -1,3 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech)
+
 diff --git a/CMake/FindWaylandProtocols.cmake b/CMake/FindWaylandProtocols.cmake
 new file mode 100644
 index 0000000000..891903feaa
--- a/packages/games/emulators/duckstationsa/patches/wayland/003-fix-wayland-compile.patch
+++ b/packages/games/emulators/duckstationsa/patches/wayland/003-fix-wayland-compile.patch
@ -1,3 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech)
+
 diff --git a/src/frontend-common/platform_misc_unix.cpp b/src/frontend-common/platform_misc_unix.cpp
 index 1f7ae9ec..e0487476 100644
 --- a/src/frontend-common/platform_misc_unix.cpp
--- a/packages/games/emulators/yuzusa/package.mk
+++ b/packages/games/emulators/yuzusa/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech)

 PKG_NAME="yuzusa"
-PKG_VERSION="cbcf210c19b3661e0edda03f22ef323cb5b30c26"
+PKG_VERSION="28fde29924ed356c5714d1eccc4210e263a7dbdb"
 PKG_ARCH="x86_64"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/yuzu-emu/yuzu"
--- a/packages/games/libretro/duckstation/patches/001-fix-gcc12-compile.patch
+++ b/packages/games/libretro/duckstation/patches/001-fix-gcc12-compile.patch
@ -1,3 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech)
+
 diff --git a/src/core/cpu_core.h b/src/core/cpu_core.h
 index c9199153..5d82b5c0 100644
 --- a/src/core/cpu_core.h
--- a/packages/games/libretro/parallel-n64/package.mk
+++ b/packages/games/libretro/parallel-n64/package.mk
@ -3,7 +3,7 @@

 PKG_NAME="parallel-n64"
 PKG_VERSION="a03fdcba6b2e9993f050b50112f597ce2f44fa2c"
-PKG_ARCH="x86_64"
+PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/parallel-n64"
 PKG_URL="${PKG_SITE}.git"
@ -23,7 +23,7 @@ fi

 case ${DEVICE} in
  RK3588)
-    PKG_MAKE_OPTS_TARGET=" platform=unix_RK3588"
+    PKG_MAKE_OPTS_TARGET=" platform=RK3588"
  ;;
 esac

--- a/packages/games/libretro/parallel-n64/patches/002-rk3588-make.patch
+++ b/packages/games/libretro/parallel-n64/patches/002-rk3588-make.patch
@ -0,0 +1,29 @@
+diff --git a/Makefile b/Makefile
+index 8a719d55..0872e619 100644
+--- a/Makefile
+++ b/Makefile
+@@ -60,6 +60,8 @@ else ifneq (,$(findstring rpi,$(platform)))
+    override platform += unix
+ else ifneq (,$(findstring odroid,$(platform)))
+    override platform += unix
+else ifneq (,$(findstring RK3588,$(platform)))
+   override platform += unix
+ endif
+ 
+ # system platform
+@@ -171,6 +173,15 @@ ifneq (,$(findstring unix,$(platform)))
+ 
+    endif
+    
+  #RK3588
+  ifneq (,$(findstring RK3588,$(platform)))
+    TARGET := $(TARGET_NAME)_libretro.so
+    CPUFLAGS += -march=armv8-a+crc+simd -mtune=cortex-a76 -DARM_FIX -DCLASSIC -DARM64
+    WITH_DYNAREC = aarch64
+    GLES = 1
+    GL_LIB := -lGLESv2
+  endif
+
+    # ODROIDs
+    ifneq (,$(findstring odroid,$(platform)))
+       BOARD ?= $(shell cat /proc/cpuinfo | grep -i odroid | awk '{print $$3}')
--- a/packages/games/libretro/parallel-n64/patches/003-libretro-cleanup.patch
+++ b/packages/games/libretro/parallel-n64/patches/003-libretro-cleanup.patch
@ -0,0 +1,58 @@
+diff --git a/libretro/libretro.c b/libretro/libretro.c
+index eea606f5..8c244e1f 100644
+--- a/libretro/libretro.c
+++ b/libretro/libretro.c
+@@ -397,10 +397,7 @@ static void setup_variables(void)
+          "Send audio lists to HLE RSP; disabled|enabled" },
+       { "parallel-n64-gfxplugin",
+          "GFX Plugin; auto"
+-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES)
+          "|glide64|gln64|rice"
+-#endif         
+-         "|angrylion"
+ #ifdef HAVE_PARALLEL
+             "|parallel"
+ #endif
+@@ -410,41 +407,22 @@ static void setup_variables(void)
+ #if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES)
+ 		 "|hle"
+ #endif
+-		 "|cxd4"
+ #ifdef HAVE_PARALLEL_RSP
+          "|parallel"
+ #endif
+          },
+-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) || defined(HAVE_PARALLEL)
+       { "parallel-n64-screensize",
+-#ifdef CLASSIC
+-         "Resolution (restart); 320x240|640x480|960x720|1280x960|1440x1080|1600x1200|1920x1440|2240x1680|2880x2160|5760x4320" },
+-#else
+-         "Resolution (restart); 640x480|960x720|1280x960|1440x1080|1600x1200|1920x1440|2240x1680|2880x2160|5760x4320|320x240" },	
+-#endif
+         "Resolution (restart); 320x240|640x480|960x720|1440x1080" },
+       { "parallel-n64-aspectratiohint",
+          "Aspect ratio hint (reinit); normal|widescreen" },
+       { "parallel-n64-filtering",
+ 		 "(Glide64) Texture Filtering; automatic|N64 3-point|bilinear|nearest" },
+-      { "parallel-n64-dithering",
+-		 "(Angrylion) Dithering; enabled|disabled" },
+       { "parallel-n64-polyoffset-factor",
+        "(Glide64) Polygon Offset Factor; -3.0|-2.5|-2.0|-1.5|-1.0|-0.5|0.0|0.5|1.0|1.5|2.0|2.5|3.0|3.5|4.0|4.5|5.0|-3.5|-4.0|-4.5|-5.0"
+       },
+       { "parallel-n64-polyoffset-units",
+        "(Glide64) Polygon Offset Units; -3.0|-2.5|-2.0|-1.5|-1.0|-0.5|0.0|0.5|1.0|1.5|2.0|2.5|3.0|3.5|4.0|4.5|5.0|-3.5|-4.0|-4.5|-5.0"
+       },
+-#endif
+-      { "parallel-n64-angrylion-vioverlay",
+-       "(Angrylion) VI Overlay; Filtered|AA+Blur|AA+Dedither|AA only|Unfiltered|Depth|Coverage"
+-      },
+-      { "parallel-n64-angrylion-sync",
+-       "(Angrylion) Thread sync level; Low|Medium|High"
+-      },
+-       { "parallel-n64-angrylion-multithread",
+-         "(Angrylion) Multi-threading; all threads|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46|47|48|49|50|51|52|53|54|55|56|57|58|59|60|61|62|63" },
+-       { "parallel-n64-angrylion-overscan",
+-         "(Angrylion) Hide overscan; disabled|enabled" },
+       { "parallel-n64-virefresh",
+          "VI Refresh (Overclock); auto|1500|2200" },
+       { "parallel-n64-bufferswap",
--- a/packages/games/libretro/parallel-n64_glide64/package.mk
+++ b/packages/games/libretro/parallel-n64_glide64/package.mk
@ -1,47 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2019-present Shanti Gilbert (https://github.com/shantigilbert)
-
-PKG_NAME="parallel-n64_glide64"
-PKG_VERSION="a03fdcba6b2e9993f050b50112f597ce2f44fa2c"
-PKG_REV="2"
-PKG_LICENSE="GPLv2"
-PKG_SITE="https://github.com/libretro/parallel-n64"
-PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain core-info"
-PKG_SECTION="libretro"
-PKG_SHORTDESC="Optimized/rewritten Nintendo 64 emulator made specifically for Libretro. Originally based on Mupen64 Plus."
-PKG_LONGDESC="Optimized/rewritten Nintendo 64 emulator made specifically for Libretro. Originally based on Mupen64 Plus."
-PKG_TOOLCHAIN="make"
-PKG_BUILD_FLAGS="-lto"
-PKG_PATCH_DIRS+="${DEVICE}"
-
-if [ ! "${OPENGL}" = "no" ]; then
-  PKG_DEPENDS_TARGET+=" ${OPENGL} glu"
-fi
-
-if [ "${OPENGLES_SUPPORT}" = yes ]; then
-  PKG_DEPENDS_TARGET+=" ${OPENGLES}"
-fi
-
-pre_configure_target() {
-  sed -i 's/info->library_name = "ParaLLEl N64";/info->library_name = "ParaLLEl N64 Glide64";/g' ${PKG_BUILD}/libretro/libretro.c
-  sed -i 's/"GFX Plugin; auto|glide64|gln64|rice/"GFX Plugin; glide64|auto|gln64|rice/g' ${PKG_BUILD}/libretro/libretro.c
-  sed -i 's/"Resolution (restart); 320x240|640x480|960x720/"Resolution (restart); 640x480|320x240|960x720/g' ${PKG_BUILD}/libretro/libretro.c
-  sed -i 's/"Framerate (restart); original|fullspeed"/"Framerate (restart); fullspeed|original"/g' ${PKG_BUILD}/libretro/libretro.c
-  sed -i 's/"GFX Accuracy (restart); veryhigh|high|medium|low"/"GFX Accuracy (restart); low|veryhigh|high|medium"/g' ${PKG_BUILD}/libretro/libretro.c
-  sed -i 's/"(Glide64) Texture Filtering; automatic|N64 3-point|bilinear|nearest"/"(Glide64) Texture Filtering; nearest|automatic|N64 3-point|bilinear"/g' ${PKG_BUILD}/libretro/libretro.c
-}
-
-makeinstall_target() {
-  mkdir -p ${INSTALL}/usr/lib/libretro
-  case ${ARCH} in
-    arm|x86_64)
-      cp parallel_n64_libretro.so ${INSTALL}/usr/lib/libretro/parallel_n64_glide64_libretro.so
-    ;;
-    aarch64)
-      cp -vP ${ROOT}/build.${DISTRO}-${DEVICE}.arm/parallel-n64_glide64-*/.install_pkg/usr/lib/libretro/parallel_n64_glide64_libretro.so ${INSTALL}/usr/lib/libretro/parallel_n64_glide64_libretro.so
-      cp -vP ${PKG_BUILD}/../core-info-*/parallel_n64_libretro.info ${INSTALL}/usr/lib/libretro/parallel_n64_glide64_libretro.info
-      sed -i 's/ParaLLEl N64/ParaLLEl N64 Glide64/g' ${INSTALL}/usr/lib/libretro/parallel_n64_glide64_libretro.info
-    ;;
-  esac
-}
--- a/packages/games/libretro/parallel-n64_gln64/package.mk
+++ b/packages/games/libretro/parallel-n64_gln64/package.mk
@ -1,55 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2019-present Shanti Gilbert (https://github.com/shantigilbert)
-
-PKG_NAME="parallel-n64_gln64"
-PKG_VERSION="a03fdcba6b2e9993f050b50112f597ce2f44fa2c"
-PKG_REV="2"
-PKG_LICENSE="GPLv2"
-PKG_SITE="https://github.com/libretro/parallel-n64"
-PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain core-info"
-PKG_SECTION="libretro"
-PKG_SHORTDESC="Optimized/rewritten Nintendo 64 emulator made specifically for Libretro. Originally based on Mupen64 Plus."
-PKG_LONGDESC="Optimized/rewritten Nintendo 64 emulator made specifically for Libretro. Originally based on Mupen64 Plus."
-PKG_TOOLCHAIN="make"
-PKG_BUILD_FLAGS="-lto"
-PKG_PATCH_DIRS+="${DEVICE}"
-
-if [ ! "${OPENGL}" = "no" ]; then
-  PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd"
-fi
-
-if [ "${OPENGLES_SUPPORT}" = yes ]; then
-  PKG_DEPENDS_TARGET+=" ${OPENGLES}"
-fi
-
-case ${ARCH} in
-  aarch64)
-    make_target() {
-      :
-    }
-  ;;
-esac
-
-pre_configure_target() {
-  sed -i 's/info->library_name = "ParaLLEl N64";/info->library_name = "ParaLLEl N64 GLN64";/g' ${PKG_BUILD}/libretro/libretro.c
-  sed -i 's/"GFX Plugin; auto|glide64|gln64|rice/"GFX Plugin; gln64|auto|glide64|rice/g' ${PKG_BUILD}/libretro/libretro.c
-  sed -i 's/"Resolution (restart); 320x240|640x480|960x720/"Resolution (restart); 640x480|320x240|960x720/g' ${PKG_BUILD}/libretro/libretro.c
-  sed -i 's/"Framerate (restart); original|fullspeed"/"Framerate (restart); fullspeed|original"/g' ${PKG_BUILD}/libretro/libretro.c
-  sed -i 's/"GFX Accuracy (restart); veryhigh|high|medium|low"/"GFX Accuracy (restart); medium|veryhigh|high|low"/g' ${PKG_BUILD}/libretro/libretro.c
-  sed -i 's/"(Glide64) Texture Filtering; automatic|N64 3-point|bilinear|nearest"/"(Glide64) Texture Filtering; nearest|automatic|N64 3-point|bilinear"/g' ${PKG_BUILD}/libretro/libretro.c
-}
-
-makeinstall_target() {
-  mkdir -p ${INSTALL}/usr/lib/libretro
-  case ${ARCH} in
-    arm|x86_64)
-      cp parallel_n64_libretro.so ${INSTALL}/usr/lib/libretro/parallel_n64_gln64_libretro.so
-    ;;
-    aarch64)
-      cp -vP ${ROOT}/build.${DISTRO}-${DEVICE}.arm/parallel-n64_gln64-*/.install_pkg/usr/lib/libretro/parallel_n64_gln64_libretro.so ${INSTALL}/usr/lib/libretro/parallel_n64_gln64_libretro.so
-      cp -vP ${PKG_BUILD}/../core-info-*/parallel_n64_libretro.info ${INSTALL}/usr/lib/libretro/parallel_n64_gln64_libretro.info
-      sed -i 's/ParaLLEl N64/ParaLLEl N64 Rice/g' ${INSTALL}/usr/lib/libretro/parallel_n64_gln64_libretro.info
-   ;;
-  esac
-}
--- a/packages/games/libretro/parallel-n64_rice/package.mk
+++ b/packages/games/libretro/parallel-n64_rice/package.mk
@ -1,55 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2019-present Shanti Gilbert (https://github.com/shantigilbert)
-
-PKG_NAME="parallel-n64_rice"
-PKG_VERSION="a03fdcba6b2e9993f050b50112f597ce2f44fa2c"
-PKG_REV="2"
-PKG_LICENSE="GPLv2"
-PKG_SITE="https://github.com/libretro/parallel-n64"
-PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain core-info"
-PKG_SECTION="libretro"
-PKG_SHORTDESC="Optimized/rewritten Nintendo 64 emulator made specifically for Libretro. Originally based on Mupen64 Plus."
-PKG_LONGDESC="Optimized/rewritten Nintendo 64 emulator made specifically for Libretro. Originally based on Mupen64 Plus."
-PKG_TOOLCHAIN="make"
-PKG_BUILD_FLAGS="-lto"
-PKG_PATCH_DIRS+="${DEVICE}"
-
-if [ ! "${OPENGL}" = "no" ]; then
-  PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd"
-fi
-
-if [ "${OPENGLES_SUPPORT}" = yes ]; then
-  PKG_DEPENDS_TARGET+=" ${OPENGLES}"
-fi
-
-case ${ARCH} in
-  aarch64)
-    make_target() {
-      :
-    }
-  ;;
-esac
-
-pre_configure_target() {
-  sed -i 's/info->library_name = "ParaLLEl N64";/info->library_name = "ParaLLEl N64 Rice";/g' ${PKG_BUILD}/libretro/libretro.c
-  sed -i 's/"GFX Plugin; auto|glide64|gln64|rice/"GFX Plugin; rice|auto|glide64|gln64/g' ${PKG_BUILD}/libretro/libretro.c
-  #sed -i 's/"Resolution (restart); 320x240|640x480|960x720/"Resolution (restart); 640x480|320x240|960x720/g' ${PKG_BUILD}/libretro/libretro.c
-  sed -i 's/"Framerate (restart); original|fullspeed"/"Framerate (restart); fullspeed|original"/g' ${PKG_BUILD}/libretro/libretro.c
-  sed -i 's/"GFX Accuracy (restart); veryhigh|high|medium|low"/"GFX Accuracy (restart); low|veryhigh|high|medium"/g' ${PKG_BUILD}/libretro/libretro.c
-  sed -i 's/"(Glide64) Texture Filtering; automatic|N64 3-point|bilinear|nearest"/"(Glide64) Texture Filtering; nearest|automatic|N64 3-point|bilinear"/g' ${PKG_BUILD}/libretro/libretro.c
-}
-
-makeinstall_target() {
-  mkdir -p ${INSTALL}/usr/lib/libretro
-  case ${ARCH} in
-    arm|x86_64)
-      cp parallel_n64_libretro.so ${INSTALL}/usr/lib/libretro/parallel_n64_rice_libretro.so
-    ;;
-    aarch64)
-      cp -vP ${ROOT}/build.${DISTRO}-${DEVICE}.arm/parallel-n64_rice-*/.install_pkg/usr/lib/libretro/parallel_n64_rice_libretro.so ${INSTALL}/usr/lib/libretro/parallel_n64_rice_libretro.so
-      cp -vP ${PKG_BUILD}/../core-info-*/parallel_n64_libretro.info ${INSTALL}/usr/lib/libretro/parallel_n64_rice_libretro.info
-      sed -i 's/ParaLLEl N64/ParaLLEl N64 Rice/g' ${INSTALL}/usr/lib/libretro/parallel_n64_rice_libretro.info
-   ;;
-  esac
-}
--- a/packages/jelos/sources/scripts/setsettings.sh
+++ b/packages/jelos/sources/scripts/setsettings.sh
@ -641,6 +641,21 @@ get_game_setting "parallel_n64_gfx_accuracy"
                sed -i '/parallel-n64-gfxplugin-accuracy = /c\parallel-n64-gfxplugin-accuracy = "veryhigh"' "/storage/.config/retroarch/config/ParaLLEl N64/ParaLLEl N64.opt"
        fi

+get_game_setting "parallel_n64_controller_pak"
+
+        if [ "${EES}" == "none" ]
+        then
+                sed -i '/parallel-n64-pak1 = /c\parallel-n64-pak1 = "none"' "/storage/.config/retroarch/config/ParaLLEl N64/ParaLLEl N64.opt"
+        fi
+        if [ "${EES}" == "memory" ]
+        then
+                sed -i '/parallel-n64-pak1 = /c\parallel-n64-pak1 = "memory"' "/storage/.config/retroarch/config/ParaLLEl N64/ParaLLEl N64.opt"
+        fi
+        if [ "${EES}" == "rumble" ]
+        then
+                sed -i '/parallel-n64-pak1 = /c\parallel-n64-pak1 = "rumble"' "/storage/.config/retroarch/config/ParaLLEl N64/ParaLLEl N64.opt"
+        fi
+
 ##
 ## Settings for special cores
 ##
--- a/packages/ui/emulationstation/config/common/es_features.cfg
+++ b/packages/ui/emulationstation/config/common/es_features.cfg
@ -346,6 +346,11 @@
             <choice name="high" value="high"/>
             <choice name="very high" value="veryhigh"/>
          </feature>
+          <feature name="parallel n64 controller pak">
+             <choice name="none" value="none"/>
+             <choice name="memory" value="memory"/>
+             <choice name="rumble" value="rumble"/>
+          </feature>
        </features>
      </core>
      <core name="pcsx_rearmed" features="netplay, rewind, autosave, cheevos" />