Update gzdoom to 2.0.02

6 files changed, 50 insertions, 57 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 597a845a49c0..be68f7fb15bb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gzdoom
 	pkgdesc = Doom source port based on ZDoom with an OpenGL renderer.
-	pkgver = 1.8.2
-	pkgrel = 3
+	pkgver = 2.0.02
+	pkgrel = 1
 	url = http://www.osnanet.de/c.oelckers/gzdoom/
 	arch = i686
 	arch = x86_64
@@ -12,9 +12,10 @@ pkgbase = gzdoom
 	makedepends = imagemagick
 	makedepends = mesa
 	depends = fluidsynth
+	depends = glew
+	depends = gtk2
 	depends = gxmessage
 	depends = sdl
-	depends = glu
 	optdepends = blasphemer: Blasphemer (free Heretic) game data
 	optdepends = chexquest3-wad: Chex Quest 3 game data
 	optdepends = doom1-wad: Doom shareware game data
@@ -25,21 +26,17 @@ pkgbase = gzdoom
 	optdepends = hexen1-wad: Hexen demo game data
 	optdepends = strife0-wad: Strife shareware game data
 	optdepends = urbanbrawl-wad: Urban Brawl: Action Doom 2 game data
-	source = gzdoom::git://github.com/coelckers/gzdoom.git#tag=g1.8.2
+	source = gzdoom::git://github.com/coelckers/gzdoom.git#tag=g2.0.02
 	source = http://www.fmod.org/download/fmodex/api/Linux/fmodapi42636linux.tar.gz
-	source = git-3a477f69.patch
-	source = git-276ca5b7.patch
 	source = config-update-fix.patch
 	source = doom-share-dir.patch
 	source = stack-noexec.patch
 	source = gzdoom.desktop
 	md5sums = SKIP
 	md5sums = 355cba00a34eb5f7d027da68b452f6d9
-	md5sums = 3d179ed90288fc1fa0df07ed6c45cf77
-	md5sums = 5824e98be50e63519325ef555aa1ae30
-	md5sums = 2fda668ab449b7ca2d75a5b62dae6870
-	md5sums = ed6c7d1175146bedac3f5a59d09d8f4b
-	md5sums = b83081e982b742010df0afe36b4d49b6
+	md5sums = eed301389f533effbd127681a3ddc2c5
+	md5sums = 3ee3d6bb1f777445438bc40ae81a95df
+	md5sums = 4778bb22190c445a4ed764c64432de12
 	md5sums = 3f5920d839086c9ad04ed1338c3fb546
 
 pkgname = gzdoom
