Lua 5.4 is now default in Arch Linux - update for that

3 files changed, 68 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 395b5eeb035a..b9753ee76f57 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = lua-gl
 	pkgdesc = Lua bindings for OpenGL
 	pkgver = 1.11
-	pkgrel = 1
+	pkgrel = 2
 	url = http://luagl.sourceforge.net
 	arch = i686
 	arch = x86_64
@@ -9,14 +9,17 @@ pkgbase = lua-gl
 	makedepends = lua
 	makedepends = lua51
 	makedepends = lua52
+	makedepends = lua53
 	makedepends = glu
 	source = https://sourceforge.net/projects/luagl/files/1.11/Docs%20and%20Sources/luagl-1.11_Sources.tar.gz
 	source = https://sourceforge.net/projects/luagl/files/1.11/Docs%20and%20Sources/luagl-1.11_Docs_html.tar.gz
+	source = tecmake-use-lua54.patch
 	sha256sums = 5898433a32c5ff7e36dcbf1a6b638f7af1e5ff8c4731ba17d5f109c4a8db981e
 	sha256sums = 3d23be0aac7d11232eaad76a6e327066b2fe4aa821af1244db7ccd37b82b0045
+	sha256sums = 6249a95238a53c57c1326f71133c46a116cfcc44597cf635b65763fa03960eba
 
 pkgname = lua-gl
-	pkgdesc = Lua 5.3 bindings for OpenGL
+	pkgdesc = Lua 5.4 bindings for OpenGL
 	depends = lua
 	depends = glu
 
@@ -30,3 +33,7 @@ pkgname = lua52-gl
 	depends = lua52
 	depends = glu
 
+pkgname = lua53-gl
+	pkgdesc = Lua 5.3 bindings for OpenGL
+	depends = lua53
+	depends = glu
diff --git a/PKGBUILD b/PKGBUILD
index 2f8ab98918b6..34eb47cb7b75 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,43 @@
 # Maintainer: Jiří Klimeš <blueowl@centrum.cz>
 
 pkgbase=lua-gl
-pkgname=('lua-gl' 'lua51-gl' 'lua52-gl')
+pkgname=('lua-gl' 'lua51-gl' 'lua52-gl' 'lua53-gl')
 pkgver=1.11
-pkgrel=1
+pkgrel=2
 pkgdesc="Lua bindings for OpenGL"
 arch=('i686' 'x86_64')
 url="http://luagl.sourceforge.net"
 license=('MIT')
-makedepends=('lua' 'lua51' 'lua52' 'glu')
+makedepends=('lua' 'lua51' 'lua52' 'lua53' 'glu')
 source=("https://sourceforge.net/projects/luagl/files/${pkgver}/Docs%20and%20Sources/luagl-${pkgver}_Sources.tar.gz"
         "https://sourceforge.net/projects/luagl/files/${pkgver}/Docs%20and%20Sources/luagl-${pkgver}_Docs_html.tar.gz"
+        "tecmake-use-lua54.patch"
 )
 sha256sums=('5898433a32c5ff7e36dcbf1a6b638f7af1e5ff8c4731ba17d5f109c4a8db981e'
-            '3d23be0aac7d11232eaad76a6e327066b2fe4aa821af1244db7ccd37b82b0045')
+            '3d23be0aac7d11232eaad76a6e327066b2fe4aa821af1244db7ccd37b82b0045'
+            '6249a95238a53c57c1326f71133c46a116cfcc44597cf635b65763fa03960eba')
 
 prepare() {
   # Add RUN_PATH variable to be able to set DT_RUNPATH
   sed 's/$(ECHO)$(LD)/& $(RUN_PATH)/' -i "$srcdir"/luagl/tecmake.mak
+
+  # Make tecmake.mak Lua 5.4 aware
+  patch -p1 < "$srcdir"/tecmake-use-lua54.patch
 }
 
 build() {
   cd "$srcdir"/luagl
-  echo 'Building with Lua 5.3'
-  make USE_LUA53=Yes RUN_PATH="-Wl,-rpath=/usr/lib/lua/5.3,--enable-new-dtags,--as-needed"
+  echo 'Building with Lua 5.4'
+  make USE_LUA54=Yes RUN_PATH="-Wl,-rpath=/usr/lib/lua/5.4,--enable-new-dtags,--as-needed"
 
   echo 'Building with Lua 5.1'
   make USE_LUA51=Yes RUN_PATH="-Wl,-rpath=/usr/lib/lua/5.1,--enable-new-dtags,--as-needed"
 
   echo 'Building with Lua 5.2'
   make USE_LUA52=Yes RUN_PATH="-Wl,-rpath=/usr/lib/lua/5.2,--enable-new-dtags,--as-needed"
+
+  echo 'Building with Lua 5.3'
+  make USE_LUA53=Yes RUN_PATH="-Wl,-rpath=/usr/lib/lua/5.3,--enable-new-dtags,--as-needed"
 }
 
 _package_helper() {
@@ -46,10 +54,10 @@ _package_helper() {
 }
 
 package_lua-gl() {
-  pkgdesc="Lua 5.3 bindings for OpenGL"
+  pkgdesc="Lua 5.4 bindings for OpenGL"
   depends=('lua' 'glu')
 
-  _package_helper "5.3"
+  _package_helper "5.4"
 }
 
 package_lua51-gl() {
@@ -66,4 +74,12 @@ package_lua52-gl() {
   _package_helper "5.2"
 }
 
+package_lua53-gl() {
+  pkgdesc="Lua 5.3 bindings for OpenGL"
+  depends=('lua53' 'glu')
+
+  _package_helper "5.3"
+}
+
+
 # vim:set ts=2 sw=2 et:
diff --git a/tecmake-use-lua54.patch b/tecmake-use-lua54.patch
new file mode 100644
index 000000000000..fadd6bc5555f
--- /dev/null
+++ b/tecmake-use-lua54.patch
@@ -0,0 +1,35 @@
+--- src/luagl/tecmake.mak.old	2022-09-27 17:04:28.923659421 +0200
++++ src/luagl/tecmake.mak	2022-09-27 17:05:06.630327729 +0200
+@@ -445,6 +445,9 @@
+ ifdef USE_LUA53
+   LIBLUA_SFX := 53
+ endif
++ifdef USE_LUA54
++  LIBLUA_SFX := 54
++endif
+ 
+ ifdef USE_OLDLIBLUA
+   TEC_UNAME_LIBLUA_DIR ?= $(TEC_UNAME_LIB_DIR)
+@@ -763,6 +766,7 @@
+ LUA51 ?= $(TECTOOLS_HOME)/lua5.1
+ LUA52 ?= $(TECTOOLS_HOME)/lua52
+ LUA53 ?= $(TECTOOLS_HOME)/lua53
++LUA54 ?= $(TECTOOLS_HOME)/lua54
+ 
+ 
+ #---------------------------------#
+@@ -826,6 +830,14 @@
+   endif
+ endif
+ 
++ifdef USE_LUA54
++  LUA_SFX := 54
++  LIBLUA_SFX := 54
++  override USE_LUA = Yes
++  LUA := $(LUA54)
++  NO_LUALIB := Yes
++endif
++
+ ifdef LUA_SUFFIX
+   LUA_SFX := $(LUA_SUFFIX)
+ endif