S922X cleanup

BUILDING.md

@@ -109,6 +109,7 @@ Building JELOS is easy, the fastest and most recommended method is to instruct t
 |handheld||```make docker-handheld```|
 |RK3588||```make docker-RK3588```|
 |RK3566||```make docker-RK3566```|
+|S922X||```make docker-S922X```|
 |ALL DEVICES||```make docker-world```|
 
 > Devices that list a dependency require the dependency to be built first as that build will be used as the root of the device you are building.  This will be done automatically by the build tooling when you start a build for your device.

packages/graphics/gl4es/package.mk

@@ -4,20 +4,34 @@
 # Copyright (C) 2023-present Fewtarius
 
 PKG_NAME="gl4es"
-PKG_VERSION="57240b0f06551a49c94f90abccc54767c738791e"
-PKG_SITE="https://github.com/ptitSeb/gl4es"
 PKG_LICENSE="GPL"
 PKG_URL="${PKG_SITE}.git"
 PKG_DEPENDS_TARGET="toolchain ${OPENGLES}"
 PKG_LONGDESC="OpenGL 2.x functionality for GLES2.0 accelerated Hardware"
 PKG_TOOLCHAIN="cmake-make"
 
+case ${DEVICE} in
+  S922X)
+    PKG_SITE="https://github.com/JohnnyonFlame/gl4es"
+    PKG_URL="${PKG_SITE}.git"
+    PKG_VERSION="17a7876ae76eb7b50ff375d80abd35018e58a50d"
+    PKG_GIT_CLONE_BRANCH="ge2d"
+  ;;
+  *)
+    PKG_SITE="https://github.com/ptitSeb/gl4es"
+    PKG_URL="${PKG_SITE}.git"
+    PKG_VERSION="22eaac79757b0e4fe011deef9cc0596ba35c22b0"
+  ;;
+esac
+
+
 pre_configure_target() {
   PKG_CMAKE_OPTS_TARGET=" -DGBM=ON -DCMAKE_BUILD_TYPE=Release "
   if [ ! "${DISPLAYSERVER}" = "x11" ]
   then
-    PKG_CMAKE_OPTS_TARGET+=" -DNOX11=1"
+    PKG_CMAKE_OPTS_TARGET+=" -DNOX11=ON"
   else
     PKG_DEPENDS_TARGET+=" libX11"
   fi
+    PKG_CMAKE_OPTS_TARGET+=" -DGLX_STUBS=ON -DEGL_WRAPPER=ON -DGBM=ON"
 }

packages/ui/emulationstation/config/device/S922X/es_systems.cfg

@@ -225,7 +225,6 @@
          <emulator name="retroarch">
             <cores>
                <core default="true">flycast</core>
-	       <core>flycast32</core>
             </cores>
          </emulator>
          <emulator name="flycast">
@@ -512,7 +511,6 @@
          <emulator name="retroarch">
             <cores>
                <core default="true">flycast</core>
-               <core>flycast32</core>
             </cores>
          </emulator>
          <emulator name="flycast">
@@ -1084,7 +1082,6 @@
          <emulator name="retroarch">
             <cores>
                <core default="true">flycast</core>
-               <core>flycast32</core>
             </cores>
          </emulator>
          <emulator name="flycast">
@@ -1445,8 +1442,7 @@
       <emulators>
          <emulator name="retroarch">
             <cores>
-               <core default="true">pcsx_rearmed32</core>
-               <core>pcsx_rearmed</core>            
+               <core default="true">pcsx_rearmed</core>
                <core>beetle_psx</core>            
                <core>swanstation</core>
                <core>duckstation</core>