diff --git a/srcpkgs/mame/patches/musl-bgfx.patch b/srcpkgs/mame/patches/musl-bgfx.patch index 93c2e3bc161..f851580d5d4 100644 --- a/srcpkgs/mame/patches/musl-bgfx.patch +++ b/srcpkgs/mame/patches/musl-bgfx.patch @@ -10,3 +10,16 @@ #if BX_PLATFORM_WINDOWS // BK - Remotery needs WinSock, but on VS2015/Win10 build // fails if WinSock2 is included after Windows.h?! +--- 3rdparty/bx/include/bx/platform.h 2017-04-26 01:02:36.000000000 +0200 ++++ 3rdparty/bx/include/bx/platform.h 2017-05-01 09:24:44.937447991 +0200 +@@ -242,6 +242,10 @@ + # elif defined(__apple_build_version__) || defined(__ORBIS__) || defined(__EMSCRIPTEN__) || defined(__llvm__) + # undef BX_CRT_LIBCXX + # define BX_CRT_LIBCXX 1 ++# else ++# undef BX_CRT_GLIBC ++# // Fake a glibc version for musl libc ++# define BX_CRT_GLIBC (2 * 10000 + 28 * 100) + # endif // + + # if !BX_CRT_BIONIC \ diff --git a/srcpkgs/mame/patches/musl-time_t.patch b/srcpkgs/mame/patches/musl-time_t.patch new file mode 100644 index 00000000000..841d96a6554 --- /dev/null +++ b/srcpkgs/mame/patches/musl-time_t.patch @@ -0,0 +1,10 @@ +--- 3rdparty/bx/src/crtnone.cpp 2017-04-26 01:02:36.000000000 +0200 ++++ 3rdparty/bx/src/crtnone.cpp 2017-04-29 16:12:17.956612429 +0200 +@@ -3,6 +3,7 @@ + * License: https://github.com/bkaradzic/bx#license-bsd-2-clause + */ + ++#include + #include + #include + #include diff --git a/srcpkgs/mame/template b/srcpkgs/mame/template index 9229c6fc0f2..983bceca5bc 100644 --- a/srcpkgs/mame/template +++ b/srcpkgs/mame/template @@ -1,6 +1,6 @@ # Template file for 'mame' pkgname=mame -version=0184 +version=0185 revision=1 wrksrc="mame-mame${version}" homepage="http://mamedev.org" @@ -8,7 +8,7 @@ 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=8bae785a5fc97a84a8bb94a123de3b5c71efc31fe849151da9701329d6a31555 +checksum=c265b43af5459ef2a2133eaf727a8f065630af31f373374c53565a89bc650e33 hostmakedepends="perl pkg-config python automoc4" makedepends="libstdc++-devel SDL2_ttf-devel $(vopt_if qt qt5-devel) lua-devel @@ -31,6 +31,8 @@ fi do_build() { local opts="REGENIE=1" + opts+=" TARGETOS=linux" + opts+=" PTR64=1" opts+=" NOWERROR=1" opts+=" TOOLS=1" opts+=" VERBOSE=1" @@ -53,8 +55,7 @@ do_build() { opts+=" CROSS_BUILD=1 OVERRIDE_CC=${CC} OVERRIDE_CXX=${CXX} OVERRIDE_LD=${CC}" fi case "$XBPS_TARGET_MACHINE" in - i686*) # Build mamearcade and mess separately to - # overcome linker memory exhaustion + i686*) # Overcome linker memory exhaustion opts+=" SYMBOLS=0" make ${opts} ${makejobs} ;;