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

Fix merge conflict.

Browse source
This commit is contained in:
fewtarius 2023-04-16 00:19:10 +00:00
commit 9e01d46693
No known key found for this signature in database
GPG key ID: F4AE55305D1B8C1A
10 changed files with 336 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
licenses/DRASTIC.pdf Executable file
View file

Binary file not shown.

111
packages/emulators/standalone/drastic-sa/config/RK3566/drastic.cfg Normal file
View file

@ -0,0 +1,111 @@
frameskip_type = 0
frameskip_value = 4
safe_frameskip = 0
show_frame_counter = 0
screen_orientation = 0
screen_swap = 0
savestate_number = 0
fast_forward = 0
enable_sound = 1
clock_speed = 0
threaded_3d = 0
mirror_touch = 0
compress_savestates = 1
savestate_snapshot = 1
unzip_roms = 0
preload_roms = 0
backup_in_savestates = 1
ignore_gamecard_limit = 0
frame_interval = 0
trim_roms = 0
fix_main_2d_screen = 0
disable_edge_marking = 0
interframe_blend = 0
hires_3d = 1
use_rtc_custom_time = 0
rtc_custom_time = 0
rtc_system_time = 0
slot2_device_type = 0
rumble_frames = 3
firmware.username = Jelos
firmware.language = 1
firmware.favorite_color = 0
firmware.birthday_month = 1
firmware.birthday_day = 1
enable_cheats = 1
controls_a[CONTROL_INDEX_UP] = 1217
controls_a[CONTROL_INDEX_DOWN] = 1153
controls_a[CONTROL_INDEX_LEFT] = 1216
controls_a[CONTROL_INDEX_RIGHT] = 1152
controls_a[CONTROL_INDEX_A] = 65535
controls_a[CONTROL_INDEX_B] = 65535
controls_a[CONTROL_INDEX_X] = 65535
controls_a[CONTROL_INDEX_Y] = 65535
controls_a[CONTROL_INDEX_L] = 65535
controls_a[CONTROL_INDEX_R] = 65535
controls_a[CONTROL_INDEX_START] = 65535
controls_a[CONTROL_INDEX_SELECT] = 65535
controls_a[CONTROL_INDEX_HINGE] = 65535
controls_a[CONTROL_INDEX_TOUCH_CURSOR_UP] = 65535
controls_a[CONTROL_INDEX_TOUCH_CURSOR_DOWN] = 65535
controls_a[CONTROL_INDEX_TOUCH_CURSOR_LEFT] = 65535
controls_a[CONTROL_INDEX_TOUCH_CURSOR_RIGHT] = 65535
controls_a[CONTROL_INDEX_TOUCH_CURSOR_PRESS] = 65535
controls_a[CONTROL_INDEX_MENU] = 65535
controls_a[CONTROL_INDEX_SAVE_STATE] = 65535
controls_a[CONTROL_INDEX_LOAD_STATE] = 65535
controls_a[CONTROL_INDEX_FAST_FORWARD] = 65535
controls_a[CONTROL_INDEX_SWAP_SCREENS] = 65535
controls_a[CONTROL_INDEX_SWAP_ORIENTATION_A] = 65535
controls_a[CONTROL_INDEX_SWAP_ORIENTATION_B] = 65535
controls_a[CONTROL_INDEX_LOAD_GAME] = 65535
controls_a[CONTROL_INDEX_QUIT] = 65535
controls_a[CONTROL_INDEX_FAKE_MICROPHONE] = 65535
controls_a[CONTROL_INDEX_UI_UP] = 1217
controls_a[CONTROL_INDEX_UI_DOWN] = 1153
controls_a[CONTROL_INDEX_UI_LEFT] = 1216
controls_a[CONTROL_INDEX_UI_RIGHT] = 1152
controls_a[CONTROL_INDEX_UI_SELECT] = 65535
controls_a[CONTROL_INDEX_UI_BACK] = 65535
controls_a[CONTROL_INDEX_UI_EXIT] = 65535
controls_a[CONTROL_INDEX_UI_PAGE_UP] = 65535
controls_a[CONTROL_INDEX_UI_PAGE_DOWN] = 65535
controls_a[CONTROL_INDEX_UI_SWITCH] = 65535
controls_b[CONTROL_INDEX_UP] = 1037
controls_b[CONTROL_INDEX_DOWN] = 1038
controls_b[CONTROL_INDEX_LEFT] = 1039
controls_b[CONTROL_INDEX_RIGHT] = 1040
controls_b[CONTROL_INDEX_A] = 1025
controls_b[CONTROL_INDEX_B] = 1024
controls_b[CONTROL_INDEX_X] = 1026
controls_b[CONTROL_INDEX_Y] = 1027
controls_b[CONTROL_INDEX_L] = 1028
controls_b[CONTROL_INDEX_R] = 1029
controls_b[CONTROL_INDEX_START] = 1033
controls_b[CONTROL_INDEX_SELECT] = 1032
controls_b[CONTROL_INDEX_HINGE] = 65535
controls_b[CONTROL_INDEX_TOUCH_CURSOR_UP] = 1219
controls_b[CONTROL_INDEX_TOUCH_CURSOR_DOWN] = 1155
controls_b[CONTROL_INDEX_TOUCH_CURSOR_LEFT] = 1218
controls_b[CONTROL_INDEX_TOUCH_CURSOR_RIGHT] = 1154
controls_b[CONTROL_INDEX_TOUCH_CURSOR_PRESS] = 1036
controls_b[CONTROL_INDEX_MENU] = 1035
controls_b[CONTROL_INDEX_SAVE_STATE] = 65535
controls_b[CONTROL_INDEX_LOAD_STATE] = 65535
controls_b[CONTROL_INDEX_FAST_FORWARD] = 65535
controls_b[CONTROL_INDEX_SWAP_SCREENS] = 65535
controls_b[CONTROL_INDEX_SWAP_ORIENTATION_A] = 1030
controls_b[CONTROL_INDEX_SWAP_ORIENTATION_B] = 1031
controls_b[CONTROL_INDEX_LOAD_GAME] = 65535
controls_b[CONTROL_INDEX_QUIT] = 65535
controls_b[CONTROL_INDEX_FAKE_MICROPHONE] = 65535
controls_b[CONTROL_INDEX_UI_UP] = 1037
controls_b[CONTROL_INDEX_UI_DOWN] = 1038
controls_b[CONTROL_INDEX_UI_LEFT] = 1039
controls_b[CONTROL_INDEX_UI_RIGHT] = 1040
controls_b[CONTROL_INDEX_UI_SELECT] = 1025
controls_b[CONTROL_INDEX_UI_BACK] = 65535
controls_b[CONTROL_INDEX_UI_EXIT] = 1024
controls_b[CONTROL_INDEX_UI_PAGE_UP] = 65535
controls_b[CONTROL_INDEX_UI_PAGE_DOWN] = 65535
controls_b[CONTROL_INDEX_UI_SWITCH] = 65535

