From 00f04992b230784c3b7f0b3797b135524e5b982d Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Mon, 2 Sep 2019 12:11:01 -0400 Subject: [PATCH 1/2] tic80: Update upstream --- recipes/android/cores-android | 2 +- recipes/linux/cores-linux-arm7neonhf | 2 +- recipes/linux/cores-linux-armhf-generic | 2 +- recipes/linux/cores-linux-x64-generic | 2 +- recipes/linux/cores-linux-x86-generic | 2 +- recipes/windows/cores-windows-x64_seh-generic | 2 +- recipes/windows/cores-windows-x86_dw2-generic | 2 +- rules.d/core-rules.sh | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/recipes/android/cores-android b/recipes/android/cores-android index 6e846ada..45cc1be1 100644 --- a/recipes/android/cores-android +++ b/recipes/android/cores-android @@ -92,7 +92,7 @@ stella libretro-stella https://github.com/stella-emu/stella.git master YES GENER tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC_JNI Makefile jni theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC_JNI Makefile jni thepowdertoy libretro-thepowdertoy https://github.com/libretro/ThePowderToy.git master YES ANDROID_CMAKE Makefile build -tic80 libretro-tic80 https://github.com/nesbox/TIC-80.git master YES ANDROID_CMAKE Makefile builddir -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_LIBRETRO=ON +tic80 libretro-tic80 https://github.com/libretro/TIC-80.git master YES ANDROID_CMAKE Makefile builddir -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -BUILD_DEMO_CARTS=OFF -DBUILD_LIBRETRO=ON tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC_JNI Makefile jni uzem libretro-uzem https://github.com/libretro/libretro-uzem.git master YES GENERIC_JNI Makefile jni vba_next libretro-vba-next https://github.com/libretro/vba-next.git master YES GENERIC_JNI Makefile libretro/jni diff --git a/recipes/linux/cores-linux-arm7neonhf b/recipes/linux/cores-linux-arm7neonhf index a9553166..a3288756 100644 --- a/recipes/linux/cores-linux-arm7neonhf +++ b/recipes/linux/cores-linux-arm7neonhf @@ -101,7 +101,7 @@ stella libretro-stella https://github.com/stella-emu/stella.git master YES GENER tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile . theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile . thepowdertoy libretro-thepowdertoy https://github.com/libretro/ThePowderToy.git master YES CMAKE Makefile build -DCMAKE_BUILD_TYPE=Release -tic80 libretro-tic80 https://github.com/nesbox/TIC-80.git master YES CMAKE Makefile builddir -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_LIBRETRO=ON +tic80 libretro-tic80 https://github.com/libretro/TIC-80.git master YES CMAKE Makefile builddir -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -BUILD_DEMO_CARTS=OFF -DBUILD_LIBRETRO=ON tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC Makefile . uzem libretro-uzem https://github.com/libretro/libretro-uzem.git master YES GENERIC Makefile . vba_next libretro-vba_next https://github.com/libretro/vba-next.git master YES GENERIC Makefile.libretro . diff --git a/recipes/linux/cores-linux-armhf-generic b/recipes/linux/cores-linux-armhf-generic index eaddce76..000a82fe 100644 --- a/recipes/linux/cores-linux-armhf-generic +++ b/recipes/linux/cores-linux-armhf-generic @@ -98,7 +98,7 @@ stella libretro-stella https://github.com/stella-emu/stella.git master YES GENER tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile . theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile . thepowdertoy libretro-thepowdertoy https://github.com/libretro/ThePowderToy.git master YES CMAKE Makefile build -DCMAKE_BUILD_TYPE=Release -tic80 libretro-tic80 https://github.com/nesbox/TIC-80.git master YES CMAKE Makefile builddir -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_LIBRETRO=ON +tic80 libretro-tic80 https://github.com/libretro/TIC-80.git master YES CMAKE Makefile builddir -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -BUILD_DEMO_CARTS=OFF -DBUILD_LIBRETRO=ON tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC Makefile . uzem libretro-uzem https://github.com/libretro/libretro-uzem.git master YES GENERIC Makefile . vba_next libretro-vba_next https://github.com/libretro/vba-next.git master YES GENERIC Makefile.libretro . diff --git a/recipes/linux/cores-linux-x64-generic b/recipes/linux/cores-linux-x64-generic index 1ad4ccec..0b9f2481 100644 --- a/recipes/linux/cores-linux-x64-generic +++ b/recipes/linux/cores-linux-x64-generic @@ -115,7 +115,7 @@ stella libretro-stella https://github.com/stella-emu/stella.git master YES GENER tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile . theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile . thepowdertoy libretro-thepowdertoy https://github.com/libretro/ThePowderToy.git master YES CMAKE Makefile build -DCMAKE_BUILD_TYPE=Release -tic80 libretro-tic80 https://github.com/nesbox/TIC-80.git master YES CMAKE Makefile builddir -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_LIBRETRO=ON +tic80 libretro-tic80 https://github.com/libretro/TIC-80.git master YES CMAKE Makefile builddir -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -BUILD_DEMO_CARTS=OFF -DBUILD_LIBRETRO=ON tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC Makefile . uzem libretro-uzem https://github.com/libretro/libretro-uzem.git master YES GENERIC Makefile . vba_next libretro-vba_next https://github.com/libretro/vba-next.git master YES GENERIC Makefile.libretro . diff --git a/recipes/linux/cores-linux-x86-generic b/recipes/linux/cores-linux-x86-generic index f39845dc..25b97a17 100644 --- a/recipes/linux/cores-linux-x86-generic +++ b/recipes/linux/cores-linux-x86-generic @@ -107,7 +107,7 @@ stella libretro-stella https://github.com/stella-emu/stella.git master YES GENER tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile . theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile . thepowdertoy libretro-thepowdertoy https://github.com/libretro/ThePowderToy.git master YES CMAKE Makefile build -DCMAKE_BUILD_TYPE=Release -tic80 libretro-tic80 https://github.com/nesbox/TIC-80.git master YES CMAKE Makefile builddir -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_LIBRETRO=ON +tic80 libretro-tic80 https://github.com/libretro/TIC-80.git master YES CMAKE Makefile builddir -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -BUILD_DEMO_CARTS=OFF -DBUILD_LIBRETRO=ON tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC Makefile . uzem libretro-uzem https://github.com/libretro/libretro-uzem.git master YES GENERIC Makefile . vba_next libretro-vba_next https://github.com/libretro/vba-next.git master YES GENERIC Makefile.libretro . diff --git a/recipes/windows/cores-windows-x64_seh-generic b/recipes/windows/cores-windows-x64_seh-generic index 1d16d5a8..67b564b3 100644 --- a/recipes/windows/cores-windows-x64_seh-generic +++ b/recipes/windows/cores-windows-x64_seh-generic @@ -110,7 +110,7 @@ stella libretro-stella https://github.com/stella-emu/stella.git master YES GENER squirreljme libretro-squirreljme https://github.com/XerTheSquirrel/SquirrelJME.git trunk YES GENERIC makefilelibretro ratufacoat tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile . theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile . -tic80 libretro-tic80 https://github.com/nesbox/TIC-80.git master YES CMAKE Makefile build -G\"Unix Makefiles\" -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_LIBRETRO=ON +tic80 libretro-tic80 https://github.com/libretro/TIC-80.git master YES CMAKE Makefile build -G\"Unix Makefiles\" -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -BUILD_DEMO_CARTS=OFF -DBUILD_LIBRETRO=ON tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC Makefile . uzem libretro-uzem https://github.com/libretro/libretro-uzem.git master YES GENERIC Makefile . vba_next libretro-vba_next https://github.com/libretro/vba-next.git master YES GENERIC Makefile.libretro . diff --git a/recipes/windows/cores-windows-x86_dw2-generic b/recipes/windows/cores-windows-x86_dw2-generic index 561f4e8f..b2a58220 100644 --- a/recipes/windows/cores-windows-x86_dw2-generic +++ b/recipes/windows/cores-windows-x86_dw2-generic @@ -109,7 +109,7 @@ squirreljme libretro-squirreljme https://github.com/XerTheSquirrel/SquirrelJME.g tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile . theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile . thepowdertoy libretro-thepowdertoy https://github.com/libretro/ThePowderToy.git master YES CMAKE Makefile build -DCMAKE_BUILD_TYPE="Release" -tic80 libretro-tic80 https://github.com/nesbox/TIC-80.git master YES CMAKE Makefile build -G\"Unix Makefiles\" -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_LIBRETRO=ON +tic80 libretro-tic80 https://github.com/libretro/TIC-80.git master YES CMAKE Makefile build -G\"Unix Makefiles\" -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -BUILD_DEMO_CARTS=OFF -DBUILD_LIBRETRO=ON tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC Makefile . uzem libretro-uzem https://github.com/libretro/libretro-uzem.git master YES GENERIC Makefile . vba_next libretro-vba_next https://github.com/libretro/vba-next.git master YES GENERIC Makefile.libretro . diff --git a/rules.d/core-rules.sh b/rules.d/core-rules.sh index 532ae3fc..ebbeeaae 100644 --- a/rules.d/core-rules.sh +++ b/rules.d/core-rules.sh @@ -1056,7 +1056,7 @@ include_core_tic80() { register_module core "tic80" -theos_ios -ngc -sncps3 -ps3 -psp1 -qnx -wii } libretro_tic80_name="TIC-80" -libretro_tic80_git_url="https://github.com/nesbox/TIC-80.git" +libretro_tic80_git_url="https://github.com/libretro/TIC-80.git" libretro_tic80_git_submodules="yes" libretro_tic80_build_makefile="Makefile" libretro_tic80_build_subdir="build" From dd20985ccf009399a66150eab9b1f42c5fce85cf Mon Sep 17 00:00:00 2001 From: Paul Hannington Date: Fri, 6 Sep 2019 11:02:13 +0100 Subject: [PATCH 2/2] Sync supported extensions to cores Sync supported extensions to cores --- dist/info/vice_x128_libretro.info | 2 +- dist/info/vice_x64_libretro.info | 2 +- dist/info/vice_x64sc_libretro.info | 2 +- dist/info/vice_xpet_libretro.info | 2 +- dist/info/vice_xplus4_libretro.info | 2 +- dist/info/vice_xvic_libretro.info | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dist/info/vice_x128_libretro.info b/dist/info/vice_x128_libretro.info index 4dae9891..50e34a6c 100644 --- a/dist/info/vice_x128_libretro.info +++ b/dist/info/vice_x128_libretro.info @@ -1,6 +1,6 @@ display_name = "Commodore - C128 (VICE x128)" authors = "VICE Core Team Members" -supported_extensions = "d64|d71|d80|d81|d82|g64||g41|x64|t64|tap|prg|p00|crt|bin|zip|gz|d6z|d7z|d8z|g6z|g4z|x6z|m3u" +supported_extensions = "d64|d71|d80|d81|d82|g64|g41|x64|t64|tap|prg|p00|crt|bin|zip|gz|d6z|d7z|d8z|g6z|g4z|x6z|cmd|m3u" corename = "VICE" manufacturer = "Commodore" categories = "Emulator" diff --git a/dist/info/vice_x64_libretro.info b/dist/info/vice_x64_libretro.info index 910c3c53..8ebcfe54 100644 --- a/dist/info/vice_x64_libretro.info +++ b/dist/info/vice_x64_libretro.info @@ -1,6 +1,6 @@ display_name = "Commodore - C64 (VICE x64, fast)" authors = "VICE Core Team Members" -supported_extensions = "d64|d71|d80|d81|d82|g64||g41|x64|t64|tap|prg|p00|crt|bin|zip|gz|d6z|d7z|d8z|g6z|g4z|x6z|m3u" +supported_extensions = "d64|d71|d80|d81|d82|g64|g41|x64|t64|tap|prg|p00|crt|bin|zip|gz|d6z|d7z|d8z|g6z|g4z|x6z|cmd|m3u" corename = "VICE" manufacturer = "Commodore" categories = "Emulator" diff --git a/dist/info/vice_x64sc_libretro.info b/dist/info/vice_x64sc_libretro.info index 38f1207c..80f329be 100644 --- a/dist/info/vice_x64sc_libretro.info +++ b/dist/info/vice_x64sc_libretro.info @@ -1,6 +1,6 @@ display_name = "Commodore - C64 (VICE x64sc, accurate)" authors = "VICE Core Team Members" -supported_extensions = "d64|d71|d80|d81|d82|g64||g41|x64|t64|tap|prg|p00|crt|bin|zip|gz|d6z|d7z|d8z|g6z|g4z|x6z|m3u" +supported_extensions = "d64|d71|d80|d81|d82|g64|g41|x64|t64|tap|prg|p00|crt|bin|zip|gz|d6z|d7z|d8z|g6z|g4z|x6z|cmd|m3u" corename = "VICE" manufacturer = "Commodore" categories = "Emulator" diff --git a/dist/info/vice_xpet_libretro.info b/dist/info/vice_xpet_libretro.info index 92ecefb3..9a047f30 100644 --- a/dist/info/vice_xpet_libretro.info +++ b/dist/info/vice_xpet_libretro.info @@ -1,6 +1,6 @@ display_name = "Commodore - PET (VICE xpet)" authors = "VICE Core Team Members" -supported_extensions = "d64|d71|d80|d81|d82|g64||g41|x64|t64|tap|prg|p00|crt|bin|zip|gz|d6z|d7z|d8z|g6z|g4z|x6z|m3u" +supported_extensions = "d64|d71|d80|d81|d82|g64|g41|x64|t64|tap|prg|p00|crt|bin|zip|gz|d6z|d7z|d8z|g6z|g4z|x6z|cmd|m3u" corename = "VICE" manufacturer = "Commodore" categories = "Emulator" diff --git a/dist/info/vice_xplus4_libretro.info b/dist/info/vice_xplus4_libretro.info index 9adca3fe..94a4ae9f 100644 --- a/dist/info/vice_xplus4_libretro.info +++ b/dist/info/vice_xplus4_libretro.info @@ -1,6 +1,6 @@ display_name = "Commodore - PLUS4 (VICE xplus4)" authors = "VICE Core Team Members" -supported_extensions = "d64|d71|d80|d81|d82|g64||g41|x64|t64|tap|prg|p00|crt|bin|zip|gz|d6z|d7z|d8z|g6z|g4z|x6z|m3u" +supported_extensions = "d64|d71|d80|d81|d82|g64|g41|x64|t64|tap|prg|p00|crt|bin|zip|gz|d6z|d7z|d8z|g6z|g4z|x6z|cmd|m3u" corename = "VICE" manufacturer = "Commodore" categories = "Emulator" diff --git a/dist/info/vice_xvic_libretro.info b/dist/info/vice_xvic_libretro.info index 09913fc8..ac8b4029 100644 --- a/dist/info/vice_xvic_libretro.info +++ b/dist/info/vice_xvic_libretro.info @@ -1,6 +1,6 @@ display_name = "Commodore - VIC20 (VICE xvic)" authors = "VICE Core Team Members" -supported_extensions = "d64|d71|d80|d81|d82|g64||g41|x64|t64|tap|prg|p00|crt|bin|zip|gz|d6z|d7z|d8z|g6z|g4z|x6z|a0|20|60|m3u" +supported_extensions = "20|40|60|a0|b0|d64|d71|d80|d81|d82|g64|g41|x64|t64|tap|prg|p00|crt|bin|zip|gz|d6z|d7z|d8z|g6z|g4z|x6z|cmd|m3u" corename = "VICE" manufacturer = "Commodore" categories = "Emulator"