Upstream version 1.6.2

2 files changed, 28 insertions, 62 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5baa5b8c40bd..91c48e2c4320 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = worldofpadman
 	pkgdesc = Cartoon-style multiplayer first-person shooter
-	pkgver = 1.6
-	pkgrel = 4
-	url = http://www.worldofpadman.com/
-	arch = i686
+	pkgver = 1.6.2
+	pkgrel = 1
+	url = https://worldofpadman.net/en/
 	arch = x86_64
 	license = GPL
 	license = custom
@@ -14,12 +13,9 @@ pkgbase = worldofpadman
 	depends = mesa
 	depends = openal
 	depends = sdl
+	source = wop-162-full-unified-zip::https://www.moddb.com/downloads/mirror/224119/124/c8b8bcc423fdfe661e190f8fbf433bad
 	source = worldofpadman.desktop
-	source = wop-1.5-unified.zip::http://downloads.sourceforge.net/project/worldofpadman/wop-1.5-unified.zip
-	source = wop-1.5.x-to-1.6-patch-unified.zip::http://downloads.sourceforge.net/project/worldofpadman/wop-1.5.x-to-1.6-patch-unified.zip
-	md5sums = 30a9fe2dfa9362a2ef9266fd37e9461c
-	md5sums = 8871affc2a36f23aa22044454c834923
-	md5sums = 86ab95804ec6b1f0c81078f083c0fcda
+	sha256sums = 526d5936225b37fa8a5b94a7c02dc600126d1f2fb1155fd0e372c36075344335
+	sha256sums = 8d99702ee5255f5ea253aaf12d78f5056e0814bcc727ba2350021fb81fbad60b
 
 pkgname = worldofpadman
-
diff --git a/PKGBUILD b/PKGBUILD
index be5a6d4b6c87..4e18423e2564 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,33 @@
 # Maintainer: SanskritFritz (gmail)
 # Contributor: Jason Melton <jason.melton@gmail.com>
-# Contributor: Tiago Pierezan Camargo <tcamargo@gmail.com
+# Contributor: Tiago Pierezan Camargo <tcamargo@gmail.com>
 # Contributor: Paul Bredbury <brebs@sent.com>
 # Contributor: Benjamin Dirks <asaru[at]wtnet[dot]de>
 
 pkgname=worldofpadman
-pkgver=1.6
-pkgrel=4
+pkgver=1.6.2
+pkgrel=1
 pkgdesc="Cartoon-style multiplayer first-person shooter"
-arch=('i686' 'x86_64')
-url="http://www.worldofpadman.com/"
+arch=('x86_64')
+url="https://worldofpadman.net/en/"
 license=('GPL' 'custom')
 depends=('curl' 'libogg' 'libvorbis' 'mesa' 'openal' 'sdl')
 makedepends=('unzip')
-source=(${pkgname}.desktop
-  wop-1.5-unified.zip::http://downloads.sourceforge.net/project/worldofpadman/wop-1.5-unified.zip
-  wop-1.5.x-to-1.6-patch-unified.zip::http://downloads.sourceforge.net/project/worldofpadman/wop-1.5.x-to-1.6-patch-unified.zip)
+source=('wop-162-full-unified-zip::https://www.moddb.com/downloads/mirror/224119/124/c8b8bcc423fdfe661e190f8fbf433bad'
+        'worldofpadman.desktop')
 
 _gamedir="/usr/share/$pkgname"
 
 package() {
-  cd "$srcdir"
+	cd "$srcdir/worldofpadman-1-6-2"
 
-  ## Binaries
-  if [ "$CARCH" == i686 ] ; then
-    install -D -m755 wop.i386 "$pkgdir/$_gamedir/wop.bin" 
-    install -D -m755 wopded.i386 "$pkgdir/$_gamedir/wopded.bin" 
-    install -D -m755 renderer_opengl1_i386.so ${pkgdir}/${_gamedir}/renderer_opengl1_i386.so
-  fi
- 
-  if [ "$CARCH" == x86_64 ]  ; then
-    install -D -m755 wop.x86_64 "$pkgdir/$_gamedir/wop.bin" 
-    install -D -m755 wopded.x86_64 "$pkgdir/$_gamedir/wopded.bin"
-    install -D -m755 renderer_opengl1_x86_64.so ${pkgdir}/${_gamedir}/renderer_opengl1_x86_64.so
-  fi
+	## Binaries
+	install -D -m755 wop-linux.x86_64 "$pkgdir/$_gamedir/wop.bin"
+	install -D -m755 wopded-linux.x86_64 "$pkgdir/$_gamedir/wopded.bin"
+	install -D -m755 renderer_opengl2_x86_64.so "$pkgdir/$_gamedir/renderer_opengl2_x86_64.so"
+	install -D -m755 renderer_opengl1_x86_64.so "$pkgdir/$_gamedir/renderer_opengl1_x86_64.so"
 
-  cat >wop.sh <<EOF
+	cat >wop.sh <<EOF
 #!/bin/bash
 cd $_gamedir && exec ./wop.bin "\$@"
 EOF
@@ -44,36 +36,14 @@ EOF
 cd $_gamedir && exec ./wopded.bin "\$@"
 EOF
 
-  install -D -m755 wop.sh "$pkgdir/usr/bin/wop"
-  install -D -m755 wopded.sh "$pkgdir/usr/bin/wopded"
+	install -D -m755 wop.sh "$pkgdir/usr/bin/wop"
+	install -D -m755 wopded.sh "$pkgdir/usr/bin/wopded"
   
-  # Data
-  # Using "read", so can handle filenames containing spaces
-  find wop -type f | while read _f ; do
-    install -D -m644 "$_f" "${pkgdir}/$_gamedir/$_f"
-  done
-  # Return from the function, since install's return just exits the loop
-  # See http://fvue.nl/wiki/Bash:_Error_handling
-  [ $? -gt 0 ] && return 1
-
-  # Desktop
-  install -D -m644 ${srcdir}/XTRAS/icon.svg     ${pkgdir}/usr/share/pixmaps/$pkgname.svg
-  install -D -m644 ${srcdir}/$pkgname.desktop   ${pkgdir}/usr/share/applications/$pkgname.desktop 
-
-  # Docs
-  cd "$srcdir/XTRAS"
-  # Using "read", so can handle filenames containing spaces
-  find . -type f | while read _f ; do
-    install -D -m644 "$_f" "${pkgdir}/usr/share/doc/$pkgname/$_f"
-  done
-  # Return from the function, since install's return just exits the loop
-  # See http://fvue.nl/wiki/Bash:_Error_handling
-  [ $? -gt 0 ] && return 1
-
-  # License
-  install -D -m644 copyright_en.txt "${pkgdir}/usr/share/licenses/$pkgname/COPYING"
+	cp --recursive wop "$pkgdir/$_gamedir/wop"
+	cp --recursive XTRAS "$pkgdir/$_gamedir/XTRAS"
+	install -D -m755 XTRAS/wop.svg "$pkgdir/usr/share/icons/hicolor/scalable/apps/wop.svg"
+	install -D -m755 "$srcdir/worldofpadman.desktop" "$pkgdir/usr/share/applications/worldofpadman.desktop"
 }
 
-md5sums=('30a9fe2dfa9362a2ef9266fd37e9461c'
-         '8871affc2a36f23aa22044454c834923'
-         '86ab95804ec6b1f0c81078f083c0fcda')
+sha256sums=('526d5936225b37fa8a5b94a7c02dc600126d1f2fb1155fd0e372c36075344335'
+            '8d99702ee5255f5ea253aaf12d78f5056e0814bcc727ba2350021fb81fbad60b')