From 7b79e634d71894c0c337a3e323324e61a3ac490f Mon Sep 17 00:00:00 2001 From: fewtarius Date: Thu, 10 Aug 2023 21:26:33 +0000 Subject: [PATCH] * Fix vice standalone emulator. --- .../AMD64/SUPPORTED_EMULATORS_AND_CORES.md | 2 +- .../RK3326/SUPPORTED_EMULATORS_AND_CORES.md | 2 +- .../RK3399/SUPPORTED_EMULATORS_AND_CORES.md | 2 +- .../SUPPORTED_EMULATORS_AND_CORES.md | 2 +- .../RK3566/SUPPORTED_EMULATORS_AND_CORES.md | 2 +- .../RK3588/SUPPORTED_EMULATORS_AND_CORES.md | 2 +- .../S922X/SUPPORTED_EMULATORS_AND_CORES.md | 2 +- .../libsndfile-use-static-libraries.patch | 10 --- .../standalone/vice-sa/configs/sdl-vicerc | 26 ++++++ .../emulators/standalone/vice-sa/package.mk | 13 ++- .../standalone/vice-sa/sources/start_vice.sh | 85 +++++++++++++++++++ .../standalone/vice-sa/sources/start_x128.sh | 13 --- .../standalone/vice-sa/sources/start_x64sc.sh | 14 --- .../vice-sa/sources/start_xplus4.sh | 14 --- .../standalone/vice-sa/sources/start_xvic.sh | 14 --- packages/virtual/emulators/package.mk | 2 +- 16 files changed, 128 insertions(+), 77 deletions(-) delete mode 100644 packages/audio/fluidsynth/patches/libsndfile-use-static-libraries.patch create mode 100644 packages/emulators/standalone/vice-sa/configs/sdl-vicerc create mode 100644 packages/emulators/standalone/vice-sa/sources/start_vice.sh delete mode 100644 packages/emulators/standalone/vice-sa/sources/start_x128.sh delete mode 100644 packages/emulators/standalone/vice-sa/sources/start_x64sc.sh delete mode 100644 packages/emulators/standalone/vice-sa/sources/start_xplus4.sh delete mode 100644 packages/emulators/standalone/vice-sa/sources/start_xvic.sh diff --git a/documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md index 3bb1e782f..4341463b1 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md @@ -33,7 +33,7 @@ This document describes all available systems emulators and cores available for |Commodore|C16 (c16)|1984|`c16`|.d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_xplus4 (default)
**vicesa:** xplus4
| |Commodore|C64 (c64)|1982|`c64`|.d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_x64 (default)
**vicesa:** x64sc
| |Commodore|Commodore PET (pet)|1977|`pet`|.20 .a0 .b0 .d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .gz .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_xpet (default)
| -|Commodore|VIC-20 (vic20)|1980|`vic20`|.20 .a0 .b0 .d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .gz .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_xvic (default)
**vicesa:** vice_xvic
| +|Commodore|VIC-20 (vic20)|1980|`vic20`|.20 .a0 .b0 .d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .gz .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_xvic (default)
**vicesa:** xvic
| |Fairchild|Channel F (channelf)|1976|`channelf`|.bin .chf .zip .7z|**retroarch:** freechaf (default)
| |id Software|Doom (doom)|1993|`doom`|.doom|**gzdoom:** gzdoom-sa (default)
| |Infocom|Z-Machine (zmachine)|1979|`zmachine`|.dat .z1 .z2 .z3 .z4 .z5 .z6 .zip|**retroarch:** mojozork (default)
| diff --git a/documentation/PER_DEVICE_DOCUMENTATION/RK3326/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/RK3326/SUPPORTED_EMULATORS_AND_CORES.md index 118edab11..abc776df6 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/RK3326/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3326/SUPPORTED_EMULATORS_AND_CORES.md @@ -33,7 +33,7 @@ This document describes all available systems emulators and cores available for |Commodore|C16 (c16)|1984|`c16`|.d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_xplus4 (default)
**vicesa:** xplus4
| |Commodore|C64 (c64)|1982|`c64`|.d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_x64 (default)
**vicesa:** x64sc
| |Commodore|Commodore PET (pet)|1977|`pet`|.20 .a0 .b0 .d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .gz .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_xpet (default)
| -|Commodore|VIC-20 (vic20)|1980|`vic20`|.20 .a0 .b0 .d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .gz .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_xvic (default)
**vicesa:** vice_xvic
| +|Commodore|VIC-20 (vic20)|1980|`vic20`|.20 .a0 .b0 .d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .gz .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_xvic (default)
**vicesa:** xvic
| |Fairchild|Channel F (channelf)|1976|`channelf`|.bin .chf .zip .7z|**retroarch:** freechaf (default)
| |id Software|Doom (doom)|1993|`doom`|.doom|**gzdoom:** gzdoom-sa (default)
| |Infocom|Z-Machine (zmachine)|1979|`zmachine`|.dat .z1 .z2 .z3 .z4 .z5 .z6 .zip|**retroarch:** mojozork (default)
| diff --git a/documentation/PER_DEVICE_DOCUMENTATION/RK3399/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/RK3399/SUPPORTED_EMULATORS_AND_CORES.md index e3de24a9f..3962dee35 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/RK3399/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3399/SUPPORTED_EMULATORS_AND_CORES.md @@ -33,7 +33,7 @@ This document describes all available systems emulators and cores available for |Commodore|C16 (c16)|1984|`c16`|.d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_xplus4 (default)
**vicesa:** xplus4
| |Commodore|C64 (c64)|1982|`c64`|.d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_x64 (default)
**vicesa:** x64sc
| |Commodore|Commodore PET (pet)|1977|`pet`|.20 .a0 .b0 .d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .gz .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_xpet (default)
| -|Commodore|VIC-20 (vic20)|1980|`vic20`|.20 .a0 .b0 .d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .gz .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_xvic (default)
**vicesa:** vice_xvic
| +|Commodore|VIC-20 (vic20)|1980|`vic20`|.20 .a0 .b0 .d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .gz .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_xvic (default)
**vicesa:** xvic
| |Fairchild|Channel F (channelf)|1976|`channelf`|.bin .chf .zip .7z|**retroarch:** freechaf (default)
| |id Software|Doom (doom)|1993|`doom`|.doom|**gzdoom:** gzdoom-sa (default)
| |Infocom|Z-Machine (zmachine)|1979|`zmachine`|.dat .z1 .z2 .z3 .z4 .z5 .z6 .zip|**retroarch:** mojozork (default)
| diff --git a/documentation/PER_DEVICE_DOCUMENTATION/RK3566-X55/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/RK3566-X55/SUPPORTED_EMULATORS_AND_CORES.md index 118edab11..abc776df6 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/RK3566-X55/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3566-X55/SUPPORTED_EMULATORS_AND_CORES.md @@ -33,7 +33,7 @@ This document describes all available systems emulators and cores available for |Commodore|C16 (c16)|1984|`c16`|.d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_xplus4 (default)
**vicesa:** xplus4
| |Commodore|C64 (c64)|1982|`c64`|.d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_x64 (default)
**vicesa:** x64sc
| |Commodore|Commodore PET (pet)|1977|`pet`|.20 .a0 .b0 .d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .gz .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_xpet (default)
| -|Commodore|VIC-20 (vic20)|1980|`vic20`|.20 .a0 .b0 .d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .gz .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_xvic (default)
**vicesa:** vice_xvic
| +|Commodore|VIC-20 (vic20)|1980|`vic20`|.20 .a0 .b0 .d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .gz .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_xvic (default)
**vicesa:** xvic
| |Fairchild|Channel F (channelf)|1976|`channelf`|.bin .chf .zip .7z|**retroarch:** freechaf (default)
| |id Software|Doom (doom)|1993|`doom`|.doom|**gzdoom:** gzdoom-sa (default)
| |Infocom|Z-Machine (zmachine)|1979|`zmachine`|.dat .z1 .z2 .z3 .z4 .z5 .z6 .zip|**retroarch:** mojozork (default)
| diff --git a/documentation/PER_DEVICE_DOCUMENTATION/RK3566/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/RK3566/SUPPORTED_EMULATORS_AND_CORES.md index 9ef14b4cd..78fac0e4e 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/RK3566/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3566/SUPPORTED_EMULATORS_AND_CORES.md @@ -33,7 +33,7 @@ This document describes all available systems emulators and cores available for |Commodore|C16 (c16)|1984|`c16`|.d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_xplus4 (default)
**vicesa:** xplus4
| |Commodore|C64 (c64)|1982|`c64`|.d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_x64 (default)
**vicesa:** x64sc
| |Commodore|Commodore PET (pet)|1977|`pet`|.20 .a0 .b0 .d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .gz .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_xpet (default)
| -|Commodore|VIC-20 (vic20)|1980|`vic20`|.20 .a0 .b0 .d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .gz .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_xvic (default)
**vicesa:** vice_xvic
| +|Commodore|VIC-20 (vic20)|1980|`vic20`|.20 .a0 .b0 .d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .gz .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_xvic (default)
**vicesa:** xvic
| |Fairchild|Channel F (channelf)|1976|`channelf`|.bin .chf .zip .7z|**retroarch:** freechaf (default)
| |id Software|Doom (doom)|1993|`doom`|.doom|**gzdoom:** gzdoom-sa (default)
| |Infocom|Z-Machine (zmachine)|1979|`zmachine`|.dat .z1 .z2 .z3 .z4 .z5 .z6 .zip|**retroarch:** mojozork (default)
| diff --git a/documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md index af1afb32a..be18513e9 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md @@ -33,7 +33,7 @@ This document describes all available systems emulators and cores available for |Commodore|C16 (c16)|1984|`c16`|.d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_xplus4 (default)
**vicesa:** xplus4
| |Commodore|C64 (c64)|1982|`c64`|.d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_x64 (default)
**vicesa:** x64sc
| |Commodore|Commodore PET (pet)|1977|`pet`|.20 .a0 .b0 .d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .gz .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_xpet (default)
| -|Commodore|VIC-20 (vic20)|1980|`vic20`|.20 .a0 .b0 .d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .gz .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_xvic (default)
**vicesa:** vice_xvic
| +|Commodore|VIC-20 (vic20)|1980|`vic20`|.20 .a0 .b0 .d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .gz .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_xvic (default)
**vicesa:** xvic
| |Fairchild|Channel F (channelf)|1976|`channelf`|.bin .chf .zip .7z|**retroarch:** freechaf (default)
| |id Software|Doom (doom)|1993|`doom`|.doom|**gzdoom:** gzdoom-sa (default)
| |Infocom|Z-Machine (zmachine)|1979|`zmachine`|.dat .z1 .z2 .z3 .z4 .z5 .z6 .zip|**retroarch:** mojozork (default)
| diff --git a/documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md index d73b27a2a..d73285038 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md @@ -33,7 +33,7 @@ This document describes all available systems emulators and cores available for |Commodore|C16 (c16)|1984|`c16`|.d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_xplus4 (default)
**vicesa:** xplus4
| |Commodore|C64 (c64)|1982|`c64`|.d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_x64 (default)
**vicesa:** x64sc
| |Commodore|Commodore PET (pet)|1977|`pet`|.20 .a0 .b0 .d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .gz .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_xpet (default)
| -|Commodore|VIC-20 (vic20)|1980|`vic20`|.20 .a0 .b0 .d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .gz .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_xvic (default)
**vicesa:** vice_xvic
| +|Commodore|VIC-20 (vic20)|1980|`vic20`|.20 .a0 .b0 .d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .gz .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_xvic (default)
**vicesa:** xvic
| |Fairchild|Channel F (channelf)|1976|`channelf`|.bin .chf .zip .7z|**retroarch:** freechaf (default)
| |id Software|Doom (doom)|1993|`doom`|.doom|**gzdoom:** gzdoom-sa (default)
| |Infocom|Z-Machine (zmachine)|1979|`zmachine`|.dat .z1 .z2 .z3 .z4 .z5 .z6 .zip|**retroarch:** mojozork (default)
| diff --git a/packages/audio/fluidsynth/patches/libsndfile-use-static-libraries.patch b/packages/audio/fluidsynth/patches/libsndfile-use-static-libraries.patch deleted file mode 100644 index ae11905f9..000000000 --- a/packages/audio/fluidsynth/patches/libsndfile-use-static-libraries.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/CMakeLists.txt 2021-09-12 13:53:14.192948082 +1000 -+++ b/CMakeLists.txt 2021-09-12 13:54:27.389413149 +1000 -@@ -535,6 +535,7 @@ - LIBSNDFILE_STATIC_LDFLAGS MATCHES "vorbis" OR - LIBSNDFILE_STATIC_LDFLAGS_OTHER MATCHES "vorbis" ) - set ( LIBSNDFILE_HASVORBIS 1 ) -+ set ( LIBSNDFILE_LIBRARIES ${LIBSNDFILE_STATIC_LIBRARIES} ) - else () - message ( NOTICE "Seems like libsndfile was compiled without OGG/Vorbis support." ) - endif () diff --git a/packages/emulators/standalone/vice-sa/configs/sdl-vicerc b/packages/emulators/standalone/vice-sa/configs/sdl-vicerc new file mode 100644 index 000000000..06a4a71ff --- /dev/null +++ b/packages/emulators/standalone/vice-sa/configs/sdl-vicerc @@ -0,0 +1,26 @@ +[Version] +ConfigVersion=3.7.1 + +[C128] +KeySetEnable=0 +JoyDevice1=4 +JoyDevice2=4 +JoyMenuControl=1 + +[C64SC] +KeySetEnable=0 +JoyDevice1=4 +JoyDevice2=4 +JoyMenuControl=1 + +[PLUS4] +KeySetEnable=0 +JoyDevice1=4 +JoyDevice2=4 +JoyMenuControl=1 + +[VIC-20] +KeySetEnable=0 +JoyDevice1=4 +JoyDevice2=4 +JoyMenuControl=1 diff --git a/packages/emulators/standalone/vice-sa/package.mk b/packages/emulators/standalone/vice-sa/package.mk index c5b7f6982..bc2e2e29d 100644 --- a/packages/emulators/standalone/vice-sa/package.mk +++ b/packages/emulators/standalone/vice-sa/package.mk @@ -13,7 +13,7 @@ PKG_PRIORITY="optional" PKG_SECTION="emulators" PKG_SHORTDESC="Commodore 8-bit Emulator" PKG_LONGDESC="Commodore 8-bit Emulator" -PKG_CONFIGURE_OPTS_TARGET+=" --disable-pdf-docs --enable-gtk3ui=no" +PKG_CONFIGURE_OPTS_TARGET+=" --disable-pdf-docs --enable-gtk3ui=no --without-alsa --with-pulse --enable-sdl2ui" if [ ! "${OPENGL}" = "no" ]; then PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd" @@ -30,10 +30,15 @@ pre_configure_target() { post_makeinstall_target() { mkdir -p ${INSTALL}/usr/config/vice - if [ -d "${PKG_DIR}/config/${DEVICE}" ] + if [ -d "${PKG_DIR}/configs" ] then - cp -f ${PKG_DIR}/config/${DEVICE}/* ${INSTALL}/usr/config/vice + cp -f ${PKG_DIR}/configs/* ${INSTALL}/usr/config/vice fi - cp -f ${PKG_DIR}/sources/* ${INSTALL}/usr/bin + + for sc in x128 x64sc xplus4 xvic + do + cp -f ${PKG_DIR}/sources/start_vice.sh ${INSTALL}/usr/bin/start_${sc}.sh + sed -i "s~@EMU@~${sc}~g" ${INSTALL}/usr/bin/start_${sc}.sh + done chmod 0755 ${INSTALL}/usr/bin/* } diff --git a/packages/emulators/standalone/vice-sa/sources/start_vice.sh b/packages/emulators/standalone/vice-sa/sources/start_vice.sh new file mode 100644 index 000000000..41fc1f6b6 --- /dev/null +++ b/packages/emulators/standalone/vice-sa/sources/start_vice.sh @@ -0,0 +1,85 @@ +#!/bin/sh +# SPDX-License-Identifier: Apache-2.0 +# Copyright (C) 2021-present - Fewtarius + +. /etc/profile + +jslisten set "-9 @EMU@" + +CONFIG_PATH="/storage/.config/vice" +SOURCE_PATH="/usr/config/vice" + +EMU="@EMU@" + +### Get the game we want to start. +GAME=${1//[\\]/} + +if [ ! -d "/storage/.config/vice" ] +then + mkdir -p /storage/.config/vice +fi + +case ${EMU} in + x128) + EMU="C128" + ;; + x64sc) + EMU="C64SC" + ;; + xplus4) + EMU="PLUS4" + ;; + xvic) + EMU="VIC20" + ;; +esac + +if [ ! -e "${CONFIG_PATH}/sdl-hotkeys-${EMU}.vhk" ] +then + cat <${CONFIG_PATH}/sdl-hotkeys-${EMU}.vhk +!CLEAR +EOF +fi + +if [ ! -e "${CONFIG_PATH}/sdl-joymap-${EMU}.vjm" ] +then + cat <${CONFIG_PATH}/sdl-joymap-${EMU}.vjm +!CLEAR + +0 0 0 0 +0 0 1 0 +0 0 2 0 +0 0 3 0 +0 0 4 0 +0 0 5 0 +0 0 6 0 +0 0 7 0 + +0 1 0 1 0 16 +0 1 1 1 0 32 +0 1 2 1 0 64 +0 1 3 0 +0 1 4 0 +0 1 ${DEVICE_BTN_SELECT} 5 Virtual keyboard +0 1 ${DEVICE_BTN_START} 4 +EOF + + if [[ ! "${DEVICE_BTN_DPAD_UP}" =~ [a-z] ]] + then + cat <>${CONFIG_PATH}/sdl-joymap-${EMU}.vjm +0 1 ${DEVICE_BTN_DPAD_UP} 1 0 1 +0 1 ${DEVICE_BTN_DPAD_DOWN} 1 0 2 +0 1 ${DEVICE_BTN_DPAD_LEFT} 1 0 4 +0 1 ${DEVICE_BTN_DPAD_RIGHT} 1 0 8 +EOF + else + cat <>${CONFIG_PATH}/sdl-joymap-${EMU}.vjm +0 2 0 1 0 1 +0 2 1 1 0 2 +0 2 2 1 0 4 +0 2 3 1 0 8 +EOF + fi +fi + +@EMU@ -joymenucontrol "${GAME}" diff --git a/packages/emulators/standalone/vice-sa/sources/start_x128.sh b/packages/emulators/standalone/vice-sa/sources/start_x128.sh deleted file mode 100644 index 24d4d24b6..000000000 --- a/packages/emulators/standalone/vice-sa/sources/start_x128.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: Apache-2.0 -# Copyright (C) 2021-present - Fewtarius - -. /etc/profile - -if [ ! -d "/storage/.config/vice" ] -then - rsync -a /usr/config/vice /storage/.config -fi - -ARG=${1//[\\]/} -x128 -sounddev alsa -sdl2renderer opengles2 "${ARG}" diff --git a/packages/emulators/standalone/vice-sa/sources/start_x64sc.sh b/packages/emulators/standalone/vice-sa/sources/start_x64sc.sh deleted file mode 100644 index ee1cb6151..000000000 --- a/packages/emulators/standalone/vice-sa/sources/start_x64sc.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: Apache-2.0 -# Copyright (C) 2021-present - Fewtarius - -. /etc/profile - -if [ ! -d "/storage/.config/vice" ] -then - rsync -a /usr/config/vice /storage/.config -fi - -ARG=${1//[\\]/} -echo "[${ARG}]" -x64sc -sounddev alsa -sdl2renderer opengles2 "${ARG}" diff --git a/packages/emulators/standalone/vice-sa/sources/start_xplus4.sh b/packages/emulators/standalone/vice-sa/sources/start_xplus4.sh deleted file mode 100644 index edccf1983..000000000 --- a/packages/emulators/standalone/vice-sa/sources/start_xplus4.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: Apache-2.0 -# Copyright (C) 2021-present - Fewtarius - -. /etc/profile - -if [ ! -d "/storage/.config/vice" ] -then - rsync -a /usr/config/vice /storage/.config -fi - -ARG=${1//[\\]/} -echo "[${ARG}]" -xplus4 -sounddev alsa -sdl2renderer opengles2 "${ARG}" diff --git a/packages/emulators/standalone/vice-sa/sources/start_xvic.sh b/packages/emulators/standalone/vice-sa/sources/start_xvic.sh deleted file mode 100644 index 4582234b4..000000000 --- a/packages/emulators/standalone/vice-sa/sources/start_xvic.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: Apache-2.0 -# Copyright (C) 2021-present - Fewtarius - -. /etc/profile - -if [ ! -d "/storage/.config/vice" ] -then - rsync -a /usr/config/vice /storage/.config -fi - -ARG=${1//[\\]/} -echo "[${ARG}]" -xvic -sounddev alsa -sdl2renderer opengles2 "${ARG}" diff --git a/packages/virtual/emulators/package.mk b/packages/virtual/emulators/package.mk index c357e4a74..54bdad332 100644 --- a/packages/virtual/emulators/package.mk +++ b/packages/virtual/emulators/package.mk @@ -244,7 +244,7 @@ makeinstall_target() { ### Commodore VIC-20 add_emu_core vic20 retroarch vice_xvic true - add_emu_core vic20 vicesa vice_xvic false + add_emu_core vic20 vicesa xvic false add_es_system vic20 ### Capcom Playsystem 1