package ownership change, update to 3.1

9 files changed, 34 insertions, 80 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6f3f14c89f93..c904836a947a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = zandronum
 	pkgdesc = OpenGL ZDoom port with Client/Server multiplayer
-	pkgver = 3.0.1
-	pkgrel = 3
+	pkgver = 3.1
+	pkgrel = 1
 	url = https://zandronum.com/
 	install = zandronum.install
 	arch = x86_64
@@ -27,31 +27,17 @@ pkgbase = zandronum
 	optdepends = gtk2: for a GUI selection screen
 	optdepends = doomseeker: a GUI server browser
 	conflicts = zandronum2
+	source = https://zandronum.com/downloads/zandronum3.1-linux-x86_64.tar.bz2
 	source = LICENSE.txt
 	source = zandronum.launcher
 	source = zandronum-server.launcher
 	source = zandronum.png
 	source = zandronum.desktop
-	source = LICENSE.txt.sig
-	source = zandronum.launcher.sig
-	source = zandronum-server.launcher.sig
-	source = zandronum.png.sig
-	source = zandronum.desktop.sig
-	validpgpkeys = 748231EBCBD808A14F5E85D28C004C2F93481F6B
-	sha512sums = b928f3211ff31f17fc2d754728e299b5783e1b946b4019713718b7613e13ff0a7c4f02087c0ab4f137f7a0de57a2bfeaa6ed63285d0e6063d2b4734b097ce9e1
-	sha512sums = 488a274e40727ea58e1a6a67d9d37e77476f4fbcee9071e5f278fcfd88ddce42d25d3337d5d15455aa5cba32a176ec731e398cddfc6b86e151ba92c8bc1e1f22
-	sha512sums = 5c4ab297579c3b623ea549548b9e0674195f3d86f17589a2a756c8362e46dec0f1eb488ec0347be14968969f9ba802998bd67d910d3d6500a90f50074fcabfb5
-	sha512sums = baad2256990455c275b23c56984a1db3b1ced921b69f2688c84d99eda996f7b61466543c7bd649e295c12b48dc288dce79ad911e2b5b5e0640a899f5281712a4
-	sha512sums = 1dacf401b7a3e25a4a14275c25ad5a63db1ead45fb1140ddbe6a3ff8e0175960d5b9b85b9b061abf81f00d48671366c8624eaaba2625fb3b4d18a2785ee367a6
-	sha512sums = SKIP
-	sha512sums = SKIP
-	sha512sums = SKIP
-	sha512sums = SKIP
-	sha512sums = SKIP
-	source_x86_64 = https://zandronum.com/downloads/zandronum3.0.1-linux-x86_64.tar.xz
-	source_x86_64 = zandronum3.0.1-linux-x86_64.tar.xz.sig
-	sha512sums_x86_64 = d09106cc7444f61abea8e07e4ea9d009b9e1e3e2e86c8f2f0320dcbe1636eda5abe2a44ba995fbb7b58c32ca43d79cb6f33ee0e54b4b9d33998a1fa3a2ea58a8
-	sha512sums_x86_64 = SKIP
+	sha256sums = 3dee92d2ab9ad9d7c485b46cac28c381e46ff9fe060695a9ca5034dd425dc9c6
+	sha256sums = c9407f638950af1dc4ff0884aa73a41490390b79435a81805a8e9c8c0ec84adf
+	sha256sums = 2ff85effc7146b467201f473be5614dc109a03ae2528eafccffba5dcb8354b97
+	sha256sums = 3e08296d00c8ee7445a9f9dfa6659acc7fd69ad672ae5382d79e1535413aa8fa
+	sha256sums = d10d4c39b5c0a6e7e94342c463daae55928b464baac8912cfbf8603dc50f10f5
+	sha256sums = dd20e904dacc5c181b711272f6908049202d0528608f648554721cc88659e523
 
 pkgname = zandronum
