upgpkg: nanosaur 1.4.3-1

* New upstream release.
* Replace glu with libglvnd.

2 files changed, 77 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dbb1aae641a9..20cba33c2e31 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,32 @@
 pkgbase = nanosaur
 	pkgdesc = Play as a cybernetic dinosaur in this third-person shooter
-	pkgver = 1.4.2
-	pkgrel = 2
+	pkgver = 1.4.3
+	pkgrel = 1
 	url = https://github.com/jorio/Nanosaur
 	arch = x86_64
 	license = custom:pangea
-	makedepends = cmake
+	license = custom:CC-BY-NC-SA-4.0
 	makedepends = git
+	makedepends = cmake
+	depends = glibc
+	depends = gcc-libs
+	depends = libglvnd
 	depends = sdl2
-	depends = glu
 	depends = hicolor-icon-theme
-	source = nanosaur::git+https://github.com/jorio/Nanosaur.git#tag=v1.4.2
+	source = nanosaur::git+https://github.com/jorio/Nanosaur.git#commit=25520d32d867e93d9523ab3b519ce21b9845fd07
 	source = git+https://github.com/jorio/Pomme.git
-	source = LICENSE
 	source = nanosaur.desktop
 	source = nanosaur.sh
+	source = LICENSE
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = 16ea64979287d313a95f7df1cf44e9ada5e01bd317d0e11aacf197778d61915a7383f332abcd26746f276301cd07b2e7174ca8fce50fc36f7e718e3db85b47e0
+	sha512sums = 498ca37847b44c15134fa174ad130cc8e481feeefb1e502da8a3dcf6f6967d4c2c93d1acfc5bd13e9b8a32d61c18e3f2b475db0d8b110244b026908083934783
+	sha512sums = 88a13f3a384c8df91243c6f6fb710d4a85f017c21140b5496ab0eb8aa68d39fba794d29ae2ca110101b9016e3128b8b93137759a24c3862289b2dce7a8efcb71
 	b2sums = SKIP
 	b2sums = SKIP
-	b2sums = ff25be6bd681b6d54b7ae97f81611bf601fad532ac413c90f2d683e252ada8015da1a24cf830b90d6d3c78463505d55044b58b457351fdae56f14fe2ab9ca754
 	b2sums = a58f80a565d56b634a3ca70867779c469755828c44c26261553b3d7e663d32204318ef29500596668e1de2c4a16068200430820f3dd2c459da1d8265ebe5b78f
 	b2sums = 21824ed76dd1150c5c7c84e4d580959c2bab00c54d9c558ee1565f63f864a4be3bf745e0d436720a71273efb0b9077cf93477ec977b46dd78bd552786569ec74
+	b2sums = ff25be6bd681b6d54b7ae97f81611bf601fad532ac413c90f2d683e252ada8015da1a24cf830b90d6d3c78463505d55044b58b457351fdae56f14fe2ab9ca754
 
 pkgname = nanosaur
-
diff --git a/PKGBUILD b/PKGBUILD
index c8af317965e7..5a9f25c9772e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,64 +1,96 @@
 # Maintainer: George Rawlinson <george@rawlinson.net.nz>
 
 pkgname=nanosaur
-pkgver=1.4.2
-pkgrel=2
+pkgver=1.4.3
+pkgrel=1
 pkgdesc="Play as a cybernetic dinosaur in this third-person shooter"
 arch=(x86_64)
 url="https://github.com/jorio/Nanosaur"
-license=('custom:pangea')
+license=('custom:pangea' 'custom:CC-BY-NC-SA-4.0')
 # License sourced from http://www.pangeasoft.net/nano/nanosource.html
 # Decent guidelines for gaming packages: https://fedoraproject.org/wiki/SIGs/Games/Packaging
