Update PKGBUILD with new data checksums

Also try to work around some build failures.
If the patches don't apply, hope that the issues have been fixed.

5 files changed, 67 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index da38b395bb73..741149f0395c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Jun  2 10:16:57 UTC 2017
+# Tue Aug  1 20:48:47 UTC 2017
 pkgbase = quake2xp-svn
 	pkgdesc = Quake 2 based engine with glsl per pixel lighting effects and more
-	pkgver = r913
+	pkgver = r949
 	pkgrel = 1
 	url = http://quake2xp.sourceforge.net/
 	install = quake2xp.install
@@ -21,23 +21,24 @@ pkgbase = quake2xp-svn
 	noextract = q2xpMdl.pkx
 	noextract = q2xpMusic.pkx
 	noextract = q2xpTex0.pkx
-	noextract = q2xpWater.pkx
 	source = quake2xp::svn://svn.code.sf.net/p/quake2xp/code/trunk
 	source = yandex://q2xp0.pkx
 	source = yandex://q2xpMaps.pkx
 	source = yandex://q2xpMdl.pkx
 	source = yandex://q2xpMusic.pkx
 	source = yandex://q2xpTex0.pkx
-	source = yandex://q2xpWater.pkx
 	source = ftp://ftp.idsoftware.com/idstuff/quake2/q2-3.20-x86-full.exe
+	source = keys-guard.patch
+	source = link-gl.patch
 	sha256sums = SKIP
-	sha256sums = c6ea8f5f5d0e024dcc5f11fc47d65939965827cfc11151c22cd290ef046e1d6d
-	sha256sums = 5cec5b38a7e1225dc805b35d3c735524fb3b662991449449e392d45d8578f15a
-	sha256sums = c4a6d25db4c9165dd5c8e1ff14ab134c21df326036b9a5bdee4380a20ceccf3a
+	sha256sums = 4ddcf5d32ff858105e9b870a608c7095c7b8b877ff08073418473a80fe9301b1
+	sha256sums = a96204dfab7e6632042267a8360b1f2cb33c7b4a804478a2b6527d2167d34a71
+	sha256sums = d2e0e15beaade312b929eb24b82b8561be9cb5ab66e921e0553ca78533f11a4a
 	sha256sums = 855ca6f37449deb82fc77d573c39d29e452c5a33dba23576402623653e58b893
-	sha256sums = fb7ab9a545b8f561c4fc56e74276c1b1d066428e20a1b1d672f5b758226ca632
-	sha256sums = 9bc8cd9498bac5fd77db09848e3a5d0bd7e50b11e76997cc28bd26e66c750d33
+	sha256sums = 7f4116742cb3abcf05e374793e4b13a630f7b0eda818b8d509dc7e5691955d34
 	sha256sums = ee1b430258d5fc5a897ef47c6246f5da11de885f4c29fbeca005ff27924700be
+	sha256sums = 22b97c937384b4ef33e87148d547affab3c472ebf83dcddb8933a9c7bef826d0
+	sha256sums = 5cc8ac34c4b495c2a1ca39324c134898e83b374c649210b1332a829eaafdd75c
 
 pkgname = quake2xp-svn
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..429e3f35842f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+*.pkx
+q2-3.20-x86-full.exe
+*.pkg.tar*
+src/
+pkg/
+quake2xp/
diff --git a/PKGBUILD b/PKGBUILD
index 81dd418a8c49..4a8b856fc22c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=quake2xp-svn
 _svnname=quake2xp
-pkgver=r913
+pkgver=r949
 pkgrel=1
 pkgdesc='Quake 2 based engine with glsl per pixel lighting effects and more'
 arch=('i686' 'x86_64')
