Updated ezquake to version 2.0

2 files changed, 30 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8bdd66b96643..a06a1c2412be 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ezquake
 	pkgdesc = One of the most Popular QuakeWorld clients for Linux/BSD/OSX/Win32. You need the retail pak files to play.
-	pkgver = 1.9.3
+	pkgver = 2.0
 	pkgrel = 1
 	url = http://ezquake.sourceforge.net/
 	install = ezquake.install
@@ -8,20 +8,22 @@ pkgbase = ezquake
 	arch = x86_64
 	license = GPL
 	makedepends = unzip
-	makedepends = p7zip
+	makedepends = wget
 	depends = libgl
+	depends = libxxf86dga
 	provides = fuhquake
 	conflicts = fuhquake
+	noextract = ezquake_linux-x86_2.0.tar.gz
 	source = ezquake.launcher
 	source = ezquake.install
 	source = ezquake.desktop
-	source = http://downloads.sourceforge.net/sourceforge/ezquake/ezquake_linux-x86_1.9.3.tar.gz
-	source = http://downloads.sourceforge.net/sourceforge/ezquake/ezquake_source_1.9.3.7z
+	source = http://downloads.sourceforge.net/sourceforge/ezquake/ezquake_linux-x86_2.0.tar.gz
+	source = http://downloads.sourceforge.net/sourceforge/ezquake/ezquake_source_2.0.zip
 	md5sums = a61707a154bc97723f9a4fad65327df3
 	md5sums = 596ab08b5514671eb1dbf72a5deeea3e
 	md5sums = 75cfa823bf495fe4cdb755c6b5546f2a
-	md5sums = baca12d351cb907748e9effb2669190e
-	md5sums = d13de873591268c0baba19329eff15d2
+	md5sums = 25cad2fa8f695b18b2e6cab313a7a8be
+	md5sums = 966922142bb577d7dd1a0512e3a1ff7a
 
 pkgname = ezquake
 
diff --git a/PKGBUILD b/PKGBUILD
index ff9356949aff..6a9efe310f09 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,46 +1,50 @@
 # Contributor: Slash <demodevil5[at]yahoo[dot]com>
 
 pkgname=ezquake
-pkgver=1.9.3
+pkgver=2.0
 pkgrel=1
 pkgdesc="One of the most Popular QuakeWorld clients for Linux/BSD/OSX/Win32. You need the retail pak files to play."
 url="http://ezquake.sourceforge.net/"
 license=('GPL')
-depends=('libgl')
-makedepends=('unzip' 'p7zip')
+depends=('libgl' 'libxxf86dga')
+makedepends=('unzip' 'wget')
 conflicts=('fuhquake')
 provides=('fuhquake')
 arch=('i686' 'x86_64')
 install=ezquake.install
 source=('ezquake.launcher' 'ezquake.install' 'ezquake.desktop' \
 "http://downloads.sourceforge.net/sourceforge/ezquake/ezquake_linux-x86_$pkgver.tar.gz" \
-"http://downloads.sourceforge.net/sourceforge/ezquake/ezquake_source_$pkgver.7z")
+"http://downloads.sourceforge.net/sourceforge/ezquake/ezquake_source_$pkgver.zip")
+noextract=("ezquake_linux-x86_$pkgver.tar.gz")
 md5sums=('a61707a154bc97723f9a4fad65327df3'
          '596ab08b5514671eb1dbf72a5deeea3e'
          '75cfa823bf495fe4cdb755c6b5546f2a'
-         'baca12d351cb907748e9effb2669190e'
-         'd13de873591268c0baba19329eff15d2')
+         '25cad2fa8f695b18b2e6cab313a7a8be'
+         '966922142bb577d7dd1a0512e3a1ff7a')
 
 build() {
     cd $startdir/src
 
     # Make Directories
-    install -d $pkgdir/opt
+    install -d $pkgdir/opt/quake
 
     # Unpack ezQuake
-    bsdtar -x -o -C $pkgdir/opt -f $srcdir/ezquake_linux-x86_$pkgver.tar.gz
-
-    # Rename Directory
-    mv $pkgdir/opt/ezquake_linux-x86.1.9.3 $pkgdir/opt/quake
-
-    # Unpack ezQuake Source
-    7z x $srcdir/ezquake_source_$pkgver.7z
+    bsdtar -x -o -C $pkgdir/opt/quake -f $srcdir/ezquake_linux-x86_$pkgver.tar.gz
 
     # Remove Binaries
     rm $pkgdir/opt/quake/ezquake{-gl.glx,.svga,.x11}
 
+    # Download Extra Libraries needed to compile
+    if [ "$CARCH" = "i686" ]; then
+        cd $srcdir/src/libs/linux-x86/
+        ./download.sh
+    else
+        cd $srcdir/src/libs/linux-x86_64/
+        ./download.sh
+    fi
+
     # Change to Source Code Directory
-    cd $srcdir/ezquake_19-3_stable/
+    cd $srcdir/src/
 
     # Compile Source Code
     make glx || return 1
@@ -48,17 +52,17 @@ build() {
     # Install Binaries
     if [ "$CARCH" = "i686" ]; then
         install -D -m755 -t $pkgdir/opt/quake/ \
-            $srcdir/ezquake_19-3_stable/release-x86/ezquake-gl.glx
+            $srcdir/src/release-x86/ezquake-gl.glx
     else
         install -D -m755 -t $pkgdir/opt/quake/ \
-            $srcdir/ezquake_19-3_stable/release-x86_64/ezquake-gl.glx
+            $srcdir/src/release-x86_64/ezquake-gl.glx
     fi
 
     # Make id1 Directory for pak0.pak and pak1.pak files
     install -d $pkgdir/opt/quake/id1/
 
     # Install Icon
-    install -D -m644 $srcdir/ezquake_19-3_stable/ezquake.ico \
+    install -D -m644 $srcdir/src/ezquake.ico \
         $pkgdir/usr/share/pixmaps/ezquake.ico
 
     # Install Launcher