diff options
author | Taner Tas <taner76@gmail.com> | 2019-03-01 04:54:43 +0300 |
---|---|---|
committer | Andy Postnikov <apostnikov@gmail.com> | 2019-03-14 00:51:35 +0200 |
commit | 30fd297e73b7f8fd8a19c6a16c3352ae5fe749dc (patch) | |
tree | d875fd2fb11bc719ccb4a7945de344f392b7df2c /testing/mame | |
parent | f8c828c5716d8e9741cb9f2844f213cd0a39484a (diff) | |
download | aports-30fd297e73b7f8fd8a19c6a16c3352ae5fe749dc.tar.bz2 aports-30fd297e73b7f8fd8a19c6a16c3352ae5fe749dc.tar.xz |
testing/mame: upgrade to 0.207
Diffstat (limited to 'testing/mame')
-rw-r--r-- | testing/mame/APKBUILD | 30 | ||||
-rw-r--r-- | testing/mame/revert-764f04c.patch | 14 |
2 files changed, 30 insertions, 14 deletions
diff --git a/testing/mame/APKBUILD b/testing/mame/APKBUILD index e5d8af2998..6213db58e5 100644 --- a/testing/mame/APKBUILD +++ b/testing/mame/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Taner Tas <taner76@gmail.com> # Maintainer: Taner Tas <taner76@gmail.com> pkgname=mame -pkgver=0.206 +pkgver=0.207 _pkgver=${pkgver/.} -pkgrel=2 +pkgrel=0 pkgdesc="Multi Arcade Machine Emulator with GroovyMAME/Switchres/No-nag patchset." url="https://mamedev.org" arch="all" @@ -48,30 +48,31 @@ 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=1HEA5y8rmupXH9uNI6TbiQ8nNsigThFVg + $_groovymame_patch::https://drive.google.com/uc?export=download&id=1_h5lcMQ3xMJlKcrh_u1CtCnQhrQgry7W 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/.} prepare() { cd "$builddir" - #clang workaraound - sed -i -e 's/-flifetime-dse=1//g' scripts/genie.lua default_prepare cp "$srcdir"/$_groovymame_patch . && dos2unix $_groovymame_patch patch -p0 < $_groovymame_patch } build() { + cd "$builddir" + case "$CARCH" in - x86|armhf) _PTR64=0 _SYMBOLS=0;; - *) _PTR64=1 _SYMBOLS=1;; + x86|armhf|armv7) _PTR64=0;; + *) _PTR64=1;; esac case "$CARCH" in @@ -93,10 +94,12 @@ build() { # clang builds have better benchmark score and smaller size export OVERRIDE_CC=clang export OVERRIDE_CXX=clang++ + # clang workaraound + sed -i -e 's/-flifetime-dse=1//g' scripts/genie.lua ;; esac - export CFLAGS="$CFLAGS -I/usr/include/lua5.3 -DBX_CRT_MUSL -Wno-everything" + export CFLAGS="-I/usr/include/lua5.3 -DBX_CRT_MUSL -Wno-everything" export CXXFLAGS="$CFLAGS" export LDFLAGS="$LDFLAGS -L/usr/lib/lua5.3" @@ -108,7 +111,7 @@ _build="make VERBOSE=1 REGENIE=1 OSD=sdl - SYMBOLS=$_SYMBOLS + SYMBOLS=0 FORCE_DRC_C_BACKEND= PTR64=$_PTR64 NOASM=$_NOASM @@ -128,8 +131,6 @@ _build="make USE_SYSTEM_LIB_PORTMIDI=1 USE_SYSTEM_LIB_ASIO=1" - cd "$builddir" - [ -f mame ] || [ -f mame64 ] || $_build TOOLS=1 SUBTARGET=mame [ -f mamearcade ] || [ -f mamearcade64 ] || $_build SUBTARGET=arcade [ -f mess ] || [ -f mess64 ] || $_build SUBTARGET=mess @@ -225,11 +226,12 @@ lang() { mkdir -p "$subpkgdir"/usr/share/$pkgname cp -r language "$subpkgdir"/usr/share/$pkgname/ } -sha512sums="d7f69565a3b4f7ff53caed76d7d241c204bfb76adcd8cf5be8aec5d8beef46ed0e610bc3200a4f3f5d8f98191ac05cb29e3e2bf4e054c61dc9f9946037fb8c90 mame0206.tar.gz -5bc2a0b399c116b5d0c51af9a26de4d57c7294c068efc5e28e03f0c4cda63cc383b3f5854eafa9189275fd28e07c0615a4fd7753485d309a7aaa09347f730103 groovymame-0.206.diff +sha512sums="098f4001fd7430f2c0230503b7c8a71adf15d02b8fb0a9c583e295e4b1688349181c6f02197f857103f39d0033f71fe32170772ab4c545adcc571babec74831e mame0207.tar.gz +b6f4d5b88b0fa07af77b0133cd4317e100e0ef652c2d2cf371cdcfba938bdeb52d52a547f509efa8f14210e8cc0df36f64944300cb7943f18737c7a45555fd09 groovymame-0.207.diff dc008245cbea0b94f58d83e09bf5fd3fff04ac0e2f3a36b910a8b7633c5377419fc67a1fd366ef268e283f744d9a8d29928cfacf456b3edaa2d0b1a11d46a701 mame.ini 8f83ff5a916f4ff8e86c5afbdfe4475f7780bb36c20c78d6d029d0eb0dafd77b3471faa538aca384001d2049dc94c4df3429c67d743adde9fd6329c91e6d19a2 midi.conf 75bba366aebb37de7758368fbf7418194a18d535e61c1768e6c2c5cf4b3b7a2f625ef687cb8278c03daa9e308951df4c0bdcc944dfcc4ce5305f5ac83e5e049b fix-musl.patch a4d628d4648d28b9ae95f27ecba4a70b999ef11ffde31b31ca3ce2ed2fd4cfcab82ec78e2602309952518fac8c549d0b8b4294f6aa34c1acaa77f012ea13de9e m68000_archopts.patch 864816a55f35f9d485ccd143a1e0acd76d47239a6d5344be2a76b50fd4efbdfb4f3e45318d7dfda67faa63c0a52022f2e8313f058965a1eba60e6ca4677a519b nonag.patch -daa915d08b61e3828b28144f1934fd1fa9fe04da00b3536f86b984035f1a1bc81da498e1bc8632bc5f9c8b86533b70814a91318627fcafc3f05ebda59e303cc4 fix-ppc64le-float.patch" +daa915d08b61e3828b28144f1934fd1fa9fe04da00b3536f86b984035f1a1bc81da498e1bc8632bc5f9c8b86533b70814a91318627fcafc3f05ebda59e303cc4 fix-ppc64le-float.patch +03f9f0f27b68034048866bc65734e421792ea7875bf9dbdf9696de5b2029db20578f7c13bfb45d4ff4c7c24a37492c205a1a0321b81ea1c321eb84aa8b4b978c revert-764f04c.patch" diff --git a/testing/mame/revert-764f04c.patch b/testing/mame/revert-764f04c.patch new file mode 100644 index 0000000000..77b0f31fe4 --- /dev/null +++ b/testing/mame/revert-764f04c.patch @@ -0,0 +1,14 @@ +--- 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 |