Apply changes from luajit-openresty-stable

Also, apply some of the suggestions from FabioLolix

2 files changed, 23 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 919bf2434a42..d62b6af6f31c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,16 @@
 pkgbase = luajit-openresty
-	pkgdesc = Just-in-time compiler and drop-in replacement for Lua (openresty fork)
-	pkgver = 2.1.20200102.r34.g31116c4d
+	pkgdesc = Just-in-time compiler for Lua, OpenResty branch
+	pkgver = 2.1.20210510
 	pkgrel = 1
-	url = http://luajit.org/
+	url = https://github.com/openresty/luajit2
 	arch = i686
 	arch = x86_64
+	arch = aarch64
 	license = MIT
 	depends = gcc-libs
 	provides = luajit
 	conflicts = luajit
-	source = git+https://github.com/openresty/luajit2.git#branch=v2.1-agentzh
-	sha1sums = SKIP
+	source = luajit-openresty-2.1.20210510.tar.gz::https://github.com/openresty/luajit2/archive/refs/tags/v2.1-20210510.tar.gz
+	sha256sums = 1ee6dad809a5bb22efb45e6dac767f7ce544ad652d353a93d7f26b605f69fe3f
 
 pkgname = luajit-openresty
-
diff --git a/PKGBUILD b/PKGBUILD
index 96b6360bb5d5..e9ee1ef2ae4f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,28 @@
+# Maintainer: Rui Marques <aur@ruimarques.xyz>
+# Maintainer: Fabio Loli <fabio.loli@disroot.org>
+# Contributor: Eduardo Bart <edub4rt@gmail.com>
+
 pkgname=luajit-openresty
-pkgver=2.1.20200102.r34.g31116c4d
+_pkgver=2.1-20210510
+pkgver=${_pkgver//-/.}
 pkgrel=1
-pkgdesc='Just-in-time compiler and drop-in replacement for Lua (openresty fork)'
-arch=('i686' 'x86_64')
-url='http://luajit.org/'
+pkgdesc='Just-in-time compiler for Lua, OpenResty branch'
+arch=('i686' 'x86_64' 'aarch64')
+url="https://github.com/openresty/luajit2"
 license=('MIT')
-depends=('gcc-libs') 
+depends=('gcc-libs')
 conflicts=('luajit')
 provides=('luajit')
-source=(git+https://github.com/openresty/luajit2.git#branch=v2.1-agentzh)
-sha1sums=('SKIP')
-
-pkgver() {
-  cd $srcdir/luajit2
-  git describe --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
-}
+source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/v$_pkgver.tar.gz")
+sha256sums=('1ee6dad809a5bb22efb45e6dac767f7ce544ad652d353a93d7f26b605f69fe3f')
 
-build() { 
-  cd $srcdir/luajit2
+build() {
+  cd "luajit2-$_pkgver"
   make amalg PREFIX=/usr
 }
 
 package() {
-  cd $srcdir/luajit2
-  make install DESTDIR=$pkgdir PREFIX=/usr
-  install -Dm644 COPYRIGHT $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT
-  install -Dm755 src/luajit $pkgdir/usr/bin/luajit
+  cd "luajit2-$_pkgver"
+  make install DESTDIR="$pkgdir" PREFIX=/usr
+  install -Dm644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT"
 }