111
packages/emulators/standalone/drastic-sa/config/S922X/drastic.cfg Normal file
View file

@ -0,0 +1,111 @@
frameskip_type = 0
frameskip_value = 4
safe_frameskip = 0
show_frame_counter = 0
screen_orientation = 1
screen_swap = 0
savestate_number = 0
fast_forward = 0
enable_sound = 1
clock_speed = 0
threaded_3d = 0
mirror_touch = 0
compress_savestates = 1
savestate_snapshot = 1
unzip_roms = 0
preload_roms = 0
backup_in_savestates = 1
ignore_gamecard_limit = 0
frame_interval = 0
trim_roms = 0
fix_main_2d_screen = 0
disable_edge_marking = 0
interframe_blend = 0
hires_3d = 1
use_rtc_custom_time = 0
rtc_custom_time = 0
rtc_system_time = 0
slot2_device_type = 0
rumble_frames = 3
firmware.username = Jelos
firmware.language = 1
firmware.favorite_color = 0
firmware.birthday_month = 1
firmware.birthday_day = 1
enable_cheats = 1
controls_a[CONTROL_INDEX_UP] = 1217
controls_a[CONTROL_INDEX_DOWN] = 1153
controls_a[CONTROL_INDEX_LEFT] = 1216
controls_a[CONTROL_INDEX_RIGHT] = 1152
controls_a[CONTROL_INDEX_A] = 65535
controls_a[CONTROL_INDEX_B] = 65535
controls_a[CONTROL_INDEX_X] = 65535
controls_a[CONTROL_INDEX_Y] = 65535
controls_a[CONTROL_INDEX_L] = 65535
controls_a[CONTROL_INDEX_R] = 65535
controls_a[CONTROL_INDEX_START] = 65535
controls_a[CONTROL_INDEX_SELECT] = 65535
controls_a[CONTROL_INDEX_HINGE] = 65535
controls_a[CONTROL_INDEX_TOUCH_CURSOR_UP] = 65535
controls_a[CONTROL_INDEX_TOUCH_CURSOR_DOWN] = 65535
controls_a[CONTROL_INDEX_TOUCH_CURSOR_LEFT] = 65535
controls_a[CONTROL_INDEX_TOUCH_CURSOR_RIGHT] = 65535
controls_a[CONTROL_INDEX_TOUCH_CURSOR_PRESS] = 65535
controls_a[CONTROL_INDEX_MENU] = 65535
controls_a[CONTROL_INDEX_SAVE_STATE] = 65535
controls_a[CONTROL_INDEX_LOAD_STATE] = 65535
controls_a[CONTROL_INDEX_FAST_FORWARD] = 65535
controls_a[CONTROL_INDEX_SWAP_SCREENS] = 65535
controls_a[CONTROL_INDEX_SWAP_ORIENTATION_A] = 65535
controls_a[CONTROL_INDEX_SWAP_ORIENTATION_B] = 65535
controls_a[CONTROL_INDEX_LOAD_GAME] = 65535
controls_a[CONTROL_INDEX_QUIT] = 65535
controls_a[CONTROL_INDEX_FAKE_MICROPHONE] = 65535
controls_a[CONTROL_INDEX_UI_UP] = 65535
controls_a[CONTROL_INDEX_UI_DOWN] = 65535
controls_a[CONTROL_INDEX_UI_LEFT] = 65535
controls_a[CONTROL_INDEX_UI_RIGHT] = 65535
controls_a[CONTROL_INDEX_UI_SELECT] = 65535
controls_a[CONTROL_INDEX_UI_BACK] = 65535
controls_a[CONTROL_INDEX_UI_EXIT] = 65535
controls_a[CONTROL_INDEX_UI_PAGE_UP] = 65535
controls_a[CONTROL_INDEX_UI_PAGE_DOWN] = 65535
controls_a[CONTROL_INDEX_UI_SWITCH] = 65535
controls_b[CONTROL_INDEX_UP] = 1032
controls_b[CONTROL_INDEX_DOWN] = 1033
controls_b[CONTROL_INDEX_LEFT] = 1034
controls_b[CONTROL_INDEX_RIGHT] = 1035
controls_b[CONTROL_INDEX_A] = 1025
controls_b[CONTROL_INDEX_B] = 1024
controls_b[CONTROL_INDEX_X] = 1026
controls_b[CONTROL_INDEX_Y] = 1027
controls_b[CONTROL_INDEX_L] = 1028
controls_b[CONTROL_INDEX_R] = 1029
controls_b[CONTROL_INDEX_START] = 1041
controls_b[CONTROL_INDEX_SELECT] = 1036
controls_b[CONTROL_INDEX_HINGE] = 65535
controls_b[CONTROL_INDEX_TOUCH_CURSOR_UP] = 1219
controls_b[CONTROL_INDEX_TOUCH_CURSOR_DOWN] = 1155
controls_b[CONTROL_INDEX_TOUCH_CURSOR_LEFT] = 1218
controls_b[CONTROL_INDEX_TOUCH_CURSOR_RIGHT] = 1154
controls_b[CONTROL_INDEX_TOUCH_CURSOR_PRESS] = 1039
controls_b[CONTROL_INDEX_MENU] = 1037
controls_b[CONTROL_INDEX_SAVE_STATE] = 1031
controls_b[CONTROL_INDEX_LOAD_STATE] = 1030
controls_b[CONTROL_INDEX_FAST_FORWARD] = 65535
controls_b[CONTROL_INDEX_SWAP_SCREENS] = 65535
controls_b[CONTROL_INDEX_SWAP_ORIENTATION_A] = 1038
controls_b[CONTROL_INDEX_SWAP_ORIENTATION_B] = 1040
controls_b[CONTROL_INDEX_LOAD_GAME] = 65535
controls_b[CONTROL_INDEX_QUIT] = 65535
controls_b[CONTROL_INDEX_FAKE_MICROPHONE] = 65535
controls_b[CONTROL_INDEX_UI_UP] = 1032
controls_b[CONTROL_INDEX_UI_DOWN] = 1033
controls_b[CONTROL_INDEX_UI_LEFT] = 1034
controls_b[CONTROL_INDEX_UI_RIGHT] = 1035
controls_b[CONTROL_INDEX_UI_SELECT] = 1025
controls_b[CONTROL_INDEX_UI_BACK] = 65535
controls_b[CONTROL_INDEX_UI_EXIT] = 1024
controls_b[CONTROL_INDEX_UI_PAGE_UP] = 65535
controls_b[CONTROL_INDEX_UI_PAGE_DOWN] = 65535
controls_b[CONTROL_INDEX_UI_SWITCH] = 65535

