From d9f6ac68dbd25d68ce5a7881f26f2e56e979ccc8 Mon Sep 17 00:00:00 2001 From: Elaine Gibson Date: Thu, 1 Feb 2024 19:33:55 +0000 Subject: [PATCH] mame: update to 0262. --- srcpkgs/mame/patches/musl-bx.patch | 32 ++++++++++++++++++++++++++++++ srcpkgs/mame/template | 18 ++++++----------- 2 files changed, 38 insertions(+), 12 deletions(-) create mode 100644 srcpkgs/mame/patches/musl-bx.patch diff --git a/srcpkgs/mame/patches/musl-bx.patch b/srcpkgs/mame/patches/musl-bx.patch new file mode 100644 index 0000000000000..662826175ddd9 --- /dev/null +++ b/srcpkgs/mame/patches/musl-bx.patch @@ -0,0 +1,32 @@ +diff --git a/3rdparty/bx/include/bx/platform.h.orig b/3rdparty/bx/include/bx/platform.h +index f14f9b680bf..ea82d7f32a3 100644 +--- a/3rdparty/bx/include/bx/platform.h.orig ++++ b/3rdparty/bx/include/bx/platform.h +@@ -37,6 +37,10 @@ + #define BX_CRT_MSVC 0 + #define BX_CRT_NEWLIB 0 + ++#ifndef BX_CRT_MUSL ++# define BX_CRT_MUSL 1 ++#endif // BX_CRT_MUSL ++ + #ifndef BX_CRT_NONE + # define BX_CRT_NONE 0 + #endif // BX_CRT_NONE +@@ -255,6 +259,7 @@ + && !BX_CRT_LIBCXX \ + && !BX_CRT_MINGW \ + && !BX_CRT_MSVC \ ++ && !BX_CRT_MUSL \ + && !BX_CRT_NEWLIB + # undef BX_CRT_NONE + # define BX_CRT_NONE 1 +@@ -432,6 +437,8 @@ + # define BX_CRT_NAME "Clang C Library" + #elif BX_CRT_NEWLIB + # define BX_CRT_NAME "Newlib" ++#elif BX_CRT_MUSL ++# define BX_CRT_NAME "musl libc" + #elif BX_CRT_NONE + # define BX_CRT_NAME "None" + #else diff --git a/srcpkgs/mame/template b/srcpkgs/mame/template index 84580d6cafa30..b1bc6174c34fd 100644 --- a/srcpkgs/mame/template +++ b/srcpkgs/mame/template @@ -1,10 +1,10 @@ # Template file for 'mame' pkgname=mame -version=0251 -revision=3 +version=0262 +revision=1 hostmakedepends="pkg-config python3 qt5-host-tools tar xz which" makedepends="SDL2_ttf-devel fontconfig-devel glm libgomp-devel libjpeg-turbo-devel - lua-devel libutf8proc-devel libuv-devel portaudio-devel portmidi-devel + libutf8proc-devel libuv-devel portaudio-devel portmidi-devel pugixml-devel rapidjson libXinerama-devel $(vopt_if qt 'qt5-devel')" depends="liberation-fonts-ttf" short_desc="Multiple Arcade Machine Emulator" @@ -12,13 +12,11 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://mamedev.org" distfiles="https://github.com/mamedev/mame/archive/mame${version}.tar.gz" -checksum=6d97db4ebfb269b1eb0e530444495a50d3961d0a60bce13e11dc88bbebb2fbc1 +checksum=64e482f3dd13be4e91c5dfa076fb7a71f450f2879118c6ae452b0037b661aaae nodebug=yes replaces="sdlmame>=0 sdlmess>=0" -CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.3" -CXXFLAGS="$CFLAGS" -[ "$XBPS_TARGET_LIBC" = "musl" ] && CXXFLAGS+=" -DBX_CRT_MUSL=1" +[ "$XBPS_TARGET_LIBC" = "musl" ] && CXXFLAGS=" -DBX_CRT_MUSL=1" case "$XBPS_TARGET_MACHINE" in ppc*) @@ -33,7 +31,7 @@ build_options_default="qt" _options="REGENIE=1 TARGETOS=linux NOWERROR=1 OPENMP=1 OPTIMIZE=3 TOOLS=1 LTO=0 USE_SYSTEM_LIB_ASIO=0 USE_SYSTEM_LIB_EXPAT=1 USE_SYSTEM_LIB_ZLIB=1 USE_SYSTEM_LIB_JPEG=1 USE_SYSTEM_LIB_FLAC=1 - USE_SYSTEM_LIB_LUA=0 USE_SYSTEM_LIB_SQLITE3=1 + USE_SYSTEM_LIB_SQLITE3=1 USE_SYSTEM_LIB_PORTMIDI=1 USE_SYSTEM_LIB_PORTAUDIO=1 USE_SYSTEM_LIB_UTF8PROC=1 USE_SYSTEM_LIB_GLM=1 USE_SYSTEM_LIB_RAPIDJSON=1 USE_SYSTEM_LIB_PUGIXML=1" @@ -64,8 +62,6 @@ fi #_options+=" TARGET=mame SUBTARGET=tiny VERBOSE=1" do_configure() { - # When linking mame expects liblua.so but we have liblua5.3.so - ln -sf liblua5.3.so ${XBPS_CROSS_BASE}/usr/lib/liblua.so if [ "${CROSS_BUILD}" ]; then case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) ;; @@ -131,6 +127,4 @@ do_install() { for f in artwork bgfx docs hash hlsl keymaps plugins samples; do vcopy ${f} usr/share/${pkgname} done - # Remove temporary liblua.so symlink - rm -f ${XBPS_CROSS_BASE}/usr/lib/liblua.so }