From 4e19e4dcab8f09958bf980e7a045fbcaebfae3d9 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Tue, 5 Sep 2017 09:33:39 -0700 Subject: [PATCH] emulation: update packages --- packages/emulation/libretro-2048/package.mk | 4 +- packages/emulation/libretro-4do/package.mk | 4 +- .../libretro-4do-0001-fix-makefile.patch | 12 ++ .../libretro-beetle-bsnes/package.mk | 4 +- .../emulation/libretro-beetle-gba/package.mk | 4 +- .../emulation/libretro-beetle-lynx/package.mk | 4 +- .../emulation/libretro-beetle-ngp/package.mk | 4 +- .../libretro-beetle-pce-fast/package.mk | 4 +- .../emulation/libretro-beetle-pcfx/package.mk | 24 ++- .../emulation/libretro-beetle-psx/package.mk | 4 +- .../libretro-beetle-saturn/package.mk | 4 +- .../libretro-beetle-supergrafx/package.mk | 4 +- .../emulation/libretro-beetle-vb/package.mk | 4 +- .../libretro-beetle-wswan/package.mk | 4 +- .../emulation/libretro-bluemsx/package.mk | 4 +- packages/emulation/libretro-bnes/package.mk | 4 +- .../package.mk | 4 +- .../package.mk | 4 +- .../package.mk | 4 +- packages/emulation/libretro-cap32/package.mk | 4 +- packages/emulation/libretro-craft/package.mk | 16 +- .../emulation/libretro-desmume/package.mk | 18 +- .../emulation/libretro-dinothawr/package.mk | 10 +- ...libretro-dinothawr-0001-fix-makefile.patch | 11 ++ .../emulation/libretro-dolphin/package.mk | 4 +- packages/emulation/libretro-dosbox/package.mk | 4 +- .../emulation/libretro-fbalpha/package.mk | 6 +- packages/emulation/libretro-fceumm/package.mk | 4 +- packages/emulation/libretro-fmsx/package.mk | 4 +- packages/emulation/libretro-fuse/package.mk | 4 +- .../emulation/libretro-gambatte/package.mk | 4 +- .../emulation/libretro-genplus/package.mk | 4 +- packages/emulation/libretro-gw/package.mk | 4 +- packages/emulation/libretro-handy/package.mk | 4 +- packages/emulation/libretro-hatari/package.mk | 4 +- packages/emulation/libretro-mame/package.mk | 26 +-- .../libretro-mame-0001-fix-makefile.patch | 14 ++ .../emulation/libretro-mame2000/package.mk | 2 +- .../emulation/libretro-mame2010/package.mk | 12 +- .../emulation/libretro-mame2014/package.mk | 12 +- packages/emulation/libretro-meteor/package.mk | 4 +- packages/emulation/libretro-mgba/package.mk | 4 +- packages/emulation/libretro-mrboom/package.mk | 4 +- .../emulation/libretro-mupen64plus/package.mk | 16 +- ...1-use-c-buttons-without-modifier-key.patch | 73 ------- ...ove-specialization-of-controller-map.patch | 186 ------------------ .../emulation/libretro-nestopia/package.mk | 4 +- packages/emulation/libretro-nx/package.mk | 4 +- packages/emulation/libretro-o2em/package.mk | 4 +- .../libretro-pcsx-rearmed/package.mk | 16 +- .../emulation/libretro-picodrive/package.mk | 4 +- packages/emulation/libretro-ppsspp/package.mk | 20 +- packages/emulation/libretro-prboom/package.mk | 4 +- .../emulation/libretro-prosystem/package.mk | 4 +- .../emulation/libretro-quicknes/package.mk | 4 +- .../emulation/libretro-reicast/package.mk | 16 +- .../emulation/libretro-scummvm/package.mk | 4 +- packages/emulation/libretro-snes9x/package.mk | 4 +- .../emulation/libretro-snes9x2002/package.mk | 4 +- .../emulation/libretro-snes9x2010/package.mk | 4 +- packages/emulation/libretro-stella/package.mk | 4 +- .../emulation/libretro-tgbdual/package.mk | 4 +- .../emulation/libretro-tyrquake/package.mk | 4 +- .../emulation/libretro-vba-next/package.mk | 4 +- packages/emulation/libretro-vbam/package.mk | 4 +- packages/emulation/libretro-vecx/package.mk | 4 +- .../libretro-virtualjaguar/package.mk | 4 +- 67 files changed, 241 insertions(+), 445 deletions(-) create mode 100644 packages/emulation/libretro-4do/patches/libretro-4do-0001-fix-makefile.patch create mode 100644 packages/emulation/libretro-dinothawr/patches/libretro-dinothawr-0001-fix-makefile.patch create mode 100644 packages/emulation/libretro-mame/patches/libretro-mame-0001-fix-makefile.patch delete mode 100644 packages/emulation/libretro-mupen64plus/patches/libretro-mupen64plus-01-use-c-buttons-without-modifier-key.patch delete mode 100644 packages/emulation/libretro-mupen64plus/patches/libretro-mupen64plus-02-remove-specialization-of-controller-map.patch diff --git a/packages/emulation/libretro-2048/package.mk b/packages/emulation/libretro-2048/package.mk index 33e18f9d6d..2920c3b894 100644 --- a/packages/emulation/libretro-2048/package.mk +++ b/packages/emulation/libretro-2048/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-2048" -PKG_VERSION="5415b1b" -PKG_SHA256="fb8ad8dcb5a3940cacbeee616810736b445bc260c6cd98b11a7f6fb1a0c26294" +PKG_VERSION="093db23" +PKG_SHA256="480d7ed5f294fd58f0ce1ba116f24e20a95821a492acfd40eb40ebc8894f1b74" PKG_ARCH="any" PKG_LICENSE="Public domain" PKG_SITE="https://github.com/libretro/libretro-2048" diff --git a/packages/emulation/libretro-4do/package.mk b/packages/emulation/libretro-4do/package.mk index 6a1bc2a399..c8b2a3454f 100644 --- a/packages/emulation/libretro-4do/package.mk +++ b/packages/emulation/libretro-4do/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-4do" -PKG_VERSION="b8b029b" -PKG_SHA256="385576b8c3cdc907fd1a9b6a9223bbeb2f67d506d45d9ed72baf4b3c94f0b7e0" +PKG_VERSION="cb9442b" +PKG_SHA256="41e2f11fdbb14d43c820aef0fe3f3f579164bf704c24eacac11290eafc0e0411" PKG_ARCH="any" PKG_LICENSE="LGPL" PKG_SITE="https://github.com/libretro/4do-libretro" diff --git a/packages/emulation/libretro-4do/patches/libretro-4do-0001-fix-makefile.patch b/packages/emulation/libretro-4do/patches/libretro-4do-0001-fix-makefile.patch new file mode 100644 index 0000000000..85ddba078c --- /dev/null +++ b/packages/emulation/libretro-4do/patches/libretro-4do-0001-fix-makefile.patch @@ -0,0 +1,12 @@ +diff -Naur a/Makefile b/Makefile +--- a/Makefile 2017-07-01 22:16:40.000000000 -0700 ++++ b/Makefile 2017-07-14 09:55:45.714816515 -0700 +@@ -37,8 +37,6 @@ + endif + + ifneq (,$(findstring unix,$(platform))) +- AR = ${CC_PREFIX}ar +- CC = ${CC_PREFIX}gcc + + TARGET := $(TARGET_NAME)_libretro.so + fpic := -fPIC diff --git a/packages/emulation/libretro-beetle-bsnes/package.mk b/packages/emulation/libretro-beetle-bsnes/package.mk index 10fd8a2aa0..df1bd345d1 100644 --- a/packages/emulation/libretro-beetle-bsnes/package.mk +++ b/packages/emulation/libretro-beetle-bsnes/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-beetle-bsnes" -PKG_VERSION="74d78da" -PKG_SHA256="48b00427ecc9c1f592a5cf9bf452f3c56a34fb03e67271cd51214d50ae986f5e" +PKG_VERSION="8560c52" +PKG_SHA256="aab837b9750a01a33d61502e3fa7cc0de404571c849475264fa570020b7bf4b8" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/beetle-bsnes-libretro" diff --git a/packages/emulation/libretro-beetle-gba/package.mk b/packages/emulation/libretro-beetle-gba/package.mk index 81af37e26f..dc9c2765d7 100644 --- a/packages/emulation/libretro-beetle-gba/package.mk +++ b/packages/emulation/libretro-beetle-gba/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-beetle-gba" -PKG_VERSION="1f948a6" -PKG_SHA256="e1214d73c3a809ef52df92cf386da2e8945b029fe1435cb41489788ddd89631b" +PKG_VERSION="102cdec" +PKG_SHA256="84e7eda93ff377df1592d37219bc00d7dc62f67721cffa1db91a71f7675744d2" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/beetle-gba-libretro" diff --git a/packages/emulation/libretro-beetle-lynx/package.mk b/packages/emulation/libretro-beetle-lynx/package.mk index 8a7db903f9..c7b086db38 100644 --- a/packages/emulation/libretro-beetle-lynx/package.mk +++ b/packages/emulation/libretro-beetle-lynx/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-beetle-lynx" -PKG_VERSION="8ea8650" -PKG_SHA256="a68e6a3c22184dbbe95bda642bf5a54eeb3e51e5bb50e93cc3f3000381525732" +PKG_VERSION="4e321b7" +PKG_SHA256="56ecfc9edf94eabeb371859ecfdb5f7b8ef11eb0bd1ead5e12a701eb92217132" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/beetle-lynx-libretro" diff --git a/packages/emulation/libretro-beetle-ngp/package.mk b/packages/emulation/libretro-beetle-ngp/package.mk index 706badcfbb..6a86b5f488 100644 --- a/packages/emulation/libretro-beetle-ngp/package.mk +++ b/packages/emulation/libretro-beetle-ngp/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-beetle-ngp" -PKG_VERSION="66ef987" -PKG_SHA256="c710d7ccfa552b59e775457122bc518ac7d0beecf58cdea1adc2afe09190b503" +PKG_VERSION="d8f11cc" +PKG_SHA256="1903eca92fb128dabc0ea02b1af18676b858d9746822edf9141c5f4f5818f4ec" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/beetle-ngp-libretro" diff --git a/packages/emulation/libretro-beetle-pce-fast/package.mk b/packages/emulation/libretro-beetle-pce-fast/package.mk index 8546cca2ec..e9b65747ec 100644 --- a/packages/emulation/libretro-beetle-pce-fast/package.mk +++ b/packages/emulation/libretro-beetle-pce-fast/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-beetle-pce-fast" -PKG_VERSION="39185a6" -PKG_SHA256="43e5f91c160dc62e795181e1484df0256eca44f1bd20b4fa6f3288af789ccfe9" +PKG_VERSION="48ac052" +PKG_SHA256="a5c00db819974485482591c66ee4bde3c1afe41bef510fe51cf59534d6b143bb" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/beetle-pce-fast-libretro" diff --git a/packages/emulation/libretro-beetle-pcfx/package.mk b/packages/emulation/libretro-beetle-pcfx/package.mk index e1833ecef2..fb5608b533 100644 --- a/packages/emulation/libretro-beetle-pcfx/package.mk +++ b/packages/emulation/libretro-beetle-pcfx/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-beetle-pcfx" -PKG_VERSION="f53c58a" -PKG_SHA256="05b727c392069159072896005199d0dbcb0f8254c2a1f702d4294b4b35e97665" +PKG_VERSION="5b06ad5" +PKG_SHA256="8187283db4500eac6e2d987380ed8a5160fe07c527ef2700d3809b934812efc2" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/beetle-pcfx-libretro" @@ -39,22 +39,26 @@ PKG_LIBVAR="BEETLE-PCFX_LIB" make_target() { case $PROJECT in RPi) - make CC=$CC CXX=$CXX platform=armv6-hardfloat - ;; - RPi2) - make CC=$CC CXX=$CXX platform=armv7-neon-hardfloat + case $DEVICE in + RPi) + make platform=armv6-hardfloat + ;; + RPi2) + make platform=armv7-neon-hardfloat + ;; + esac ;; imx6) - make CC=$CC CXX=$CXX platform=armv7-cortexa9-neon-hardfloat + make platform=armv7-cortexa9-neon-hardfloat ;; WeTek_Play|WeTek_Core) - make CC=$CC CXX=$CXX platform=armv7-cortexa9-neon-hardfloat + make platform=armv7-cortexa9-neon-hardfloat ;; Odroid_C2|WeTek_Hub|WeTek_Play_2) - make CC=$CC CXX=$CXX platform=aarch64 + make platform=aarch64 ;; Generic) - make CC=$CC CXX=$CXX + make ;; esac } diff --git a/packages/emulation/libretro-beetle-psx/package.mk b/packages/emulation/libretro-beetle-psx/package.mk index 839d95a663..6d1d85185f 100644 --- a/packages/emulation/libretro-beetle-psx/package.mk +++ b/packages/emulation/libretro-beetle-psx/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-beetle-psx" -PKG_VERSION="e3aae3d" -PKG_SHA256="861f9fb4358001159a71b9dabc3911c2a40dfd34bfb50e35d5b86d7502ac7e4a" +PKG_VERSION="09d2a02" +PKG_SHA256="612391ac05d983e973ccda3b3aac99e750da7a9bcf5503b6c419cd57388ec0bf" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/beetle-psx-libretro" diff --git a/packages/emulation/libretro-beetle-saturn/package.mk b/packages/emulation/libretro-beetle-saturn/package.mk index 0351b54e35..196cdcacfa 100644 --- a/packages/emulation/libretro-beetle-saturn/package.mk +++ b/packages/emulation/libretro-beetle-saturn/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-beetle-saturn" -PKG_VERSION="bb5d0c1" -PKG_SHA256="e4a57c422beb834e9409306f46f24758e3395de7835187c258c3ccf9d7269598" +PKG_VERSION="8d70f01" +PKG_SHA256="8ce3b2aa6bdbc51bc2f9b73f8e9c0fbf1327a45fc584d598605e7f377a1f6098" PKG_ARCH="any" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/beetle-saturn-libretro" diff --git a/packages/emulation/libretro-beetle-supergrafx/package.mk b/packages/emulation/libretro-beetle-supergrafx/package.mk index 3a1c055713..8f0f6460f0 100644 --- a/packages/emulation/libretro-beetle-supergrafx/package.mk +++ b/packages/emulation/libretro-beetle-supergrafx/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-beetle-supergrafx" -PKG_VERSION="1757cc3" -PKG_SHA256="8980725b402b0721b50c6e7652d908b01689f662b0e78dae97f39335f2304611" +PKG_VERSION="e9c44a3" +PKG_SHA256="a6458d934f6e7f8213ec9b880c35975b2e48a86db750c03e535813d404a0664f" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/beetle-supergrafx-libretro" diff --git a/packages/emulation/libretro-beetle-vb/package.mk b/packages/emulation/libretro-beetle-vb/package.mk index 233a66f144..c79efc0592 100644 --- a/packages/emulation/libretro-beetle-vb/package.mk +++ b/packages/emulation/libretro-beetle-vb/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-beetle-vb" -PKG_VERSION="1809ea7" -PKG_SHA256="d73a63137d29c2bb722cf92ae6202465bb65a7b1aeebf0dc469c4eb41c6d6d44" +PKG_VERSION="eb940c1" +PKG_SHA256="ed03f9bb4c97fec83959d123db4b9dfe4c85113281573eb5c7e6f4ecf9428aa6" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/beetle-vb-libretro" diff --git a/packages/emulation/libretro-beetle-wswan/package.mk b/packages/emulation/libretro-beetle-wswan/package.mk index aa2d435c33..62ae72accd 100644 --- a/packages/emulation/libretro-beetle-wswan/package.mk +++ b/packages/emulation/libretro-beetle-wswan/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-beetle-wswan" -PKG_VERSION="d106ea1" -PKG_SHA256="3b60cc8c95075fea2bccb55d82209b8facba407bea3099a0c4030248058f1717" +PKG_VERSION="611a574" +PKG_SHA256="09cdca0f94307d3be05b79884a30eb94c11b150f2b9c38983a5dd063b7257bb2" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/beetle-wswan-libretro" diff --git a/packages/emulation/libretro-bluemsx/package.mk b/packages/emulation/libretro-bluemsx/package.mk index 3ea1d55b0f..9de7f34c2b 100644 --- a/packages/emulation/libretro-bluemsx/package.mk +++ b/packages/emulation/libretro-bluemsx/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-bluemsx" -PKG_VERSION="24144ba" -PKG_SHA256="c9acbc257730869cf195141c24e7fbeda9691f3b1821d4638decb9fec8c8a851" +PKG_VERSION="1abb4a3" +PKG_SHA256="a25dd9df3323c20e2812ed9c180ab82de74901863a99e6a888f09bebbc67a49a" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/blueMSX-libretro" diff --git a/packages/emulation/libretro-bnes/package.mk b/packages/emulation/libretro-bnes/package.mk index 9a70b7c7cb..a7ef1f762c 100644 --- a/packages/emulation/libretro-bnes/package.mk +++ b/packages/emulation/libretro-bnes/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-bnes" -PKG_VERSION="5197b6c" -PKG_SHA256="d6888184e4df8bee18317a655d401d132287ccbd2bb3c7d8d94eb26d6bd19f6b" +PKG_VERSION="38161f4" +PKG_SHA256="da7f916f828cc46f16e092318adba747059583e53aea779586ec3a2ac487e326" PKG_ARCH="any" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/bnes-libretro" diff --git a/packages/emulation/libretro-bsnes-mercury-accuracy/package.mk b/packages/emulation/libretro-bsnes-mercury-accuracy/package.mk index 7c2b122f07..ef969ff8d2 100644 --- a/packages/emulation/libretro-bsnes-mercury-accuracy/package.mk +++ b/packages/emulation/libretro-bsnes-mercury-accuracy/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-bsnes-mercury-accuracy" -PKG_VERSION="9061b90" -PKG_SHA256="b2fb674b5fbef83dea72fdd2ee8be255a2e1cb0b73c16d77a2151474d1744454" +PKG_VERSION="b68bd0a" +PKG_SHA256="3c3b6fc42a20eab835049218ab5fd3b35f841a2236f7549ac78a92e58d8bd52a" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/bsnes-mercury" diff --git a/packages/emulation/libretro-bsnes-mercury-balanced/package.mk b/packages/emulation/libretro-bsnes-mercury-balanced/package.mk index 62a911e94b..a71d6ab563 100644 --- a/packages/emulation/libretro-bsnes-mercury-balanced/package.mk +++ b/packages/emulation/libretro-bsnes-mercury-balanced/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-bsnes-mercury-balanced" -PKG_VERSION="9061b90" -PKG_SHA256="b2fb674b5fbef83dea72fdd2ee8be255a2e1cb0b73c16d77a2151474d1744454" +PKG_VERSION="b68bd0a" +PKG_SHA256="3c3b6fc42a20eab835049218ab5fd3b35f841a2236f7549ac78a92e58d8bd52a" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/bsnes-mercury" diff --git a/packages/emulation/libretro-bsnes-mercury-performance/package.mk b/packages/emulation/libretro-bsnes-mercury-performance/package.mk index 882e4185d4..e564af01c5 100644 --- a/packages/emulation/libretro-bsnes-mercury-performance/package.mk +++ b/packages/emulation/libretro-bsnes-mercury-performance/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-bsnes-mercury-performance" -PKG_VERSION="9061b90" -PKG_SHA256="b2fb674b5fbef83dea72fdd2ee8be255a2e1cb0b73c16d77a2151474d1744454" +PKG_VERSION="b68bd0a" +PKG_SHA256="3c3b6fc42a20eab835049218ab5fd3b35f841a2236f7549ac78a92e58d8bd52a" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/bsnes-mercury" diff --git a/packages/emulation/libretro-cap32/package.mk b/packages/emulation/libretro-cap32/package.mk index d787db5759..39d611a960 100644 --- a/packages/emulation/libretro-cap32/package.mk +++ b/packages/emulation/libretro-cap32/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-cap32" -PKG_VERSION="04bffe8" -PKG_SHA256="525853a110ade3abd800c6f9fbae528b0355142c70ee591bff6e45c8b0ae7362" +PKG_VERSION="37ccb4a" +PKG_SHA256="7abd4f7f9b712c50038788b7ea086bb9d4baf178ea93bb1cef82d579c4f799e6" PKG_ARCH="any" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/libretro-cap32" diff --git a/packages/emulation/libretro-craft/package.mk b/packages/emulation/libretro-craft/package.mk index 0f507dfe0c..a1a112778c 100644 --- a/packages/emulation/libretro-craft/package.mk +++ b/packages/emulation/libretro-craft/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-craft" -PKG_VERSION="4a11641" -PKG_SHA256="918384a177bbb6caad1e275da09bcbf1d17c029dbeba002189aa3af95ca17980" +PKG_VERSION="a662b3b" +PKG_SHA256="b4511fcb5061c0914a9447065701a61687bc5e2a852b4bf0b9636bbb1e8f33b8" PKG_ARCH="any" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/Craft" @@ -46,10 +46,14 @@ pre_configure_target() { make_target() { case $PROJECT in RPi) - make -f Makefile.libretro platform=rpi - ;; - RPi2) - make -f Makefile.libretro platform=rpi2 + case $DEVICE in + RPi) + make -f Makefile.libretro platform=rpi + ;; + RPi2) + make -f Makefile.libretro platform=rpi2 + ;; + esac ;; imx6) make -f Makefile.libretro platform=imx6 diff --git a/packages/emulation/libretro-desmume/package.mk b/packages/emulation/libretro-desmume/package.mk index 3e59cd91aa..e170070614 100644 --- a/packages/emulation/libretro-desmume/package.mk +++ b/packages/emulation/libretro-desmume/package.mk @@ -39,19 +39,23 @@ PKG_LIBVAR="DESMUME_LIB" make_target() { case $PROJECT in RPi) - make -f Makefile.libretro CC=$CC platform=armv6-hardfloat-arm1176jzf-s - ;; - RPi2) - make -f Makefile.libretro CC=$CC platform=armv7-neon-hardfloat-cortex-a7 + case $DEVICE in + RPi) + make -f Makefile.libretro platform=armv6-hardfloat-arm1176jzf-s + ;; + RPi2) + make -f Makefile.libretro platform=armv7-neon-hardfloat-cortex-a7 + ;; + esac ;; imx6) - make -f Makefile.libretro CC=$CC platform=armv7-neon-hardfloat-cortex-a9 + make -f Makefile.libretro platform=armv7-neon-hardfloat-cortex-a9 ;; WeTek_Play|WeTek_Core) - make -f Makefile.libretro CC=$CC platform=armv7-neon-hardfloat-cortex-a9 + make -f Makefile.libretro platform=armv7-neon-hardfloat-cortex-a9 ;; Generic) - make -f Makefile.libretro CC=$CC + make -f Makefile.libretro ;; esac } diff --git a/packages/emulation/libretro-dinothawr/package.mk b/packages/emulation/libretro-dinothawr/package.mk index 1c6694e1c4..11dff1e86d 100644 --- a/packages/emulation/libretro-dinothawr/package.mk +++ b/packages/emulation/libretro-dinothawr/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-dinothawr" -PKG_VERSION="02821dd" -PKG_SHA256="c76bff34c6444197ad478053ed53ec751e29dbf19e2d17063c203023c10ca200" +PKG_VERSION="a2abe12" +PKG_SHA256="1154df10e5878980ba894645a00be9ee56368c132b29377d0ff16376702e3bf1" PKG_ARCH="any" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/Dinothawr" @@ -36,8 +36,10 @@ PKG_LIBNAME="dinothawr_libretro.so" PKG_LIBPATH="$PKG_LIBNAME" PKG_LIBVAR="DINOTHAWR_LIB" -make_target() { - make +pre_make_target() { + if echo "$TARGET_FPU" | grep -q '^neon'; then + export HAVE_NEON=1 + fi } makeinstall_target() { diff --git a/packages/emulation/libretro-dinothawr/patches/libretro-dinothawr-0001-fix-makefile.patch b/packages/emulation/libretro-dinothawr/patches/libretro-dinothawr-0001-fix-makefile.patch new file mode 100644 index 0000000000..ac37a5ca33 --- /dev/null +++ b/packages/emulation/libretro-dinothawr/patches/libretro-dinothawr-0001-fix-makefile.patch @@ -0,0 +1,11 @@ +diff -Naur a/Makefile b/Makefile +--- a/Makefile 2017-06-12 09:00:49.000000000 -0700 ++++ b/Makefile 2017-07-14 13:23:42.430741116 -0700 +@@ -1,6 +1,6 @@ + DEBUG = 0 + USE_CXX03 = 0 +-HAVE_NEON=0 ++HAVE_NEON ?= 0 + + ifeq ($(platform),) + platform = unix diff --git a/packages/emulation/libretro-dolphin/package.mk b/packages/emulation/libretro-dolphin/package.mk index 3b3ecd4b51..fcd7794372 100644 --- a/packages/emulation/libretro-dolphin/package.mk +++ b/packages/emulation/libretro-dolphin/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-dolphin" -PKG_VERSION="7d55df4" -PKG_SHA256="b61cc4f7d4dff392dd04d0d97c4d87529cb694e8acc42b6e880a007743c9d262" +PKG_VERSION="8260ec4" +PKG_SHA256="96add8ce38926e3007bc9ba254a857a36cd755c01c430c8747988504b3a46ec3" PKG_ARCH="none" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/dolphin" diff --git a/packages/emulation/libretro-dosbox/package.mk b/packages/emulation/libretro-dosbox/package.mk index 1bbd11e565..e3771f5373 100644 --- a/packages/emulation/libretro-dosbox/package.mk +++ b/packages/emulation/libretro-dosbox/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-dosbox" -PKG_VERSION="8dae921" -PKG_SHA256="1d42f72d9a11b5e4394cd6a9954e89784fd6ac6a7a0b8e19708a2f01cb954208" +PKG_VERSION="ce1bb80" +PKG_SHA256="c416d44a33f098bd59e6513edaa525d4544edb9e5b46d986b88c40bedc9e60f0" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/dosbox-libretro" diff --git a/packages/emulation/libretro-fbalpha/package.mk b/packages/emulation/libretro-fbalpha/package.mk index 3424f581af..84deb66fc1 100644 --- a/packages/emulation/libretro-fbalpha/package.mk +++ b/packages/emulation/libretro-fbalpha/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-fbalpha" -PKG_VERSION="3e64a22" -PKG_SHA256="2d29ea334490236c061fe5d811af7f26705264c69e9a17c4a98a43961190d93e" +PKG_VERSION="5f7f225" +PKG_SHA256="d138a4087af05b5ac8e1829d92086a788f9e24624827b1b2c796c9e863e578a6" PKG_ARCH="any" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/fbalpha" @@ -32,7 +32,7 @@ PKG_AUTORECONF="no" PKG_IS_ADDON="no" PKG_USE_CMAKE="no" -PKG_LIBNAME="fba_libretro.so" +PKG_LIBNAME="fbalpha_libretro.so" PKG_LIBPATH="$PKG_LIBNAME" PKG_LIBVAR="FBALPHA_LIB" diff --git a/packages/emulation/libretro-fceumm/package.mk b/packages/emulation/libretro-fceumm/package.mk index 233fbccacc..5a9419a1ce 100644 --- a/packages/emulation/libretro-fceumm/package.mk +++ b/packages/emulation/libretro-fceumm/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-fceumm" -PKG_VERSION="5a27aa3" -PKG_SHA256="96ff4f9ae3de07824b5848becc37e92d6c91f4707e956c36452336443fec1933" +PKG_VERSION="b2aefbf" +PKG_SHA256="063c9730d5fdb5eefe7b0d16351aea900b8382e1babfb33b208503720b9959b5" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/libretro-fceumm" diff --git a/packages/emulation/libretro-fmsx/package.mk b/packages/emulation/libretro-fmsx/package.mk index 8c7efa7b78..508109bff2 100644 --- a/packages/emulation/libretro-fmsx/package.mk +++ b/packages/emulation/libretro-fmsx/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-fmsx" -PKG_VERSION="0386da0" -PKG_SHA256="05cc82589dc29013344c9b12b9c23ba35c7b2412c968cb0970fee6b96d2d612f" +PKG_VERSION="7c0c733" +PKG_SHA256="2b65d12d87449d1af09d7c584d203b71c893e4ec5cd0249d7f1db73d46920c58" PKG_ARCH="any" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/fmsx-libretro" diff --git a/packages/emulation/libretro-fuse/package.mk b/packages/emulation/libretro-fuse/package.mk index f357807959..8ecde19cd6 100644 --- a/packages/emulation/libretro-fuse/package.mk +++ b/packages/emulation/libretro-fuse/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-fuse" -PKG_VERSION="f834c9b" -PKG_SHA256="f5a41694d6083448d0cc6cdd467f381db305a895455d1500b1d710f3487611b5" +PKG_VERSION="ae9dda6" +PKG_SHA256="e7ca00939dbd14bfea84302635d0c6191f7dc92c65ce74935c446a349c08f1a0" PKG_ARCH="any" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/fuse-libretro" diff --git a/packages/emulation/libretro-gambatte/package.mk b/packages/emulation/libretro-gambatte/package.mk index 3e25e57702..7d991db1e9 100644 --- a/packages/emulation/libretro-gambatte/package.mk +++ b/packages/emulation/libretro-gambatte/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-gambatte" -PKG_VERSION="b1af734" -PKG_SHA256="53967da808ef8132b131f41a5407d11e7d7b43f5a69f4a52389bd5d23291a503" +PKG_VERSION="02e222e" +PKG_SHA256="7c24b95a7a8f434757decfd16c8eb7e2b43a1f242533ed13169b2a4a85a22d7c" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/gambatte-libretro" diff --git a/packages/emulation/libretro-genplus/package.mk b/packages/emulation/libretro-genplus/package.mk index 1add6bf7d2..396c74ab9b 100644 --- a/packages/emulation/libretro-genplus/package.mk +++ b/packages/emulation/libretro-genplus/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-genplus" -PKG_VERSION="afa38e3" -PKG_SHA256="3bae8b3db61b50e6afd6b07e73f2bbf9a042981ef6a2dae52d955279f4c13f0d" +PKG_VERSION="9c10f4f" +PKG_SHA256="6ca92f6616ec40c09b34475a84544ef1367fb28a62faf86827551ca0b19c37ad" PKG_ARCH="any" PKG_LICENSE="Modified BSD / LGPLv2.1" PKG_SITE="https://github.com/libretro/Genesis-Plus-GX" diff --git a/packages/emulation/libretro-gw/package.mk b/packages/emulation/libretro-gw/package.mk index 82d86c95f7..02007bb392 100644 --- a/packages/emulation/libretro-gw/package.mk +++ b/packages/emulation/libretro-gw/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-gw" -PKG_VERSION="7e1c2a6" -PKG_SHA256="bb747a4a27592572e08a5d1e0525ef53d82c5f34fc26a4c7d76ff4f7410d50c4" +PKG_VERSION="7cafbf4" +PKG_SHA256="dcb262c560969de3f8c3a0a9374479f494f441d57738489ee109ad2063d6adfb" PKG_ARCH="any" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/gw-libretro" diff --git a/packages/emulation/libretro-handy/package.mk b/packages/emulation/libretro-handy/package.mk index 629b65f4ff..ed6a89dcb0 100644 --- a/packages/emulation/libretro-handy/package.mk +++ b/packages/emulation/libretro-handy/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-handy" -PKG_VERSION="c55760b" -PKG_SHA256="579b9ece7fcb168f0cf33c0782b9117fdcd428ca4c98035732a09b6f1ead173c" +PKG_VERSION="e04d06c" +PKG_SHA256="84297cfe84587a0af3c0bf1b36348ffc071d8fbc4093afd0a34df271c898b258" PKG_ARCH="any" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/libretro-handy" diff --git a/packages/emulation/libretro-hatari/package.mk b/packages/emulation/libretro-hatari/package.mk index ca9c722e70..8c65161df0 100644 --- a/packages/emulation/libretro-hatari/package.mk +++ b/packages/emulation/libretro-hatari/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-hatari" -PKG_VERSION="e99678b" -PKG_SHA256="a1d4d5aad156147455b9eb70307d8bb471a65f157c1140d94593477146882479" +PKG_VERSION="bd035e8" +PKG_SHA256="dc0e0dea24106e5206b1dc171a1c68b37fca9cf65dade8597e4b33ea90c156fc" PKG_ARCH="any" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/hatari" diff --git a/packages/emulation/libretro-mame/package.mk b/packages/emulation/libretro-mame/package.mk index cfe68342a7..b707763e35 100644 --- a/packages/emulation/libretro-mame/package.mk +++ b/packages/emulation/libretro-mame/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-mame" -PKG_VERSION="769dd8d" -PKG_SHA256="4d6c2fa63fb6f57bb484f487f3d149520099b66905dea5ceb0005d6089812bb0" +PKG_VERSION="a449150" +PKG_SHA256="48a0d75fc0f19eb86c25687bf1300fe7c5534a1371e7282c54070365f28f4c44" PKG_ARCH="x86_64" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/mame" @@ -39,30 +39,10 @@ PKG_LIBVAR="MAME_LIB" pre_make_target() { strip_lto strip_gold - - export OVERRIDE_CC="$CC" - export OVERRIDE_CXX="$CXX" - export OVERRIDE_LD="$CXX" } make_target() { - case $PROJECT in - RPi) - make platform=armv6-hardfloat-arm1176jzf-s - ;; - RPi2) - make platform=armv7-neon-hardfloat-cortex-a7 - ;; - imx6) - make platform=armv7-neon-hardfloat-cortex-a9 - ;; - WeTek_Play|WeTek_Core) - make platform=armv7-neon-hardfloat-cortex-a9 - ;; - Generic) - make -f Makefile.libretro - ;; - esac + make -f Makefile.libretro } makeinstall_target() { diff --git a/packages/emulation/libretro-mame/patches/libretro-mame-0001-fix-makefile.patch b/packages/emulation/libretro-mame/patches/libretro-mame-0001-fix-makefile.patch new file mode 100644 index 0000000000..9bd7cd5bff --- /dev/null +++ b/packages/emulation/libretro-mame/patches/libretro-mame-0001-fix-makefile.patch @@ -0,0 +1,14 @@ +diff -Naur a/3rdparty/genie/build/gmake.linux/genie.make b/3rdparty/genie/build/gmake.linux/genie.make +--- a/3rdparty/genie/build/gmake.linux/genie.make 2017-06-28 12:47:18.000000000 -0700 ++++ b/3rdparty/genie/build/gmake.linux/genie.make 2017-07-14 12:21:57.302218319 -0700 +@@ -28,10 +28,6 @@ + RM = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul || exit 0 + endif + +-CC = gcc +-CXX = g++ +-AR = ar +- + ifndef RESCOMP + ifdef WINDRES + RESCOMP = $(WINDRES) diff --git a/packages/emulation/libretro-mame2000/package.mk b/packages/emulation/libretro-mame2000/package.mk index 03a2352fa7..51723f4129 100644 --- a/packages/emulation/libretro-mame2000/package.mk +++ b/packages/emulation/libretro-mame2000/package.mk @@ -42,7 +42,7 @@ configure_target() { make_target() { case $PROJECT in - RPi|RPi2|imx6|WeTek_Play|WeTek_Core) + RPi|imx6|WeTek_Play|WeTek_Core) make ARM=1 ;; Generic|Odroid_C2|WeTek_Hub|WeTek_Play_2) diff --git a/packages/emulation/libretro-mame2010/package.mk b/packages/emulation/libretro-mame2010/package.mk index 0269632624..46a2b81712 100644 --- a/packages/emulation/libretro-mame2010/package.mk +++ b/packages/emulation/libretro-mame2010/package.mk @@ -46,10 +46,14 @@ pre_make_target() { make_target() { case $PROJECT in RPi) - make platform=armv6-hardfloat-arm1176jzf-s - ;; - RPi2) - make platform=armv7-neon-hardfloat-cortex-a7 + case $DEVICE in + RPi) + make platform=armv6-hardfloat-arm1176jzf-s + ;; + RPi2) + make platform=armv7-neon-hardfloat-cortex-a7 + ;; + esac ;; imx6) make platform=armv7-neon-hardfloat-cortex-a9 diff --git a/packages/emulation/libretro-mame2014/package.mk b/packages/emulation/libretro-mame2014/package.mk index bfdcdcc6b2..1dfb60fcc6 100644 --- a/packages/emulation/libretro-mame2014/package.mk +++ b/packages/emulation/libretro-mame2014/package.mk @@ -46,10 +46,14 @@ pre_make_target() { make_target() { case $PROJECT in RPi) - make platform=armv6-hardfloat-arm1176jzf-s - ;; - RPi2) - make platform=armv7-neon-hardfloat-cortex-a7 + case $DEVICE in + RPi) + make platform=armv6-hardfloat-arm1176jzf-s + ;; + RPi2) + make platform=armv7-neon-hardfloat-cortex-a7 + ;; + esac ;; imx6) make platform=armv7-neon-hardfloat-cortex-a9 diff --git a/packages/emulation/libretro-meteor/package.mk b/packages/emulation/libretro-meteor/package.mk index 26987d4a9d..1557ec0e0f 100644 --- a/packages/emulation/libretro-meteor/package.mk +++ b/packages/emulation/libretro-meteor/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-meteor" -PKG_VERSION="b7f5c82" -PKG_SHA256="8b0ed75f8a7e67aeb6830bb2185f7b857a2590f8c6ef611328e6045862d078fc" +PKG_VERSION="21412cf" +PKG_SHA256="396497e61afd9d3bf388586fa87fe853969ca2529b8489e732b12964b4bcf506" PKG_ARCH="any" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/meteor-libretro" diff --git a/packages/emulation/libretro-mgba/package.mk b/packages/emulation/libretro-mgba/package.mk index e11b2ec5e7..e782fa65e6 100644 --- a/packages/emulation/libretro-mgba/package.mk +++ b/packages/emulation/libretro-mgba/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-mgba" -PKG_VERSION="0e19a58" -PKG_SHA256="a822fe43bdcb38bdd866ce1c523d95dc8d09fc787822f623ab510e1a158b549b" +PKG_VERSION="4304cc9" +PKG_SHA256="7e8279a3418b6a831ad611d563515aa23d7d3eec5539e6328e5f4ea7d43992ad" PKG_ARCH="any" PKG_LICENSE="MPL 2.0" PKG_SITE="https://github.com/libretro/mgba" diff --git a/packages/emulation/libretro-mrboom/package.mk b/packages/emulation/libretro-mrboom/package.mk index 08d04a5f77..14f8a9bb53 100644 --- a/packages/emulation/libretro-mrboom/package.mk +++ b/packages/emulation/libretro-mrboom/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-mrboom" -PKG_VERSION="3008bec" -PKG_SHA256="45140f943a70bbb9813ba2a35116ddfbc06702450ea14ef0b36f9f6059bdcdf9" +PKG_VERSION="2b4595f" +PKG_SHA256="26606453e2363f68c98573ba09405db6e7cc78b166848a2971b4c60b351add56" PKG_ARCH="any" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/mrboom-libretro" diff --git a/packages/emulation/libretro-mupen64plus/package.mk b/packages/emulation/libretro-mupen64plus/package.mk index 57617f76ea..7ae562fb6b 100644 --- a/packages/emulation/libretro-mupen64plus/package.mk +++ b/packages/emulation/libretro-mupen64plus/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-mupen64plus" -PKG_VERSION="78f37ec" -PKG_SHA256="c0c66102c355ac8f75c7156bd3a0d856982e960613117d55d9b92393c2fca2c1" +PKG_VERSION="2a7893e" +PKG_SHA256="d3f19c6bb5b425de2807c853d21132bc4b94b563fb6451c814d96ddaeca152fa" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/mupen64plus-libretro" @@ -39,10 +39,14 @@ PKG_LIBVAR="MUPEN64PLUS_LIB" make_target() { case $PROJECT in RPi) - make platform=rpi - ;; - RPi2) - make platform=rpi2 + case $DEVICE in + RPi) + make platform=rpi + ;; + RPi2) + make platform=rpi2 + ;; + esac ;; imx6) make platform=imx6 diff --git a/packages/emulation/libretro-mupen64plus/patches/libretro-mupen64plus-01-use-c-buttons-without-modifier-key.patch b/packages/emulation/libretro-mupen64plus/patches/libretro-mupen64plus-01-use-c-buttons-without-modifier-key.patch deleted file mode 100644 index 0834a4ea51..0000000000 --- a/packages/emulation/libretro-mupen64plus/patches/libretro-mupen64plus-01-use-c-buttons-without-modifier-key.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 717b800f4e7d2f69da040ffa6312549bd3b44349 Mon Sep 17 00:00:00 2001 -From: Wolfgang Haupt -Date: Sun, 13 Sep 2015 17:29:00 +0200 -Subject: [PATCH 1/2] use c-buttons without modifier key - ---- - .../src/plugin/emulate_game_controller_via_libretro.c | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) - -diff --git a/mupen64plus-core/src/plugin/emulate_game_controller_via_libretro.c b/mupen64plus-core/src/plugin/emulate_game_controller_via_libretro.c -index e08af9d..ee13999 100644 ---- a/mupen64plus-core/src/plugin/emulate_game_controller_via_libretro.c -+++ b/mupen64plus-core/src/plugin/emulate_game_controller_via_libretro.c -@@ -85,6 +85,8 @@ static void inputGetKeys_default_descriptor(void) - { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R, "R-Trigger" }, - { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X, "(C-Up)" }, - { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y, "(C-Left)" }, -+ { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L3, "(C-Right)" }, -+ { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R3, "(C-Down)" }, - - { 0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT , RETRO_DEVICE_ID_ANALOG_X, "Control Stick X" }, - { 0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT , RETRO_DEVICE_ID_ANALOG_Y, "Control Stick Y" }, -@@ -105,6 +107,8 @@ static void inputGetKeys_default_descriptor(void) - { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R, "R-Trigger" }, - { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X, "(C-Up)" }, - { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y, "(C-Left)" }, -+ { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L3, "(C-Right)" }, -+ { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R3, "(C-Down)" }, - - { 1, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT , RETRO_DEVICE_ID_ANALOG_X, "Control Stick X" }, - { 1, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT , RETRO_DEVICE_ID_ANALOG_Y, "Control Stick Y" }, -@@ -125,6 +129,8 @@ static void inputGetKeys_default_descriptor(void) - { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R, "R-Trigger" }, - { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X, "(C-Up)" }, - { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y, "(C-Left)" }, -+ { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L3, "(C-Right)" }, -+ { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R3, "(C-Down)" }, - - { 2, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT , RETRO_DEVICE_ID_ANALOG_X, "Control Stick X" }, - { 2, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT , RETRO_DEVICE_ID_ANALOG_Y, "Control Stick Y" }, -@@ -145,6 +151,8 @@ static void inputGetKeys_default_descriptor(void) - { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R, "R-Trigger" }, - { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X, "(C-Up)" }, - { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y, "(C-Left)" }, -+ { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L3, "(C-Right)" }, -+ { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R3, "(C-Down)" }, - - { 3, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT , RETRO_DEVICE_ID_ANALOG_X, "Control Stick X" }, - { 3, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT , RETRO_DEVICE_ID_ANALOG_Y, "Control Stick Y" }, -@@ -716,7 +724,7 @@ static void inputGetKeys_default( int Control, BUTTONS *Keys ) - - Keys->R_TRIG = input_cb(Control, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R); - -- hold_cstick = input_cb(Control, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R2); -+ //hold_cstick = input_cb(Control, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R2); - if (hold_cstick) - { - Keys->R_CBUTTON = input_cb(Control, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A); -@@ -730,6 +738,11 @@ static void inputGetKeys_default( int Control, BUTTONS *Keys ) - Keys->A_BUTTON = input_cb(Control, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A); - Keys->L_TRIG = input_cb(Control, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L); - Keys->Z_TRIG = input_cb(Control, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L2); -+ -+ Keys->R_CBUTTON = input_cb(Control, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L3); -+ Keys->L_CBUTTON = input_cb(Control, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y); -+ Keys->D_CBUTTON = input_cb(Control, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R3); -+ Keys->U_CBUTTON = input_cb(Control, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X); - } - - --- -2.3.2 (Apple Git-55) - diff --git a/packages/emulation/libretro-mupen64plus/patches/libretro-mupen64plus-02-remove-specialization-of-controller-map.patch b/packages/emulation/libretro-mupen64plus/patches/libretro-mupen64plus-02-remove-specialization-of-controller-map.patch deleted file mode 100644 index 8f162ee6b6..0000000000 --- a/packages/emulation/libretro-mupen64plus/patches/libretro-mupen64plus-02-remove-specialization-of-controller-map.patch +++ /dev/null @@ -1,186 +0,0 @@ -From cabbb38de353050d2257097e54eb1610ae6e4fe9 Mon Sep 17 00:00:00 2001 -From: Charlie Marshall -Date: Mon, 28 Dec 2015 17:59:24 +0000 -Subject: [PATCH] Update emulate_game_controller_via_libretro.c - ---- - .../plugin/emulate_game_controller_via_libretro.c | 166 --------------------- - 1 file changed, 166 deletions(-) - -diff --git a/mupen64plus-core/src/plugin/emulate_game_controller_via_libretro.c b/mupen64plus-core/src/plugin/emulate_game_controller_via_libretro.c -index 823870e..b3b992a 100644 ---- a/mupen64plus-core/src/plugin/emulate_game_controller_via_libretro.c -+++ b/mupen64plus-core/src/plugin/emulate_game_controller_via_libretro.c -@@ -766,172 +766,6 @@ void inputInitiateCallback(const char *headername) - return; - } - -- if ( -- (!strcmp(headername, "KILLER INSTINCT GOLD")) || -- (!strcmp(headername, "Killer Instinct Gold")) || -- (!strcmp(headername, "CLAYFIGHTER 63")) || -- (!strcmp(headername, "Clayfighter SC")) || -- (!strcmp(headername, "RAKUGAKIDS"))) -- { -- static struct retro_input_descriptor desc[] = { -- { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT, "D-Pad Left" }, -- { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP, "D-Pad Up" }, -- { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN, "D-Pad Down" }, -- { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT, "D-Pad Right" }, -- { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B, "A [Low Kick]" }, -- { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A, "C-Down [Medium Kick]" }, -- { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X, "C-Left [Medium Punch]" }, -- { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y, "B [Low Punch]" }, -- { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L, "C-Up [Fierce Punch]" }, -- { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R, "C-Right [Fierce Kick]" }, -- { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L2, "Z-Trigger" }, -- { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R2, "R" }, -- { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Change Controls" }, -- { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START, "Start" }, -- -- { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT, "D-Pad Left" }, -- { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP, "D-Pad Up" }, -- { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN, "D-Pad Down" }, -- { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT, "D-Pad Right" }, -- { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B, "A [Low Kick]" }, -- { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A, "C-Down [Medium Kick]" }, -- { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X, "C-Left [Medium Punch]" }, -- { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y, "B [Low Punch]" }, -- { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L, "C-Up [Fierce Punch]" }, -- { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R, "C-Right [Fierce Kick]" }, -- { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L2, "Z-Trigger" }, -- { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R2, "R" }, -- { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Change Controls" }, -- { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START, "Start" }, -- -- { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT, "D-Pad Left" }, -- { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP, "D-Pad Up" }, -- { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN, "D-Pad Down" }, -- { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT, "D-Pad Right" }, -- { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B, "A [Low Kick]" }, -- { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A, "C-Down [Medium Kick]" }, -- { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X, "C-Left [Medium Punch]" }, -- { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y, "B [Low Punch]" }, -- { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L, "C-Up [Fierce Punch]" }, -- { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R, "C-Right [Fierce Kick]" }, -- { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L2, "Z-Trigger" }, -- { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R2, "R" }, -- { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Change Controls" }, -- { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START, "Start" }, -- -- { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT, "D-Pad Left" }, -- { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP, "D-Pad Up" }, -- { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN, "D-Pad Down" }, -- { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT, "D-Pad Right" }, -- { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B, "A [Low Kick]" }, -- { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A, "C-Down [Medium Kick]" }, -- { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X, "C-Left [Medium Punch]" }, -- { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y, "B [Low Punch]" }, -- { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L, "C-Up [Fierce Punch]" }, -- { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R, "C-Right [Fierce Kick]" }, -- { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L2, "Z-Trigger" }, -- { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R2, "R" }, -- { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Change Controls" }, -- { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START, "Start" }, -- -- { 0 }, -- }; -- environ_cb(RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS, desc); -- getKeys = inputGetKeys_6ButtonFighters; -- } -- else if (!strcmp(headername, "BIOFREAKS")) -- getKeys = inputGetKeys_Biofreaks; -- else if (!strcmp(headername, "DARK RIFT")) -- getKeys = inputGetKeys_DarkRift; -- else if (!strcmp(headername, "XENAWARRIORPRINCESS")) -- getKeys = inputGetKeys_XENA; -- else if (!strcmp(headername, "RIDGE RACER 64")) -- { -- static struct retro_input_descriptor desc[] = { -- { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT, "D-Pad Left" }, -- { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP, "D-Pad Up" }, -- { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN, "D-Pad Down" }, -- { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT, "D-Pad Right" }, -- { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B, "A" }, -- { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X, "C-Up" }, -- { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y, "B" }, -- { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L, "L" }, -- { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R, "R" }, -- { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Change Controls" }, -- { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START, "Start" }, -- -- { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT, "D-Pad Left" }, -- { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP, "D-Pad Up" }, -- { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN, "D-Pad Down" }, -- { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT, "D-Pad Right" }, -- { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B, "A" }, -- { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X, "C-Up" }, -- { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y, "B" }, -- { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L, "L" }, -- { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R, "R" }, -- { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Change Controls" }, -- { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START, "Start" }, -- -- { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT, "D-Pad Left" }, -- { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP, "D-Pad Up" }, -- { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN, "D-Pad Down" }, -- { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT, "D-Pad Right" }, -- { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B, "A" }, -- { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X, "C-Up" }, -- { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y, "B" }, -- { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L, "L" }, -- { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R, "R" }, -- { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Change Controls" }, -- { 2, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START, "Start" }, -- -- { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT, "D-Pad Left" }, -- { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP, "D-Pad Up" }, -- { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN, "D-Pad Down" }, -- { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT, "D-Pad Right" }, -- { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B, "A" }, -- { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X, "C-Up" }, -- { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y, "B" }, -- { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L, "L" }, -- { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R, "R" }, -- { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Change Controls" }, -- { 3, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START, "Start" }, -- -- { 0 }, -- }; -- environ_cb(RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS, desc); -- getKeys = inputGetKeys_RR64; -- } -- else if ((!strcmp(headername, "I S S 64")) || -- (!strcmp(headername, "J WORLD SOCCER3")) || -- (!strcmp(headername, "J.WORLD CUP 98")) || -- (!strcmp(headername, "I.S.S.98")) || -- (!strcmp(headername, "PERFECT STRIKER2")) || -- (!strcmp(headername, "I.S.S.2000"))) -- getKeys = inputGetKeys_ISS; -- else if (!strcmp(headername, "MACE")) -- getKeys = inputGetKeys_Mace; -- else if ((!strcmp(headername, "MISCHIEF MAKERS")) || -- (!strcmp(headername, "TROUBLE MAKERS"))) -- getKeys = inputGetKeys_MischiefMakers; -- else if ((!strcmp(headername, "MortalKombatTrilogy")) || -- (!strcmp(headername, "WAR GODS"))) -- getKeys = inputGetKeys_MKTrilogy; -- else if (!strcmp(headername, "MORTAL KOMBAT 4")) -- getKeys = inputGetKeys_MK4; -- else if (!strcmp(headername, "MK_MYTHOLOGIES")) -- getKeys = inputGetKeys_MKMythologies; -- else if ((!strcmp(headername, "RAMPAGE")) || -- (!strcmp(headername, "RAMPAGE2"))) -- getKeys = inputGetKeys_Rampage; -- else if ((!strcmp(headername, "READY 2 RUMBLE")) || -- (!strcmp(headername, "Ready to Rumble"))) -- getKeys = inputGetKeys_Ready2Rumble; -- else if (!strcmp(headername, "Wipeout 64")) -- getKeys = inputGetKeys_Wipeout64; -- else if ((!strcmp(headername, "WRESTLEMANIA 2000")) || -- (!strcmp(headername, "WWF No Mercy"))) -- getKeys = inputGetKeys_WWF; -- - if (getKeys == &inputGetKeys_default) - return; - diff --git a/packages/emulation/libretro-nestopia/package.mk b/packages/emulation/libretro-nestopia/package.mk index b924e85268..d3dca8e0e4 100644 --- a/packages/emulation/libretro-nestopia/package.mk +++ b/packages/emulation/libretro-nestopia/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-nestopia" -PKG_VERSION="ebd462b" -PKG_SHA256="983b3661780aee0fffa9571f9a09cc30671a1312996c2341d745110a30b4ccdb" +PKG_VERSION="c4c7de4" +PKG_SHA256="11e469cd96be7f4f5ea52dc9fc159f48d1ece11471c7426b0f2dce5d725f5574" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/nestopia" diff --git a/packages/emulation/libretro-nx/package.mk b/packages/emulation/libretro-nx/package.mk index a22abde4d3..be76a2c861 100644 --- a/packages/emulation/libretro-nx/package.mk +++ b/packages/emulation/libretro-nx/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-nx" -PKG_VERSION="20f6aac" -PKG_SHA256="3d3fa5a73be0d1ac7ab86f3ae3d6ac5901074f0af908594b1b02db9620fc015f" +PKG_VERSION="28fe427" +PKG_SHA256="bcd5350a01659b9765d7b42ed9328c9a9f227a75fc9c81d95b7d2e7d1958fe8a" PKG_ARCH="any" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/nxengine-libretro" diff --git a/packages/emulation/libretro-o2em/package.mk b/packages/emulation/libretro-o2em/package.mk index 30ce998070..4d145912fd 100644 --- a/packages/emulation/libretro-o2em/package.mk +++ b/packages/emulation/libretro-o2em/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-o2em" -PKG_VERSION="1d62d4e" -PKG_SHA256="e28625b0d18ec9afa6d80dbbe88db1afc5e7fada52a0cf89453f43d24f9fcc78" +PKG_VERSION="86b050a" +PKG_SHA256="1ac3fc4f12f9594aef5feb0f65c1521adaa833b1287f9958eb9cafedf441051e" PKG_ARCH="any" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/libretro-o2em" diff --git a/packages/emulation/libretro-pcsx-rearmed/package.mk b/packages/emulation/libretro-pcsx-rearmed/package.mk index dad6c6087e..726f1855af 100644 --- a/packages/emulation/libretro-pcsx-rearmed/package.mk +++ b/packages/emulation/libretro-pcsx-rearmed/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-pcsx-rearmed" -PKG_VERSION="731139f" -PKG_SHA256="fcb0ed735534e13429ac7c7fb2d76e32c416a3e943d81c9ce05c5d3ad2082272" +PKG_VERSION="358a876" +PKG_SHA256="f939b644db95cbe58c66994e95676f79dc700f6a46e30afca7a3b8036d3ac07d" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/pcsx_rearmed" @@ -44,10 +44,14 @@ make_target() { cd $PKG_BUILD case $PROJECT in RPi) - make -f Makefile.libretro platform=armv6-hardfloat-arm1176jzf-s - ;; - RPi2) - make -f Makefile.libretro platform=armv7-neon-hardfloat-cortex-a7 + case $DEVICE in + RPi) + make -f Makefile.libretro platform=armv6-hardfloat-arm1176jzf-s + ;; + RPi2) + make -f Makefile.libretro platform=armv7-neon-hardfloat-cortex-a7 + ;; + esac ;; imx6) make -f Makefile.libretro platform=armv7-neon-hardfloat-cortex-a9 diff --git a/packages/emulation/libretro-picodrive/package.mk b/packages/emulation/libretro-picodrive/package.mk index 0e149c0fd8..b091dccb08 100644 --- a/packages/emulation/libretro-picodrive/package.mk +++ b/packages/emulation/libretro-picodrive/package.mk @@ -18,8 +18,8 @@ PKG_NAME="libretro-picodrive" -PKG_VERSION="d6be4fa" -PKG_SHA256="ed57ec91534cbcba63ece9b6e037f974f2c01eda4d7c4d5e1eabc2d2766b2e61" +PKG_VERSION="cbc93b6" +PKG_SHA256="40d1022ea0ff1afd763212a9526da618c0f65f6c9b50a417e2c41280f1eb0e55" PKG_ARCH="any" PKG_LICENSE="MAME" PKG_SITE="https://github.com/libretro/picodrive" diff --git a/packages/emulation/libretro-ppsspp/package.mk b/packages/emulation/libretro-ppsspp/package.mk index 0a27eca3bc..ee356e74c2 100644 --- a/packages/emulation/libretro-ppsspp/package.mk +++ b/packages/emulation/libretro-ppsspp/package.mk @@ -18,7 +18,7 @@ PKG_NAME="libretro-ppsspp" PKG_VERSION="5f7bcf7" -PKG_SHA256="09e61300c05705b1f98e1b575e44d366e5a243cc3be97b3a09ad420581459f87" +PKG_SHA256="e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/libretro-ppsspp" @@ -50,19 +50,23 @@ pre_make_target() { make_target() { case $PROJECT in RPi) - make -C libretro CC=$CC CXX=$CXX platform=armv6-gles-hardfloat-arm1176jzf-s - ;; - RPi2) - make -C libretro CC=$CC CXX=$CXX platform=armv7-neon-gles-hardfloat-cortex-a7 + case $DEVICE in + RPi) + make -C libretro platform=armv6-gles-hardfloat-arm1176jzf-s + ;; + RPi2) + make -C libretro platform=armv7-neon-gles-hardfloat-cortex-a7 + ;; + esac ;; imx6) - make -C libretro CC=$CC CXX=$CXX platform=armv7-neon-gles-hardfloat-cortex-a9 + make -C libretro platform=armv7-neon-gles-hardfloat-cortex-a9 ;; WeTek_Play|WeTek_Core) - make -C libretro CC=$CC CXX=$CXX platform=armv7-neon-gles-hardfloat-cortex-a9 + make -C libretro platform=armv7-neon-gles-hardfloat-cortex-a9 ;; Generic) - make -C libretro CC=$CC CXX=$CXX + make -C libretro ;; esac } diff --git a/packages/emulation/libretro-prboom/package.mk b/packages/emulation/libretro-prboom/package.mk index bf82f1b39b..b18e223f5e 100644 --- a/packages/emulation/libretro-prboom/package.mk +++ b/packages/emulation/libretro-prboom/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-prboom" -PKG_VERSION="6384659" -PKG_SHA256="6b352e2c9d0a586b804e02598b7342aabdf7d3c3b3d7610fcd086b970ef6f450" +PKG_VERSION="1b5c4e4" +PKG_SHA256="65d2ee36450abc13e5b40cf7662f34183d99f1422f58a7c9027546fdad1c048f" PKG_ARCH="any" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/libretro-prboom" diff --git a/packages/emulation/libretro-prosystem/package.mk b/packages/emulation/libretro-prosystem/package.mk index db15fee097..4560a83817 100644 --- a/packages/emulation/libretro-prosystem/package.mk +++ b/packages/emulation/libretro-prosystem/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-prosystem" -PKG_VERSION="1cf5472" -PKG_SHA256="85fdbc85e952bb3d1cd83d15458ea5db0af637ea76c4f4864d5b032cb934582e" +PKG_VERSION="a7462bf" +PKG_SHA256="d1bffc193528d67e006b86fb6066ee74213779c0235caa4b49e5018b7c6643a4" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/prosystem-libretro" diff --git a/packages/emulation/libretro-quicknes/package.mk b/packages/emulation/libretro-quicknes/package.mk index 342ca2328c..98832a714e 100644 --- a/packages/emulation/libretro-quicknes/package.mk +++ b/packages/emulation/libretro-quicknes/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-quicknes" -PKG_VERSION="f7238df" -PKG_SHA256="e2e5610c24887be55bc3ca59e2f21a86789957aac9a66c83ce35cdaf5a0becd2" +PKG_VERSION="05a742e" +PKG_SHA256="7849d68d1b3a650f256cfea60c9c0e0e861bac445068dcfff46590f364d75ca9" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/QuickNES_Core" diff --git a/packages/emulation/libretro-reicast/package.mk b/packages/emulation/libretro-reicast/package.mk index f728bc2e3d..a7da5c983e 100644 --- a/packages/emulation/libretro-reicast/package.mk +++ b/packages/emulation/libretro-reicast/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-reicast" -PKG_VERSION="3601150" -PKG_SHA256="e266d9950dc133cbf3077e5d6ddb50b6d35a4ba32fd81757f9cc5cc3795fe465" +PKG_VERSION="3ea9f94" +PKG_SHA256="b61648a561c5a7e3ec1be8ca9a38ff98b76ce58020684b95df17ec4cea770f16" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/reicast-emulator" @@ -39,10 +39,14 @@ PKG_LIBVAR="REICAST_LIB" make_target() { case $PROJECT in RPi) - make platform=armv6-hardfloat-arm1176jzf-s - ;; - RPi2) - make platform=rpi2 + case $DEVICE in + RPi) + make platform=armv6-hardfloat-arm1176jzf-s + ;; + RPi2) + make platform=rpi2 + ;; + esac ;; imx6) make platform=armv7-neon-hardfloat-cortex-a9 diff --git a/packages/emulation/libretro-scummvm/package.mk b/packages/emulation/libretro-scummvm/package.mk index 59d1775e4d..faaa5b2b1b 100644 --- a/packages/emulation/libretro-scummvm/package.mk +++ b/packages/emulation/libretro-scummvm/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-scummvm" -PKG_VERSION="011f40a" -PKG_SHA256="d1c62935dc2808f8112cd7bfef4a27a6ddfa196366377a494e0c5e6bdf080998" +PKG_VERSION="0013c98" +PKG_SHA256="ed10134d42e9029561322b30e95d68d2ec2f1868ce9a1fa4047371841cb80ef5" PKG_ARCH="any" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/scummvm" diff --git a/packages/emulation/libretro-snes9x/package.mk b/packages/emulation/libretro-snes9x/package.mk index f60ec976ef..72efb5bed1 100644 --- a/packages/emulation/libretro-snes9x/package.mk +++ b/packages/emulation/libretro-snes9x/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-snes9x" -PKG_VERSION="2d579c6" -PKG_SHA256="412d9da8e5307de8b25940883c709a5828c6b6ebc60a1aec7d806d5e6c005c0c" +PKG_VERSION="4030c32" +PKG_SHA256="9daaf305b1a314c196bdd3888f4aaf2d3ec50a564439390477cc1dc1efabc298" PKG_ARCH="any" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/snes9x" diff --git a/packages/emulation/libretro-snes9x2002/package.mk b/packages/emulation/libretro-snes9x2002/package.mk index e406e9baa7..f0590155ae 100644 --- a/packages/emulation/libretro-snes9x2002/package.mk +++ b/packages/emulation/libretro-snes9x2002/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-snes9x2002" -PKG_VERSION="0c28605" -PKG_SHA256="15b6a86b00eca43b46c6075e8d4f372c7807e2f3c04079dfe8408829f2394469" +PKG_VERSION="04c179c" +PKG_SHA256="31eced0cf240151c252783ee5afc590dc330c7cb9aa506883cdf5a50cf74d2ea" PKG_ARCH="arm" PKG_LICENSE="GPL" PKG_SITE="https://github.com/libretro/snes9x2002" diff --git a/packages/emulation/libretro-snes9x2010/package.mk b/packages/emulation/libretro-snes9x2010/package.mk index 130423ca01..024dead51f 100644 --- a/packages/emulation/libretro-snes9x2010/package.mk +++ b/packages/emulation/libretro-snes9x2010/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-snes9x2010" -PKG_VERSION="9710b8f" -PKG_SHA256="d342f886faf55032ed91ac98d4be1b531d1b5b11dc51fdbea4dfc6c1095b0d9f" +PKG_VERSION="26fbc4b" +PKG_SHA256="fecdba806ea4367d562c530a53355f1c605431e38d5f07413294de680dfb8146" PKG_ARCH="any" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/snes9x2010" diff --git a/packages/emulation/libretro-stella/package.mk b/packages/emulation/libretro-stella/package.mk index 2fcec312ea..ff89ee3b70 100644 --- a/packages/emulation/libretro-stella/package.mk +++ b/packages/emulation/libretro-stella/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-stella" -PKG_VERSION="cdbc9cc" -PKG_SHA256="b9e3c523e9619fac13e4017027d43977bdfc9b4e8d2993a1d093c5a607ff5c7f" +PKG_VERSION="bf2353f" +PKG_SHA256="469c3370a1dc72141b199849047914a338d4ebd03735b08435bdaf3ad512a60c" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/stella-libretro" diff --git a/packages/emulation/libretro-tgbdual/package.mk b/packages/emulation/libretro-tgbdual/package.mk index feaf750f7c..2fb0b74241 100644 --- a/packages/emulation/libretro-tgbdual/package.mk +++ b/packages/emulation/libretro-tgbdual/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-tgbdual" -PKG_VERSION="7c5706b" -PKG_SHA256="32532f420aa0e77548bba1c6ccf874559bbf1147cd00eb0a9c4dcc075462512a" +PKG_VERSION="99f7994" +PKG_SHA256="b4c5c534f93b0a4bac805c539974d4d94a94e72b60a7b15baaf14fe7fc80d01f" PKG_ARCH="any" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/tgbdual-libretro" diff --git a/packages/emulation/libretro-tyrquake/package.mk b/packages/emulation/libretro-tyrquake/package.mk index e41b8b8844..5cebf0dc79 100644 --- a/packages/emulation/libretro-tyrquake/package.mk +++ b/packages/emulation/libretro-tyrquake/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-tyrquake" -PKG_VERSION="8cb9ceb" -PKG_SHA256="59ca323c25acdfea5e344559e2fd503c9d8591ce0a3ba46a344138a36be85ca5" +PKG_VERSION="a0502d1" +PKG_SHA256="0a2cf814293e9ac46bca15f7cb760d401dab635d6fc7ba39101e673ea565acc8" PKG_ARCH="any" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/tyrquake" diff --git a/packages/emulation/libretro-vba-next/package.mk b/packages/emulation/libretro-vba-next/package.mk index 82bba44c74..205dd574bc 100644 --- a/packages/emulation/libretro-vba-next/package.mk +++ b/packages/emulation/libretro-vba-next/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-vba-next" -PKG_VERSION="e773475" -PKG_SHA256="7078d8db05264d9d2ef7333bdd8d1849bec6155cdb8975181da0180feb166da3" +PKG_VERSION="8676175" +PKG_SHA256="8d33dadf26a6e37f1a20773564fc30c6a7491d8a5cdfdd36637d60b72f8a17c7" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/vba-next" diff --git a/packages/emulation/libretro-vbam/package.mk b/packages/emulation/libretro-vbam/package.mk index b6c7a03594..50bda99694 100644 --- a/packages/emulation/libretro-vbam/package.mk +++ b/packages/emulation/libretro-vbam/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-vbam" -PKG_VERSION="f3d150b" -PKG_SHA256="bce88b38ca04025ccd9f92c6db3dbfeb135b189514d6b3392425433d2c203de0" +PKG_VERSION="84072be" +PKG_SHA256="f50b47945799c1de3c6624b077f54e78e8ac374c57538a94b071736ef1b78d19" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/vbam-libretro" diff --git a/packages/emulation/libretro-vecx/package.mk b/packages/emulation/libretro-vecx/package.mk index ee1527ff7b..2ae83a2408 100644 --- a/packages/emulation/libretro-vecx/package.mk +++ b/packages/emulation/libretro-vecx/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-vecx" -PKG_VERSION="30d39a0" -PKG_SHA256="eb9036917ccbac596adccc336d0acf2d0caa0401ed3b8f382dba9a5b5add14b2" +PKG_VERSION="bad6f6a" +PKG_SHA256="4b02ab154eee945cf641f42137eb44b92236b48622384eb60cea733b16dc6101" PKG_ARCH="any" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/libretro-vecx" diff --git a/packages/emulation/libretro-virtualjaguar/package.mk b/packages/emulation/libretro-virtualjaguar/package.mk index 87a52548a2..a6e9d6b537 100644 --- a/packages/emulation/libretro-virtualjaguar/package.mk +++ b/packages/emulation/libretro-virtualjaguar/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="libretro-virtualjaguar" -PKG_VERSION="7697f9d" -PKG_SHA256="4ee75db3ab930aa2d534cbf59cd2f434ed96cd5ce2492a68c88c03430dd7e2bc" +PKG_VERSION="6f10bbc" +PKG_SHA256="1a549660c0344ba18f4ed10dcc33ab22ef7a21c8fbbfc0b71098a24c228180fd" PKG_ARCH="any" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/virtualjaguar-libretro"