From 6a18831a37cab432cb2b1b0a77496be4bf65f1b3 Mon Sep 17 00:00:00 2001 From: M4xw Date: Fri, 5 Jul 2019 13:52:28 +0200 Subject: [PATCH] Remove mupen64plus-libretro -The core has been archived --- dist/info/mupen64plus_gles3_libretro.info | 13 ------------- dist/info/mupen64plus_libretro.info | 13 ------------- recipes/android/cores-android-r16b | 2 -- recipes/apple/cores-osx-x64-generic | 1 - recipes/emscripten/emscripten | 1 - recipes/linux/cores-linux-arm7neonhf | 1 - recipes/linux/cores-linux-armhf-generic | 1 - recipes/linux/cores-linux-x64-generic | 1 - recipes/linux/cores-linux-x86-generic | 1 - recipes/nintendo/libnx | 1 - recipes/windows/cores-windows-x64_seh-generic | 1 - recipes/windows/cores-windows-x86_dw2-generic | 1 - rules.d/core-rules.sh | 16 ---------------- 13 files changed, 53 deletions(-) delete mode 100644 dist/info/mupen64plus_gles3_libretro.info delete mode 100644 dist/info/mupen64plus_libretro.info diff --git a/dist/info/mupen64plus_gles3_libretro.info b/dist/info/mupen64plus_gles3_libretro.info deleted file mode 100644 index c20a1ac7..00000000 --- a/dist/info/mupen64plus_gles3_libretro.info +++ /dev/null @@ -1,13 +0,0 @@ -display_name = "Nintendo - Nintendo 64 (Mupen64Plus GLES3)" -authors = "Hacktarux|Mupen64Plus Team" -supported_extensions = "n64|v64|z64|bin|u1|ndd" -corename = "Mupen64Plus" -manufacturer = "Nintendo" -categories = "Emulator" -systemname = "Nintendo 64" -systemid = "nintendo_64" -database = "Nintendo - Nintendo 64|Nintendo - Nintendo 64DD" -license = "GPLv2" -permissions = "dynarec_optional" -display_version = "2.5" -supports_no_game = "false" diff --git a/dist/info/mupen64plus_libretro.info b/dist/info/mupen64plus_libretro.info deleted file mode 100644 index bced177b..00000000 --- a/dist/info/mupen64plus_libretro.info +++ /dev/null @@ -1,13 +0,0 @@ -display_name = "Nintendo - Nintendo 64 (Mupen64Plus)" -authors = "Hacktarux|Mupen64Plus Team" -supported_extensions = "n64|v64|z64|bin|u1|ndd" -corename = "Mupen64Plus OpenGL" -manufacturer = "Nintendo" -categories = "Emulator" -systemname = "Nintendo 64" -systemid = "nintendo_64" -database = "Nintendo - Nintendo 64|Nintendo - Nintendo 64DD" -license = "GPLv2" -permissions = "dynarec_optional" -display_version = "2.5" -supports_no_game = "false" diff --git a/recipes/android/cores-android-r16b b/recipes/android/cores-android-r16b index f55e19a2..2cc22cfb 100644 --- a/recipes/android/cores-android-r16b +++ b/recipes/android/cores-android-r16b @@ -2,8 +2,6 @@ bsnes_cplusplus98 libretro-bsnes_cplusplus98 https://github.com/libretro/bsnes-libretro-cplusplus98.git master YES GENERIC_JNI Makefile jni easyrpg libretro-easyrpg https://github.com/libretro/easyrpg-libretro.git master YES GENERIC_JNI Makefile.libretro builds/libretro/jni gpsp libretro-gpsp https://github.com/libretro/gpsp.git master YES GENERIC_JNI Makefile jni -mupen64plus libretro-mupen64plus https://github.com/libretro/mupen64plus-libretro.git master YES GENERIC_JNI Makefile libretro/jni -mupen64plus_gles3 libretro-mupen64plus-gles3 https://github.com/libretro/mupen64plus-libretro.git master YES GENERIC_JNI Makefile libretro/jni GLES3=1 APP_PLATFORM=android-18 pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git master YES GENERIC_JNI Makefile.libretro jni picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC_JNI Makefile.libretro jni parallel_n64 libretro-parallel_n64 https://github.com/libretro/parallel-n64.git master YES GENERIC_JNI Makefile jni diff --git a/recipes/apple/cores-osx-x64-generic b/recipes/apple/cores-osx-x64-generic index 47e92b64..140d6f72 100644 --- a/recipes/apple/cores-osx-x64-generic +++ b/recipes/apple/cores-osx-x64-generic @@ -32,7 +32,6 @@ freeintv libretro-freeintv https://github.com/markwkidd/FreeIntv.git master YES gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git master YES GENERIC Makefile . genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git master YES GENERIC Makefile.libretro . ishiiruka libretro-ishiiruka https://github.com/libretro/Ishiiruka.git master YES CMAKE Makefile build -DLIBRETRO=ON -DCMAKE_BUILD_TYPE=Release -mupen64plus libretro-mupen64plus https://github.com/libretro/mupen64plus-libretro.git master YES GENERIC_GL Makefile . WITH_DYNAREC=x86_64 gearboy libretro-gearboy https://github.com/drhelius/Gearboy.git master YES GENERIC Makefile platforms/libretro gearsystem libretro-gearsystem https://github.com/drhelius/Gearsystem.git master YES GENERIC Makefile platforms/libretro gme libretro-gme https://github.com/libretro/libretro-gme.git master YES GENERIC Makefile . diff --git a/recipes/emscripten/emscripten b/recipes/emscripten/emscripten index ec6cbcfb..a5556911 100644 --- a/recipes/emscripten/emscripten +++ b/recipes/emscripten/emscripten @@ -20,7 +20,6 @@ fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git master YES GENE freeintv libretro-freeintv https://github.com/markwkidd/FreeIntv.git master YES GENERIC Makefile . gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git master YES GENERIC Makefile . genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git master YES GENERIC Makefile.libretro . -mupen64plus libretro-mupen64plus https://github.com/libretro/mupen64plus-libretro.git master NO GENERIC_GL Makefile . gme libretro-gme https://github.com/libretro/libretro-gme.git master YES GENERIC Makefile . gpsp libretro-gpsp https://github.com/libretro/gpsp.git master NO GENERIC Makefile . handy libretro-handy https://github.com/libretro/libretro-handy.git master YES GENERIC Makefile . diff --git a/recipes/linux/cores-linux-arm7neonhf b/recipes/linux/cores-linux-arm7neonhf index a7d7a67a..047f0ef5 100644 --- a/recipes/linux/cores-linux-arm7neonhf +++ b/recipes/linux/cores-linux-arm7neonhf @@ -66,7 +66,6 @@ meteor libretro-meteor https://github.com/libretro/meteor-libretro.git master NO mgba libretro-mgba https://github.com/libretro/mgba.git master YES GENERIC Makefile.libretro . mrboom libretro-mrboom https://github.com/libretro/mrboom-libretro.git master YES GENERIC Makefile . mu libretro-mu https://github.com/meepingsnesroms/Mu.git master YES GENERIC Makefile libretroBuildSystem -mupen64plus libretro-mupen64plus https://github.com/libretro/mupen64plus-libretro.git master NO GENERIC_GL Makefile . WITH_DYNAREC=arm mupen64plus_next libretro-mupen64plus_next https://github.com/libretro/mupen64plus-libretro-nx.git mupen_next NO GENERIC_GL Makefile . WITH_DYNAREC=arm nekop2 libretro-nekop2 https://github.com/libretro/libretro-meowPC98.git master YES GENERIC Makefile.libretro libretro nestopia libretro-nestopia https://github.com/libretro/nestopia.git master YES GENERIC Makefile libretro diff --git a/recipes/linux/cores-linux-armhf-generic b/recipes/linux/cores-linux-armhf-generic index 416027df..b242b4a9 100644 --- a/recipes/linux/cores-linux-armhf-generic +++ b/recipes/linux/cores-linux-armhf-generic @@ -64,7 +64,6 @@ meteor libretro-meteor https://github.com/libretro/meteor-libretro.git master NO mgba libretro-mgba https://github.com/libretro/mgba.git master YES GENERIC Makefile.libretro . mrboom libretro-mrboom https://github.com/libretro/mrboom-libretro.git master YES GENERIC Makefile . mu libretro-mu https://github.com/meepingsnesroms/Mu.git master YES GENERIC Makefile libretroBuildSystem -mupen64plus libretro-mupen64plus https://github.com/libretro/mupen64plus-libretro.git master YES GENERIC_GL Makefile . WITH_DYNAREC=arm nekop2 libretro-nekop2 https://github.com/libretro/libretro-meowPC98.git master YES GENERIC Makefile.libretro libretro nestopia libretro-nestopia https://github.com/libretro/nestopia.git master YES GENERIC Makefile libretro np2kai libretro-np2kai https://github.com/libretro/NP2kai.git master YES GENERIC Makefile.libretro sdl2 diff --git a/recipes/linux/cores-linux-x64-generic b/recipes/linux/cores-linux-x64-generic index e98bf69b..262690c8 100644 --- a/recipes/linux/cores-linux-x64-generic +++ b/recipes/linux/cores-linux-x64-generic @@ -75,7 +75,6 @@ meteor libretro-meteor https://github.com/libretro/meteor-libretro.git master NO mgba libretro-mgba https://github.com/libretro/mgba.git master YES GENERIC Makefile.libretro . mrboom libretro-mrboom https://github.com/libretro/mrboom-libretro.git master YES GENERIC Makefile . mu libretro-mu https://github.com/meepingsnesroms/Mu.git master YES GENERIC Makefile libretroBuildSystem -mupen64plus libretro-mupen64plus https://github.com/libretro/mupen64plus-libretro.git master YES GENERIC_GL Makefile . WITH_DYNAREC=x86_64 mupen64plus_next libretro-mupen64plus_next https://github.com/libretro/mupen64plus-libretro-nx.git GLideN64 YES GENERIC_GL Makefile . WITH_DYNAREC=x86_64 nekop2 libretro-nekop2 https://github.com/libretro/libretro-meowPC98.git master YES GENERIC Makefile.libretro libretro nestopia libretro-nestopia https://github.com/libretro/nestopia.git master YES GENERIC Makefile libretro diff --git a/recipes/linux/cores-linux-x86-generic b/recipes/linux/cores-linux-x86-generic index 46a38f29..38778283 100644 --- a/recipes/linux/cores-linux-x86-generic +++ b/recipes/linux/cores-linux-x86-generic @@ -69,7 +69,6 @@ meteor libretro-meteor https://github.com/libretro/meteor-libretro.git master NO mgba libretro-mgba https://github.com/libretro/mgba.git master YES GENERIC Makefile.libretro . mrboom libretro-mrboom https://github.com/libretro/mrboom-libretro.git master YES GENERIC Makefile . mu libretro-mu https://github.com/meepingsnesroms/Mu.git master YES GENERIC Makefile libretroBuildSystem -mupen64plus libretro-mupen64plus https://github.com/libretro/mupen64plus-libretro.git master YES GENERIC_GL Makefile . WITH_DYNAREC=x86 mupen64plus_next libretro-mupen64plus_next https://github.com/libretro/mupen64plus-libretro-nx.git GLideN64 YES GENERIC_GL Makefile . WITH_DYNAREC=x86 nekop2 libretro-nekop2 https://github.com/libretro/libretro-meowPC98.git master YES GENERIC Makefile.libretro libretro nestopia libretro-nestopia https://github.com/libretro/nestopia.git master YES GENERIC Makefile libretro diff --git a/recipes/nintendo/libnx b/recipes/nintendo/libnx index e0d2bd09..6b81255d 100644 --- a/recipes/nintendo/libnx +++ b/recipes/nintendo/libnx @@ -28,7 +28,6 @@ mednafen_vb libretro-beetle_vb https://github.com/libretro/beetle-vb-libretro.gi mgba libretro-mgba https://github.com/libretro/mgba.git master YES GENERIC Makefile.libretro . mrboom libretro-mrboom https://github.com/libretro/mrboom-libretro.git master YES GENERIC Makefile . mu libretro-mu https://github.com/meepingsnesroms/Mu.git master YES GENERIC Makefile libretroBuildSystem -mupen64plus libretro-mupen64plus https://github.com/libretro/mupen64plus-libretro.git master YES GENERIC_GL Makefile . mupen64plus_next libretro-mupen64plus_next https://github.com/libretro/mupen64plus-libretro-nx.git GLideN64 YES GENERIC_GL Makefile . nestopia libretro-nestopia https://github.com/libretro/nestopia.git master YES GENERIC Makefile libretro np2kai libretro-np2kai https://github.com/libretro/NP2kai.git master YES GENERIC Makefile.libretro sdl2 diff --git a/recipes/windows/cores-windows-x64_seh-generic b/recipes/windows/cores-windows-x64_seh-generic index 6a421cf2..500e599f 100644 --- a/recipes/windows/cores-windows-x64_seh-generic +++ b/recipes/windows/cores-windows-x64_seh-generic @@ -74,7 +74,6 @@ meteor libretro-meteor https://github.com/libretro/meteor-libretro.git master NO mgba libretro-mgba https://github.com/libretro/mgba.git master YES GENERIC Makefile.libretro . mrboom libretro-mrboom https://github.com/libretro/mrboom-libretro.git master YES GENERIC Makefile . mu libretro-mu https://github.com/meepingsnesroms/Mu.git master YES GENERIC Makefile libretroBuildSystem -mupen64plus libretro-mupen64plus https://github.com/libretro/mupen64plus-libretro.git master YES GENERIC_GL Makefile . WITH_DYNAREC=x86_64 mupen64plus_next libretro-mupen64plus_next https://github.com/libretro/mupen64plus-libretro-nx.git GLideN64 YES GENERIC_GL Makefile . WITH_DYNAREC=x86_64 nekop2 libretro-nekop2 https://github.com/libretro/libretro-meowPC98.git master YES GENERIC Makefile.libretro libretro nestopia libretro-nestopia https://github.com/libretro/nestopia.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 942b36ad..179a0841 100644 --- a/recipes/windows/cores-windows-x86_dw2-generic +++ b/recipes/windows/cores-windows-x86_dw2-generic @@ -72,7 +72,6 @@ meteor libretro-meteor https://github.com/libretro/meteor-libretro.git master NO mgba libretro-mgba https://github.com/libretro/mgba.git master YES GENERIC Makefile.libretro . mrboom libretro-mrboom https://github.com/libretro/mrboom-libretro.git master YES GENERIC Makefile . mu libretro-mu https://github.com/meepingsnesroms/Mu.git master YES GENERIC Makefile libretroBuildSystem -mupen64plus libretro-mupen64plus https://github.com/libretro/mupen64plus-libretro.git master YES GENERIC_GL Makefile . WITH_DYNAREC=x86 mupen64plus_next libretro-mupen64plus_next https://github.com/libretro/mupen64plus-libretro-nx.git GLideN64 YES GENERIC_GL Makefile . WITH_DYNAREC=x86 nekop2 libretro-nekop2 https://github.com/libretro/libretro-meowPC98.git master YES GENERIC Makefile.libretro libretro nestopia libretro-nestopia https://github.com/libretro/nestopia.git master YES GENERIC Makefile libretro diff --git a/rules.d/core-rules.sh b/rules.d/core-rules.sh index 58046c40..ce7ea063 100644 --- a/rules.d/core-rules.sh +++ b/rules.d/core-rules.sh @@ -758,22 +758,6 @@ libretro_mesens_name="Mesen-S" libretro_mesens_git_url="https://github.com/SourMesen/Mesen-S.git" libretro_mesens_build_subdir="Libretro" -include_core_mupen64plus() { - register_module core "mupen64plus" -theos_ios -ngc -ps3 -psp1 -wii -} -libretro_mupen64plus_name="Mupen64 Plus" -libretro_mupen64plus_git_url="https://github.com/libretro/mupen64plus-libretro.git" -libretro_mupen64plus_build_platform="$FORMAT_COMPILER_TARGET_ALT" -libretro_mupen64plus_configure() { - if iscpu_x86_64 $ARCH; then - core_build_args="WITH_DYNAREC=x86_64" - elif iscpu_x86 $ARCH; then - core_build_args="WITH_DYNAREC=x86" - elif [ "${CORTEX_A8}" ] || [ "${CORTEX_A9}" ] || [ "$platform" = "ios" ]; then - core_build_args="WITH_DYNAREC=arm" - fi -} - include_core_mupen64plus_next() { register_module core "mupen64plus_next" -theos_ios -ngc -ps3 -psp1 -wii }