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

Merge pull request #1926 from JustEnoughLinuxOS/dev

Browse source 
PR for release
This commit is contained in:
fewtarius 2023-08-13 22:33:40 -04:00 committed by GitHub
commit fb129a5577
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 459 additions and 198 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config/blocklist
View file

@ -7,3 +7,4 @@ 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

2
documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md
View file

@ -67,7 +67,7 @@ This document describes all available systems emulators and cores available for
|Nintendo|Game and Watch (gameandwatch)|1980|`gameandwatch`|.mgw .zip .7z|**retroarch:** gw<br>|
|Nintendo|Game Boy (gb)|1989|`gb`|.gb .gbc .zip .7z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>|
|Nintendo|Game Boy (Hacks) (gbh)|1989|`gbh`|.gb .zip .7z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>|
|Nintendo|Game Boy Advance (gba)|2001|`gba`|.gba .zip .7z|**retroarch:** mgba (default)<br>**retroarch:** gbsp<br>**retroarch:** vbam<br>**retroarch:** vba_next<br>**retroarch:** beetle_gba<br>|
|Nintendo|Game Boy Advance (gba)|2001|`gba`|.gba .zip .7z|**retroarch:** mgba (default)<br>**retroarch:** gbsp<br>**retroarch:** vbam<br>**retroarch:** vba_next<br>**retroarch:** beetle_gba<br>**nanoboyadvance:** nanoboyadvance-sa<br>|
|Nintendo|Game Boy Advance (Hacks) (gbah)|2001|`gbah`|.gba .zip .7z|**retroarch:** mgba (default)<br>**retroarch:** gbsp<br>**retroarch:** vbam<br>**retroarch:** vba_next<br>**retroarch:** beetle_gba<br>|
|Nintendo|Game Boy Color (gbc)|1998|`gbc`|.gb .gbc .zip .7z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>|
|Nintendo|Game Boy Color (Hacks) (gbch)|1998|`gbch`|.gb .gbc .zip .7z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>|

2
documentation/PER_DEVICE_DOCUMENTATION/RK3326/SUPPORTED_EMULATORS_AND_CORES.md
View file

@ -65,7 +65,7 @@ This document describes all available systems emulators and cores available for
|Nintendo|Game and Watch (gameandwatch)|1980|`gameandwatch`|.mgw .zip .7z|**retroarch:** gw<br>|
|Nintendo|Game Boy (gb)|1989|`gb`|.gb .gbc .zip .7z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>|
|Nintendo|Game Boy (Hacks) (gbh)|1989|`gbh`|.gb .zip .7z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>|
|Nintendo|Game Boy Advance (gba)|2001|`gba`|.gba .zip .7z|**retroarch:** mgba (default)<br>**retroarch:** gbsp<br>**retroarch:** vbam<br>**retroarch:** vba_next<br>**retroarch:** beetle_gba<br>**retroarch:** gpsp<br>|
|Nintendo|Game Boy Advance (gba)|2001|`gba`|.gba .zip .7z|**retroarch:** mgba (default)<br>**retroarch:** gbsp<br>**retroarch:** vbam<br>**retroarch:** vba_next<br>**retroarch:** beetle_gba<br>**retroarch:** gpsp<br>**nanoboyadvance:** nanoboyadvance-sa<br>|
|Nintendo|Game Boy Advance (Hacks) (gbah)|2001|`gbah`|.gba .zip .7z|**retroarch:** mgba (default)<br>**retroarch:** gbsp<br>**retroarch:** vbam<br>**retroarch:** vba_next<br>**retroarch:** beetle_gba<br>|
|Nintendo|Game Boy Color (gbc)|1998|`gbc`|.gb .gbc .zip .7z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>|
|Nintendo|Game Boy Color (Hacks) (gbch)|1998|`gbch`|.gb .gbc .zip .7z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>|

2
documentation/PER_DEVICE_DOCUMENTATION/RK3399/SUPPORTED_EMULATORS_AND_CORES.md
View file

@ -65,7 +65,7 @@ This document describes all available systems emulators and cores available for
|Nintendo|Game and Watch (gameandwatch)|1980|`gameandwatch`|.mgw .zip .7z|**retroarch:** gw<br>|
|Nintendo|Game Boy (gb)|1989|`gb`|.gb .gbc .zip .7z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>|
|Nintendo|Game Boy (Hacks) (gbh)|1989|`gbh`|.gb .zip .7z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>|
|Nintendo|Game Boy Advance (gba)|2001|`gba`|.gba .zip .7z|**retroarch:** mgba (default)<br>**retroarch:** gbsp<br>**retroarch:** vbam<br>**retroarch:** vba_next<br>**retroarch:** beetle_gba<br>**retroarch:** gpsp<br>|
|Nintendo|Game Boy Advance (gba)|2001|`gba`|.gba .zip .7z|**retroarch:** mgba (default)<br>**retroarch:** gbsp<br>**retroarch:** vbam<br>**retroarch:** vba_next<br>**retroarch:** beetle_gba<br>**retroarch:** gpsp<br>**nanoboyadvance:** nanoboyadvance-sa<br>|
|Nintendo|Game Boy Advance (Hacks) (gbah)|2001|`gbah`|.gba .zip .7z|**retroarch:** mgba (default)<br>**retroarch:** gbsp<br>**retroarch:** vbam<br>**retroarch:** vba_next<br>**retroarch:** beetle_gba<br>|
|Nintendo|Game Boy Color (gbc)|1998|`gbc`|.gb .gbc .zip .7z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>|
|Nintendo|Game Boy Color (Hacks) (gbch)|1998|`gbch`|.gb .gbc .zip .7z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>|

