From 3b24fcb96c536d4a6d1925c632e9270bf78528ed Mon Sep 17 00:00:00 2001
From: George Rawlinson <george@rawlinson.net.nz>
Date: Tue, 29 Oct 2024 07:03:16 +0000
Subject: [PATCH] upgpkg: opentyrian 2.1.20221123-1

---
 opentyrian/.SRCINFO | 23 +++++++++++++++++++++++
 opentyrian/PKGBUILD | 39 +++++++++++++++++----------------------
 2 files changed, 40 insertions(+), 22 deletions(-)
 create mode 100644 opentyrian/.SRCINFO

diff --git a/opentyrian/.SRCINFO b/opentyrian/.SRCINFO
new file mode 100644
index 0000000..daf92b1
--- /dev/null
+++ b/opentyrian/.SRCINFO
@@ -0,0 +1,23 @@
+pkgbase = opentyrian
+	pkgdesc = Open Source port of the classic DOS shoot-em-up Tyrian
+	pkgver = 2.1.20221123
+	pkgrel = 1
+	url = https://github.com/opentyrian/opentyrian
+	arch = x86_64
+	license = GPL-2.0-only
+	license = LicenseRef-Freeware
+	makedepends = git
+	depends = sdl2
+	depends = sdl2_net
+	depends = hicolor-icon-theme
+	source = opentyrian::git+https://github.com/opentyrian/opentyrian.git#tag=v2.1.20221123
+	source = opentyrian-2.1.20221123-assets.zip::https://camanis.net/tyrian/tyrian21.zip
+	source = update-paths.patch
+	sha512sums = 62906b7a1c261b1badb48bd9c65eb818328b5d741c6f9ea0f4a4762d440e43d3eb29047dcb7c417aa91ab8d1d297e112a4eef027dc4d0842bdd5579dd31ca14f
+	sha512sums = 639aa773778386c14ce508feb4729512d00f80182a3bb0fe8bba4ee38bce91da1867ca93f1a7e5e30ff127da077eed275d8dd6ba82042b627b84f1606e2d6bce
+	sha512sums = 7059d2c5a19191e1cf24abbf764adbd0fa81d8b529e1f5839a330b15a3023af78763f90de3f559fb980e30081110b6b9c1b1097823a58caa3e0ca00b2a20ce6c
+	b2sums = 8a0a88fbdb43335f4e08a490ff17da5547b4f5fdac0a58d5995a943e8ef8969463b50340f9ff48308089f016cc21406f805a4b34df8c0a58e5ac5967f39f8aee
+	b2sums = 6bef66fbc34a4d2d865fe7088a6942a29348153d0d10347860952a152b882fd9eef1748fbfa9fd32d030593d2f8c21e1cd227dd6ca540488ba5093b95a95fb33
+	b2sums = 7535e7ee5773a4e8de6bd51110931aa81b9abaa11f215c846cc914bebf352984a317ae5f31f47ed36cdd4e5a4ec286dabe0b3a31985b50c12f1859568924fe3c
+
+pkgname = opentyrian
diff --git a/opentyrian/PKGBUILD b/opentyrian/PKGBUILD
index 8c8d755..f6ece8f 100644
--- a/opentyrian/PKGBUILD
+++ b/opentyrian/PKGBUILD
@@ -3,33 +3,31 @@
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=opentyrian
-pkgver=2.1.20220318
+pkgver=2.1.20221123
 pkgrel=1
 pkgdesc='Open Source port of the classic DOS shoot-em-up Tyrian'
-url="https://github.com/opentyrian/opentyrian"
+url='https://github.com/opentyrian/opentyrian'
 arch=('x86_64')
-license=('GPL2')
+# refs for asset licensing:
+# https://www.camanis.net/
+# https://web.archive.org/web/20120218200015/http://www.freewebs.com/worldtreegames
+# https://lostgarden.home.blog/2007/04/05/free-game-graphics-tyrian-ships-and-tiles/
+# https://lostgarden.home.blog/2007/03/15/lost-garden-license/
+license=('GPL-2.0-only' 'LicenseRef-Freeware')
 depends=('sdl2' 'sdl2_net' 'hicolor-icon-theme')
 makedepends=('git')
-_commit='8f205e6b12cb9c34905fa960416b6f661bf38ac3'
 source=(
-  "$pkgname::git+https://github.com/opentyrian/opentyrian.git#commit=$_commit"
-  "$pkgname-assets.zip::https://camanis.net/tyrian/tyrian21.zip"
+  "$pkgname::git+https://github.com/opentyrian/opentyrian.git#tag=v$pkgver"
+  "$pkgname-$pkgver-assets.zip::https://camanis.net/tyrian/tyrian21.zip"
   'update-paths.patch'
 )
-sha512sums=('SKIP'
+sha512sums=('62906b7a1c261b1badb48bd9c65eb818328b5d741c6f9ea0f4a4762d440e43d3eb29047dcb7c417aa91ab8d1d297e112a4eef027dc4d0842bdd5579dd31ca14f'
             '639aa773778386c14ce508feb4729512d00f80182a3bb0fe8bba4ee38bce91da1867ca93f1a7e5e30ff127da077eed275d8dd6ba82042b627b84f1606e2d6bce'
             '7059d2c5a19191e1cf24abbf764adbd0fa81d8b529e1f5839a330b15a3023af78763f90de3f559fb980e30081110b6b9c1b1097823a58caa3e0ca00b2a20ce6c')
-b2sums=('SKIP'
+b2sums=('8a0a88fbdb43335f4e08a490ff17da5547b4f5fdac0a58d5995a943e8ef8969463b50340f9ff48308089f016cc21406f805a4b34df8c0a58e5ac5967f39f8aee'
         '6bef66fbc34a4d2d865fe7088a6942a29348153d0d10347860952a152b882fd9eef1748fbfa9fd32d030593d2f8c21e1cd227dd6ca540488ba5093b95a95fb33'
         '7535e7ee5773a4e8de6bd51110931aa81b9abaa11f215c846cc914bebf352984a317ae5f31f47ed36cdd4e5a4ec286dabe0b3a31985b50c12f1859568924fe3c')
 
-pkgver() {
-  cd "$pkgname"
-
-  git describe --tags | sed 's/^v//'
-}
-
 prepare() {
   cd "$pkgname"
 
@@ -45,16 +43,13 @@ package() {
 
   make DESTDIR="$pkgdir" prefix=/usr install
 
-  # desktop file & icons
-  install -vDm644 -t "$pkgdir/usr/share/applications" linux/opentyrian.desktop
-  for _x in 22 24 32 48 128; do
-    install -vDm644 "linux/icons/tyrian-$_x.png" \
-      "$pkgdir/usr/share/icons/hicolor/${_x}x${_x}/apps/$pkgname.png"
-  done
-
   # assets
-  cd "$srcdir/tyrian21"
+  pushd "$srcdir/tyrian21"
   install -vDm644 -t "$pkgdir/usr/share/$pkgname" \
     *.dat *.lvl *.shp *.snd demo.* music.mus \
     tyrend.anm tyrian.{cdt,hdt,pic} tshp2.pcx
+  popd
+
+  # license
+  install -vDm644 -t "$pkgdir/usr/share/licenses/$pkgname" README COPYING
 }