diff --git a/.gitignore b/.gitignore
index 5642e2f2619b..7bb10554e78c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+gzdoom
+
 /*.tar.gz
 /*.tar.bz2
 /*.tar.xz
diff --git a/PKGBUILD b/PKGBUILD
index 6511d6dedaa9..5a83d8049765 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,13 +8,13 @@ if [[ "$CARCH" == x86_64 ]]; then
 fi
 
 pkgname=gzdoom
-pkgver=1.8.2
-pkgrel=3
+pkgver=2.0.02
+pkgrel=1
 pkgdesc="Doom source port based on ZDoom with an OpenGL renderer."
 arch=('i686' 'x86_64')
 url="http://www.osnanet.de/c.oelckers/gzdoom/"
 license=('custom')
-depends=('fluidsynth' 'gxmessage' 'sdl' 'glu')
+depends=('fluidsynth' 'glew' 'gtk2' 'gxmessage' 'sdl')
 makedepends=('nasm' 'cmake' 'git' 'imagemagick' 'mesa')
 optdepends=('blasphemer: Blasphemer (free Heretic) game data'
             'chexquest3-wad: Chex Quest 3 game data'
@@ -28,19 +28,15 @@ optdepends=('blasphemer: Blasphemer (free Heretic) game data'
             'urbanbrawl-wad: Urban Brawl: Action Doom 2 game data')
 source=(gzdoom::git://github.com/coelckers/gzdoom.git#tag=g${pkgver}
         http://www.fmod.org/download/fmodex/api/Linux/fmodapi${_fmodver}${_fmodarch}.tar.gz \
-        git-3a477f69.patch \
-        git-276ca5b7.patch \
         config-update-fix.patch \
         doom-share-dir.patch \
         stack-noexec.patch \
         gzdoom.desktop)
 md5sums=('SKIP'
          '355cba00a34eb5f7d027da68b452f6d9'
-         '3d179ed90288fc1fa0df07ed6c45cf77'
-         '5824e98be50e63519325ef555aa1ae30'
-         '2fda668ab449b7ca2d75a5b62dae6870'
-         'ed6c7d1175146bedac3f5a59d09d8f4b'
-         'b83081e982b742010df0afe36b4d49b6'
+         'eed301389f533effbd127681a3ddc2c5'
+         '3ee3d6bb1f777445438bc40ae81a95df'
+         '4778bb22190c445a4ed764c64432de12'
          '3f5920d839086c9ad04ed1338c3fb546')
 
 if [[ "$CARCH" == i?86 ]]; then
@@ -55,8 +51,6 @@ _sharedir=/usr/share/games/gzdoom
 prepare() {
   cd gzdoom
 
-  patch -p1 <"$srcdir/git-3a477f69.patch"
-  patch -p1 <"$srcdir/git-276ca5b7.patch"
   patch -p1 <"$srcdir/config-update-fix.patch"
   patch -p1 <"$srcdir/doom-share-dir.patch"
   patch -p1 <"$srcdir/stack-noexec.patch"
diff --git a/config-update-fix.patch b/config-update-fix.patch
index 8dffee29592c..fbf3906e5017 100644
--- a/config-update-fix.patch
+++ b/config-update-fix.patch
@@ -1,12 +1,12 @@
-diff -ur gzdoom-1.7.00.orig/src/m_misc.cpp gzdoom-1.7.00/src/m_misc.cpp
---- gzdoom-1.7.00.orig/src/m_misc.cpp	2012-12-29 10:13:37.691978200 +0100
-+++ gzdoom-1.7.00/src/m_misc.cpp	2012-12-29 10:15:08.318658023 +0100
-@@ -362,7 +362,7 @@
- 		// This can be removed after a release or two

- 		// Transfer the old zdoom directory to the new location

- 		bool moved = false;

--		FString oldpath = NicePath("~/.zdoom/");

-+		FString oldpath = NicePath("~/.gzdoom/");

- 		if (stat (oldpath, &extrainfo) != -1)

- 		{

- 			if (rename(oldpath, path) == -1)

+diff -ur a/src/m_specialpaths.cpp b/src/m_specialpaths.cpp
+--- a/src/m_specialpaths.cpp	2014-09-10 15:35:08.217777234 +0200
++++ b/src/m_specialpaths.cpp	2014-09-10 15:39:12.774441440 +0200
+@@ -497,7 +497,7 @@
+ 		// This can be removed after a release or two
+ 		// Transfer the old zdoom directory to the new location
+ 		bool moved = false;
+-		FString oldpath = NicePath("~/.zdoom/");
++		FString oldpath = NicePath("~/.gzdoom/");
+ 		if (stat (oldpath, &extrainfo) != -1)
+ 		{
+ 			if (rename(oldpath, path) == -1)
diff --git a/doom-share-dir.patch b/doom-share-dir.patch
index 8675694bf81a..3214e45b77d2 100644
--- a/doom-share-dir.patch
+++ b/doom-share-dir.patch
@@ -1,7 +1,7 @@
-diff -ur gzdoom-1.6.00.orig/src/gameconfigfile.cpp gzdoom-1.6.00/src/gameconfigfile.cpp
---- gzdoom-1.6.00.orig/src/gameconfigfile.cpp	2012-11-06 15:17:16.674596717 +0100
-+++ gzdoom-1.6.00/src/gameconfigfile.cpp	2012-11-06 15:22:53.667933990 +0100
-@@ -140,6 +140,7 @@
+diff -ur a/src/gameconfigfile.cpp b/src/gameconfigfile.cpp
+--- a/src/gameconfigfile.cpp	2014-09-10 15:49:16.484435366 +0200
++++ b/src/gameconfigfile.cpp	2014-09-10 15:49:28.591101911 +0200
+@@ -139,6 +139,7 @@
  #else

  		SetValueForKey ("Path", "~/" GAME_DIR, true);

  		SetValueForKey ("Path", SHARE_DIR, true);

diff --git a/stack-noexec.patch b/stack-noexec.patch
index c903e79dcf5f..55bb824115a4 100644
--- a/stack-noexec.patch
+++ b/stack-noexec.patch
@@ -1,6 +1,6 @@
-diff -ur gzdoom-1.6.00.orig/src/asm_ia32/a.asm gzdoom-1.6.00/src/asm_ia32/a.asm
---- gzdoom-1.6.00.orig/src/asm_ia32/a.asm	2012-11-06 15:17:27.061263504 +0100
-+++ gzdoom-1.6.00/src/asm_ia32/a.asm	2012-11-06 15:24:25.474601731 +0100
+diff -ur a/src/asm_ia32/a.asm b/src/asm_ia32/a.asm
+--- a/src/asm_ia32/a.asm	2014-09-10 16:00:39.331095163 +0200
++++ b/src/asm_ia32/a.asm	2014-09-10 16:00:50.571095050 +0200
 @@ -810,3 +810,13 @@
  GLOBAL _rtext_a_end

  _rtext_a_end:

@@ -15,9 +15,9 @@ diff -ur gzdoom-1.6.00.orig/src/asm_ia32/a.asm gzdoom-1.6.00/src/asm_ia32/a.asm
 +%ifidn __OUTPUT_FORMAT__,elf64  

 +section .note.GNU-stack noalloc noexec nowrite progbits

 +%endif

-diff -ur gzdoom-1.6.00.orig/src/asm_ia32/misc.asm gzdoom-1.6.00/src/asm_ia32/misc.asm
---- gzdoom-1.6.00.orig/src/asm_ia32/misc.asm	2012-11-06 15:17:27.064596838 +0100
-+++ gzdoom-1.6.00/src/asm_ia32/misc.asm	2012-11-06 15:24:25.474601731 +0100
+diff -ur a/src/asm_ia32/misc.asm b/src/asm_ia32/misc.asm
+--- a/src/asm_ia32/misc.asm	2014-09-10 16:00:39.331095163 +0200
++++ b/src/asm_ia32/misc.asm	2014-09-10 16:00:50.571095050 +0200
 @@ -198,3 +198,13 @@
  		pop		ebx

  		emms

@@ -32,9 +32,9 @@ diff -ur gzdoom-1.6.00.orig/src/asm_ia32/misc.asm gzdoom-1.6.00/src/asm_ia32/mis
 +%ifidn __OUTPUT_FORMAT__,elf64  

 +section .note.GNU-stack noalloc noexec nowrite progbits

 +%endif

-diff -ur gzdoom-1.6.00.orig/src/asm_ia32/tmap.asm gzdoom-1.6.00/src/asm_ia32/tmap.asm
---- gzdoom-1.6.00.orig/src/asm_ia32/tmap.asm	2012-11-06 15:17:27.061263504 +0100
-+++ gzdoom-1.6.00/src/asm_ia32/tmap.asm	2012-11-06 15:24:25.474601731 +0100
+diff -ur a/src/asm_ia32/tmap.asm b/src/asm_ia32/tmap.asm
+--- a/src/asm_ia32/tmap.asm	2014-09-10 16:00:39.334428497 +0200
++++ b/src/asm_ia32/tmap.asm	2014-09-10 16:00:50.571095050 +0200
 @@ -1891,3 +1891,13 @@
  		selfmod rtext_start, rtext_end

  		call	setpitch3

@@ -49,9 +49,9 @@ diff -ur gzdoom-1.6.00.orig/src/asm_ia32/tmap.asm gzdoom-1.6.00/src/asm_ia32/tma
 +%ifidn __OUTPUT_FORMAT__,elf64  

 +section .note.GNU-stack noalloc noexec nowrite progbits

 +%endif

-diff -ur gzdoom-1.6.00.orig/src/asm_ia32/tmap2.asm gzdoom-1.6.00/src/asm_ia32/tmap2.asm
---- gzdoom-1.6.00.orig/src/asm_ia32/tmap2.asm	2012-11-06 15:17:27.061263504 +0100
-+++ gzdoom-1.6.00/src/asm_ia32/tmap2.asm	2012-11-06 15:24:25.474601731 +0100
+diff -ur a/src/asm_ia32/tmap2.asm b/src/asm_ia32/tmap2.asm
+--- a/src/asm_ia32/tmap2.asm	2014-09-10 16:00:39.334428497 +0200
++++ b/src/asm_ia32/tmap2.asm	2014-09-10 16:00:50.571095050 +0200
 @@ -638,3 +638,13 @@
  GLOBAL _rtext_tmap2_end

  _rtext_tmap2_end:

@@ -66,9 +66,9 @@ diff -ur gzdoom-1.6.00.orig/src/asm_ia32/tmap2.asm gzdoom-1.6.00/src/asm_ia32/tm
 +%ifidn __OUTPUT_FORMAT__,elf64  

 +section .note.GNU-stack noalloc noexec nowrite progbits

 +%endif

-diff -ur gzdoom-1.6.00.orig/src/asm_ia32/tmap3.asm gzdoom-1.6.00/src/asm_ia32/tmap3.asm
---- gzdoom-1.6.00.orig/src/asm_ia32/tmap3.asm	2012-11-06 15:17:27.061263504 +0100
-+++ gzdoom-1.6.00/src/asm_ia32/tmap3.asm	2012-11-06 15:24:25.474601731 +0100
+diff -ur a/src/asm_ia32/tmap3.asm b/src/asm_ia32/tmap3.asm
+--- a/src/asm_ia32/tmap3.asm	2014-09-10 16:00:39.334428497 +0200
++++ b/src/asm_ia32/tmap3.asm	2014-09-10 16:00:50.574428383 +0200
 @@ -342,3 +342,13 @@
  GLOBAL _rtext_tmap3_end

  _rtext_tmap3_end:

@@ -83,9 +83,9 @@ diff -ur gzdoom-1.6.00.orig/src/asm_ia32/tmap3.asm gzdoom-1.6.00/src/asm_ia32/tm
 +%ifidn __OUTPUT_FORMAT__,elf64

 +section .note.GNU-stack noalloc noexec nowrite progbits

 +%endif

-diff -ur gzdoom-1.6.00.orig/src/asm_x86_64/tmap3.s gzdoom-1.6.00/src/asm_x86_64/tmap3.s
---- gzdoom-1.6.00.orig/src/asm_x86_64/tmap3.s	2012-11-06 15:17:30.497930211 +0100
-+++ gzdoom-1.6.00/src/asm_x86_64/tmap3.s	2012-11-06 15:24:25.474601731 +0100
+diff -ur a/src/asm_x86_64/tmap3.s b/src/asm_x86_64/tmap3.s
+--- a/src/asm_x86_64/tmap3.s	2014-09-10 16:00:39.334428497 +0200
++++ b/src/asm_x86_64/tmap3.s	2014-09-10 16:00:50.574428383 +0200
 @@ -139,3 +139,4 @@
  		.align 16