2
documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md
View file

@ -65,7 +65,7 @@ This document describes all available systems emulators and cores available for
|Nintendo|Game and Watch (gameandwatch)|1980|`gameandwatch`|.mgw .zip .7z|**retroarch:** gw<br>|
|Nintendo|Game Boy (gb)|1989|`gb`|.gb .gbc .zip .7z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>|
|Nintendo|Game Boy (Hacks) (gbh)|1989|`gbh`|.gb .zip .7z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>|
|Nintendo|Game Boy Advance (gba)|2001|`gba`|.gba .zip .7z|**retroarch:** mgba (default)<br>**retroarch:** gbsp<br>**retroarch:** vbam<br>**retroarch:** vba_next<br>**retroarch:** beetle_gba<br>**retroarch:** gpsp<br>|
|Nintendo|Game Boy Advance (gba)|2001|`gba`|.gba .zip .7z|**retroarch:** mgba (default)<br>**retroarch:** gbsp<br>**retroarch:** vbam<br>**retroarch:** vba_next<br>**retroarch:** beetle_gba<br>**retroarch:** gpsp<br>**nanoboyadvance:** nanoboyadvance-sa<br>|
|Nintendo|Game Boy Advance (Hacks) (gbah)|2001|`gbah`|.gba .zip .7z|**retroarch:** mgba (default)<br>**retroarch:** gbsp<br>**retroarch:** vbam<br>**retroarch:** vba_next<br>**retroarch:** beetle_gba<br>|
|Nintendo|Game Boy Color (gbc)|1998|`gbc`|.gb .gbc .zip .7z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>|
|Nintendo|Game Boy Color (Hacks) (gbch)|1998|`gbch`|.gb .gbc .zip .7z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>|

6
packages/compress/p7zip/package.mk
View file

@ -34,13 +34,11 @@ pre_build_target() {
}
make_target() {
make CXX=${CXX} CC=${CC} -C ${PKG_BUILD}/.${TARGET_NAME} 7z 7za
make CXX=${CXX} CC=${CC} -C ${PKG_BUILD}/.${TARGET_NAME} all3
}
makeinstall_target() {
mkdir -p ${INSTALL}/usr/bin
cp -p ${PKG_BUILD}/.${TARGET_NAME}/bin/7z.so ${INSTALL}/usr/bin
cp -pr ${PKG_BUILD}/.${TARGET_NAME}/bin/Codecs ${INSTALL}/usr/bin
cp -p ${PKG_BUILD}/.${TARGET_NAME}/bin/7z ${INSTALL}/usr/bin
cp -p ${PKG_BUILD}/.${TARGET_NAME}/bin/7za ${INSTALL}/usr/bin
cp -p ${PKG_BUILD}/.${TARGET_NAME}/bin/7z* ${INSTALL}/usr/bin
}

18
packages/emulators/standalone/nanoboyadvance-sa/config/AMD64/keymap.toml Normal file
View file

@ -0,0 +1,18 @@
# See https://wiki.libsdl.org/SDL_Keycode for key names
[general]
fastforward = "Space"
reset = "F9"
fullscreen = "F10"
[gba]
a = "A"
b = "S"
l = "D"
r = "F"
start = "Return"
select = "Backspace"
up = "Up"
down = "Down"
left = "Left"
right = "Right"

18
packages/emulators/standalone/nanoboyadvance-sa/config/AMD64/keympa.toml Normal file
View file

@ -0,0 +1,18 @@
# See https://wiki.libsdl.org/SDL_Keycode for key names
[general]
fastforward = "Space"
reset = "F9"
fullscreen = "F10"
[gba]
a = "A"
b = "S"
l = "D"
r = "F"
start = "Return"
select = "Backspace"
up = "Up"
down = "Down"
left = "Left"
right = "Right"

18
packages/emulators/standalone/nanoboyadvance-sa/config/RK3326/keymap.toml Normal file
View file

@ -0,0 +1,18 @@
# See https://wiki.libsdl.org/SDL_Keycode for key names
[general]
fastforward = "Space"
reset = "F9"
fullscreen = "F10"
[gba]
a = "A"
b = "S"
l = "D"
r = "F"
start = "Return"
select = "Backspace"
up = "Up"
down = "Down"
left = "Left"
right = "Right"

18
packages/emulators/standalone/nanoboyadvance-sa/config/RK3326/keympa.toml Normal file
View file

@ -0,0 +1,18 @@
# See https://wiki.libsdl.org/SDL_Keycode for key names
[general]
fastforward = "Space"
reset = "F9"
fullscreen = "F10"
[gba]
a = "A"
b = "S"
l = "D"
r = "F"
start = "Return"
select = "Backspace"
up = "Up"
down = "Down"
left = "Left"
right = "Right"

18
packages/emulators/standalone/nanoboyadvance-sa/config/RK3399/keymap.toml Normal file
View file

@ -0,0 +1,18 @@
# See https://wiki.libsdl.org/SDL_Keycode for key names
[general]
fastforward = "Space"
reset = "F9"
fullscreen = "F10"
[gba]
a = "A"
b = "S"
l = "D"
r = "F"
start = "Return"
select = "Backspace"
up = "Up"
down = "Down"
left = "Left"
right = "Right"

18
packages/emulators/standalone/nanoboyadvance-sa/config/RK3399/keympa.toml Normal file
View file

