diff --git a/srcpkgs/mame/patches/musl-bgfx.patch b/srcpkgs/mame/patches/musl-bgfx.patch deleted file mode 100644 index f851580d5d4..00000000000 --- a/srcpkgs/mame/patches/musl-bgfx.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- 3rdparty/bgfx/src/bgfx.cpp 2017-01-24 23:44:30.000000000 +0100 -+++ 3rdparty/bgfs/src/bgfx.cpp 2017-01-25 06:24:41.519845947 +0100 -@@ -4,6 +4,9 @@ - */ - - #include -+#if !defined(__GLIBC__) -+#include -+#endif - #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 index 841d96a6554..02c11cf0dd9 100644 --- a/srcpkgs/mame/patches/musl-time_t.patch +++ b/srcpkgs/mame/patches/musl-time_t.patch @@ -1,10 +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 - */ +--- 3rdparty/bx/include/bx/bx.h 2017-12-27 02:45:37.000000000 +0100 ++++ 3rdparty/bx/include/bx/bx.h 2017-12-28 10:58:30.254932880 +0100 +@@ -11,6 +11,7 @@ + #include // uint32_t + #include // size_t + #include // ptrdiff_t ++#include // time_t -+#include - #include - #include - #include + #include "platform.h" + #include "config.h" diff --git a/srcpkgs/mame/template b/srcpkgs/mame/template index b82213e1d5e..36bcc936f96 100644 --- a/srcpkgs/mame/template +++ b/srcpkgs/mame/template @@ -1,6 +1,6 @@ # Template file for 'mame' pkgname=mame -version=0192 +version=0193 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=13ccc4e334a73a727e44dbfed6d3dd33b3c193542856d5ac081a64254b781537 +checksum=6b5e90b602befbcad2b6989b1e930d0ff6e537dc901f7b1615a3e6deec2207a2 hostmakedepends="perl pkg-config python automoc4" makedepends="libstdc++-devel SDL2_ttf-devel $(vopt_if qt qt5-devel) lua-devel @@ -17,15 +17,15 @@ depends="liberation-fonts-ttf" nocross=yes replaces="sdlmame>=0 sdlmess>=0" +CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.3" case "$XBPS_TARGET_MACHINE" in - i686*) # was: nodebug=yes + *-musl) CXXFLAGS+=" -DBX_CRT_MUSL=1" + ;; + i686*) # was: nodebug=yes broken="https://build.voidlinux.eu/builders/i686_builder/builds/2964/steps/shell_3/logs/stdio" ;; esac -CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.3" -LDFLAGS="-Wl,-fuse-ld=gold" - build_options="qt" if [ -z "$CROSS_BUILD" ]; then build_options_default="qt" @@ -38,10 +38,10 @@ do_build() { x86_64*|aarch64*) opts+=" PTR64=1" ;; esac opts+=" NOWERROR=1" - opts+=" TOOLS=1" opts+=" VERBOSE=1" opts+=" OPTIMIZE=3" opts+=" PRECOMPILE=0" + opts+=" TOOLS=1" opts+=" USE_SYSTEM_LIB_EXPAT=1" opts+=" USE_SYSTEM_LIB_ZLIB=1" opts+=" USE_SYSTEM_LIB_JPEG=1" @@ -50,8 +50,7 @@ do_build() { opts+=" USE_SYSTEM_LIB_SQLITE3=1" opts+=" USE_SYSTEM_LIB_PORTMIDI=1" opts+=" USE_SYSTEM_LIB_PORTAUDIO=1" - opts+=" USE_SYSTEM_LIB_UV=1" - opts+=" USE_SYSTEM_LIB_SDL2=1" + # opts+=" USE_SYSTEM_LIB_UTF8PROC=1" if [ "$build_option_qt" ]; then opts+=" USE_QTDEBUG=1" fi