Use lua 5.3. Cosmetic changes.

It does not build with the current lua 5.4.

2 files changed, 21 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9778427864fa..6787df07bb55 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mame-git
 	pkgdesc = A port of the popular Multiple Arcade Machine Emulator using SDL with OpenGL support (git version)
-	pkgver = 0.220.r0.gc5c5723b9d5
+	pkgver = 0.223.r0.gc55a261d26d
 	pkgrel = 1
 	url = https://www.mamedev.org/
 	arch = x86_64
@@ -14,7 +14,7 @@ pkgbase = mame-git
 	makedepends = libxinerama
 	depends = sdl2_ttf
 	depends = qt5-base
-	depends = lua
+	depends = lua53
 	depends = libutf8proc
 	depends = pugixml
 	depends = portmidi
@@ -28,7 +28,7 @@ pkgbase = mame-git
 	source = mame.svg
 	sha256sums = SKIP
 	sha256sums = ee1c59bafc5e5441e99fa4c58108a3e18048e60672f34de865c8a5a976094dba
-	sha256sums = 6beb883c8efed5b7466d43d0658b47c3e4a9928b5d0245ed56446b230e28306b
+	sha256sums = 0e5e93f84673c2d17a1bf7a6b256cfa54ef89a086a828df19bc054c12776d821
 	sha256sums = 17c442c933d764175e4ce1de50a80c0c2ddd5d733caf09c3cd5e6ba697ac43f4
 
 pkgname = mame-git
diff --git a/PKGBUILD b/PKGBUILD
index 43e645b8cfb1..bb493d03ab4c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=mame-git
-pkgver=0.220.r0.gc5c5723b9d5
+pkgver=0.223.r0.gc55a261d26d
 pkgrel=1
 pkgdesc='A port of the popular Multiple Arcade Machine Emulator using SDL with OpenGL support (git version)'
 url='https://www.mamedev.org/'
 license=('GPL')
 arch=('x86_64')
-depends=('sdl2_ttf' 'qt5-base' 'lua' 'libutf8proc' 'pugixml' 'portmidi' 'portaudio' 'flac')
+depends=('sdl2_ttf' 'qt5-base' 'lua53' 'libutf8proc' 'pugixml' 'portmidi' 'portaudio' 'flac')
 makedepends=('git' 'nasm' 'python' 'asio' 'rapidjson' 'glm' 'libxinerama')
 provides=('mame')
 conflicts=('mame')
@@ -17,15 +17,13 @@ source=('git+https://github.com/mamedev/mame.git'
         'mame.svg')
 sha256sums=('SKIP'
             'ee1c59bafc5e5441e99fa4c58108a3e18048e60672f34de865c8a5a976094dba'
-            '6beb883c8efed5b7466d43d0658b47c3e4a9928b5d0245ed56446b230e28306b'
+            '0e5e93f84673c2d17a1bf7a6b256cfa54ef89a086a828df19bc054c12776d821'
             '17c442c933d764175e4ce1de50a80c0c2ddd5d733caf09c3cd5e6ba697ac43f4')
 
 prepare() {
-    # use system libraries
-    sed -e 's|\# USE_SYSTEM_LIB|USE_SYSTEM_LIB|g' -i mame/makefile
-    
-    # except for asio
-    sed -e 's|USE_SYSTEM_LIB_ASIO|\# USE_SYSTEM_LIB_ASIO|g' -i mame/makefile
+    # use system libraries, except for asio
+    sed -e 's|\# USE_SYSTEM_LIB|USE_SYSTEM_LIB|g' \
+        -e 's|USE_SYSTEM_LIB_ASIO|\# USE_SYSTEM_LIB_ASIO|g' -i mame/makefile
 }
 
 pkgver() {
@@ -34,6 +32,14 @@ pkgver() {
 }
 
 build() {
+    export CFLAGS+=' -I/usr/include/lua5.3'
+    export CXXFLAGS+=' -I/usr/include/lua5.3'
+    
+    # hack to force linking to lua 5.3
+    mkdir lib
+    ln -s /usr/lib/liblua5.3.so lib/liblua.so
+    export LDFLAGS+=" -L$(pwd)/lib"
+    
     make -C mame \
         NOWERROR='1' \
         OPTIMIZE='2' \
@@ -58,8 +64,8 @@ package() {
     done
     
     # extra bits
-    install -D -m644 src/osd/modules/opengl/shader/glsl*.*h -t "${pkgdir}/usr/lib/mame/shader/"
-    cp -a {artwork,bgfx,plugins,language,ctrlr,keymaps,hash}   "${pkgdir}/usr/lib/mame/"
+    install -D -m644 src/osd/modules/opengl/shader/glsl*.*h -t "${pkgdir}/usr/lib/mame/shader"
+    cp -a {artwork,bgfx,plugins,language,ctrlr,keymaps,hash}   "${pkgdir}/usr/lib/mame"
     
     # desktop file and icon
     install -D -m644 "${srcdir}/mame.desktop" -t "${pkgdir}/usr/share/applications"
@@ -70,6 +76,6 @@ package() {
     cp -a docs "${pkgdir}/usr/share/doc/mame"
     rm -r "${pkgdir}/usr/share/doc/mame/man"
     install -d "$pkgdir"/usr/share/man/man{1,6}
-    install -m644 docs/man/*.1* "${pkgdir}/usr/share/man/man1/"
-    install -m644 docs/man/*.6* "${pkgdir}/usr/share/man/man6/"
+    install -m644 docs/man/*.1* "${pkgdir}/usr/share/man/man1"
+    install -m644 docs/man/*.6* "${pkgdir}/usr/share/man/man6"
 }