@ -0,0 +1,18 @@
# See https://wiki.libsdl.org/SDL_Keycode for key names
[general]
fastforward = "Space"
reset = "F9"
fullscreen = "F10"
[gba]
a = "A"
b = "S"
l = "D"
r = "F"
start = "Return"
select = "Backspace"
up = "Up"
down = "Down"
left = "Left"
right = "Right"

18
packages/emulators/standalone/nanoboyadvance-sa/config/RK3588/keymap.toml Normal file
View file

@ -0,0 +1,18 @@
# See https://wiki.libsdl.org/SDL_Keycode for key names
[general]
fastforward = "Space"
reset = "F9"
fullscreen = "F10"
[gba]
a = "A"
b = "S"
l = "D"
r = "F"
start = "Return"
select = "Backspace"
up = "Up"
down = "Down"
left = "Left"
right = "Right"

18
packages/emulators/standalone/nanoboyadvance-sa/config/RK3588/keympa.toml Normal file
View file

@ -0,0 +1,18 @@
# See https://wiki.libsdl.org/SDL_Keycode for key names
[general]
fastforward = "Space"
reset = "F9"
fullscreen = "F10"
[gba]
a = "A"
b = "S"
l = "D"
r = "F"
start = "Return"
select = "Backspace"
up = "Up"
down = "Down"
left = "Left"
right = "Right"

29
packages/emulators/standalone/nanoboyadvance-sa/config/config.toml Normal file
View file

@ -0,0 +1,29 @@
[general]
bios_path = "/storage/roms/bios/gba_bios.bin"
bios_skip = false
sync_to_audio = false
[cartridge]
# Possible values: detect, none, sram, flash64, flash128, eeprom512, eeprom8192
save_type = "detect"
# Force-enable RTC emulation, otherwise rely on game database.
force_rtc = true
[video]
fullscreen = false
scale = 2
# Set empty string for no shader.
shader_vs = "/storage/.config/nanoboyadvance/shader/gba_colors.vs"
shader_fs = "/storage/.config/nanoboyadvance/shader/gba_colors.fs"
[audio]
# Possible values: cosine, cubic, sinc64, sinc128, sinc256
resampler = "cubic"
# Filter FIFO audio before passing it to the mixer.
# This will reduce the dity high-frequency aliasing typical to the GBA.
interpolate_fifo = true
# Reimplementation of the popular MP2K/M4A audio mixer with higher quality.
# This is experimental and may still have issues.
mp2k_hle_enable = false
# Use cubic interpolation in the MP2K reimplementation.
mp2k_hle_cubic = false

36
packages/emulators/standalone/nanoboyadvance-sa/package.mk Normal file
View file