-
diff --git a/.gitignore b/.gitignore
index e16177da2907..3a27af025060 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1,4 @@
-*/
-.*.swp
-*.pkg.tar.xz
-src/
-pkg/
-*.tar
-*.tar.bz2
-*.tar.xz
-*.tar.gz
-*.tgz
-*.txz
-*.tbz
-*.tbz2
-*.zip
-*.run
-*.7z
-*.rar
-*.deb
+/src/
+/pkg/
+/*.pkg.tar.zst
+/*.tar.bz2
diff --git a/LICENSE.txt.sig b/LICENSE.txt.sig
deleted file mode 100644
index a873adf82097..000000000000
--- a/LICENSE.txt.sig
+++ /dev/null
diff --git a/PKGBUILD b/PKGBUILD
index 439869a948d1..0322f78194db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,10 @@
-# Maintainer: brent s. <bts[at]square-r00t[dot]net>
-validpgpkeys=('748231EBCBD808A14F5E85D28C004C2F93481F6B')
-# Bug reports can be filed at https://bugs.square-r00t.net/index.php?project=3
-# News updates for packages can be followed at https://devblog.square-r00t.net
-# Thanks to mobo's package, https://aur.archlinux.org/packages/zandronum2/
+# Maintainer: randomnobody <nobody "at" 420blaze "dot" it>
+# Contributor: brent s. <bts[at]square-r00t[dot]net>
 pkgname=zandronum
-pkgver=3.0.1
-pkgrel=3
-_fmodex_ver=4.24.16
+pkgver=3.1
+pkgrel=1
+_fmodex_ver=4.44.64
 pkgdesc="OpenGL ZDoom port with Client/Server multiplayer"
-#arch=('i686' 'x86_64')
 arch=('x86_64')
 url="https://zandronum.com/"
 license=('custom')
@@ -18,34 +14,24 @@ makedepends=( 'zlib' 'sdl' 'libjpeg-turbo' 'nasm' 'gtk2' 'cmake' 'mercurial' 'fl
 _pkgname=zandronum
 conflicts=('zandronum2')
 install=zandronum.install
-source=("LICENSE.txt"
+
+source=(
+	"https://zandronum.com/downloads/${_pkgname}${pkgver}-linux-x86_64.tar.bz2"
+	'LICENSE.txt'
 	"${pkgname}.launcher"
 	"${pkgname}-server.launcher"
 	"${pkgname}.png"
 	"${pkgname}.desktop"
-	"LICENSE.txt.sig"
-	"${pkgname}.launcher.sig"
-	"${pkgname}-server.launcher.sig"
-	"${pkgname}.png.sig"
-	"${pkgname}.desktop.sig")
-sha512sums=('b928f3211ff31f17fc2d754728e299b5783e1b946b4019713718b7613e13ff0a7c4f02087c0ab4f137f7a0de57a2bfeaa6ed63285d0e6063d2b4734b097ce9e1'
-	    '488a274e40727ea58e1a6a67d9d37e77476f4fbcee9071e5f278fcfd88ddce42d25d3337d5d15455aa5cba32a176ec731e398cddfc6b86e151ba92c8bc1e1f22'
-	    '5c4ab297579c3b623ea549548b9e0674195f3d86f17589a2a756c8362e46dec0f1eb488ec0347be14968969f9ba802998bd67d910d3d6500a90f50074fcabfb5'
-	    'baad2256990455c275b23c56984a1db3b1ced921b69f2688c84d99eda996f7b61466543c7bd649e295c12b48dc288dce79ad911e2b5b5e0640a899f5281712a4'
-	    '1dacf401b7a3e25a4a14275c25ad5a63db1ead45fb1140ddbe6a3ff8e0175960d5b9b85b9b061abf81f00d48671366c8624eaaba2625fb3b4d18a2785ee367a6'
-	    'SKIP'
-	    'SKIP'
-	    'SKIP'
-	    'SKIP'
-	    'SKIP')
-#source_i686=("https://zandronum.com/downloads/${_pkgname}${pkgver}-linux-x86.tar.xz"
-#             "${_pkgname}${pkgver}-linux-x86.tar.xz.sig")
-#sha512sums_i686=('e04d421b817f366d5b0d0251088065b36daadb550b77f2d655db735c8163e92110ad7ec602b7d0fe93fcacd89bdb93c5de79eaa1546e4f8ba4d297200033e1a0'
-#            	 'SKIP')
-source_x86_64=("https://zandronum.com/downloads/${_pkgname}${pkgver}-linux-x86_64.tar.xz"
-               "${_pkgname}${pkgver}-linux-x86_64.tar.xz.sig")
-sha512sums_x86_64=('d09106cc7444f61abea8e07e4ea9d009b9e1e3e2e86c8f2f0320dcbe1636eda5abe2a44ba995fbb7b58c32ca43d79cb6f33ee0e54b4b9d33998a1fa3a2ea58a8'
-            	   'SKIP')
+)
+
+sha256sums=(
+	'3dee92d2ab9ad9d7c485b46cac28c381e46ff9fe060695a9ca5034dd425dc9c6'
+	'c9407f638950af1dc4ff0884aa73a41490390b79435a81805a8e9c8c0ec84adf'
+	'2ff85effc7146b467201f473be5614dc109a03ae2528eafccffba5dcb8354b97'
+	'3e08296d00c8ee7445a9f9dfa6659acc7fd69ad672ae5382d79e1535413aa8fa'
+	'd10d4c39b5c0a6e7e94342c463daae55928b464baac8912cfbf8603dc50f10f5'
+	'dd20e904dacc5c181b711272f6908049202d0528608f648554721cc88659e523'
+)
 
 if [ "${CARCH}" == "x86_64" ];
 then
@@ -56,11 +42,10 @@ fi
 
 package() {
   cd ${srcdir}
-  
+
   install -Dm644 "zandronum.pk3" "${pkgdir}/usr/share/${pkgname}/zandronum.pk3"
-  #install -Dm644 "brightmaps.pk3" "${pkgdir}/usr/share/${pkgname}/brightmaps.pk3"
+  install -Dm644 "brightmaps.pk3" "${pkgdir}/usr/share/${pkgname}/brightmaps.pk3"
   install -Dm644 "skulltag_actors.pk3" "${pkgdir}/usr/share/${pkgname}/skulltag_actors.pk3"
-  install -Dm755 "liboutput_sdl.so" "${pkgdir}/usr/share/${pkgname}/lib/liboutput_sdl.so"
   install -Dm755 "zandronum" "${pkgdir}/usr/share/${pkgname}/zandronum"
   install -Dm755 "zandronum-server" "${pkgdir}/usr/share/${pkgname}/zandronum-server"
   install -Dm755 "zandronum.launcher" "${pkgdir}/usr/bin/zandronum"
@@ -70,8 +55,5 @@ package() {
   install -Dm644 "zandronum.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
   install -dm755 ${pkgdir}/usr/share/${pkgname}/lib
 
-#  ln -s "/usr/lib/libcrypto.so" "$pkgdir/usr/share/zandronum/lib/libcrypto.so.0.9.8"
-#  ln -s "/usr/lib/libssl.so" "$pkgdir/usr/share/zandronum/lib/libssl.so.0.9.8"
-
   install -Dm644 "LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/zandronum-server.launcher.sig b/zandronum-server.launcher.sig
deleted file mode 100644
index 93863d7bd38b..000000000000
--- a/zandronum-server.launcher.sig
+++ /dev/null
diff --git a/zandronum.desktop.sig b/zandronum.desktop.sig
deleted file mode 100644
index c42ee00be8e7..000000000000
--- a/zandronum.desktop.sig
+++ /dev/null
diff --git a/zandronum.launcher.sig b/zandronum.launcher.sig
deleted file mode 100644
index cf914c703b15..000000000000
--- a/zandronum.launcher.sig
+++ /dev/null
diff --git a/zandronum.png.sig b/zandronum.png.sig
deleted file mode 100644
index 104f6994e3a1..000000000000
--- a/zandronum.png.sig
+++ /dev/null
diff --git a/zandronum3.0.1-linux-x86_64.tar.xz.sig b/zandronum3.0.1-linux-x86_64.tar.xz.sig
deleted file mode 100644
index c2d4297ac209..000000000000
--- a/zandronum3.0.1-linux-x86_64.tar.xz.sig
+++ /dev/null