34
packages/emulators/standalone/drastic-sa/package.mk Normal file
View file

@ -0,0 +1,34 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech)
PKG_NAME="drastic-sa"
PKG_VERSION="1.0"
PKG_LICENSE="Proprietary:DRASTIC.pdf"
PKG_ARCH="aarch64"
PKG_URL="https://github.com/brooksytech/JelosAddOns/raw/main/drastic.tar.gz"
PKG_DEPENDS_TARGET="toolchain"
PKG_LONGDESC="Install Drastic Launcher script, will dowload bin on first run"
PKG_TOOLCHAIN="make"
make_target() {
:
}
makeinstall_target() {
mkdir -p ${INSTALL}/usr/bin
case ${DEVICE} in
S922X)
cp -rf ${PKG_DIR}/scripts/${DEVICE}/* ${INSTALL}/usr/bin
;;
*)
cp -rf ${PKG_DIR}/scripts/* ${INSTALL}/usr/bin
;;
esac
chmod +x ${INSTALL}/usr/bin/start_drastic.sh
mkdir -p ${INSTALL}/usr/config/drastic/config
cp -rf ${PKG_BUILD}/drastic_aarch64/* ${INSTALL}/usr/config/drastic/
cp -rf ${PKG_DIR}/config/${DEVICE}/drastic.cfg ${INSTALL}/usr/config/drastic/config/drastic.cfg
}

35
packages/emulators/standalone/drastic-sa/scripts/S922X/start_drastic.sh Normal file
View file

@ -0,0 +1,35 @@
#!/bin/bash
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2023-present BrooksyTech (https://github.com/brooksytech)
. /etc/profile
#Copy drastic files to .config
if [ ! -d "/storage/.config/drastic" ]; then
mkdir -p /storage/.config/drastic/
cp -r /usr/config/drastic/* /storage/.config/drastic/
fi
#Make drastic savestate folder
if [ ! -d "/storage/roms/savestates/nds" ]; then
mkdir -p /storage/roms/savestates/nds
fi
#Link savestates to roms/savestates/nds
rm -rf /storage/.config/drastic/savestates
ln -sf /storage/roms/savestates/nds /storage/.config/drastic/savestates
#Link saves to roms/nds/saves
rm -rf /storage/.config/drastic/backup
ln -sf /storage/roms/nds /storage/.config/drastic/backup
cd /storage/.config/drastic/
export SDL_VIDEO_GL_DRIVER=./libs/libGL.so.1
export SDL_VIDEO_EGL_DRIVER=./libs/libEGL.so.1
export LIBGL_ES=2
export LIBGL_GL=21
export LIBGL_FB=2
./drastic "$1"

29
packages/emulators/standalone/drastic-sa/scripts/start_drastic.sh Normal file
View file

@ -0,0 +1,29 @@
#!/bin/bash
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2023-present BrooksyTech (https://github.com/brooksytech)
. /etc/profile
#Copy drastic files to .config
if [ ! -d "/storage/.config/drastic" ]; then
mkdir -p /storage/.config/drastic/
cp -r /usr/config/drastic/* /storage/.config/drastic/
fi
#Make drastic savestate folder
if [ ! -d "/storage/roms/savestates/nds" ]; then
mkdir -p /storage/roms/savestates/nds
fi
#Link savestates to roms/savestates/nds
rm -rf /storage/.config/drastic/savestates
ln -sf /storage/roms/savestates/nds /storage/.config/drastic/savestates
#Link saves to roms/nds/saves
rm -rf /storage/.config/drastic/backup
ln -sf /storage/roms/nds /storage/.config/drastic/backup
cd /storage/.config/drastic/
./drastic "$1"

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

@ -242,9 +242,12 @@ then
RUNTHIS='${TBASH} "${ROMNAME}"'
;;
"nds")
jslisten set "-9 melonDS"
if [ "$EMU" = "melonds-sa" ]; then
jslisten set "-9 melonDS"
RUNTHIS='${TBASH} /usr/bin/start_melonds.sh "${ROMNAME}"'
elif [ "$EMU" = "drastic-sa" ]; then
jslisten set "-9 drastic"
RUNTHIS='${TBASH} /usr/bin/start_drastic.sh "${ROMNAME}"'
fi
;;
"solarus")

9
packages/ui/emulationstation/config/device/RK3566/es_systems.cfg
View file

@ -1209,15 +1209,14 @@
<platform>nds</platform>
<theme>nds</theme>
<emulators>
<emulator name="retroarch">
<emulator name="drastic">
<cores>
<core default="true">melonds</core>
<core>desmume</core>
<core default="true">drastic-sa</core>
</cores>
</emulator>
<emulator name="melondssa">
<emulator name="retroarch">
<cores>
<core>melondssa</core>
<core>melonds</core>
</cores>
</emulator>
</emulators>

7
packages/ui/emulationstation/config/device/S922X/es_systems.cfg
View file

@ -1216,9 +1216,14 @@
<platform>nds</platform>
<theme>nds</theme>
<emulators>
<emulator name="drastic">
<cores>
<core default="true">drastic-sa</core>
</cores>
</emulator>
<emulator name="retroarch">
<cores>
<core default="true">melonds</core>
<core>melonds</core>
</cores>
</emulator>
</emulators>

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

@ -44,11 +44,11 @@ case "${DEVICE}" in
RK3566)
[ "${ENABLE_32BIT}" == "true" ] && EMUS_32BIT="box86 flycast-lr pcsx_rearmed-lr"
PKG_DEPENDS_TARGET+=" common-shaders glsl-shaders mupen64plus-sa box64"
PKG_EMUS+=" yabasanshiro-sa"
PKG_EMUS+=" dolphin-sa drastic-sa yabasanshiro-sa"
;;
S922X)
[ "${ENABLE_32BIT}" == "true" ] && EMUS_32BIT="box86 flycast-lr pcsx_rearmed-lr"
PKG_EMUS+=" aethersx2-sa dolphin-sa duckstation-sa mupen64plus-sa yabasanshiro-sa box64"
PKG_EMUS+=" aethersx2-sa dolphin-sa drastic-sa duckstation-sa mupen64plus-sa yabasanshiro-sa box64"
LIBRETRO_CORES+=" beetle-psx-lr bsnes-hd-lr flycast-lr dolphin-lr yabasanshiro-sa"
esac