Merge pull request #2651 from JustEnoughLinuxOS/dev

PR for release
JustEnoughLinuxOS · Jan 9, 2024 · 68414f1 · 68414f1
2 parents 4f44c70 + f9555a7
commit 68414f1
Show file tree

Hide file tree

Showing 96 changed files with 192,230 additions and 2,415 deletions.
diff --git a/.github/workflows/release-dev.yaml b/.github/workflows/release-dev.yaml
@@ -6,8 +6,6 @@
 
 name: release-dev
 on:
-  schedule:
-    - cron:  '0 12 * * *'
   workflow_dispatch:
 env:
   BRANCH: dev

diff --git a/README.md b/README.md
@@ -115,6 +115,7 @@ JELOS supports a variety of ARM and Intel/AMD based devices.
 | AYANEO | [Air / Air Pro](http://jelos.org/devices/ayaneo/air) | Amd Ryzen 5 5560U / AMD Ryzen 7 5825U (x86_64) | Mainline Linux | Radeonsi | Weston + Emulation Station |
 | AYANEO | [Air Plus](http://jelos.org/devices/ayaneo/air-plus) | Amd Ryzen 7 6800U / (x86_64) | Mainline Linux | Radeonsi | Weston + Emulation Station |
 | AYANEO | [AYANEO 2](http://jelos.org/devices/ayaneo/ayaneo-2) | Amd Ryzen 7 6800U / (x86_64) | Mainline Linux | Radeonsi | Weston + Emulation Station |
+| AYANEO | [AYANEO 2S](http://jelos.org/devices/ayaneo/ayaneo-2) | Amd Ryzen 7 7840U / (x86_64) | Mainline Linux | Radeonsi | Weston + Emulation Station |
 | Ayn | [Loki Zero](http://jelos.org/devices/ayn/loki-zero) | AMD Athlon Silver 3050e (x86_64) | Mainline Linux | Radeonsi | Weston + Emulation Station |
 | Ayn | [Loki Max](http://jelos.org/devices/ayn/loki-max) | Amd Ryzen 7 6800U / (x86_64) | Mainline Linux | Radeonsi | Weston + Emulation Station |
 | GPD | [Win 4](http://jelos.org/devices/gpd/win4) | Amd Ryzen 7 6800U / (x86_64) | Mainline Linux | Radeonsi | Weston + Emulation Station |

diff --git a/config/blocklist b/config/blocklist
@@ -12,3 +12,4 @@ 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.
+gzdoom-sa #Stick to release versions.
diff --git a/packages/apps/moonlight/package.mk b/packages/apps/moonlight/package.mk
@@ -14,7 +14,7 @@ if [ "${TARGET_ARCH}" = "x86_64" ]
 then
   PKG_SITE+="qt"
   PKG_URL="${PKG_SITE}.git"
-  PKG_VERSION="8f2db994068757bead7598a8308c9e839be85e8c"
+  PKG_VERSION="c3e886fbcc4664b7afb5f0062c1558eda02b9001"
   PKG_DEPENDS_TARGET+=" qt5"
   PKG_TOOLCHAIN="manual"
   make_target() {

diff --git a/packages/emulators/libretro/beetle-pce-fast-lr/package.mk b/packages/emulators/libretro/beetle-pce-fast-lr/package.mk
@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="beetle-pce-fast-lr"
-PKG_VERSION="fe662eb161f73749a372657192c7fe234bc8e3ad"
+PKG_VERSION="fa2ad8e4ad2c01f2e6dc05e5e9cc3b68153c4d66"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"

diff --git a/packages/emulators/libretro/beetle-pce-lr/package.mk b/packages/emulators/libretro/beetle-pce-lr/package.mk
@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="beetle-pce-lr"
-PKG_VERSION="65977d85040622d15e96b6aa6581e30e6c6829e8"
+PKG_VERSION="7f0375608181c02b504d585c788a568522a0606c"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"

diff --git a/packages/emulators/libretro/beetle-supafaust-lr/config/Supafaust.opt b/packages/emulators/libretro/beetle-supafaust-lr/config/Supafaust.opt
@@ -0,0 +1,19 @@
+supafaust_audio_rate = "disabled"
+supafaust_correct_aspect = "enabled"
+supafaust_cx4_clock_rate = "100"
+supafaust_deinterlacer = "bob_offset"
+supafaust_frame_begin_vblank = "enabled"
+supafaust_h_filter = "phr256blend_auto512"
+supafaust_multitap = "disabled"
+supafaust_pixel_format = "rgb565"
+supafaust_region = "auto"
+supafaust_renderer = "mt"
+supafaust_run_ahead = "disabled"
+supafaust_slend = "223"
+supafaust_slendp = "238"
+supafaust_slstart = "0"
+supafaust_slstartp = "0"
+supafaust_superfx_clock_rate = "100"
+supafaust_superfx_icache = "disabled"
+supafaust_thread_affinity_emu = "0x3"
+supafaust_thread_affinity_ppu = "0xc"
diff --git a/packages/emulators/libretro/beetle-supafaust-lr/package.mk b/packages/emulators/libretro/beetle-supafaust-lr/package.mk
@@ -38,4 +38,7 @@ PKG_AUTORECONF="no"
 makeinstall_target() {
   mkdir -p ${INSTALL}/usr/lib/libretro
   cp ${PKG_BUILD}/mednafen_supafaust_libretro.so ${INSTALL}/usr/lib/libretro/beetle_supafaust_libretro.so
+
+  mkdir -p ${INSTALL}/usr/config/retroarch
+  cp -rf ${PKG_DIR}/config/* ${INSTALL}/usr/config/retroarch/
 }
diff --git a/packages/emulators/libretro/beetle-supergrafx-lr/package.mk b/packages/emulators/libretro/beetle-supergrafx-lr/package.mk
@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="beetle-supergrafx-lr"
-PKG_VERSION="47c977c169cd60f1518d64ccf1fc83481bf6e869"
+PKG_VERSION="b30e5619610f9ddba3932a9a45542c1665121502"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"

diff --git a/packages/emulators/libretro/bsnes-lr/package.mk b/packages/emulators/libretro/bsnes-lr/package.mk
@@ -2,7 +2,7 @@
 # Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS)
 
 PKG_NAME="bsnes-lr"
-PKG_VERSION="370a8642b1ec06d60d65467f4db1b098e4cb49f1"
+PKG_VERSION="80066f22b12014f02f853fbfcf0f494c974800ec"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/bsnes-libretro"
 PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz"

diff --git a/packages/emulators/libretro/cap32-lr/package.mk b/packages/emulators/libretro/cap32-lr/package.mk
@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="cap32-lr"
-PKG_VERSION="4a071f2c004273abf0f9fa0640b36f6664d8381a"
+PKG_VERSION="e727310c86ef1dc1d1c3ffa2e7fa73b3c8dd0d0d"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"

diff --git a/packages/emulators/libretro/dosbox-pure-lr/package.mk b/packages/emulators/libretro/dosbox-pure-lr/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="dosbox-pure-lr"
-PKG_VERSION="696503df41c52376cc4de8774c4c46107a846a8f"
+PKG_VERSION="87bf6365158325b76ff238c1ad8daf16a859bbe8"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"

diff --git a/packages/emulators/libretro/fbneo-lr/package.mk b/packages/emulators/libretro/fbneo-lr/package.mk
@@ -4,7 +4,7 @@
 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
 
 PKG_NAME="fbneo-lr"
-PKG_VERSION="c6cb6e43497f45a7d39e1194447f318eb0b27b16"
+PKG_VERSION="4138e7d4f949780f4176f6c174177eb3b6cc2789"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"

diff --git a/packages/emulators/libretro/fceumm-lr/package.mk b/packages/emulators/libretro/fceumm-lr/package.mk
@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="fceumm-lr"
-PKG_VERSION="76bde1c45707db6c5947c35b9c3e46dea4eb6258"
+PKG_VERSION="20efbf049918a1000e43fb240fba57ed70887581"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"

diff --git a/packages/emulators/libretro/gambatte-lr/package.mk b/packages/emulators/libretro/gambatte-lr/package.mk
@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="gambatte-lr"
-PKG_VERSION="035dbe127a38ce55501a0dfc3913d85f6446fe9a"
+PKG_VERSION="71d22fdd891e7776f9a175a5a6af51d2b9844b44"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"

diff --git a/packages/emulators/libretro/gearboy-lr/package.mk b/packages/emulators/libretro/gearboy-lr/package.mk
@@ -15,7 +15,7 @@
 ################################################################################
 
 PKG_NAME="gearboy-lr"
-PKG_VERSION="7e2b48051875ea5fe9a61d68b821bab763646c85"
+PKG_VERSION="af6ed2870c104e266accfb3cbb2fde761cec9e63"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

diff --git a/packages/emulators/libretro/gearcoleco-lr/package.mk b/packages/emulators/libretro/gearcoleco-lr/package.mk
@@ -15,7 +15,7 @@
 ################################################################################
 
 PKG_NAME="gearcoleco-lr"
-PKG_VERSION="09f8d89f1c35bbd5d6eaf5fb47c090a3fdad28ba"
+PKG_VERSION="512990acdeb98fc87483e2964f21be557ccd0844"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

diff --git a/packages/emulators/libretro/gearsystem-lr/package.mk b/packages/emulators/libretro/gearsystem-lr/package.mk
@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="gearsystem-lr"
-PKG_VERSION="302fc34fc36e33d017bbc6dbe3ca101e6e3fafae"
+PKG_VERSION="538367784fecf9767cf9197794b9d489fd044042"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"

diff --git a/packages/emulators/libretro/genesis-plus-gx-lr/package.mk b/packages/emulators/libretro/genesis-plus-gx-lr/package.mk
@@ -21,7 +21,7 @@
 ################################################################################
 
 PKG_NAME="genesis-plus-gx-lr"
-PKG_VERSION="5ca4135eed69e8ce153c76e403491eae560eae69"
+PKG_VERSION="565c126dfa2edd12c6ab27acb168465bace33171"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"

diff --git a/packages/emulators/libretro/genesis-plus-gx-wide-lr/package.mk b/packages/emulators/libretro/genesis-plus-gx-wide-lr/package.mk
@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="genesis-plus-gx-wide-lr"
-PKG_VERSION="659329cbfbc3267f4f617910a3ecee60dd655dac"
+PKG_VERSION="d5531ca58d628a2ba6f791804aa01e2fb2cb0e13"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"

diff --git a/packages/emulators/libretro/handy-lr/package.mk b/packages/emulators/libretro/handy-lr/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="handy-lr"
-PKG_VERSION="0559d3397f689ea453b986311aeac8dbd33afb0b"
+PKG_VERSION="65d6b865544cd441ef2bd18cde7bd834c23d0e48"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Zlib"

diff --git a/packages/emulators/libretro/libretro-database/package.mk b/packages/emulators/libretro/libretro-database/package.mk
@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="libretro-database"
-PKG_VERSION="02dac2c8a7b779b495d5ce93d8fedd01738fc566"
+PKG_VERSION="4d5109f74e9a5b1050398bcbe84ebcf0bd14ff7c"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

diff --git a/packages/emulators/libretro/mame2003-plus-lr/package.mk b/packages/emulators/libretro/mame2003-plus-lr/package.mk
@@ -21,7 +21,7 @@
 ################################################################################
 
 PKG_NAME="mame2003-plus-lr"
-PKG_VERSION="59e49400fa6fc95237885c06732dfeef27687dec"
+PKG_VERSION="b4b8587904ffe8870708861d7209938c33cd7fc3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MAME"

diff --git a/packages/emulators/libretro/mojozork-lr/package.mk b/packages/emulators/libretro/mojozork-lr/package.mk
@@ -2,7 +2,7 @@
 # Copyright (C) 2022-present AmberELEC (https://github.com/AmberELEC)
 
 PKG_NAME="mojozork-lr"
-PKG_VERSION="89832e31d9d05c4e81908286b99db21924f3ba1a"
+PKG_VERSION="5c8d81f8db53c206ace6952472e7a7e68bd8e752"
 PKG_SITE="https://github.com/icculus/mojozork"
 PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"

diff --git a/packages/emulators/libretro/mupen64plus-nx-lr/package.mk b/packages/emulators/libretro/mupen64plus-nx-lr/package.mk
@@ -2,7 +2,7 @@
 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
 
 PKG_NAME="mupen64plus-nx-lr"
-PKG_VERSION="f1ad37c3a9be64b499d9a36f57e41d59fb677c73"
+PKG_VERSION="9e54bfbee47cd161df31c6bf429a9761ae7e005a"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/mupen64plus-libretro-nx"
 PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz"

diff --git a/packages/emulators/libretro/opera-lr/package.mk b/packages/emulators/libretro/opera-lr/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="opera-lr"
-PKG_VERSION="100ae1e7decefe1f17d98cfcb9f2af4ff8452691"
+PKG_VERSION="a830b24fc38b62c36ae3086c7c6e1159e9d7b064"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL with additional notes"

diff --git a/packages/emulators/libretro/pcsx_rearmed-lr/package.mk b/packages/emulators/libretro/pcsx_rearmed-lr/package.mk
@@ -3,7 +3,7 @@
 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
 
 PKG_NAME="pcsx_rearmed-lr"
-PKG_VERSION="963f41620dce6ddb2527b7e3dced09564031f783"
+PKG_VERSION="5ee1c9269d333936eba3e7e3259956f601ff5edd"
 PKG_ARCH="arm aarch64"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/pcsx_rearmed"

diff --git a/packages/emulators/libretro/picodrive-lr/package.mk b/packages/emulators/libretro/picodrive-lr/package.mk
@@ -1,5 +1,5 @@
 PKG_NAME="picodrive-lr"
-PKG_VERSION="6101a0052d9a49bc9f5a5f97f1369a41726f25d6"
+PKG_VERSION="019421c9a1d70cc7d30ae4bfa60a79660a0e2bcd"
 PKG_LICENSE="MAME"
 PKG_SITE="https://github.com/libretro/picodrive"
 PKG_URL="${PKG_SITE}.git"

diff --git a/packages/emulators/libretro/scummvm-lr/package.mk b/packages/emulators/libretro/scummvm-lr/package.mk
@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="scummvm-lr"
-PKG_VERSION="0db091d15ac2a1a6058c8f0d69df36d23bc3638f"
+PKG_VERSION="6118a0d92907ae68c38d444a680aa4a1610099c8"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"

diff --git a/packages/emulators/libretro/slang-shaders/package.mk b/packages/emulators/libretro/slang-shaders/package.mk
@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="slang-shaders"
-PKG_VERSION="8595c3cbea2120bc9b82e4ff756f61100543ec83"
+PKG_VERSION="5e1db94e0d3e5cde0267e0766a9b2f4344f652c8"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

diff --git a/packages/emulators/libretro/stella-lr/package.mk b/packages/emulators/libretro/stella-lr/package.mk
@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="stella-lr"
-PKG_VERSION="8fe2adf28affc0477ee91689edef3b90168cd3ce"
+PKG_VERSION="39caf7d629eda889d239fea629b56f38e6fff2fc"
 PKG_REV="1"
 PKG_LICENSE="GPL2"
 PKG_SITE="https://github.com/stella-emu/stella"

diff --git a/packages/emulators/libretro/tic80-lr/package.mk b/packages/emulators/libretro/tic80-lr/package.mk
@@ -2,7 +2,7 @@
 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
 
 PKG_NAME="tic80-lr"
-PKG_VERSION="8bae7dd6fae8e2660f2523992392a07357e6eabf"
+PKG_VERSION="f83a769e63783aac848cb1084450064c16ce0b83"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/nesbox/TIC-80"
 PKG_URL="${PKG_SITE}.git"

diff --git a/packages/emulators/libretro/tic80-lr/patches/001-dont-build-with-janet.patch b/packages/emulators/libretro/tic80-lr/patches/001-dont-build-with-janet.patch
@@ -1,8 +1,8 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 22f6adb2..465e48cd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -479,7 +479,7 @@ endif()
+diff --git a/cmake/janet.cmake b/cmake/janet.cmake
+index 5830878e..65a71989 100644
+--- a/cmake/janet.cmake
++++ b/cmake/janet.cmake
+@@ -2,7 +2,7 @@
  # Janet
  ################################
 
@@ -11,3 +11,10 @@ index 22f6adb2..465e48cd 100644
 
  option(BUILD_WITH_JANET "Janet Enabled" ${BUILD_WITH_JANET_DEFAULT})
  message("BUILD_WITH_JANET: ${BUILD_WITH_JANET}")
+@@ -42,4 +42,4 @@ if(BUILD_WITH_JANET)
+     target_include_directories(janet PUBLIC ${CMAKE_SOURCE_DIR}/build/janet/)
+     target_compile_definitions(janet INTERFACE TIC_BUILD_WITH_JANET=1)
+
+-endif()
+\ No newline at end of file
++endif()
diff --git a/packages/emulators/standalone/citra-sa/package.mk b/packages/emulators/standalone/citra-sa/package.mk
@@ -17,7 +17,7 @@ case ${DEVICE} in
   ;;
   *)
     PKG_URL="${PKG_SITE}.git"
-    PKG_VERSION="b6b98af105c7bcc958b5888f8a3b85fec71989ed"
+    PKG_VERSION="9b147d3f9c31bc6af1ce1281c52b02b338925e5a"
   ;;
 esac
 

diff --git a/packages/emulators/standalone/dolphin-sa/package.mk b/packages/emulators/standalone/dolphin-sa/package.mk
@@ -45,18 +45,15 @@ if [ "${VULKAN_SUPPORT}" = "yes" ]
 then
   PKG_DEPENDS_TARGET+=" vulkan-loader vulkan-headers"
   PKG_CMAKE_OPTS_TARGET+=" -DENABLE_VULKAN=ON"
+else
+  PKG_CMAKE_OPTS_TARGET+=" -DENABLE_VULKAN=OFF"
 fi
 
 pre_configure_target() {
-  sed -i 's~#include <cstdlib>~#include <cstdlib>\n#include <cstdint>~g' ${PKG_BUILD}/Externals/VulkanMemoryAllocator/include/vk_mem_alloc.h
-  sed -i 's~#include <cstdint>~#include <cstdint>\n#include <string>~g' ${PKG_BUILD}/Externals/VulkanMemoryAllocator/include/vk_mem_alloc.h
-}
-
-PKG_CMAKE_OPTS_TARGET+=" -DENABLE_HEADLESS=ON \
+  PKG_CMAKE_OPTS_TARGET+=" -DENABLE_HEADLESS=ON \
                          -DENABLE_EVDEV=ON \
                          -DUSE_DISCORD_PRESENCE=OFF \
                          -DBUILD_SHARED_LIBS=OFF \
-                         -DUSE_MGBA=OFF \
                          -DLINUX_LOCAL_DEV=ON \
                          -DENABLE_PULSEAUDIO=ON \
                          -DENABLE_ALSA=ON \
@@ -67,7 +64,10 @@ PKG_CMAKE_OPTS_TARGET+=" -DENABLE_HEADLESS=ON \
                          -DENABLE_QT=OFF \
                          -DENCODE_FRAMEDUMPS=OFF \
                          -DENABLE_CLI_TOOL=OFF"
+  sed -i 's~#include <cstdlib>~#include <cstdlib>\n#include <cstdint>~g' ${PKG_BUILD}/Externals/VulkanMemoryAllocator/include/vk_mem_alloc.h
+  sed -i 's~#include <cstdint>~#include <cstdint>\n#include <string>~g' ${PKG_BUILD}/Externals/VulkanMemoryAllocator/include/vk_mem_alloc.h
 
+}
 
 makeinstall_target() {
   mkdir -p ${INSTALL}/usr/bin

diff --git a/packages/emulators/standalone/flycast-sa/package.mk b/packages/emulators/standalone/flycast-sa/package.mk
@@ -3,7 +3,7 @@
 # Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS)
 
 PKG_NAME="flycast-sa"
-PKG_VERSION="f4f087a6ea83a5483dedf23ad2b38763988eccc5"
+PKG_VERSION="e7d0a5f2f9e656bab8bbe64d9d5d9cf6034cf444"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/flyinghead/flycast"
 PKG_URL="${PKG_SITE}.git"

diff --git a/packages/emulators/standalone/gzdoom-sa/package.mk b/packages/emulators/standalone/gzdoom-sa/package.mk
@@ -3,10 +3,11 @@
 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
 
 PKG_NAME="gzdoom-sa"
-PKG_VERSION="a368588db6f8485072429f264aca2d9c411fe9b2"
+PKG_VERSION="6ce809e"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/ZDoom/gzdoom"
 PKG_URL="${PKG_SITE}.git"
+PKG_GIT_CLONE_BRANCH="4.11"
 PKG_DEPENDS_HOST="toolchain SDL2:host zmusic:host libvpx: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"
@@ -36,15 +37,15 @@ 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
-    PKG_CMAKE_OPTS_TARGET+=" -DHAVE_GLES2=ON \
-                             -DHAVE_VULKAN=OFF"
+    PKG_CMAKE_OPTS_TARGET+=" -DHAVE_GLES2=ON"
   fi
 
   ### Enable vulkan support on devices that have it available.
   if [ "${VULKAN_SUPPORT}" = "yes" ]
   then
     PKG_CMAKE_OPTS_TARGET+=" -DHAVE_VULKAN=ON"
+  else
+    PKG_CMAKE_OPTS_TARGET+=" -DHAVE_VULKAN=OFF"
   fi
 }