@ -0,0 +1,36 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2023-present BrooksyTech (https://github.com/brooksytech)
PKG_NAME="nanoboyadvance-sa"
PKG_VERSION="3bb6f478f977dbfd3106508536e5fbce90d1898b"
PKG_LICENSE="GPLv3"
PKG_SITE="https://github.com/nba-emu/NanoBoyAdvance"
PKG_URL="${PKG_SITE}.git"
PKG_OPEN_SOURCE_BIOS="https://github.com/Nebuleon/ReGBA/raw/master/bios/gba_bios.bin"
PKG_DEPENDS_TARGET="toolchain SDL2 glew"
PKG_LONGDESC="NanoBoyAdvance is a cycle-accurate Game Boy Advance emulator."
PKG_TOOLCHAIN="cmake"
PKG_PATCH_DIRS+="${DEVICE}"
if [ "${OPENGL_SUPPORT}" = "yes" ]; then
PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd"
elif [ "${OPENGLES_SUPPORT}" = yes ]; then
PKG_DEPENDS_TARGET+=" ${OPENGLES}"
fi
PKG_CMAKE_OPTS_TARGET+=" -DPLATFORM_SDL2=ON \
-DPLATFORM_QT=OFF"
makeinstall_target() {
mkdir -p ${INSTALL}/usr/bin
cp -rf ${PKG_BUILD}/.${TARGET_NAME}/bin/sdl/NanoBoyAdvance ${INSTALL}/usr/bin
cp -rf ${PKG_DIR}/scripts/* ${INSTALL}/usr/bin
chmod 755 ${INSTALL}/usr/bin/*
mkdir -p ${INSTALL}/usr/config/nanoboyadvance
cp -rf ${PKG_DIR}/config/config.toml ${INSTALL}/usr/config/nanoboyadvance/
cp -rf ${PKG_DIR}/config/${DEVICE}/keymap.toml ${INSTALL}/usr/config/nanoboyadvance/
mkdir -p ${INSTALL}/usr/config/nanoboyadvance/bios
curl -Lo ${INSTALL}/usr/config/nanoboyadvance/bios/gba_bios.bin ${PKG_OPEN_SOURCE_BIOS}
}

22
packages/emulators/standalone/nanoboyadvance-sa/patches/000-config-path.patch Normal file
View file

@ -0,0 +1,22 @@
diff --git a/src/platform/sdl/main.cpp b/src/platform/sdl/main.cpp
index 432d984..96d4848 100644
--- a/src/platform/sdl/main.cpp
+++ b/src/platform/sdl/main.cpp
@@ -216,7 +216,7 @@ void load_keymap() {
toml::value data;
try {
- data = toml::parse("keymap.toml");
+ data = toml::parse("/storage/.config/nanoboyadvance/keymap.toml");
} catch (std::exception& ex) {
Log<Warn>("SDL: failed to load keymap configuration.");
return;
@@ -290,7 +290,7 @@ void init(int argc, char** argv) {
if (argc >= 1) {
fs::current_path(fs::absolute(argv[0]).replace_filename(fs::path{ }));
}
- g_config->Load("config.toml");
+ g_config->Load("/storage/.config/nanoboyadvance/config.toml");
parse_arguments(argc, argv);
load_keymap();
SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_GAMECONTROLLER);

39
packages/emulators/standalone/nanoboyadvance-sa/scripts/start_nanoboyadvance.sh Normal file
View file

@ -0,0 +1,39 @@
#!/bin/bash
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2023-present BrooksyTech (https://github.com/brooksytech)
. /etc/profile
jslisten set "-9 NanoBoyAdvance"
#Check if nanoboyadvance exists in .config
if [ ! -d "/storage/.config/nanoboyadvance" ]; then
mkdir -p "/storage/.config/nanoboyadvance"
cp -r "/usr/config/nanoboyadvance" "/storage/.config/"
fi
#Make nanoboyadvance bios folder
if [ ! -d "/storage/roms/bios/gba" ]; then
mkdir -p "/storage/roms/bios/gba"
fi
#Copy open source bios if no other bios exists
if [ ! -f "/storage/roms/bios/gba/gba_bios.bin" ]; then
cp -r "/usr/config/nanoboyadvance" "/storage/roms/bios/gba/gba_bios.bin"
fi
#Set the cores to use
CORES=$(get_setting "cores" "${PLATFORM}" "${ROMNAME##*/}")
if [ "${CORES}" = "little" ]
then
EMUPERF="${SLOW_CORES}"
elif [ "${CORES}" = "big" ]
then
EMUPERF="${FAST_CORES}"
else
### All..
unset EMUPERF
fi
#Run nanoboyadvance emulator
${EMUPERF} /usr/bin/NanoBoyAdvance "${1}"

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

@ -7,7 +7,7 @@ PKG_REV="1"
PKG_ARCH="any"
PKG_SITE="https://github.com/hrydgard/ppsspp"
PKG_URL="${PKG_SITE}.git"
PKG_VERSION="fabcaf6e045983e3cb6dcc2000b034730e8b71d3"
PKG_VERSION="56c2974e5e0a115d779daa0bcbc11e0b8d88f0c2"
PKG_LICENSE="GPLv2"
PKG_DEPENDS_TARGET="toolchain ffmpeg libzip SDL2 zlib zip"
PKG_SHORTDESC="PPSSPPDL"

40
packages/emulators/standalone/ppsspp-sa/patches/003-disable-mouse.patch
View file

@ -1,32 +1,22 @@
diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp
index 86bd19131..99bc80d1f 100644
index d81157d83..3eaf5af42 100644
--- a/SDL/SDLMain.cpp
+++ b/SDL/SDLMain.cpp
@@ -795,12 +795,7 @@ static void ProcessSDLEvent(SDL_Window *window, const SDL_Event &event, InputSta
g_Config.iWindowWidth = new_width;
g_Config.iWindowHeight = new_height;
}
- // Hide/Show cursor correctly toggling fullscreen
- if (lastUIState == UISTATE_INGAME && fullscreen && !g_Config.bShowTouchControls) {
- SDL_ShowCursor(SDL_DISABLE);
- } else if (lastUIState != UISTATE_INGAME || !fullscreen) {
- SDL_ShowCursor(SDL_ENABLE);
- }
+ SDL_ShowCursor(SDL_DISABLE);
break;
}
@@ -996,12 +996,7 @@ int main(int argc, char *argv[]) {
g_Config.iWindowWidth = new_width;
g_Config.iWindowHeight = new_height;
}
- // Hide/Show cursor correctly toggling fullscreen
- if (lastUIState == UISTATE_INGAME && fullscreen && !g_Config.bShowTouchControls) {
- SDL_ShowCursor(SDL_DISABLE);
- } else if (lastUIState != UISTATE_INGAME || !fullscreen) {
- SDL_ShowCursor(SDL_ENABLE);
- }
+ SDL_ShowCursor(SDL_DISABLE);
break;
}
@@ -1382,9 +1377,7 @@ int main(int argc, char *argv[]) {
printf("Init from thread error: '%s'\n", error_message.c_str());
}
-#ifdef MOBILE_DEVICE
SDL_ShowCursor(SDL_DISABLE);
-#endif
if (!useEmuThread) {
NativeInitGraphics(graphicsContext);
@@ -1436,10 +1429,7 @@ int main(int argc, char *argv[]) {
@@ -1295,10 +1290,7 @@ int main(int argc, char *argv[]) {
#if !defined(MOBILE_DEVICE)
if (lastUIState != GetUIState()) {
lastUIState = GetUIState();

126
packages/emulators/standalone/retroarch/package.mk
View file

@ -13,73 +13,73 @@ GET_HANDLER_SUPPORT="git"
PKG_PATCH_DIRS+=" ${DEVICE}"
PKG_CONFIGURE_OPTS_TARGET=" --disable-qt \
--enable-alsa \
--enable-udev \
--disable-opengl1 \
--disable-opengl \
--disable-opengles \
--disable-opengles3 \
--disable-opengles3_2 \
--disable-wayland \
--disable-x11 \
--enable-zlib \
--enable-freetype \
--disable-discord \
--disable-vg \
--disable-sdl \
--enable-sdl2 \
--enable-ffmpeg"
case ${DEVICE} in
RK3566-X55)
PKG_DEPENDS_TARGET+=" librga libgo2"
PKG_CONFIGURE_OPTS_TARGET+=" --enable-odroidgo2"
;;
*)
PKG_CONFIGURE_OPTS_TARGET+=" --disable-odroidgo2"
;;
esac
case ${ARCH} in
arm)
PKG_CONFIGURE_OPTS_TARGET+=" --enable-neon"
;;
aarch64)
PKG_CONFIGURE_OPTS_TARGET+=" --disable-neon"
;;
esac
if [ "${DISPLAYSERVER}" = "wl" ]; then
PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER}"
PKG_CONFIGURE_OPTS_TARGET+=" --enable-wayland"
fi
if [ ! "${OPENGL}" = "no" ]; then
PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd"
PKG_CONFIGURE_OPTS_TARGET+=" --enable-opengl"
else
PKG_CONFIGURE_OPTS_TARGET+=" --disable-opengl"
fi
if [ "${OPENGLES_SUPPORT}" = yes ] && \
[[ ! "${ARCH}" =~ i*86|x86_64 ]]; then
PKG_DEPENDS_TARGET+=" ${OPENGLES}"
PKG_CONFIGURE_OPTS_TARGET+=" --enable-opengles --enable-opengles3 --enable-opengles3_2 --enable-kms"
else
PKG_CONFIGURE_OPTS_TARGET+=" --disable-opengles --disable-opengles3 --disable-opengles3_2"
fi
if [ "${VULKAN_SUPPORT}" = "yes" ]
then
PKG_DEPENDS_TARGET+=" vulkan-loader vulkan-headers"
PKG_CONFIGURE_OPTS_TARGET+=" --enable-vulkan --enable-vulkan_display"
fi
pre_configure_target() {
CFLAGS+=" -DUDEV_TOUCH_SUPPORT"
CXXFLAGS+=" -DUDEV_TOUCH_SUPPORT"
TARGET_CONFIGURE_OPTS=""
PKG_CONFIGURE_OPTS_TARGET=" --disable-qt \
--enable-alsa \
--enable-udev \
--disable-opengl1 \
--disable-opengl \
--disable-opengles \
--disable-opengles3 \
--disable-opengles3_2 \
--disable-wayland \
--disable-x11 \
--enable-zlib \
--enable-freetype \
--disable-discord \
--disable-vg \
--disable-sdl \
--enable-sdl2 \
--enable-ffmpeg"
case ${DEVICE} in
RK3566-X55)
PKG_DEPENDS_TARGET+=" librga libgo2"
PKG_CONFIGURE_OPTS_TARGET+=" --enable-odroidgo2"
;;
*)
PKG_CONFIGURE_OPTS_TARGET+=" --disable-odroidgo2"
;;
esac
case ${ARCH} in
arm)
PKG_CONFIGURE_OPTS_TARGET+=" --enable-neon"
;;
aarch64)
PKG_CONFIGURE_OPTS_TARGET+=" --disable-neon"
;;
*)
esac
if [ "${DISPLAYSERVER}" = "wl" ]; then
PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER}"
PKG_CONFIGURE_OPTS_TARGET+=" --enable-wayland"
fi
if [ ! "${OPENGL}" = "no" ]; then
PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd"
PKG_CONFIGURE_OPTS_TARGET+=" --enable-opengl"
else
PKG_CONFIGURE_OPTS_TARGET+=" --disable-opengl"
fi
if [ "${OPENGLES_SUPPORT}" = yes ] && \
[[ ! "${ARCH}" =~ i*86|x86_64 ]]; then
PKG_DEPENDS_TARGET+=" ${OPENGLES}"
PKG_CONFIGURE_OPTS_TARGET+=" --enable-opengles --enable-opengles3 --enable-opengles3_2 --enable-kms"
else
PKG_CONFIGURE_OPTS_TARGET+=" --disable-opengles --disable-opengles3 --disable-opengles3_2"
fi
if [ "${VULKAN_SUPPORT}" = "yes" ]
then
PKG_DEPENDS_TARGET+=" vulkan-loader vulkan-headers"
PKG_CONFIGURE_OPTS_TARGET+=" --enable-vulkan --enable-vulkan_display"
fi
cd ${PKG_BUILD}
}

