From a1e4f46d0c878b90472d93b7b3c8c5c6dcd5ea61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 30 Sep 2015 16:11:04 +0200 Subject: [PATCH] mame: update to 0.166 Use system packages where possible. TODO: use system lua-5.3.x once it is available --- .../mame/patches/musl-thread_setname_np.patch | 11 ++++++++ srcpkgs/mame/template | 27 ++++++++++++++----- 2 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/mame/patches/musl-thread_setname_np.patch diff --git a/srcpkgs/mame/patches/musl-thread_setname_np.patch b/srcpkgs/mame/patches/musl-thread_setname_np.patch new file mode 100644 index 00000000000..dea6721da35 --- /dev/null +++ b/srcpkgs/mame/patches/musl-thread_setname_np.patch @@ -0,0 +1,11 @@ +--- 3rdparty/bx/include/bx/thread.h 2015-09-30 14:03:06.501362188 +0200 ++++ 3rdparty/bx/include/bx/thread.h 2015-09-30 14:07:06.685343449 +0200 +@@ -149,7 +149,7 @@ + { + #if BX_PLATFORM_OSX || BX_PLATFORM_IOS + pthread_setname_np(_name); +-#elif BX_PLATFORM_LINUX || BX_PLATFORM_FREEBSD ++#elif (BX_PLATFORM_LINUX && defined(__GLIBC__)) || BX_PLATFORM_FREEBSD + pthread_setname_np(m_handle, _name); + #elif BX_PLATFORM_WINDOWS && BX_COMPILER_MSVC + # pragma pack(push, 8) diff --git a/srcpkgs/mame/template b/srcpkgs/mame/template index 4284e066845..0f13cb08e9a 100644 --- a/srcpkgs/mame/template +++ b/srcpkgs/mame/template @@ -1,6 +1,6 @@ # Template file for 'mame' pkgname=mame -version=0165 +version=0166 revision=1 wrksrc="mame-${version}s" homepage="http://mamedev.org" @@ -8,10 +8,11 @@ distfiles="https://github.com/mamedev/$pkgname/releases/download/${pkgname}${ver short_desc="The Multiple Arcade Machine Emulator" maintainer="Jürgen Buchmüller " license="mame" -checksum=bf94762a4cc9d470121fa7ba8e79a25469466d4b7a964215007f98e1635f070f +checksum=78c8f4c212f5a5bd30f946739eeea429e326ec8f7d15656e452ee3057ae01c1d hostmakedepends="unzip perl pkg-config python automoc4" -makedepends="SDL2_ttf-devel fontconfig-devel libXinerama-devel qt-devel alsa-lib-devel lua-devel" +makedepends="SDL2_ttf-devel fontconfig-devel qt-devel lua-devel + libjpeg-turbo-devel libflac-devel sqlite-devel portaudio-devel portmidi-devel" depends="liberation-fonts-ttf" nocross=yes repository="nonfree" @@ -26,9 +27,23 @@ do_extract() { find . -type f -not -name \*.png -print0 | xargs -0 perl -pi -e 's/\r\n?/\n/g' } do_build() { - local opts="REGENIE=1 NOWERROR=1 TOOLS=1 OPTIMIZE=3" - if [ "${CROSS_BUILD}" ]; then - # Doesn't work yet because of qt (which can't be cross compiled ?) + local opts="REGENIE=1" + opts+=" NOWERROR=1" + opts+=" TOOLS=1" + opts+=" OPTIMIZE=3" + opts+=" USE_QTDEBUG=1" + opts+=" USE_SYSTEM_LIB_EXPAT=1" + opts+=" USE_SYSTEM_LIB_ZLIB=1" + opts+=" USE_SYSTEM_LIB_JPEG=1" + opts+=" USE_SYSTEM_LIB_FLAC=1" + # Doesn't work with lua 5.2.x because it fails to find + # find lua_writestringerror() which is part of lua 5.3.x + # opts+=" USE_SYSTEM_LIB_LUA=1" + opts+=" USE_SYSTEM_LIB_SQLITE3=1" + opts+=" USE_SYSTEM_LIB_PORTMIDI=1" + opts+=" USE_SYSTEM_LIB_PORTAUDIO=1" + if [ "${CROSS_BUILD}" ]; then + # Doesn't work yet because of qt (which can't be cross compiled) opts+=" CROSS_BUILD=1 OVERRIDE_CC=${CC} OVERRIDE_CXX=${CXX} OVERRIDE_LD=${CC}" fi make ${opts} ${makejobs}