Date: Thursday, March 30, 2023 @ 12:44:53
  Author: arojas
Revision: 1431280

Update to 0.253

Added:
  mame/trunk/lua-no-cpp.patch
Modified:
  mame/trunk/PKGBUILD

------------------+
 PKGBUILD         |   27 +++++++++++----------------
 lua-no-cpp.patch |   20 ++++++++++++++++++++
 2 files changed, 31 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2023-03-30 12:41:41 UTC (rev 1431279)
+++ PKGBUILD    2023-03-30 12:44:53 UTC (rev 1431280)
@@ -5,19 +5,21 @@
 
 pkgbase=mame
 pkgname=(mame mame-tools)
-pkgver=0.252
-pkgrel=2
+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 
lua53 libutf8proc pugixml portmidi portaudio flac libpulse)
+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)
-sha256sums=('9d6365fed1c5f6a7a854d5489df4c70300d01d2aabf6764b0e2476b59babc13e'
+        mame.sh mame.desktop mame.svg
+        lua-no-cpp.patch)
+sha256sums=('52065a1ae0db365a9aa35d62bafb226edc546ad993d6c75327e166596f25e4e4'
             'ee1c59bafc5e5441e99fa4c58108a3e18048e60672f34de865c8a5a976094dba'
             '0e5e93f84673c2d17a1bf7a6b256cfa54ef89a086a828df19bc054c12776d821'
-            '17c442c933d764175e4ce1de50a80c0c2ddd5d733caf09c3cd5e6ba697ac43f4')
+            '17c442c933d764175e4ce1de50a80c0c2ddd5d733caf09c3cd5e6ba697ac43f4'
+            '1bca876381c711ddd08e571493e1e7894b8e56fbb8b5cc65fd484131d997f3e3')
 options=(!debug !lto) # debug build fails
 
 prepare() {
@@ -25,20 +27,13 @@
 
 # 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 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 \
@@ -48,7 +43,7 @@
 }
 
 package_mame() {
-  depends=(sdl2_ttf qt5-base lua53 libutf8proc pugixml portmidi portaudio flac 
libpulse hicolor-icon-theme)
+  depends=(sdl2_ttf qt5-base lua libutf8proc pugixml portmidi portaudio flac 
libpulse hicolor-icon-theme)
   conflicts=(sdlmame)
   replaces=(sdlmame) 
 

Added: lua-no-cpp.patch
===================================================================
--- lua-no-cpp.patch                            (rev 0)
+++ lua-no-cpp.patch    2023-03-30 12:44:53 UTC (rev 1431280)
@@ -0,0 +1,20 @@
+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" }

Reply via email to