Merge pull request #79 from fewtarius/dev

Adds hypes-singe.
2022-04-18 19:34:25 -04:00 · 2022-04-18 19:34:25 -04:00 · 96f6b0fe28
commit 96f6b0fe28
parent 2bf3015bce c03d838d05
51 changed files with 307 additions and 104 deletions
--- a/packages/audio/libvorbis/package.mk
+++ b/packages/audio/libvorbis/package.mk
@ -13,9 +13,7 @@ PKG_LONGDESC="Lossless audio compression tools using the ogg-vorbis algorithms."
 PKG_TOOLCHAIN="autotools"
 PKG_BUILD_FLAGS="+pic"

-PKG_CONFIGURE_OPTS_TARGET="--enable-static \
-                           --disable-shared \
-                           --with-ogg=${SYSROOT_PREFIX}/usr \
+PKG_CONFIGURE_OPTS_TARGET="--with-ogg=${SYSROOT_PREFIX}/usr \
                           --disable-docs \
                           --disable-examples \
                           --disable-oggtest"
--- a/packages/games/emulators/PPSSPPSDL/package.mk
+++ b/packages/games/emulators/PPSSPPSDL/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2019-present Shanti Gilbert (https://github.com/shantigilbert)
 # Copyright (C) 2022-present Fewtarius
 PKG_NAME="PPSSPPSDL"
-PKG_VERSION="6de574104c95839c1c4b8fd2695149bcc706a6e6"
+PKG_VERSION="83b8211abf7fb705835eb1ccf8feae04816ae96c"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
--- a/packages/games/emulators/amiberry/package.mk
+++ b/packages/games/emulators/amiberry/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2018-present Frank Hartung (supervisedthinking (@) gmail.com)

 PKG_NAME="amiberry"
-PKG_VERSION="9d8619b"
+PKG_VERSION="e23ca569b4e3bcbe0112fc4d32302334eaa3fdd7"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/midwan/amiberry"
 PKG_URL="${PKG_SITE}.git"
--- a/packages/games/emulators/flycastsa/package.mk
+++ b/packages/games/emulators/flycastsa/package.mk
@ -3,7 +3,7 @@
 # Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech)

 PKG_NAME="flycastsa"
-PKG_VERSION="fd50529d864c0af7007f2f283a84bf67851fe0e4"
+PKG_VERSION="aa6c9e21063c929ccf651328547e5c6a9afd1f62"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/flyinghead/flycast"
 PKG_URL="$PKG_SITE.git"
--- a/packages/games/emulators/hatarisa/package.mk
+++ b/packages/games/emulators/hatarisa/package.mk
@ -2,8 +2,8 @@
 # Copyright (C) 2018-present 5schatten (https://github.com/5schatten)

 PKG_NAME="hatarisa"
-PKG_VERSION="3b2ebaed34ccd551c2f38b0433cdcf809b7be2fd"
-PKG_SHA256="7da1fb5f73dfa2050e863ee08a3cc73cd342a79ebff763a3da95ac40d275506d"
+PKG_VERSION="7c8ed67c8a419cb2f83bd5cc02e870f467f2596c"
+PKG_SHA256="4c895ab40c7c7a8a1c293f8b4931ed8930ccd1214a8160d85dc9ab12ecd5a984"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/hatari/hatari"
 PKG_URL="https://github.com/hatari/hatari/archive/${PKG_VERSION}.tar.gz"
--- a/packages/games/emulators/hypseus-singe/package.mk
+++ b/packages/games/emulators/hypseus-singe/package.mk
@ -0,0 +1,31 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2021-present Shanti Gilbert (https://github.com/shantigilbert)
+# Copyright (C) 2022-present Fewtarius
+
+PKG_NAME="hypseus-singe"
+PKG_VERSION="7ada3221c4eaf85581c3714e65fe38d7082d4051"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL3"
+PKG_SITE="https://github.com/DirtBagXon/hypseus-singe"
+PKG_URL="${PKG_SITE}.git"
+PKG_DEPENDS_TARGET="toolchain SDL2 libogg libvorbis"
+PKG_LONGDESC="Hypseus is a fork of Daphne. A program that lets one play the original versions of many laserdisc arcade games on one's PC."
+PKG_TOOLCHAIN="cmake"
+GET_HANDLER_SUPPORT="git"
+
+PKG_CMAKE_OPTS_TARGET=" ./src"
+
+pre_configure_target() {
+  mkdir -p ${INSTALL}/usr/config/game/configs/hypseus
+  ln -fs /storage/roms/daphne/roms ${INSTALL}/usr/config/game/configs/hypseus/roms
+  ln -fs /usr/share/daphne/sound ${INSTALL}/usr/config/game/configs/hypseus/sound
+  ln -fs /usr/share/daphne/fonts ${INSTALL}/usr/config/game/configs/hypseus/fonts
+  ln -fs /usr/share/daphne/pics ${INSTALL}/usr/config/game/configs/hypseus/pics
+}
+
+post_makeinstall_target() {
+  cp -rf ${PKG_BUILD}/doc/hypinput.ini ${INSTALL}/usr/config/game/configs/hypseus/
+  ln -fs /storage/.config/game/configs/hypseus/hypinput.ini ${INSTALL}/usr/share/daphne/hypinput.ini
+  cp ${PKG_BUILD}/start_hypseus.sh ${INSTALL}/usr/bin
+}
--- a/packages/games/emulators/hypseus-singe/patches/hypseus-singe-001-buildfix.patch
+++ b/packages/games/emulators/hypseus-singe/patches/hypseus-singe-001-buildfix.patch
@ -0,0 +1,89 @@
+--- a/src/CMakeLists.txt	2021-06-07 19:12:18.646828485 +0200
+++ b/src/CMakeLists.txt	2021-06-07 19:13:56.113491528 +0200
+@@ -45,14 +45,12 @@
+ include(GNUInstallDirs)
+ include(InstallRequiredSystemLibraries)
+ include(FindPkgConfig)
+-include(ExternalProject)
+-include(BuildLibMPEG2)
+ 
+ use_cxx11( )
+ 
+ PKG_SEARCH_MODULE(SDL2 REQUIRED sdl2)
+ PKG_SEARCH_MODULE(SDL2_TTF REQUIRED SDL2_ttf)
+-build_libmpeg2( )
+PKG_SEARCH_MODULE(MPEG2 REQUIRED libmpeg2)
+ 
+ message(STATUS "Target: ${CMAKE_SYSTEM_NAME} ${CMAKE_TARGET_ARCHITECTURES}")
+ 
+@@ -91,7 +89,6 @@
+ add_subdirectory(video)
+ add_subdirectory(vldp)
+ 
+-add_dependencies( vldp libmpeg2 )
+ add_dependencies( ldp-out vldp )
+ add_dependencies( game vldp )
+ add_dependencies( sound vldp )
+@@ -129,3 +129,5 @@ set(CPACK_PACKAGE_VERSION_MINOR "${VER_MINOR}")
+ set(CPACK_PACKAGE_VERSION_PATCH "${VER_PATCH}")
+ 
+ include(CPack)
+install(TARGETS hypseus DESTINATION bin)
+install(DIRECTORY ../pics ../fonts ../sound DESTINATION /usr/share/daphne)
+diff --git a/src/vldp/vldp.h b/src/vldp/vldp.h
+index a59c723..3c986dc 100644
+--- a/src/vldp/vldp.h
+++ b/src/vldp/vldp.h
+@@ -34,6 +34,8 @@ extern "C" {
+ // Ubuntu Linux complains with plain <SDL.h>
+ #include <SDL2/SDL.h> // only used for threading
+ 
+#include <mpeg2dec/mpeg2.h>
+
+ struct yuv_buf {
+     uint8_t *Y;     // Y channel
+     uint8_t *U;     // U channel
+diff --git a/src/vldp/vldp_internal.h b/src/vldp/vldp_internal.h
+index cd046fe..67cea2d 100644
+--- a/src/vldp/vldp_internal.h
+++ b/src/vldp/vldp_internal.h
+@@ -27,7 +27,6 @@
+ 
+ #include "vldp.h" // for the VLDP_BOOL definition and SDL.h
+ 
+-#include <mpeg2.h>
+ 
+ // this is which version of the .dat file format we are using
+ #define DAT_VERSION 2
+ 
+--- a/src/manymouse/manymouse.c
+++ b/src/manymouse/manymouse.c
+@@ -17,7 +17,6 @@
+ extern const ManyMouseDriver *ManyMouseDriver_evdev;
+ extern const ManyMouseDriver *ManyMouseDriver_hidmanager;
+ extern const ManyMouseDriver *ManyMouseDriver_hidutilities;
+-extern const ManyMouseDriver *ManyMouseDriver_xinput2;
+ 
+ /*
+  * These have to be in the favored order...obviously it doesn't matter if the
+@@ -31,7 +30,6 @@
+  */
+ static const ManyMouseDriver **mice_drivers[] =
+ {
+-    &ManyMouseDriver_xinput2,
+     &ManyMouseDriver_evdev,
+     &ManyMouseDriver_windows,
+     &ManyMouseDriver_hidmanager,
+
+--- a/src/manymouse/CMakeLists.txt
+++ b/src/manymouse/CMakeLists.txt
+@@ -1,7 +1,8 @@
+
+
+ set( LIB_SOURCES
+     manymouse.c linux_evdev.c macosx_hidmanager.c
+     macosx_hidutilities.c windows_wminput.c
+-    x11_xinput2.c
+ )
+ 
+ set( LIB_HEADERS
--- a/packages/games/emulators/hypseus-singe/sources/start_hypseus.sh
+++ b/packages/games/emulators/hypseus-singe/sources/start_hypseus.sh
@ -0,0 +1,87 @@
+#!/bin/bash
+
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2021-present Shanti Gilbert (https://github.com/shantigilbert)
+# Copyright (C) 2022-present Fewtarius
+
+dir="${1}"
+name=${dir##*/}
+name=${name%.*}
+config="/storage/.config/game/configs/hypseus"
+configfile="${config}/hypinput.ini"
+
+# Attempt to auto configure gamepad
+#
+GAMEPADINFO="$(sdljoytest -skip_loop)"
+#JOYGUID=$(echo "${GAMEPADINFO}" | grep "Joystick 0 Guid " | sed "s|Joystick 0 Guid ||")
+JOYNAME=$(echo "${GAMEPADINFO}" | grep "Joystick 0 name " | sed "s|Joystick 0 name ||" | sed "s|'||g")
+#
+
+for file in /tmp/joypads/*.cfg; do
+	GAMEPAD=$(cat "$file" | grep input_device|  cut -d'"' -f 2)
+    if [ "${JOYNAME}" == "${GAMEPAD}" ]; then
+        GPFILE="${file}"
+        # Other keys to consider KEY_SCREENSHOT KEY_QUIT KEY_PAUSE
+        for key in KEY_UP KEY_DOWN KEY_LEFT KEY_RIGHT KEY_BUTTON1 KEY_BUTTON2 KEY_BUTTON3 KEY_START1 KEY_COIN1; do 
+            case ${key} in
+                "KEY_UP")
+                button=$(cat "${GPFILE}" | grep -E 'input_up_btn' | cut -d '"' -f2)
+                keyboard="1073741906 0"
+                ;;
+                "KEY_DOWN")
+                button=$(cat "${GPFILE}" | grep -E 'input_down_btn' | cut -d '"' -f2)
+                keyboard="1073741905 0"
+                ;;
+                "KEY_LEFT")
+                button=$(cat "${GPFILE}" | grep -E 'input_left_btn' | cut -d '"' -f2)
+                keyboard="1073741904 0"
+                ;;
+                "KEY_RIGHT")
+                button=$(cat "${GPFILE}" | grep -E 'input_right_btn' | cut -d '"' -f2)
+                keyboard="1073741903 0"
+                ;;
+                "KEY_BUTTON1")
+                button=$(cat "${GPFILE}" | grep -E 'input_a_btn' | cut -d '"' -f2)
+                keyboard="1073742048 0"
+                ;;
+                "KEY_BUTTON2")
+                button=$(cat "${GPFILE}" | grep -E 'input_b_btn' | cut -d '"' -f2) 
+                keyboard="1073742050 0"
+                ;;
+                "KEY_BUTTON3")
+                button=$(cat "${GPFILE}" | grep -E 'input_x_btn' | cut -d '"' -f2) 
+                keyboard="32 0"
+                ;;
+                "KEY_START1")
+                button=$(cat "${GPFILE}" | grep -E 'input_start_btn' | cut -d '"' -f2) 
+                keyboard="49 0"
+                ;;
+                "KEY_COIN1")
+                button=$(cat "${GPFILE}" | grep -E 'input_select_btn' | cut -d '"' -f2) 
+                keyboard="53 54"
+                ;;
+            esac
+
+            # if the button is in fact a hat extract the number, else use the button number+1
+            if [[ "${button}" == "h"* ]]; then
+                button="0 ${button:1:1}"
+            else
+                button="$((${button} + 1))"
+            fi
+
+            sed -i "s|${key}.*|${key} = ${keyboard} ${button} |" ${configfile}
+        done 
+    fi 
+done # finish auto gamepad
+
+if [[ -f "${dir}/${name}.commands" ]]; then
+    params=$(<"${dir}/${name}.commands")
+fi
+
+cd "${config}"
+
+if [[ -f "${dir}/${name}.singe" ]]; then
+    hypseus singe vldp -framefile "${dir}/${name}.txt" -script "${dir}/${name}.singe" -fullscreen -useoverlaysb 2 $params
+else
+    hypseus "${name}" vldp -framefile "${dir}/${name}.txt" -fullscreen -useoverlaysb 2 $params
+fi
--- a/packages/games/emulators/lzdoom/package.mk
+++ b/packages/games/emulators/lzdoom/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="lzdoom"
-PKG_VERSION="e57ebb11265dcf3e48546b6a7e412873348f27e7"
+PKG_VERSION="2ee3ea91bc9c052b3143f44c96d85df22851426f"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/351ELEC/lzdoom"
 PKG_URL="${PKG_SITE}.git"
--- a/packages/games/emulators/mupen64plussa/mupen64plussa-audio-sdl/package.mk
+++ b/packages/games/emulators/mupen64plussa/mupen64plussa-audio-sdl/package.mk
@ -2,8 +2,8 @@
 # Copyright (C) 2019-present Shanti Gilbert (https://github.com/shantigilbert)

 PKG_NAME="mupen64plussa-audio-sdl"
-PKG_VERSION="af6af5b1fd4fdb435c836be15371dd047f395c4d"
-PKG_SHA256="265ccdd56736f9cb4144196ad6673d2728a8ebd1e7b9c4280a632c3a343be261"
+PKG_VERSION="238b119ac9251b63b16718ef4fddb76be5fdec6d"
+PKG_SHA256="c3db901239303abd38beb25327708810c0df4546d2caf5f79c2bc92bd8ee3c54"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/mupen64plus/mupen64plus-audio-sdl"
--- a/packages/games/emulators/mupen64plussa/mupen64plussa-core/package.mk
+++ b/packages/games/emulators/mupen64plussa/mupen64plussa-core/package.mk
@ -2,8 +2,8 @@
 # Copyright (C) 2019-present Shanti Gilbert (https://github.com/shantigilbert)

 PKG_NAME="mupen64plussa-core"
-PKG_VERSION="49dd0bfc8f48afd04ddd1762ea9d9e89a85fc8a2"
-PKG_SHA256="dc1c344044bebaacc1aa4dcc7cb072cbd3677261bfe4f4e748fe6144f02f08b3"
+PKG_VERSION="014b2ab8903dc48f292905d77daf373785c2f705"
+PKG_SHA256="5097db2c40fa12d0ff3ee9f260be2134be679a9225976a7ca661303a7cae4365"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/mupen64plus/mupen64plus-core"
--- a/packages/games/emulators/mupen64plussa/mupen64plussa-input-sdl/package.mk
+++ b/packages/games/emulators/mupen64plussa/mupen64plussa-input-sdl/package.mk
@ -2,8 +2,8 @@
 # Copyright (C) 2019-present Shanti Gilbert (https://github.com/shantigilbert)

 PKG_NAME="mupen64plussa-input-sdl"
-PKG_VERSION="5e20c6f87b73a07c92148cc4d11f9dfb3b0b0f15"
-PKG_SHA256="113558329487f8fba6c6fe361a1ff5863d0e3088c26dde6f1a4eb6c599762917"
+PKG_VERSION="95d901b73725da1ad967c3e2549eab53479a4508"
+PKG_SHA256="61360510c387cbf5ea8439eff9b932f58469d454b51344ac1727f02388ead706"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/mupen64plus/mupen64plus-input-sdl"
--- a/packages/games/emulators/mupen64plussa/mupen64plussa-rsp-hle/package.mk
+++ b/packages/games/emulators/mupen64plussa/mupen64plussa-rsp-hle/package.mk
@ -2,8 +2,8 @@
 # Copyright (C) 2019-present Shanti Gilbert (https://github.com/shantigilbert)

 PKG_NAME="mupen64plussa-rsp-hle"
-PKG_VERSION="4bac3aeb98aff2d89095c59ec105aad721a16167"
-PKG_SHA256="eadefaacbd7e916ae578c8be9ead84d0a079ba1b0bb3f61b9b91f40de5448e37"
+PKG_VERSION="2ae723c33b86a75422a59c87a749e8cdfa8c9593"
+PKG_SHA256="742353572fcc4a9fb1c163ac51838325f52b87505033fc42511451e8fc34dc2f"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/mupen64plus/mupen64plus-rsp-hle"
--- a/packages/games/emulators/mupen64plussa/mupen64plussa-ui-console/package.mk
+++ b/packages/games/emulators/mupen64plussa/mupen64plussa-ui-console/package.mk
@ -2,8 +2,8 @@
 # Copyright (C) 2019-present Shanti Gilbert (https://github.com/shantigilbert)

 PKG_NAME="mupen64plussa-ui-console"
-PKG_VERSION="b5f62979ed77e526877c9c67dbb8568a3511347c"
-PKG_SHA256="0e7da477e58652ecadcf78a474fd9007f613ba9062364bf197ea88f5a7c12ed1"
+PKG_VERSION="cd0c0e6c101f1beaea73205f29143fa549d09dad"
+PKG_SHA256="cc6c9e43f293ce1f8ec1e45719d97d82523987263eb1d29804c064889ce680f1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/mupen64plus/mupen64plus-ui-console"
--- a/packages/games/emulators/mupen64plussa/mupen64plussa-video-glide64mk2/package.mk
+++ b/packages/games/emulators/mupen64plussa/mupen64plussa-video-glide64mk2/package.mk
@ -2,8 +2,8 @@
 # Copyright (C) 2019-present Shanti Gilbert (https://github.com/shantigilbert)

 PKG_NAME="mupen64plussa-video-glide64mk2"
-PKG_VERSION="5ac60b38e2c9d9dea3c21fd341b03799841b0b5f"
-PKG_SHA256="715a4d92f38672225ccf670edbec974816870d061e5ccdf4bc70a49cdccde8d2"
+PKG_VERSION="3266c61cf285b61cdf0945aaa9f0402d75107794"
+PKG_SHA256="dc746fd12a90d9c250a5ca01f55516eca413ffa62003b284121a72178b93a856"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/mupen64plus/mupen64plus-video-glide64mk2"
--- a/packages/games/emulators/mupen64plussa/mupen64plussa-video-rice/package.mk
+++ b/packages/games/emulators/mupen64plussa/mupen64plussa-video-rice/package.mk
@ -2,8 +2,8 @@
 # Copyright (C) 2019-present Shanti Gilbert (https://github.com/shantigilbert)

 PKG_NAME="mupen64plussa-video-rice"
-PKG_VERSION="3da7d800989717111da5992a50a8ac410cac038f"
-PKG_SHA256="4a7d1ac05a0dc82f071afdef747b4a7876140e580e2d6c8b5306865cfb069c43"
+PKG_VERSION="d2244bbf054afd3851cd23e625d5cdfeaf650b08"
+PKG_SHA256="ca3f1ee33bd0bdf61d357dc7d278a5e841d6cc7b64796ab57e60780d85af6864"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/mupen64plus/mupen64plus-video-rice"
--- a/packages/games/emulators/raze/package.mk
+++ b/packages/games/emulators/raze/package.mk
@ -3,7 +3,7 @@
 # Copyright (C) 2022-present Fewtarius

 PKG_NAME="raze"
-PKG_VERSION="a071479339bea27aa886956ac40d608953201c2b"
+PKG_VERSION="f5579caa8fe1a2731202f27ce96723e421f88869"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/coelckers/Raze"
 PKG_URL="${PKG_SITE}.git"
--- a/packages/games/emulators/retroarch/package.mk
+++ b/packages/games/emulators/retroarch/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2021-present 351ELEC (https://github.com/351ELEC)

 PKG_NAME="retroarch"
-PKG_VERSION="9b282aa742b6c3d2f2925ae5a12e2cd7c6b6ad38"
+PKG_VERSION="da5d135a9ffb242618e60718345babe94a13ceb9"
 PKG_SITE="https://github.com/libretro/RetroArch"
 PKG_URL="${PKG_SITE}.git"
 PKG_LICENSE="GPLv3"
--- a/packages/games/emulators/scummvmsa/package.mk
+++ b/packages/games/emulators/scummvmsa/package.mk
@ -3,8 +3,8 @@
 # Copyright (C) 2020-present Fewtarius

 PKG_NAME="scummvmsa"
-PKG_VERSION="7631d04f29da55ce2863999355a0ea052ad63491"
-PKG_SHA256="2b926324029b65119494f64df69397b9ffe2c83cf319f53a277b5e603fae5fba"
+PKG_VERSION="8b4e75ded7a4d02adc5efcbc5aa5fd54e12f24fe"
+PKG_SHA256="22de2f864f48cf2652537c4d6dba3991f1af42e0e4ea555053175c6366c6ef9b"
 PKG_REV="1"
 PKG_LICENSE="GPL2"
 PKG_SITE="https://github.com/scummvm/scummvm"
--- a/packages/games/libretro/81/package.mk
+++ b/packages/games/libretro/81/package.mk
@ -19,8 +19,8 @@
 ################################################################################

 PKG_NAME="81"
-PKG_VERSION="6aba19246c1ec08f3de5659b2dbc3277ec6bfb97"
-PKG_SHA256="0e2d58021b7be33c588698f541bc2d3e630e9d0c773422d79eabc272a1a8cc3b"
+PKG_VERSION="2e34567a320cba27b9162b1776db4de3cdb7cf03"
+PKG_SHA256="574396196d10f9c1aaf92d0f74cda86eefc5e759c1111db6b8b443ec7ed14fca"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
--- a/packages/games/libretro/TIC-80/package.mk
+++ b/packages/games/libretro/TIC-80/package.mk
@ -20,7 +20,7 @@
 ################################################################################

 PKG_NAME="TIC-80"
-PKG_VERSION="f9e2a247956e123708810d91ff3addd0943d1a0d"
+PKG_VERSION="3a4c813d49f110d701d98fd0d96decb5ca0cbf05"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
--- a/packages/games/libretro/cap32/package.mk
+++ b/packages/games/libretro/cap32/package.mk
@ -20,8 +20,8 @@
 ################################################################################

 PKG_NAME="cap32"
-PKG_VERSION="a1b2329416b1e3f32e0859dd8d3c71cb8c3e1c08"
-PKG_SHA256="5debdaab644c1b889cff9ddb4b98836c68805cd12edd26dfcc71095e699a0a9d"
+PKG_VERSION="4450f5aa3c6bae613bbaf0d74ae09df85941c041"
+PKG_SHA256="7a638ad07f83fdc53d428ecdeaf296d0f000ec610cfc16390d2c41fd10b48ade"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
--- a/packages/games/libretro/common-shaders/package.mk
+++ b/packages/games/libretro/common-shaders/package.mk
@ -21,7 +21,7 @@
 ################################################################################

 PKG_NAME="common-shaders"
-PKG_VERSION="55e401834b732e62c34411321c4ffd82524345d4"
+PKG_VERSION="86cfa146a8dfddf6377ddb5dbcff552feae2e5bf"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/games/libretro/dosbox-pure/package.mk
+++ b/packages/games/libretro/dosbox-pure/package.mk
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="dosbox-pure"
-PKG_VERSION="69d33559ca4b4fbe1ba6cee1933b129607088544"
+PKG_VERSION="d6d89900243ae09c816c27d1e44554ccbc7a092e"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
--- a/packages/games/libretro/fbneo/package.mk
+++ b/packages/games/libretro/fbneo/package.mk
@ -3,8 +3,8 @@
 # Maintenance 2020 351ELEC team (https://github.com/fewtarius/351ELEC)

 PKG_NAME="fbneo"
-PKG_VERSION="01bf2e189dcd96f978c3a4ae7bbbb00f2d90aabf"
-PKG_SHA256="d93970f8b93db40dcc63ebeed6074f12fd475599ade49d72102be464499b61e3"
+PKG_VERSION="100c758b1a9b3b647234174b0b1607c8d60cd147"
+PKG_SHA256="3ff7ddf1cf6c02582da5112f0a08aad644cb6f1b06508149c1f62da96a65c017"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"
--- a/packages/games/libretro/flycast/package.mk
+++ b/packages/games/libretro/flycast/package.mk
@ -3,7 +3,7 @@
 # Copyright (C) 2022-present Fewtarius

 PKG_NAME="flycast"
-PKG_VERSION="52d95e537c188adc8032f9f06dd62080d77ba0ed"
+PKG_VERSION="aa6c9e21063c929ccf651328547e5c6a9afd1f62"
 PKG_SITE="https://github.com/flyinghead/flycast"
 PKG_URL="${PKG_SITE}.git"
 PKG_DEPENDS_TARGET="toolchain ${OPENGLES} libzip"
--- a/packages/games/libretro/freechaf/package.mk
+++ b/packages/games/libretro/freechaf/package.mk
@ -1,5 +1,5 @@
 PKG_NAME="freechaf"
-PKG_VERSION="bc5a4ee2889930b7b8d1dd390c8c6ba29f7644dd"
+PKG_VERSION="47da0b39b248d56d5693d61212f4c09b843508df"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
--- a/packages/games/libretro/fuse-libretro/package.mk
+++ b/packages/games/libretro/fuse-libretro/package.mk
@ -20,8 +20,8 @@
 ################################################################################

 PKG_NAME="fuse-libretro"
-PKG_VERSION="8b734a975633a0ed21494c2e1a50e7e1de432122"
-PKG_SHA256="5af46a0f21867501dd3268c2a7679ff60c545c9ea564206e31e657bbf5b298c5"
+PKG_VERSION="71557910d4a2f290fc85235f2fc1b81eec006689"
+PKG_SHA256="acb00dfec35ede9ff76e8fa0839cf47f77a3f197325fc07bec0f77805caac36c"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
--- a/packages/games/libretro/genesis-plus-gx/package.mk
+++ b/packages/games/libretro/genesis-plus-gx/package.mk
@ -20,8 +20,8 @@
 ################################################################################

 PKG_NAME="genesis-plus-gx"
-PKG_VERSION="144045b30a18ab4b27c3ae46490274988f302748"
-PKG_SHA256="356f0dc757a3a4ec8fbe4c9b4c3ddefa93ab1f80e121177aa2d865821ca82214"
+PKG_VERSION="7520ac8aae7b08262c0472e724e6ef0bfe41d285"
+PKG_SHA256="6a5e373f0ae9e8ccf833fd019ff229bf9d298198912603d7862d76c877390c2c"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"
--- a/packages/games/libretro/glsl-shaders/package.mk
+++ b/packages/games/libretro/glsl-shaders/package.mk
@ -20,7 +20,7 @@
 ################################################################################

 PKG_NAME="glsl-shaders"
-PKG_VERSION="8f6b2649489760caea8f36ec6099998854059569"
+PKG_VERSION="ab3eeabd097211998934d87d991c3253f2d32335"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/games/libretro/handy/package.mk
+++ b/packages/games/libretro/handy/package.mk
@ -19,8 +19,8 @@
 ################################################################################

 PKG_NAME="handy"
-PKG_VERSION="5145f79bb746f6d9c0b340c2f9cc4bf059848924"
-PKG_SHA256="fcb505d6f2c88af621e485af59c2ca9d073b419bc05edf28d2a47a453c3f21be"
+PKG_VERSION="517bb2d02909271836604c01c8f09a79ad605297"
+PKG_SHA256="9cb28a26aee3b1ce503458ec3fb954a3464fdd41f1a1acb1e6c93426b2c2f9f0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Zlib"
--- a/packages/games/libretro/libretro-database/package.mk
+++ b/packages/games/libretro/libretro-database/package.mk
@ -20,8 +20,8 @@
 ################################################################################

 PKG_NAME="libretro-database"
-PKG_VERSION="f3b10ec262fcbd78da3473f46d244270d12a327e"
-PKG_SHA256="33e0227f4256d6c97699c03979e75c019b9d4a771516a386e11f04467cb87b1f"
+PKG_VERSION="41f2b87cb5ba5d634b93f8ed4eb6288c2933d746"
+PKG_SHA256="5a13f0e39d926002a32bbe973f7fc8071fce1da5fe0a2752c428190779de57bd"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/games/libretro/mame2000/package.mk
+++ b/packages/games/libretro/mame2000/package.mk
@ -20,8 +20,8 @@
 ################################################################################

 PKG_NAME="mame2000"
-PKG_VERSION="f35db3877f8a79a174dd3b2e37f4ebf39d71d5a4"
-PKG_SHA256="52eff8f99439be00c2875d3811ec1534d2e9a3f08dccfaafd49331dcaf3e6145"
+PKG_VERSION="dd9d6612c29bf5b29bc2f94cab2d43fe3dcd69ee"
+PKG_SHA256="0dded25186c3dd4229c5b9036e853089b7c615f5f1999485b4757eaf5676202a"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MAME"
--- a/packages/games/libretro/pokemini/package.mk
+++ b/packages/games/libretro/pokemini/package.mk
@ -19,8 +19,8 @@
 ################################################################################

 PKG_NAME="pokemini"
-PKG_VERSION="c072d0275c7306c625f1e554a98e7c84137d2841"
-PKG_SHA256="c9e58828853d4f57ab9769dd3b1fe0aba7c4079d6d43162c0afb67b796506beb"
+PKG_VERSION="684e7ea0950f4df48cd1fbf1160e6af3c262c9f0"
+PKG_SHA256="764b09a2d2aa260410ab991b0a9db76d2a1eb0d02828f2da9bfc0e72510c2402"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
--- a/packages/games/libretro/ppsspp/package.mk
+++ b/packages/games/libretro/ppsspp/package.mk
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="ppsspp"
-PKG_VERSION="6de574104c95839c1c4b8fd2695149bcc706a6e6"
+PKG_VERSION="83b8211abf7fb705835eb1ccf8feae04816ae96c"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/hrydgard/ppsspp"
 PKG_URL="https://github.com/hrydgard/ppsspp.git"
--- a/packages/games/libretro/puae/package.mk
+++ b/packages/games/libretro/puae/package.mk
@ -20,8 +20,8 @@
 ################################################################################

 PKG_NAME="puae"
-PKG_VERSION="fd52745fb0955dd0a4efcceb049f5f7f44d69610"
-PKG_SHA256="af73d1ea5917e07f7950404d8f66f20ceac9390abe3d5b362d14e63025f34466"
+PKG_VERSION="7fba9fddcda29a17afe4b51c1a3d02b35e17a7f5"
+PKG_SHA256="876657fcd077c2b7763a3dc13cae0e2f572e50f0a7050f31bb3d971ec0c3c806"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/games/libretro/snes9x/package.mk
+++ b/packages/games/libretro/snes9x/package.mk
@ -19,8 +19,8 @@
 ################################################################################

 PKG_NAME="snes9x"
-PKG_VERSION="92e5907e35ee2e17c7d7f3a1d77f66544926898c"
-PKG_SHA256="a7236ac6e2c8d0bc8602ee060807cbf53762e5688d841aa7b6547b74a25c08df"
+PKG_VERSION="bc65c09c280cb225084099385375d3b513a43455"
+PKG_SHA256="b5a2e4e1663e140bb0503b3d32d31da9428e9dd66a08d249c6a41aecb7bf71f2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"
--- a/packages/games/libretro/stella/package.mk
+++ b/packages/games/libretro/stella/package.mk
@ -19,8 +19,8 @@
 ################################################################################

 PKG_NAME="stella"
-PKG_VERSION="cdecb9165e66fa5ffa83a9f06daf64a2932c4925"
-PKG_SHA256="3c08ddcd183a8dcfd6321535f22c6adca578dbd645c165eece905012d283d023"
+PKG_VERSION="ecaa3197d25d5af6604d04ccc5ee7cc0dc1fcb9b"
+PKG_SHA256="0442dac86010ca8525ec12f8ee0e5ae51853b3cd515d841ab15a73807e8ba703"
 PKG_REV="1"
 PKG_LICENSE="GPL2"
 PKG_SITE="https://github.com/stella-emu/stella"
--- a/packages/games/libretro/swanstation/package.mk
+++ b/packages/games/libretro/swanstation/package.mk
@ -3,8 +3,8 @@
 # Maintenance 2020 351ELEC team (https://github.com/fewtarius/351ELEC)

 PKG_NAME="swanstation"
-PKG_VERSION="0932243b0e5f1a5a237b0521b30b39473b61fa31"
-PKG_SHA256="e2fb73fa16595c8a5db8d0665f9d1a1cb7611f204cd276846e439664d5a79f9f"
+PKG_VERSION="0db3923f1dbb481deeaa9329e00f50ea23a60e4c"
+PKG_SHA256="7cb93d6f4e3eb9e66c7c0e07f447f46a833143d97ebb08ef20a36a740506506c"
 PKG_ARCH="aarch64"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/swanstation"
--- a/packages/games/libretro/uzem/package.mk
+++ b/packages/games/libretro/uzem/package.mk
@ -19,8 +19,8 @@
 ################################################################################

 PKG_NAME="uzem"
-PKG_VERSION="4c70043e4ad6a8a3aa6326834fba53f2b1c68699"
-PKG_SHA256="04d456737bd056df20eb781cc1c18f077e9a36e812345b8de8c0a1c77e53f9b7"
+PKG_VERSION="08e39e19167727c89fb995e3fa70dde252e6aab0"
+PKG_SHA256="a0c84adb7db92826c4cf1c2175972e9d04932d7e88462351669f8ada37cb21bd"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
--- a/packages/games/tools/sdljoytest/package.mk
+++ b/packages/games/tools/sdljoytest/package.mk
@ -0,0 +1,25 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2020-present Shanti Gilbert (https://github.com/shantigilbert)
+# Copyright (C) 2022-present Fewtarius
+
+PKG_NAME="sdljoytest"
+PKG_VERSION="811d9875e0c13e0c87d93351e69169bf74d28270"
+PKG_SHA256="8e5bb4c81ff23f2826efd87c2fc20b1a70b691395c1639ef3b08c87698faa139"
+PKG_LICENSE="OSS"
+PKG_SITE="https://github.com/Wintermute0110/sdljoytest"
+PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain SDL2"
+PKG_LONGDESC="Test joystick with SDL2 in Linux"
+PKG_TOOLCHAIN="make"
+
+pre_configure_target() {
+sed -i "s|gcc|${CC}|" Makefile
+}
+
+makeinstall_target() {
+  mkdir -p ${INSTALL}/usr/bin
+  cp -rf test_gamepad_SDL2 ${INSTALL}/usr/bin
+  ln -s test_gamepad_SDL2 ${INSTALL}/usr/bin/sdljoytest
+  cp -rf map_gamepad_SDL2 ${INSTALL}/usr/bin
+  ln -s map_gamepad_SDL2 ${INSTALL}/usr/bin/sdljoymap
+}
--- a/packages/tools/sysutils/sixaxis/package.mk
+++ b/packages/tools/sysutils/sixaxis/package.mk
@ -1,5 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2019-present Shanti Gilbert (https://github.com/shantigilbert)
+# Copyright (C) 2022-present Fewtarius

 PKG_NAME="sixaxis"
 PKG_VERSION="f53b0ca28c35ebd71b54190f33eadcb8c3267186"
@ -7,7 +8,7 @@ PKG_SHA256="baf7fd22c86c5a32d5043a6bd8487928d2ae216759414632b1d3a998ba61d922"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/RetroPie/sixaxis"
-PKG_URL="$PKG_SITE/archive/$PKG_VERSION.tar.gz"
+PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="emuelec/tools"
 PKG_LONGDESC="sixaxis helper service "
@ -17,9 +18,9 @@ PKG_AUTORECONF="no"


 makeinstall_target() {
-  mkdir -p $INSTALL/usr/bin
-    cp sixaxis-helper.sh $INSTALL/usr/bin/sixaxis-helper.sh
-    cp bins/sixaxis-timeout $INSTALL/usr/bin/sixaxis-timeout
+  mkdir -p ${INSTALL}/usr/bin
+    cp sixaxis-helper.sh ${INSTALL}/usr/bin/sixaxis-helper.sh
+    cp bins/sixaxis-timeout ${INSTALL}/usr/bin/sixaxis-timeout
 }

 post_install() {
--- a/packages/tools/sysutils/sixaxis/system.d/sixaxis@.service
+++ b/packages/tools/sysutils/sixaxis/system.d/sixaxis@.service
--- a/packages/tools/sysutils/sixaxis/udev.d/99-sixaxis.rules
+++ b/packages/tools/sysutils/sixaxis/udev.d/99-sixaxis.rules
--- a/packages/tools/sysutils/sixpair/package.mk
+++ b/packages/tools/sysutils/sixpair/package.mk
@ -1,5 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2019-present Shanti Gilbert (https://github.com/shantigilbert)
+# Copyright (C) 2022-present Fewtarius

 PKG_NAME="sixpair"
 PKG_VERSION="23e6e087fe7f013128ce2e0e19a8f4b04fa7a6e8"
@ -7,7 +8,7 @@ PKG_SHA256="9fc491060a85a01789a88e4dcb5271806ff6c7fbe62b58f828ac83ed1b4de1fe"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.pabr.org/sixlinux/"
-PKG_URL="https://github.com/lakkatv/sixpair/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/lakkatv/sixpair/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libusb libusb-compat"
 PKG_SECTION="network"
 PKG_SHORTDESC="Associate PS3 Sixaxis controller to system bluetoothd via USB"
@ -21,7 +22,7 @@ make_target() {
 }

 makeinstall_target() {
-  mkdir -p $INSTALL/usr/bin
-    cp sixpair $INSTALL/usr/bin
+  mkdir -p ${INSTALL}/usr/bin
+    cp sixpair ${INSTALL}/usr/bin
 }

--- a/packages/jelos/package.mk
+++ b/packages/jelos/package.mk
@ -24,7 +24,7 @@ PKG_EMUS="common-shaders glsl-shaders libretro-database retroarch hatarisa openb
          scummvmsa PPSSPPSDL yabasanshiroSA vicesa mupen64plussa-audio-sdl         \
          mupen64plussa-input-sdl mupen64plussa-ui-console mupen64plussa-video-rice \
          mupen64plussa-core mupen64plussa-rsp-hle mupen64plussa-video-glide64mk2   \
-          lzdoom gzdoom ecwolf amiberry raze pico-8 drastic flycastsa"
+          lzdoom gzdoom ecwolf amiberry raze pico-8 drastic flycastsa hypseus-singe"

 LIBRETRO_CORES="2048 81 a5200 atari800 beetle-gba beetle-lynx beetle-ngp beetle-pce beetle-pcfx      \
                beetle-supafaust beetle-supergrafx beetle-vb beetle-wswan bluemsx cannonball cap32   \
@ -45,7 +45,7 @@ PKG_COMPAT="lib32"
 PKG_MULTIMEDIA="ffmpeg mpv vlc"

 PKG_GAMESUPPORT="sixaxis jslisten evtest rg351p-js2xbox gptokeyb textviewer 351files jstest-sdl \
-                 gamecontrollerdb jelosaddons libgo2 rclone"
+                 gamecontrollerdb jelosaddons libgo2 rclone sdljoytest"

 PKG_EXPERIMENTAL=""

--- a/packages/jelos/sources/scripts/runemu.sh
+++ b/packages/jelos/sources/scripts/runemu.sh
@ -263,13 +263,6 @@ then
 				RUNTHIS='${TBASH} /usr/bin/m64p.sh "${CORE}" "${ROMNAME}"'
 			fi
 		;;
-		"daphne")
-			jslisten set "hypseus"
-			if [ "$EMU" = "HYPSEUS" ]
-			then
-				RUNTHIS='${TBASH} /usr/bin/hypseus.start.sh "${ROMNAME}"'
-			fi
-		;;
 		"pc")
 			jslisten set "dosbox dosbox-x"
 			if [ "$EMU" = "DOSBOXSDL2" ]
--- a/packages/themes/es-theme-art-book-next/package.mk
+++ b/packages/themes/es-theme-art-book-next/package.mk
@ -4,7 +4,7 @@
 # Copyright (C) 2021 Fewtarius

 PKG_NAME="es-theme-art-book-next"
-PKG_VERSION="e6586aa049f3d7f1f2934c15925cc4829d8fd079"
+PKG_VERSION="2b6d721366b3dac0381e949c876202f231fd5563"
 PKG_ARCH="any"
 PKG_LICENSE="CUSTOM"
 PKG_SITE="https://github.com/anthonycaccese/es-theme-art-book-next"
--- a/packages/themes/thememaster/package.mk
+++ b/packages/themes/thememaster/package.mk
@ -3,7 +3,7 @@
 # Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech)

 PKG_NAME="thememaster"
-PKG_VERSION="3bee9dab9cbf87f28a0eef5c3104c46dd5820f50"
+PKG_VERSION="55795a9c4be13a07b47bbc0dc917bde8928e7d71"
 PKG_ARCH="any"
 PKG_SITE="https://github.com/JohnIrvine1433/ThemeMaster"
 PKG_URL="${PKG_SITE}.git"
--- a/packages/tools/sysutils/sdljoytest/package.mk
+++ b/packages/tools/sysutils/sdljoytest/package.mk
@ -1,22 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2020-present Shanti Gilbert (https://github.com/shantigilbert)
-
-PKG_NAME="sdljoytest"
-PKG_VERSION="c316d9e87a102e1d42882fc862f7953e578ae257"
-PKG_SHA256="b5812d24990eb4092ce3b46dc5b1670ba1d80bfee6c52a5ae4eb24abbf48359d"
-PKG_LICENSE="OSS"
-PKG_SITE="https://github.com/Wintermute0110/sdljoytest"
-PKG_URL="$PKG_SITE/archive/$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain SDL2"
-PKG_LONGDESC="Test joystick with SDL2 in Linux"
-PKG_TOOLCHAIN="make"
-
-pre_configure_target() {
-sed -i "s|gcc|${CC}|" Makefile
-}
-
-makeinstall_target() {
-mkdir -p $INSTALL/usr/bin
-cp -rf test_gamepad_SDL2 $INSTALL/usr/bin
-cp -rf map_gamepad_SDL2 $INSTALL/usr/bin
-}
--- a/packages/ui/emulationstation/config/es_systems.cfg
+++ b/packages/ui/emulationstation/config/es_systems.cfg
@ -472,9 +472,9 @@
          <core>daphne</core>
        </cores>
      </emulator>
-      <emulator name="HYPSEUS">
+      <emulator name="hypseus">
        <cores>
-          <core default="true">HYPSEUS</core>
+          <core default="true">hypseus</core>
        </cores>
      </emulator>
    </emulators>