From: ypsvlq <ypsvlq@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] mame: update to 0262.
Date: Thu, 01 Feb 2024 21:41:23 +0100 [thread overview]
Message-ID: <20240201204123.372D322F2D@inbox.vuxu.org> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-48481@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1233 bytes --]
There is an updated pull request by ypsvlq against master on the void-packages repository
https://github.com/ypsvlq/void-packages mame
https://github.com/void-linux/void-packages/pull/48481
mame: update to 0262.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/48481.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mame-48481.patch --]
[-- Type: text/x-diff, Size: 3848 bytes --]
From d9f6ac68dbd25d68ce5a7881f26f2e56e979ccc8 Mon Sep 17 00:00:00 2001
From: Elaine Gibson <ypsvlq@gmail.com>
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 <orphan@voidlinux.org>"
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
}
next prev parent reply other threads:[~2024-02-01 20:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-01 19:40 [PR PATCH] " ypsvlq
2024-02-01 20:41 ` ypsvlq [this message]
2024-02-02 11:17 ` [PR PATCH] [Updated] " ypsvlq
2024-02-02 14:53 ` ypsvlq
2024-02-13 17:43 ` ypsvlq
2024-02-13 17:50 ` ypsvlq
2024-02-15 3:46 ` [PR PATCH] [Merged]: " classabbyamp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240201204123.372D322F2D@inbox.vuxu.org \
--to=ypsvlq@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).