From a4249fba7f990fb122548f4a5b7e1c5b0f729d0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Thu, 30 Jun 2016 07:56:45 +0200 Subject: [PATCH] mame: update to 0.175 --- .../patches/0002-internal-cbegin-cend.patch | 12 ------------ srcpkgs/mame/patches/0002-remove-codecvt.patch | 10 ++++++++++ srcpkgs/mame/template | 17 +++++++---------- 3 files changed, 17 insertions(+), 22 deletions(-) delete mode 100644 srcpkgs/mame/patches/0002-internal-cbegin-cend.patch create mode 100644 srcpkgs/mame/patches/0002-remove-codecvt.patch diff --git a/srcpkgs/mame/patches/0002-internal-cbegin-cend.patch b/srcpkgs/mame/patches/0002-internal-cbegin-cend.patch deleted file mode 100644 index eaeab6168c1..00000000000 --- a/srcpkgs/mame/patches/0002-internal-cbegin-cend.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- src/lib/util/strformat.h 2016-03-30 11:03:03.000000000 +0200 -+++ src/lib/utils/strformat.h 2016-03-31 03:15:28.076259871 +0200 -@@ -185,7 +185,8 @@ - #include - #include - --#if defined(__GLIBCXX__) && (__GLIBCXX__ < 20150413) -+#if (defined(USE_INTERNAL_CBEGIN_CEND) && USE_INTERNAL_CBEGIN_CEND) || \ -+ (defined(__GLIBCXX__) && (__GLIBCXX__ < 20150413)) - namespace std - { - template diff --git a/srcpkgs/mame/patches/0002-remove-codecvt.patch b/srcpkgs/mame/patches/0002-remove-codecvt.patch new file mode 100644 index 00000000000..22ceda9978d --- /dev/null +++ b/srcpkgs/mame/patches/0002-remove-codecvt.patch @@ -0,0 +1,10 @@ +--- src/osd/modules/lib/osdlib_unix.cpp 2016-06-29 08:34:30.000000000 +0200 ++++ src/osd/modules/lib/osdlib_unix.cpp 2016-06-30 00:05:37.786102315 +0200 +@@ -15,7 +15,6 @@ + #include + #include + +-#include + #include + #include + diff --git a/srcpkgs/mame/template b/srcpkgs/mame/template index 5389c8cd00a..39f6e429f66 100644 --- a/srcpkgs/mame/template +++ b/srcpkgs/mame/template @@ -1,6 +1,6 @@ # Template file for 'mame' pkgname=mame -version=0174 +version=0175 revision=1 wrksrc="mame-mame${version}" homepage="http://mamedev.org" @@ -8,11 +8,11 @@ distfiles="https://github.com/mamedev/mame/archive/mame${version}.tar.gz" short_desc="The Multiple Arcade Machine Emulator" maintainer="Jürgen Buchmüller " license="GPL-2" -checksum=249dc43d27f435b47e6bd30754eaa2b52253da37aa04498cb9cc6df5c2041cfa +checksum=b24a889cff0fa98c04e0a14dc06f72ba8dbec57b251a01cdd201da1824a3afd4 hostmakedepends="perl pkg-config python automoc4" -makedepends="SDL2_ttf-devel $(vopt_if qt qt5-devel) lua-devel libjpeg-turbo-devel - libflac-devel libuv-devel sqlite-devel portaudio-devel portmidi-devel" +makedepends="libstdc++-devel SDL2_ttf-devel $(vopt_if qt qt5-devel) lua-devel +libjpeg-turbo-devel libflac-devel libuv-devel sqlite-devel portaudio-devel portmidi-devel" depends="liberation-fonts-ttf" nocross=yes replaces="sdlmame>=0 sdlmess>=0" @@ -20,10 +20,6 @@ replaces="sdlmame>=0 sdlmess>=0" CXXFLAGS="-DUSE_INTERNAL_CBEGIN_CEND=1 -I${XBPS_CROSS_BASE}/usr/include/lua5.3" LDFLAGS="-Wl,-fuse-ld=gold" -case "$XBPS_TARGET_MACHINE" in - i686*) broken="ENOMEM";; -esac - build_options="qt" if [ -z "$CROSS_BUILD" ]; then build_options_default="qt" @@ -33,6 +29,7 @@ do_build() { local opts="REGENIE=1" opts+=" NOWERROR=1" opts+=" TOOLS=1" + opts+=" VERBOSE=1" opts+=" OPTIMIZE=3" opts+=" USE_SYSTEM_LIB_EXPAT=1" opts+=" USE_SYSTEM_LIB_ZLIB=1" @@ -54,8 +51,8 @@ do_build() { case "$XBPS_TARGET_MACHINE" in i686*) # Build mamearcade and mess separately to # overcome linker memory exhaustion - make ${opts} SUBTARGET=arcade ${makejobs} - make ${opts} SUBTARGET=mess ${makejobs} + opts+=" SYMBOLS=0" + make ${opts} ${makejobs} ;; *) # Build all in one mame[64] make ${opts} ${makejobs}