64
packages/jelos/sources/scripts/runemu.sh
View file

@ -24,7 +24,7 @@ TBASH="/usr/bin/bash"
RATMPCONF="/storage/.config/retroarch/retroarch.cfg"
RAAPPENDCONF="/tmp/.retroarch.cfg"
NETPLAY="No"
SHADERTMP="/tmp/shader"
SETSETTINGS_TMP="/tmp/shader"
OUTPUT_LOG="${LOGSDIR}/${LOGFILE}"
### Do not change the variables below as it may break things.
MYNAME=$(basename "$0")
@ -78,11 +78,15 @@ fi
### perhaps rewrite to use ^ functionality
[[ ${PLATFORM} = "ports" ]] && RETROARCH="yes"
# Make sure netplay isn't defined before we start our tests/configuration.
del_setting netplay.mode
# check if we started as host for a game
if [[ "$arguments" == *"--host"* ]]; then
NETPLAY="${arguments##*--host}" # read from --host onwards
NETPLAY="${NETPLAY%%--nick*}" # until --nick is found
NETPLAY="--host $NETPLAY --nick"
set_setting netplay.mode host
fi
# check if we are trying to connect to a client on netplay
@ -90,6 +94,12 @@ if [[ "$arguments" == *"--connect"* ]]; then
NETPLAY="${arguments##*--connect}" # read from --connect onwards
NETPLAY="${NETPLAY%%--nick*}" # until --nick is found
NETPLAY="--connect $NETPLAY --nick"
set_setting netplay.mode client
fi
# check if we are trying to connect as spectator on netplay
if [[ "$arguments" == *"--netplaymode spectator"* ]]; then
set_setting "netplay.mode" "spectator"
fi
### Offline all but the number of cores we need for this game if configured.
@ -154,10 +164,6 @@ then
fi
fi
# Disable netplay by default
set_setting "netplay.client.ip" "disable"
set_setting "netplay.client.port" "disable"
### Function Library
function log() {
@ -359,26 +365,6 @@ else
# CORE=${EMU%%_*}
### Configure netplay
if [[ ${NETPLAY} != "No" ]]; then
NETPLAY_NICK=$(get_setting netplay.nickname)
[[ -z "$NETPLAY_NICK" ]] && NETPLAY_NICK="${uuidgen | awk 'BEGIN {FS="-"} {print toupper($1)}'}"
set_setting netplay.nickname ${NETPLAY_NICK}
if [[ "${NETPLAY}" == *"connect"* ]]; then
NETPLAY_PORT="${arguments##*--port }" # read from -netplayport onwards
NETPLAY_PORT="${NETPLAY_PORT%% *}" # until a space is found
NETPLAY_IP="${arguments##*--connect }" # read from -netplayip onwards
NETPLAY_IP="${NETPLAY_IP%% *}" # until a space is found
set_setting "netplay.client.ip" "${NETPLAY_IP}"
set_setting "netplay.client.port" "${NETPLAY_PORT}"
RUNTHIS=$(echo ${RUNTHIS} | sed "s|--config|--connect ${NETPLAY_IP}\|${NETPLAY_PORT} --nick ${NETPLAY_NICK} --config|")
else
RUNTHIS=$(echo ${RUNTHIS} | sed "s|--config|${NETPLAY} --nick ${NETPLAY_NICK} --config|")
fi
fi
# Platform specific configurations
case ${PLATFORM} in
"atomiswave")
@ -397,33 +383,27 @@ else
esac
fi
if [ -e "${SHADERTMP}" ]
if [ -e "${SETSETTINGS_TMP}" ]
then
rm -f "${SHADERTMP}"
rm -f "${SETSETTINGS_TMP}"
fi
if [[ ${PLATFORM} == "ports" ]]; then
(/usr/bin/setsettings.sh "${PLATFORM}" "${PORTSCRIPT}" "${CORE}" --controllers="${CONTROLLERCONFIG}" --autosave="${AUTOSAVE}" --snapshot="${SNAPSHOT}" >${SHADERTMP}) &
(/usr/bin/setsettings.sh "${PLATFORM}" "${PORTSCRIPT}" "${CORE}" --controllers="${CONTROLLERCONFIG}" --autosave="${AUTOSAVE}" --snapshot="${SNAPSHOT}" >${SETSETTINGS_TMP})
else
(/usr/bin/setsettings.sh "${PLATFORM}" "${ROMNAME}" "${CORE}" --controllers="${CONTROLLERCONFIG}" --autosave="${AUTOSAVE}" --snapshot="${SNAPSHOT}" >${SHADERTMP}) &
(/usr/bin/setsettings.sh "${PLATFORM}" "${ROMNAME}" "${CORE}" --controllers="${CONTROLLERCONFIG}" --autosave="${AUTOSAVE}" --snapshot="${SNAPSHOT}" >${SETSETTINGS_TMP})
fi
SETSETTINGS_PID=$!
clear_screen
### Wait for background jobs to complete before continuing.
wait ${SETSETTINGS_PID} #Don't wait for show splash
### If setsettings wrote data in the background, grab it and assign it to SHADERSET
if [ -e "${SHADERTMP}" ]
### If setsettings wrote data in the background, grab it and assign it to EXTRAOPTS
if [ -e "${SETSETTINGS_TMP}" ]
then
SHADERSET=$(cat ${SHADERTMP})
rm -f ${SHADERTMP}
$VERBOSE && log $0 "Shader set to ${SHADERSET}"
EXTRAOPTS=$(cat ${SETSETTINGS_TMP})
rm -f ${SETSETTINGS_TMP}
$VERBOSE && log $0 "Extra Options: ${EXTRAOPTS}"
fi
if [[ ${SHADERSET} != 0 ]]; then
RUNTHIS=$(echo ${RUNTHIS} | sed "s|--config|${SHADERSET} --config|")
if [[ ${EXTRAOPTS} != 0 ]]; then
RUNTHIS=$(echo ${RUNTHIS} | sed "s|--config|${EXTRAOPTS} --config|")
fi
clear_screen