-depends=(sdl2 glu hicolor-icon-theme)
-makedepends=(cmake git)
-source=("$pkgname::git+https://github.com/jorio/Nanosaur.git#tag=v$pkgver"
-        "git+https://github.com/jorio/Pomme.git"
-        LICENSE
-        "$pkgname.desktop"
-        "$pkgname.sh")
+depends=(
+  'glibc'
+  'gcc-libs'
+  'libglvnd'
+  'sdl2'
+  'hicolor-icon-theme'
+)
+makedepends=('git' 'cmake')
+_commit='25520d32d867e93d9523ab3b519ce21b9845fd07'
+source=(
+  "$pkgname::git+https://github.com/jorio/Nanosaur.git#commit=$_commit"
+  'git+https://github.com/jorio/Pomme.git'
+  "$pkgname.desktop"
+  "$pkgname.sh"
+  'LICENSE'
+)
+sha512sums=('SKIP'
+            'SKIP'
+            '16ea64979287d313a95f7df1cf44e9ada5e01bd317d0e11aacf197778d61915a7383f332abcd26746f276301cd07b2e7174ca8fce50fc36f7e718e3db85b47e0'
+            '498ca37847b44c15134fa174ad130cc8e481feeefb1e502da8a3dcf6f6967d4c2c93d1acfc5bd13e9b8a32d61c18e3f2b475db0d8b110244b026908083934783'
+            '88a13f3a384c8df91243c6f6fb710d4a85f017c21140b5496ab0eb8aa68d39fba794d29ae2ca110101b9016e3128b8b93137759a24c3862289b2dce7a8efcb71')
 b2sums=('SKIP'
         'SKIP'
-        'ff25be6bd681b6d54b7ae97f81611bf601fad532ac413c90f2d683e252ada8015da1a24cf830b90d6d3c78463505d55044b58b457351fdae56f14fe2ab9ca754'
         'a58f80a565d56b634a3ca70867779c469755828c44c26261553b3d7e663d32204318ef29500596668e1de2c4a16068200430820f3dd2c459da1d8265ebe5b78f'
-        '21824ed76dd1150c5c7c84e4d580959c2bab00c54d9c558ee1565f63f864a4be3bf745e0d436720a71273efb0b9077cf93477ec977b46dd78bd552786569ec74')
+        '21824ed76dd1150c5c7c84e4d580959c2bab00c54d9c558ee1565f63f864a4be3bf745e0d436720a71273efb0b9077cf93477ec977b46dd78bd552786569ec74'
+        'ff25be6bd681b6d54b7ae97f81611bf601fad532ac413c90f2d683e252ada8015da1a24cf830b90d6d3c78463505d55044b58b457351fdae56f14fe2ab9ca754')
+
+pkgver() {
+  cd "$pkgname"
+
+  git describe --tags | sed 's/^v//'
+}
 
 prepare() {
   cd "$pkgname"
+
+  # setup git submodules
   git submodule init
   git config submodule.Pomme.url ../Pomme
   git submodule update
-  cmake -S . -B build \
+}
+
+build() {
+  cmake \
+    -S "$pkgname" \
+    -B build \
     -DCMAKE_BUILD_TYPE=None \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -Wno-dev
-}
 
-build() {
-  cd "$pkgname"
   cmake --build build
 }
 
 package() {
-  cd "$pkgname"
+  # create directories
+  install -dv \
+    "$pkgdir/usr/lib/$pkgname" \
+    "$pkgdir/usr/share/doc/$pkgname"
 
-  # create dirs
-  install -d "$pkgdir/usr/lib/$pkgname" "$pkgdir/usr/share/doc/$pkgname"
-
-  # move binary & assets
-  mv build/{Data,Nanosaur} "$pkgdir/usr/lib/$pkgname"
+  # binary & assets
+  cp -vr build/{Data,Nanosaur} "$pkgdir/usr/lib/$pkgname"
 
   # wrapper script for $PATH execution
-  install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
-
-  # license
-  install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" "$srcdir/LICENSE"
+  install -vDm755 "$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
 
   # desktop file & icon
-  install -Dm644 -t "$pkgdir/usr/share/applications" "$srcdir/$pkgname.desktop"
-  install -Dm644 \
-    "$srcdir/$pkgname/cmake/Nanosaur.png" \
+  install -vDm644 \
+    -t "$pkgdir/usr/share/applications" \
+    "$pkgname.desktop"
+  install -vDm644 \
+    "$srcdir/$pkgname/packaging/Nanosaur.png" \
     "$pkgdir/usr/share/icons/hicolor/512x512/apps/$pkgname.png"
 
   # documentation
-  cp "$srcdir/$pkgname/"docs/* "$pkgdir/usr/share/doc/$pkgname"
+  cp "$pkgname"/docs/* "$pkgdir/usr/share/doc/$pkgname"
+  sed -e "s/@PROJECT_VERSION@/$pkgver/" \
+    "$pkgname/packaging/ReadMe.txt.in" \
+    > "$pkgdir/usr/share/doc/ReadMe.txt"
+
+  # licenses
+  install -vDm644 \
+    -t "$pkgdir/usr/share/licenses/$pkgname" \
+    LICENSE \
+    "$pkgname/LICENSE.md"
 }