diff options
| author | Taner Tas <taner76@gmail.com> | 2019-10-12 23:06:18 +0000 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2019-12-26 16:41:36 +0100 |
| commit | 5594b3d8c9d1b0e6ca518e31461c2c395b9da01e (patch) | |
| tree | 812461b9e14832eec30c390feeef78a7f7903371 /testing/mame | |
| parent | 9458e758ab7596f4d7c0e326935a3e008825e2c2 (diff) | |
| download | aports-5594b3d8c9d1b0e6ca518e31461c2c395b9da01e.tar.bz2 aports-5594b3d8c9d1b0e6ca518e31461c2c395b9da01e.tar.xz | |
testing/mame: upgrade to 0.214
* Use bundled asio due to incompability with system asio (https://github.com/mamedev/mame/issues/5721)
* Temporary disable on aarch64 due to buld system problem (https://github.com/mamedev/mame/issues/5741)
* Remove obselete patches
Diffstat (limited to 'testing/mame')
| -rw-r--r-- | testing/mame/APKBUILD | 20 | ||||
| -rw-r--r-- | testing/mame/m68000_archopts.patch | 17 | ||||
| -rw-r--r-- | testing/mame/revert-764f04c.patch | 14 |
3 files changed, 8 insertions, 43 deletions
diff --git a/testing/mame/APKBUILD b/testing/mame/APKBUILD index 6213db58e5..bc67e47575 100644 --- a/testing/mame/APKBUILD +++ b/testing/mame/APKBUILD @@ -1,17 +1,16 @@ # Contributor: Taner Tas <taner76@gmail.com> # Maintainer: Taner Tas <taner76@gmail.com> pkgname=mame -pkgver=0.207 +pkgver=0.214 _pkgver=${pkgver/.} pkgrel=0 pkgdesc="Multi Arcade Machine Emulator with GroovyMAME/Switchres/No-nag patchset." url="https://mamedev.org" -arch="all" +arch="all !aarch64" license="GPL-2.0-or-later" depends="$pkgname-common" makedepends=" alsa-lib-dev - asio-dev clang-dev coreutils dos2unix @@ -20,6 +19,7 @@ makedepends=" fontconfig-dev glm-dev libjpeg-turbo-dev + libxi-dev libxinerama-dev libxrandr-dev lua5.3-dev @@ -48,14 +48,12 @@ subpackages=" _groovymame_patch=groovymame-$pkgver.diff source=" https://github.com/mamedev/mame/archive/$pkgname$_pkgver.tar.gz - $_groovymame_patch::https://drive.google.com/uc?export=download&id=1_h5lcMQ3xMJlKcrh_u1CtCnQhrQgry7W + $_groovymame_patch::https://drive.google.com/uc?export=download&id=11cjRkLc4hfLdCVsNCXOua2YQeM_ZD2p- mame.ini midi.conf fix-musl.patch - m68000_archopts.patch nonag.patch fix-ppc64le-float.patch - revert-764f04c.patch " options="!check" # No test suite builddir="$srcdir"/$pkgname-$pkgname${pkgver/.} @@ -129,7 +127,7 @@ _build="make USE_SYSTEM_LIB_GLM=1 USE_SYSTEM_LIB_RAPIDJSON=1 USE_SYSTEM_LIB_PORTMIDI=1 - USE_SYSTEM_LIB_ASIO=1" + USE_SYSTEM_LIB_ASIO=0" [ -f mame ] || [ -f mame64 ] || $_build TOOLS=1 SUBTARGET=mame [ -f mamearcade ] || [ -f mamearcade64 ] || $_build SUBTARGET=arcade @@ -226,12 +224,10 @@ lang() { mkdir -p "$subpkgdir"/usr/share/$pkgname cp -r language "$subpkgdir"/usr/share/$pkgname/ } -sha512sums="098f4001fd7430f2c0230503b7c8a71adf15d02b8fb0a9c583e295e4b1688349181c6f02197f857103f39d0033f71fe32170772ab4c545adcc571babec74831e mame0207.tar.gz -b6f4d5b88b0fa07af77b0133cd4317e100e0ef652c2d2cf371cdcfba938bdeb52d52a547f509efa8f14210e8cc0df36f64944300cb7943f18737c7a45555fd09 groovymame-0.207.diff +sha512sums="1c5851c7a95f4f3a312b47ba182f2f8fdfd186e16593d58555c8291174c07d8f18b7c4bec8d26589755e427dc2f29c66404a2dfb4f35dca9b63292b42faaca1c mame0214.tar.gz +a1bfe6af9ffd0f8ce0c8ee0613d74fb7f1da45b4be62e22c20c4d9a6a6bfeefb9ba41fa90157626cd8ded8aef0380963fd40dd83e6c93aa6444d7107af5be44e groovymame-0.214.diff dc008245cbea0b94f58d83e09bf5fd3fff04ac0e2f3a36b910a8b7633c5377419fc67a1fd366ef268e283f744d9a8d29928cfacf456b3edaa2d0b1a11d46a701 mame.ini 8f83ff5a916f4ff8e86c5afbdfe4475f7780bb36c20c78d6d029d0eb0dafd77b3471faa538aca384001d2049dc94c4df3429c67d743adde9fd6329c91e6d19a2 midi.conf 75bba366aebb37de7758368fbf7418194a18d535e61c1768e6c2c5cf4b3b7a2f625ef687cb8278c03daa9e308951df4c0bdcc944dfcc4ce5305f5ac83e5e049b fix-musl.patch -a4d628d4648d28b9ae95f27ecba4a70b999ef11ffde31b31ca3ce2ed2fd4cfcab82ec78e2602309952518fac8c549d0b8b4294f6aa34c1acaa77f012ea13de9e m68000_archopts.patch 864816a55f35f9d485ccd143a1e0acd76d47239a6d5344be2a76b50fd4efbdfb4f3e45318d7dfda67faa63c0a52022f2e8313f058965a1eba60e6ca4677a519b nonag.patch -daa915d08b61e3828b28144f1934fd1fa9fe04da00b3536f86b984035f1a1bc81da498e1bc8632bc5f9c8b86533b70814a91318627fcafc3f05ebda59e303cc4 fix-ppc64le-float.patch -03f9f0f27b68034048866bc65734e421792ea7875bf9dbdf9696de5b2029db20578f7c13bfb45d4ff4c7c24a37492c205a1a0321b81ea1c321eb84aa8b4b978c revert-764f04c.patch" +daa915d08b61e3828b28144f1934fd1fa9fe04da00b3536f86b984035f1a1bc81da498e1bc8632bc5f9c8b86533b70814a91318627fcafc3f05ebda59e303cc4 fix-ppc64le-float.patch" diff --git a/testing/mame/m68000_archopts.patch b/testing/mame/m68000_archopts.patch deleted file mode 100644 index 46fd4a6630..0000000000 --- a/testing/mame/m68000_archopts.patch +++ /dev/null @@ -1,17 +0,0 @@ -Author: Jordi Mallach <jordi@debian.org> -Description: Pass $(ARCHOPTS) to standalone m68000 makefile. -Forwarded: no - -Index: mame/src/devices/cpu/m68000/makefile -=================================================================== ---- mame.orig/src/devices/cpu/m68000/makefile -+++ mame/src/devices/cpu/m68000/makefile -@@ -25,7 +25,7 @@ clean: - -@rm -f m68kops.* - - m68kmake.o: m68kmake.cpp -- $(SILENT) $(CC) -x c++ -std=c++11 -o "$@" -c "$<" -+ $(SILENT) $(CC) -x c++ -std=c++11 $(ARCHOPTS) -o "$@" -c "$<" - - m68kmake$(EXE) : m68kmake.o - @echo Linking $@... diff --git a/testing/mame/revert-764f04c.patch b/testing/mame/revert-764f04c.patch deleted file mode 100644 index 77b0f31fe4..0000000000 --- a/testing/mame/revert-764f04c.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/makefile -+++ b/makefile -@@ -973,11 +973,7 @@ - endif - endif - else --ifdef OVERRIDE_CC --GCC_VERSION := $(shell $(TOOLCHAIN)$(subst @,,$(OVERRIDE_CC)) -dumpversion 2> /dev/null) --else - GCC_VERSION := $(shell $(TOOLCHAIN)$(subst @,,$(CC)) -dumpversion 2> /dev/null) --endif - ifneq ($(OS),solaris) - CLANG_VERSION := $(shell $(TOOLCHAIN)$(subst @,,$(CC)) --version 2> /dev/null | head -n 1 | grep -e 'version [0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?' -o | grep -e '[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?' -o | tail -n 1) - endif |