Date: Thursday, March 30, 2023 @ 17:20:15
Author: arojas
Revision: 1431300
archrelease: copy trunk to community-x86_64
Added:
mame/repos/community-x86_64/PKGBUILD
(from rev 1431299, mame/trunk/PKGBUILD)
mame/repos/community-x86_64/lua-no-cpp.patch
(from rev 1431299, mame/trunk/lua-no-cpp.patch)
mame/repos/community-x86_64/mame.desktop
(from rev 1431299, mame/trunk/mame.desktop)
mame/repos/community-x86_64/mame.sh
(from rev 1431299, mame/trunk/mame.sh)
mame/repos/community-x86_64/mame.svg
(from rev 1431299, mame/trunk/mame.svg)
Deleted:
mame/repos/community-x86_64/PKGBUILD
mame/repos/community-x86_64/mame.desktop
mame/repos/community-x86_64/mame.sh
mame/repos/community-x86_64/mame.svg
------------------+
PKGBUILD | 193 +++++++++++++++++++++++++----------------------------
lua-no-cpp.patch | 51 ++++++++++++++
mame.desktop | 40 +++++-----
mame.sh | 110 +++++++++++++++---------------
4 files changed, 220 insertions(+), 174 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-03-30 17:20:00 UTC (rev 1431299)
+++ PKGBUILD 2023-03-30 17:20:15 UTC (rev 1431300)
@@ -1,99 +0,0 @@
-# Maintainer: Antonio Rojas <[email protected]>
-# Contributor: Sergej Pupykin <[email protected]>
-# Contributor: robb_force <[email protected]>
-# Contributor: JJDaNiMoTh <[email protected]>
-
-pkgbase=mame
-pkgname=(mame mame-tools)
-pkgver=0.252
-pkgrel=2
-pkgdesc='Port of the popular Multiple Arcade Machine Emulator using SDL with
OpenGL support'
-url='https://mamedev.org/'
-license=(GPL2)
-arch=(x86_64)
-makedepends=(nasm python asio rapidjson glm libxinerama sdl2_ttf qt5-base
lua53 libutf8proc pugixml portmidi portaudio flac libpulse)
-source=(https://github.com/mamedev/mame/archive/mame${pkgver/./}.tar.gz
- mame.sh mame.desktop mame.svg)
-sha256sums=('9d6365fed1c5f6a7a854d5489df4c70300d01d2aabf6764b0e2476b59babc13e'
- 'ee1c59bafc5e5441e99fa4c58108a3e18048e60672f34de865c8a5a976094dba'
- '0e5e93f84673c2d17a1bf7a6b256cfa54ef89a086a828df19bc054c12776d821'
- '17c442c933d764175e4ce1de50a80c0c2ddd5d733caf09c3cd5e6ba697ac43f4')
-options=(!debug !lto) # debug build fails
-
-prepare() {
- cd mame-mame${pkgver/./}
-
-# Use system libraries
- sed -e 's|\# USE_SYSTEM_LIB|USE_SYSTEM_LIB|g' -i makefile
-}
-
-build() {
- cd mame-mame${pkgver/./}
- export CFLAGS+=" -I/usr/include/lua5.3/"
- export CXXFLAGS+=" -I/usr/include/lua5.3/"
-
- export CXXFLAGS+=" -Wp,-U_GLIBCXX_ASSERTIONS" # FS#73202
-
-# Hack to force linking to lua5.3
- mkdir lib
- ln -s /usr/lib/liblua5.3.so lib/liblua.so
- export LDFLAGS+=" -L${PWD}/lib"
-
- make \
- VERBOSE=1 \
- NOWERROR=1 \
- OPTIMIZE=2 \
- TOOLS=1 \
- ARCHOPTS=-flifetime-dse=1
-}
-
-package_mame() {
- depends=(sdl2_ttf qt5-base lua53 libutf8proc pugixml portmidi portaudio flac
libpulse hicolor-icon-theme)
- conflicts=(sdlmame)
- replaces=(sdlmame)
-
- cd mame-mame${pkgver/./}
-
- # Install the mame script
- install -Dm755 "$srcdir"/$pkgname.sh "$pkgdir"/usr/bin/$pkgname
-
- # Install the binaries
- install -Dm755 mame -t "$pkgdir"/usr/lib/mame
-
- # Install the extra bits
- install -Dm644 src/osd/modules/opengl/shader/glsl*.*h -t
"$pkgdir"/usr/lib/$pkgname/shader/
- cp -ar {artwork,bgfx,plugins,language,ctrlr,keymaps,hash}
"$pkgdir"/usr/lib/$pkgname/
-
- # Include the license
- install -Dm644 docs/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-
- # FS#28203
- sed -i 's|KEYCODE_2_PAD|KEYCODE_2PAD|' "$pkgdir"/usr/lib/mame/ctrlr/*.cfg
- sed -i 's|KEYCODE_4_PAD|KEYCODE_4PAD|' "$pkgdir"/usr/lib/mame/ctrlr/*.cfg
- sed -i 's|KEYCODE_6_PAD|KEYCODE_6PAD|' "$pkgdir"/usr/lib/mame/ctrlr/*.cfg
- sed -i 's|KEYCODE_8_PAD|KEYCODE_8PAD|' "$pkgdir"/usr/lib/mame/ctrlr/*.cfg
-
- # documentation
- install -dm0755 "$pkgdir"/usr/share/doc
- cp -a docs "$pkgdir"/usr/share/doc/$pkgname
- rm -r "$pkgdir"/usr/share/doc/$pkgname/man
- install -Dm644 docs/man/*.6* -t "$pkgdir"/usr/share/man/man6/
-
- # install desktop file and icon
- install -Dm644 "$srcdir"/mame.desktop -t "$pkgdir"/usr/share/applications
- install -Dm644 "$srcdir"/mame.svg -t
"$pkgdir"/usr/share/icons/hicolor/scalable/apps
-}
-
-package_mame-tools() {
- pkgdesc='Port of the popular Multiple Arcade Machine Emulator using SDL with
OpenGL support (tools)'
- depends=(sdl2 libutf8proc flac)
-
- cd mame-mame${pkgver/./}
- for _i in castool chdman floptool imgtool jedutil ldresample ldverify nltool
nlwav pngcmp regrep romcmp \
- split srcclean testkeys unidasm; do
- install -Dm755 $_i -t "$pkgdir"/usr/bin
- done
- mv "$pkgdir"/usr/bin/{,mame-}split # Fix conflicts
-
- install -Dm644 docs/man/*.1* -t "$pkgdir"/usr/share/man/man1/
-}
Copied: mame/repos/community-x86_64/PKGBUILD (from rev 1431299,
mame/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-03-30 17:20:15 UTC (rev 1431300)
@@ -0,0 +1,94 @@
+# Maintainer: Antonio Rojas <[email protected]>
+# Contributor: Sergej Pupykin <[email protected]>
+# Contributor: robb_force <[email protected]>
+# Contributor: JJDaNiMoTh <[email protected]>
+
+pkgbase=mame
+pkgname=(mame mame-tools)
+pkgver=0.253
+pkgrel=1
+pkgdesc='Port of the popular Multiple Arcade Machine Emulator using SDL with
OpenGL support'
+url='https://mamedev.org/'
+license=(GPL2)
+arch=(x86_64)
+makedepends=(nasm python asio rapidjson glm libxinerama sdl2_ttf qt5-base lua
libutf8proc pugixml portmidi portaudio flac libpulse)
+source=(https://github.com/mamedev/mame/archive/mame${pkgver/./}.tar.gz
+ mame.sh mame.desktop mame.svg
+ lua-no-cpp.patch)
+sha256sums=('52065a1ae0db365a9aa35d62bafb226edc546ad993d6c75327e166596f25e4e4'
+ 'ee1c59bafc5e5441e99fa4c58108a3e18048e60672f34de865c8a5a976094dba'
+ '0e5e93f84673c2d17a1bf7a6b256cfa54ef89a086a828df19bc054c12776d821'
+ '17c442c933d764175e4ce1de50a80c0c2ddd5d733caf09c3cd5e6ba697ac43f4'
+ '7febeab1d8a26079ae80b53118f1ee6ceb647e8ce3e3a1e95757d0f62133c728')
+options=(!debug !lto) # debug build fails
+
+prepare() {
+ cd mame-mame${pkgver/./}
+
+# Use system libraries
+ sed -e 's|\# USE_SYSTEM_LIB|USE_SYSTEM_LIB|g' -i makefile
+# Don't expect C++ LUA
+ patch -p1 < ../lua-no-cpp.patch
+}
+
+build() {
+ cd mame-mame${pkgver/./}
+ export CXXFLAGS+=" -Wp,-U_GLIBCXX_ASSERTIONS" # FS#73202
+ make \
+ VERBOSE=1 \
+ NOWERROR=1 \
+ OPTIMIZE=2 \
+ TOOLS=1 \
+ ARCHOPTS=-flifetime-dse=1
+}
+
+package_mame() {
+ depends=(sdl2_ttf qt5-base lua libutf8proc pugixml portmidi portaudio flac
libpulse hicolor-icon-theme)
+ conflicts=(sdlmame)
+ replaces=(sdlmame)
+
+ cd mame-mame${pkgver/./}
+
+ # Install the mame script
+ install -Dm755 "$srcdir"/$pkgname.sh "$pkgdir"/usr/bin/$pkgname
+
+ # Install the binaries
+ install -Dm755 mame -t "$pkgdir"/usr/lib/mame
+
+ # Install the extra bits
+ install -Dm644 src/osd/modules/opengl/shader/glsl*.*h -t
"$pkgdir"/usr/lib/$pkgname/shader/
+ cp -ar {artwork,bgfx,plugins,language,ctrlr,keymaps,hash}
"$pkgdir"/usr/lib/$pkgname/
+
+ # Include the license
+ install -Dm644 docs/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+
+ # FS#28203
+ sed -i 's|KEYCODE_2_PAD|KEYCODE_2PAD|' "$pkgdir"/usr/lib/mame/ctrlr/*.cfg
+ sed -i 's|KEYCODE_4_PAD|KEYCODE_4PAD|' "$pkgdir"/usr/lib/mame/ctrlr/*.cfg
+ sed -i 's|KEYCODE_6_PAD|KEYCODE_6PAD|' "$pkgdir"/usr/lib/mame/ctrlr/*.cfg
+ sed -i 's|KEYCODE_8_PAD|KEYCODE_8PAD|' "$pkgdir"/usr/lib/mame/ctrlr/*.cfg
+
+ # documentation
+ install -dm0755 "$pkgdir"/usr/share/doc
+ cp -a docs "$pkgdir"/usr/share/doc/$pkgname
+ rm -r "$pkgdir"/usr/share/doc/$pkgname/man
+ install -Dm644 docs/man/*.6* -t "$pkgdir"/usr/share/man/man6/
+
+ # install desktop file and icon
+ install -Dm644 "$srcdir"/mame.desktop -t "$pkgdir"/usr/share/applications
+ install -Dm644 "$srcdir"/mame.svg -t
"$pkgdir"/usr/share/icons/hicolor/scalable/apps
+}
+
+package_mame-tools() {
+ pkgdesc='Port of the popular Multiple Arcade Machine Emulator using SDL with
OpenGL support (tools)'
+ depends=(sdl2 libutf8proc flac)
+
+ cd mame-mame${pkgver/./}
+ for _i in castool chdman floptool imgtool jedutil ldresample ldverify nltool
nlwav pngcmp regrep romcmp \
+ split srcclean testkeys unidasm; do
+ install -Dm755 $_i -t "$pkgdir"/usr/bin
+ done
+ mv "$pkgdir"/usr/bin/{,mame-}split # Fix conflicts
+
+ install -Dm644 docs/man/*.1* -t "$pkgdir"/usr/share/man/man1/
+}
Copied: mame/repos/community-x86_64/lua-no-cpp.patch (from rev 1431299,
mame/trunk/lua-no-cpp.patch)
===================================================================
--- lua-no-cpp.patch (rev 0)
+++ lua-no-cpp.patch 2023-03-30 17:20:15 UTC (rev 1431300)
@@ -0,0 +1,51 @@
+diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
+index 5744e8d5a2f..4848d905d50 100644
+--- a/scripts/src/3rdparty.lua
++++ b/scripts/src/3rdparty.lua
+@@ -845,7 +845,6 @@ project "lua"
+ kind "StaticLib"
+
+ options {
+- "ForceCPP",
+ }
+
+ configuration { "gmake or ninja" }
+@@ -933,7 +932,6 @@ project "lualibs"
+ kind "StaticLib"
+
+ options {
+- "ForceCPP",
+ }
+
+ configuration { "gmake or ninja" }
+diff --git a/src/frontend/mame/luaengine.cpp b/src/frontend/mame/luaengine.cpp
+index ebf2f701e15..9adfd413321 100644
+--- a/src/frontend/mame/luaengine.cpp
++++ b/src/frontend/mame/luaengine.cpp
+@@ -41,11 +41,12 @@
+ // LUA ENGINE
+ //**************************************************************************
+
++extern "C" {
+ int luaopen_zlib(lua_State *const L);
+-extern "C" int luaopen_lfs(lua_State *L);
++int luaopen_lfs(lua_State *L);
+ int luaopen_linenoise(lua_State *L);
+ int luaopen_lsqlite3(lua_State *L);
+-
++}
+
+ template <typename T>
+ struct lua_engine::devenum
+diff --git a/src/frontend/mame/luaengine.h b/src/frontend/mame/luaengine.h
+index 0767a349ae2..c848952db14 100644
+--- a/src/frontend/mame/luaengine.h
++++ b/src/frontend/mame/luaengine.h
+@@ -20,7 +20,6 @@
+ #include <tuple>
+ #include <vector>
+
+-#define SOL_USING_CXX_LUA 1
+ #ifdef MAME_DEBUG
+ #define SOL_ALL_SAFETIES_ON 1
+ #else
Deleted: mame.desktop
===================================================================
--- mame.desktop 2023-03-30 17:20:00 UTC (rev 1431299)
+++ mame.desktop 2023-03-30 17:20:15 UTC (rev 1431300)
@@ -1,20 +0,0 @@
-[Desktop Entry]
-Name=MAME™ Arcade Emulator
-Name[ca]=Emulador de jocs arcade MAME™
-Name[fr]=Emulateur arcade MAME™
-Name[it]=Emulatore di giochi arcade MAME™
-GenericName=Arcade Emulator
-GenericName[ca]=Emulador de jocs arcade
-GenericName[fr]=Emulateur arcade
-GenericName[it]=Emulatore di giochi arcade
-Comment=Play vintage arcade games using the MAME™ emulator
-Comment[ca]=Jugueu a jocs d'arcade antics emprant l'emulador MAME™
-Comment[fr]=Jugueu a jocs d'arcade antics emprant l'emulador MAME™
-Comment[it]=Gioca ai vecchi arcade con l'emulatore MAME™
-Exec=mame
-Icon=mame
-Terminal=false
-Type=Application
-Categories=Game;Emulator;
-Keywords=Game;Emulator;Arcade;
-
Copied: mame/repos/community-x86_64/mame.desktop (from rev 1431299,
mame/trunk/mame.desktop)
===================================================================
--- mame.desktop (rev 0)
+++ mame.desktop 2023-03-30 17:20:15 UTC (rev 1431300)
@@ -0,0 +1,20 @@
+[Desktop Entry]
+Name=MAME™ Arcade Emulator
+Name[ca]=Emulador de jocs arcade MAME™
+Name[fr]=Emulateur arcade MAME™
+Name[it]=Emulatore di giochi arcade MAME™
+GenericName=Arcade Emulator
+GenericName[ca]=Emulador de jocs arcade
+GenericName[fr]=Emulateur arcade
+GenericName[it]=Emulatore di giochi arcade
+Comment=Play vintage arcade games using the MAME™ emulator
+Comment[ca]=Jugueu a jocs d'arcade antics emprant l'emulador MAME™
+Comment[fr]=Jugueu a jocs d'arcade antics emprant l'emulador MAME™
+Comment[it]=Gioca ai vecchi arcade con l'emulatore MAME™
+Exec=mame
+Icon=mame
+Terminal=false
+Type=Application
+Categories=Game;Emulator;
+Keywords=Game;Emulator;Arcade;
+
Deleted: mame.sh
===================================================================
--- mame.sh 2023-03-30 17:20:00 UTC (rev 1431299)
+++ mame.sh 2023-03-30 17:20:15 UTC (rev 1431300)
@@ -1,55 +0,0 @@
-#!/bin/sh
-mame=/usr/lib/mame/mame
-
-mame_first_run() {
- echo "Creating an ini file for MAME at $HOME/.mame/mame.ini"
- echo "Modify this file for permanent changes to your MAME"
- echo "options and paths before running MAME again."
-
- cd -- ~/.mame || exit
-
- if [ -e mame.ini ]; then
- mv mame.ini mameini.bak || exit
- echo "Your old ini file has been renamed to mameini.bak"
- fi
-
- # Note: the single quotes here are not a mistake; MAME will save these
- # strings verbatim into its configuration file, and expand the variables when
- # it is run in future.
- "$mame" \
- -artpath '$HOME/.mame/artwork;/usr/lib/mame/artwork' \
- -bgfx_path '$HOME/.mame/bgfx;/usr/lib/mame/bgfx' \
- -ctrlrpath '$HOME/.mame/ctrlr;/usr/lib/mame/ctrlr' \
- -hashpath '$HOME/.mame/hash;/usr/lib/mame/hash' \
- -languagepath '$HOME/.mame/language;/usr/lib/mame/language' \
- -pluginspath '/usr/lib/mame/plugins' \
- -inipath '$HOME/.mame/ini' \
- -rompath '$HOME/.mame/roms' \
- -samplepath '$HOME/.mame/samples' \
- -cfg_directory '$HOME/.mame/cfg' \
- -comment_directory '$HOME/.mame/comments' \
- -diff_directory '$HOME/.mame/diff' \
- -input_directory '$HOME/.mame/inp' \
- -nvram_directory '$HOME/.mame/nvram' \
- -snapshot_directory '$HOME/.mame/snap' \
- -state_directory '$HOME/.mame/sta' \
- -video opengl \
- -createconfig
-}
-
-if [ "$1" = "--newini" ]; then
- mame_first_run
- exit
-elif ! [ -e ~/.mame ]; then
- echo "Running MAME for the first time..."
-
- mkdir -- ~/.mame
- (
- cd -- ~/.mame || exit
- mkdir artwork bgfx cfg comments ctrlr diff hash ini inp language nvram
samples snap sta roms
-
- mame_first_run
- ) || exit
-fi
-
-exec "$mame" "$@"
Copied: mame/repos/community-x86_64/mame.sh (from rev 1431299,
mame/trunk/mame.sh)
===================================================================
--- mame.sh (rev 0)
+++ mame.sh 2023-03-30 17:20:15 UTC (rev 1431300)
@@ -0,0 +1,55 @@
+#!/bin/sh
+mame=/usr/lib/mame/mame
+
+mame_first_run() {
+ echo "Creating an ini file for MAME at $HOME/.mame/mame.ini"
+ echo "Modify this file for permanent changes to your MAME"
+ echo "options and paths before running MAME again."
+
+ cd -- ~/.mame || exit
+
+ if [ -e mame.ini ]; then
+ mv mame.ini mameini.bak || exit
+ echo "Your old ini file has been renamed to mameini.bak"
+ fi
+
+ # Note: the single quotes here are not a mistake; MAME will save these
+ # strings verbatim into its configuration file, and expand the variables when
+ # it is run in future.
+ "$mame" \
+ -artpath '$HOME/.mame/artwork;/usr/lib/mame/artwork' \
+ -bgfx_path '$HOME/.mame/bgfx;/usr/lib/mame/bgfx' \
+ -ctrlrpath '$HOME/.mame/ctrlr;/usr/lib/mame/ctrlr' \
+ -hashpath '$HOME/.mame/hash;/usr/lib/mame/hash' \
+ -languagepath '$HOME/.mame/language;/usr/lib/mame/language' \
+ -pluginspath '/usr/lib/mame/plugins' \
+ -inipath '$HOME/.mame/ini' \
+ -rompath '$HOME/.mame/roms' \
+ -samplepath '$HOME/.mame/samples' \
+ -cfg_directory '$HOME/.mame/cfg' \
+ -comment_directory '$HOME/.mame/comments' \
+ -diff_directory '$HOME/.mame/diff' \
+ -input_directory '$HOME/.mame/inp' \
+ -nvram_directory '$HOME/.mame/nvram' \
+ -snapshot_directory '$HOME/.mame/snap' \
+ -state_directory '$HOME/.mame/sta' \
+ -video opengl \
+ -createconfig
+}
+
+if [ "$1" = "--newini" ]; then
+ mame_first_run
+ exit
+elif ! [ -e ~/.mame ]; then
+ echo "Running MAME for the first time..."
+
+ mkdir -- ~/.mame
+ (
+ cd -- ~/.mame || exit
+ mkdir artwork bgfx cfg comments ctrlr diff hash ini inp language nvram
samples snap sta roms
+
+ mame_first_run
+ ) || exit
+fi
+
+exec "$mame" "$@"
Deleted: mame.svg
===================================================================
(Binary files differ)
Copied: mame/repos/community-x86_64/mame.svg (from rev 1431299,
mame/trunk/mame.svg)
===================================================================
(Binary files differ)