111
packages/jelos/sources/scripts/setsettings.sh
View file

@ -341,11 +341,11 @@ function configure_hotkeys() {
cp /tmp/joypads/"${MY_CONTROLLER}.cfg" /tmp
sed -i "s# = #=#g" /tmp/"${MY_CONTROLLER}.cfg"
source /tmp/"${MY_CONTROLLER}.cfg"
for HKEYSETTING in input_enable_hotkey_btn input_bind_hold \
input_exit_emulator_btn input_fps_toggle_btn \
input_menu_toggle_btn input_save_state_btn \
input_load_state_btn input_hold_fast_forward \
input_toggle_fast_forward_btn
for HKEYSETTING in input_enable_hotkey_btn input_bind_hold \
input_exit_emulator_btn input_fps_toggle_btn \
input_menu_toggle_btn input_save_state_btn \
input_load_state_btn input_toggle_fast_forward_btn \
input_rewind_btn
do
clear_setting "${HKEYSETTING}"
done
@ -358,7 +358,8 @@ input_fps_toggle_btn = "${input_y_btn}"
input_menu_toggle_btn = "${input_x_btn}"
input_save_state_btn = "${input_r_btn}"
input_load_state_btn = "${input_l_btn}"
input_hold_fast_forward_btn = "${input_r2_btn}"
input_toggle_fast_forward_btn = "${input_r2_btn}"
input_rewind_btn = "${input_l2_btn}"
EOF
rm -f /tmp/"${MY_CONTROLLER}.cfg"
fi
@ -408,34 +409,44 @@ function set_netplay() {
if [ "${USE_NETPLAY}" = 1 ]
then
add_setting "retroachievements.hardcore" "cheevos_hardcore_mode_enable" "false"
add_setting "netplay.frames" "netplay_delay_frames"
add_setting "netplay.nickname" "netplay_nickname"
add_setting "netplay.spectator" "netplay_spectator_mode_enable"
add_setting "global.netplay.nickname" "netplay_nickname"
add_setting "global.netplay.password" "netplay_password"
add_setting "netplay_public_announce" "netplay_public_announce"
local NETPLAY_MODE=$(game_setting "netplay.mode")
case ${NETPLAY_MODE} in
host)
add_setting "none" "netplay_mode" "false"
add_setting "none" "netplay_client_swap_input" "false"
add_setting "netplay.port" "netplay_ip_port"
add_setting "global.netplay.port" "netplay_ip_port"
echo -n " --host"
;;
client)
local NETPLAY_HOST_IP=$(get_setting global.netplay.host)
add_setting "none" "netplay_mode" "true"
add_setting "none" "netplay_client_swap_input" "true"
add_setting "netplay.client.ip" "netplay_ip_address"
add_setting "netplay.client.port" "netplay_ip_port"
add_setting "global.netplay.port" "netplay_ip_port"
if [ ! -z "${NETPLAY_HOST_IP}" ]
then
add_setting "none" "netplay_ip_address" "${NETPLAY_HOST_IP}"
echo -n " --connect ${NETPLAY_HOST_IP}"
fi
;;
esac
local NETPLAY_RELAY=$(game_setting netplay.relay)
case $(NETPLAY_RELAY) in
none|false|0)
add_setting "none" "netplay_use_mitm_server" "false"
;;
*)
add_setting "none" "netplay_use_mitm_server" "true"
add_setting "none" "netplay_mitm_server" "${NETPLAY_RELAY}"
;;
esac
local NETPLAY_RELAY=$(game_setting global.netplay.relay)
if [ -n "${NETPLAY_RELAY}" ]
then
case $(NETPLAY_RELAY) in
none|false|0)
add_setting "none" "netplay_use_mitm_server" "false"
;;
*)
add_setting "none" "netplay_use_mitm_server" "true"
add_setting "none" "netplay_mitm_server" "${NETPLAY_RELAY}"
;;
esac
else
add_setting "none" "netplay_use_mitm_server" "false"
fi
else
add_setting "none" "netplay" "false"
fi
@ -503,7 +514,7 @@ function set_shader() {
*)
add_setting "none" "video_shader_enable" "true"
add_setting "none" "video_shader" "${SHADER}"
echo "--set-shader /tmp/shaders/${SHADER}"
echo -n " --set-shader /tmp/shaders/${SHADER}"
;;
esac
}
@ -559,35 +570,39 @@ function set_savestates() {
}
function set_autosave() {
local CHKAUTOSAVE="$(game_setting autosave)"
local SETLOADSTATE=false
local SETSAVESTATE=false
case ${CHKAUTOSAVE} in
[1-3])
log "Autosave enabled (${CHKAUTOSAVE})"
add_setting "none" "savestate_directory" "${SNAPSHOTS}/${PLATFORM}"
if [ ! -d "${SNAPSHOTS}/${PLATFORM}" ]
then
mkdir "${SNAPSHOTS}/${PLATFORM}"
fi
case ${AUTOSAVE} in
1)
log "Autosave active (${AUTOSAVE})"
SETSAVESTATE="true"
if [ ! -z "${SNAPSHOT}" ]
then
log "Autosave snapshot enabled (${SNAPSHOT})"
add_setting "none" "state_slot" "${SNAPSHOT}"
SETLOADSTATE="true"
else
SETLOADSTATE="false"
fi
local SETAUTOSAVE=false
# argument overrides user setting
case ${AUTOSAVE} in
0)
SETAUTOSAVE=false
;;
1)
SETAUTOSAVE=true
;;
*)
local AUTOSAVE_SETTING="$(game_setting autosave)"
case ${AUTOSAVE_SETTING} in
[1-3])
SETAUTOSAVE=true
;;
esac
;;
esac
add_setting "none" "savestate_auto_load" "${SETLOADSTATE}"
add_setting "none" "savestate_auto_save" "${SETSAVESTATE}"
add_setting "none" "savestate_directory" "${SNAPSHOTS}/${PLATFORM}"
if [ ! -d "${SNAPSHOTS}/${PLATFORM}" ]
then
mkdir "${SNAPSHOTS}/${PLATFORM}"
fi
if [ ! -z "${SNAPSHOT}" ]
then
add_setting "none" "state_slot" "${SNAPSHOT}"
fi
add_setting "none" "savestate_auto_load" "${SETAUTOSAVE}"
add_setting "none" "savestate_auto_save" "${SETAUTOSAVE}"
}
function set_runahead() {

2
packages/themes/es-theme-art-book-next/package.mk
View file

@ -4,7 +4,7 @@
# Copyright (C) 2021 Fewtarius
PKG_NAME="es-theme-art-book-next"
PKG_VERSION="1d1d9207a1c3a486bee82a1919cd76baad293621"
PKG_VERSION="f2e1c55547e60f475e416b734aa1effbcf726201"
PKG_ARCH="any"
PKG_LICENSE="CUSTOM"
PKG_SITE="https://github.com/anthonycaccese/art-book-next-jelos"

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

@ -3,7 +3,7 @@
# Copyright (C) 2020-present Fewtarius
PKG_NAME="emulationstation"
PKG_VERSION="211b537"
PKG_VERSION="a613250"
PKG_GIT_CLONE_BRANCH="main"
PKG_REV="1"
PKG_ARCH="any"

25
packages/virtual/emulators/package.mk
View file

@ -32,21 +32,21 @@ LIBRETRO_CORES="81-lr a5200-lr arduous-lr atari800-lr beetle-gba-lr beetle-lynx-
case "${DEVICE}" in
AMD64)
[ "${ENABLE_32BIT}" == "true" ] && EMUS_32BIT="lutris-wine"
PKG_EMUS+=" amiberry cemu-sa citra-sa dolphin-sa duckstation-sa melonds-sa minivmacsa mupen64plus-sa pcsx2-sa \
primehack rpcs3-sa ryujinx-sa scummvmsa xemu-sa yuzu-sa"
LIBRETRO_CORES+=" beetle-psx-lr bsnes-hd-lr citra-lr desmume-lr dolphin-lr flycast-lr lrps2-lr mame-lr \
minivmac-lr play-lr"
PKG_EMUS+=" amiberry cemu-sa citra-sa dolphin-sa duckstation-sa melonds-sa minivmacsa mupen64plus-sa \
nanoboyadvance-sa pcsx2-sa primehack rpcs3-sa ryujinx-sa scummvmsa xemu-sa yuzu-sa"
LIBRETRO_CORES+=" beetle-psx-lr bsnes-hd-lr citra-lr desmume-lr dolphin-lr flycast-lr lrps2-lr mame-lr minivmac-lr \
play-lr"
;;
RK358*)
[ "${ENABLE_32BIT}" == "true" ] && EMUS_32BIT="box86 desmume-lr flycast-lr gpsp-lr pcsx_rearmed-lr"
PKG_EMUS+=" amiberry aethersx2-sa duckstation-sa pcsx_rearmed-lr box64 scummvmsa yabasanshiro-sa box64 portmaster"
LIBRETRO_CORES+=" uae4arm beetle-psx-lr bsnes-hd-lr citra-lr dolphin-lr mame-lr"
PKG_EMUS+=" amiberry aethersx2-sa duckstation-sa nanoboyadvance-sa box64 scummvmsa yabasanshiro-sa box64 portmaster"
LIBRETRO_CORES+=" uae4arm beetle-psx-lr bsnes-hd-lr citra-lr dolphin-lr mame-lr pcsx_rearmed-lr"
PKG_RETROARCH+=" retropie-shaders"
;;
RK3399)
[ "${ENABLE_32BIT}" == "true" ] && EMUS_32BIT="box86 desmume-lr gpsp-lr pcsx_rearmed-lr"
PKG_EMUS+=" amiberry aethersx2-sa dolphin-sa drastic-sa duckstation-sa melonds-sa mupen64plus-sa box64 scummvmsa \
yabasanshiro-sa portmaster"
yabasanshiro-sa portmaster nanoboyadvance-sa"
LIBRETRO_CORES+=" uae4arm beetle-psx-lr bsnes-hd-lr dolphin-lr flycast-lr mame-lr pcsx_rearmed-lr"
PKG_RETROARCH+=" retropie-shaders"
;;
@ -67,7 +67,7 @@ case "${DEVICE}" in
RK3326*)
[ "${ENABLE_32BIT}" == "true" ] && EMUS_32BIT="flycast-lr desmume-lr gpsp-lr pcsx_rearmed-lr"
PKG_DEPENDS_TARGET+=" common-shaders glsl-shaders"
PKG_EMUS+=" amiberry drastic-sa mupen64plus-sa scummvmsa yabasanshiro-sa portmaster"
PKG_EMUS+=" amiberry drastic-sa mupen64plus-sa nanoboyadvance-sa scummvmsa yabasanshiro-sa portmaster"
LIBRETRO_CORES+=" uae4arm flycast-lr"
PKG_RETROARCH+=" retropie-shaders"
;;
@ -372,9 +372,16 @@ makeinstall_target() {
add_emu_core gba retroarch vba_next false
add_emu_core gba retroarch beetle_gba false
case ${DEVICE} in
RK3*)
RK356*)
add_emu_core gba retroarch gpsp false
;;
RK33*|RK3588)
add_emu_core gba retroarch gpsp false
add_emu_core gba nanoboyadvance nanoboyadvance-sa false
;;
AMD64)
add_emu_core gba nanoboyadvance nanoboyadvance-sa false
;;
esac
add_es_system gba