@@ -17,18 +17,20 @@ source=("$_svnname::svn://svn.code.sf.net/p/quake2xp/code/trunk"
 	'yandex://q2xpMdl.pkx'
 	'yandex://q2xpMusic.pkx'
 	'yandex://q2xpTex0.pkx'
-	'yandex://q2xpWater.pkx'
-	'ftp://ftp.idsoftware.com/idstuff/quake2/q2-3.20-x86-full.exe')
+	'ftp://ftp.idsoftware.com/idstuff/quake2/q2-3.20-x86-full.exe'
+	'keys-guard.patch'
+	'link-gl.patch')
 DLAGENTS+=("yandex::/usr/bin/echo %u - You need to download the files from https://yadi.sk/d/RP5yRSM-sx5ck/baseq2.")
 sha256sums=('SKIP'
-            'c6ea8f5f5d0e024dcc5f11fc47d65939965827cfc11151c22cd290ef046e1d6d'
-            '5cec5b38a7e1225dc805b35d3c735524fb3b662991449449e392d45d8578f15a'
-            'c4a6d25db4c9165dd5c8e1ff14ab134c21df326036b9a5bdee4380a20ceccf3a'
+            '4ddcf5d32ff858105e9b870a608c7095c7b8b877ff08073418473a80fe9301b1'
+            'a96204dfab7e6632042267a8360b1f2cb33c7b4a804478a2b6527d2167d34a71'
+            'd2e0e15beaade312b929eb24b82b8561be9cb5ab66e921e0553ca78533f11a4a'
             '855ca6f37449deb82fc77d573c39d29e452c5a33dba23576402623653e58b893'
-            'fb7ab9a545b8f561c4fc56e74276c1b1d066428e20a1b1d672f5b758226ca632'
-            '9bc8cd9498bac5fd77db09848e3a5d0bd7e50b11e76997cc28bd26e66c750d33'
-            'ee1b430258d5fc5a897ef47c6246f5da11de885f4c29fbeca005ff27924700be')
-noextract=(q2xp0.pkx q2xpMaps.pkx q2xpMdl.pkx q2xpMusic.pkx q2xpTex0.pkx q2xpWater.pkx)
+            '7f4116742cb3abcf05e374793e4b13a630f7b0eda818b8d509dc7e5691955d34'
+            'ee1b430258d5fc5a897ef47c6246f5da11de885f4c29fbeca005ff27924700be'
+            '22b97c937384b4ef33e87148d547affab3c472ebf83dcddb8933a9c7bef826d0'
+            '5cc8ac34c4b495c2a1ca39324c134898e83b374c649210b1332a829eaafdd75c')
+noextract=(q2xp0.pkx q2xpMaps.pkx q2xpMdl.pkx q2xpMusic.pkx q2xpTex0.pkx)
 
 pkgver() {
 	cd "$srcdir/$_svnname"
@@ -39,6 +41,9 @@ pkgver() {
 prepare() {
 	cd "$srcdir"
 	unzip q2-3.20-x86-full.exe baseq2/\*
+	cd "$_svnname"
+	patch --binary -p1 -i ../keys-guard.patch || true
+	patch --binary -p1 -i ../link-gl.patch || true
 }
 
 build() {
diff --git a/keys-guard.patch b/keys-guard.patch
new file mode 100644
index 000000000000..22498b38cb1c
--- /dev/null
+++ b/keys-guard.patch
@@ -0,0 +1,18 @@
+--- a/client/keys.h

++++ b/client/keys.h

+@@ -21,6 +21,9 @@

+ //

+ // these are the key numbers that should be passed to Key_Event

+ //

++#ifndef _KEYS_H_

++#define _KEYS_H_

++

+ typedef enum {

+    K_TAB = 9,

+    K_ENTER = 13,

+@@ -113,3 +116,5 @@

+ void Key_SetBinding (int keynum, char *binding);

+ void Key_ClearStates (void);

+ int Key_GetKey (void);

++

++#endif

diff --git a/link-gl.patch b/link-gl.patch
new file mode 100644
index 000000000000..a2c9d2f057a9
--- /dev/null
+++ b/link-gl.patch
@@ -0,0 +1,18 @@
+--- a/wscript

++++ b/wscript

+@@ -48,7 +48,7 @@

+

+ def configure(conf):

+     conf.load('compiler_c')

+-    for lib in ['sdl', 'ogg', 'vorbis', 'vorbisfile', 'IL', 'ILU', 'ILUT', 'openal', 'x11']:

++    for lib in ['sdl', 'ogg', 'vorbis', 'vorbisfile', 'IL', 'ILU', 'ILUT', 'openal', 'x11', 'glu']:

+         conf.check_cfg(package=lib, args=['--cflags', '--libs'])

+

+ def build(bld):

+@@ -100,5 +100,5 @@

+         source = sources['client'],

+         target = 'quake2xp',

+         lib = ['z', 'm', 'dl'],

+-        use = ['IL', 'ILU', 'ILUT', 'OPENAL', 'X11', 'SDL', 'OGG', 'VORBIS', 'VORBISFILE']

++        use = ['IL', 'ILU', 'ILUT', 'OPENAL', 'X11', 'SDL', 'OGG', 'VORBIS', 'VORBISFILE', 'GLU']

+     )