Update to match the gzdoom package

8 files changed, 329 insertions, 174 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a91b338aa26c..b10150a7c87b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,30 @@
 pkgbase = gzdoom-git
-	pkgdesc = Doom source port based on ZDoom with an OpenGL renderer (git version).
-	pkgver = 2.1.pre.r1486.g86797b4
+	pkgdesc = Advanced Doom source port with OpenGL support (git version)
+	pkgver = 2.2pre.709.g6f28735
 	pkgrel = 1
-	url = http://forum.drdteam.org/viewforum.php?f=22
+	url = http://www.zdoom.org/
+	install = install
 	arch = i686
 	arch = x86_64
-	license = custom
-	makedepends = nasm
+	license = BSD
+	license = custom:BUILD
+	license = custom:doom
+	license = custom:dumb
+	license = LGPL
 	makedepends = cmake
+	makedepends = desktop-file-utils
 	makedepends = git
 	makedepends = imagemagick
-	makedepends = mesa
+	makedepends = xdg-utils
 	depends = fluidsynth
-	depends = fmodex4.26.36
-	depends = glew
+	depends = fmodex=4.26.36
 	depends = gtk2
 	depends = gxmessage
+	depends = libgl
+	depends = libgme
+	depends = libsndfile
+	depends = mpg123
+	depends = openal
 	depends = sdl2
 	optdepends = blasphemer-wad: Blasphemer (free Heretic) game data
 	optdepends = chexquest3-wad: Chex Quest 3 game data
@@ -26,17 +35,19 @@ pkgbase = gzdoom-git
 	optdepends = heretic1-wad: Heretic shareware game data
 	optdepends = hexen1-wad: Hexen demo game data
 	optdepends = strife0-wad: Strife shareware game data
+	optdepends = square1-wad: The Adventures of Square, Episode 1 game data
 	optdepends = urbanbrawl-wad: Urban Brawl: Action Doom 2 game data
 	provides = gzdoom
 	conflicts = gzdoom
 	source = gzdoom::git://github.com/coelckers/gzdoom.git
-	source = doom-share-dir.patch
-	source = stack-noexec.patch
-	source = gzdoom.desktop
+	source = desktop.template
+	source = 0001-Mark-stack-as-not-executable-in-assembler-sources.patch
+	source = 0002-Include-SHARE_DIR-in-IWADSearch.Directories.patch
 	sha256sums = SKIP
-	sha256sums = 7fa660bdff8dd0aa9151173c2ddc9122e639d3b0a2c6f98573d37b92765bab7d
-	sha256sums = a23277cc90ef8bd720417b097609ede6f5054b252843742209f794e0d1306205
-	sha256sums = 2a0b837ddc423d3a6be50f60735c55ee27cd26f58c42540b44aab395030b9cc4
+	sha256sums = f2c58925238fe0d01e630527c8c4431681ccaec2d763ba075429b747d1a98a8c
+	sha256sums = 52d03619b1e53d0d033eabc818661406a7b623918e81f6ca395e9ff2e9f77d2b
+	sha256sums = 56ef41d8f96053886919a11a44a9e8080fbbee35e65631ad4aceb204a29b2ee6
+	makedepends_i686 = nasm
 
 pkgname = gzdoom-git
 
diff --git a/0001-Mark-stack-as-not-executable-in-assembler-sources.patch b/0001-Mark-stack-as-not-executable-in-assembler-sources.patch
new file mode 100644
index 000000000000..c225f6541da1
--- /dev/null
+++ b/0001-Mark-stack-as-not-executable-in-assembler-sources.patch
@@ -0,0 +1,116 @@
+From c09e5b4b9346a5b52acbabb0b8870343cc79e366 Mon Sep 17 00:00:00 2001
+From: Jan Cholasta <grubber@grubber.cz>
+Date: Thu, 18 Feb 2016 10:56:03 +0100
+Subject: [PATCH 1/2] Mark stack as not executable in assembler sources
+
+---
+ src/asm_ia32/a.asm     | 10 ++++++++++
+ src/asm_ia32/misc.asm  | 10 ++++++++++
+ src/asm_ia32/tmap.asm  | 10 ++++++++++
+ src/asm_ia32/tmap2.asm | 10 ++++++++++
+ src/asm_ia32/tmap3.asm | 10 ++++++++++
+ src/asm_x86_64/tmap3.s |  1 +
+ 6 files changed, 51 insertions(+)
+
+diff --git a/src/asm_ia32/a.asm b/src/asm_ia32/a.asm
+index 786396d..9530e4c 100644
+--- a/src/asm_ia32/a.asm
++++ b/src/asm_ia32/a.asm
+@@ -810,3 +810,13 @@ align 16
+ GLOBAL _rtext_a_end
+ _rtext_a_end:
+ %endif
++
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
++%ifidn __OUTPUT_FORMAT__,elf32
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
++%ifidn __OUTPUT_FORMAT__,elf64
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
+diff --git a/src/asm_ia32/misc.asm b/src/asm_ia32/misc.asm
+index b825a4d..c694124 100644
+--- a/src/asm_ia32/misc.asm
++++ b/src/asm_ia32/misc.asm
+@@ -198,3 +198,13 @@ BestColor_MMX:
+ 		pop		ebx
+ 		emms
+ 		ret
++
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
++%ifidn __OUTPUT_FORMAT__,elf32
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
++%ifidn __OUTPUT_FORMAT__,elf64
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
+diff --git a/src/asm_ia32/tmap.asm b/src/asm_ia32/tmap.asm
+index fb372d4..05c90fd 100644
+--- a/src/asm_ia32/tmap.asm
++++ b/src/asm_ia32/tmap.asm
+@@ -1891,3 +1891,13 @@ _ASM_PatchPitch:
+ 		selfmod rtext_start, rtext_end
+ 		call	setpitch3
+ 		jmp		setvlinebpl_
++
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
++%ifidn __OUTPUT_FORMAT__,elf32
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
++%ifidn __OUTPUT_FORMAT__,elf64
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
+diff --git a/src/asm_ia32/tmap2.asm b/src/asm_ia32/tmap2.asm
+index 8fa141e..81d92be 100644
+--- a/src/asm_ia32/tmap2.asm
++++ b/src/asm_ia32/tmap2.asm
+@@ -638,3 +638,13 @@ rtext_end:
+ GLOBAL _rtext_tmap2_end
+ _rtext_tmap2_end:
+ %endif
++
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
++%ifidn __OUTPUT_FORMAT__,elf32
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
++%ifidn __OUTPUT_FORMAT__,elf64
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
+diff --git a/src/asm_ia32/tmap3.asm b/src/asm_ia32/tmap3.asm
+index bafc336..7379cb7 100644
+--- a/src/asm_ia32/tmap3.asm
++++ b/src/asm_ia32/tmap3.asm
+@@ -342,3 +342,13 @@ shift12:	shr	ecx,16
+ GLOBAL _rtext_tmap3_end
+ _rtext_tmap3_end:
+ %endif
++
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
++%ifidn __OUTPUT_FORMAT__,elf32
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
++%ifidn __OUTPUT_FORMAT__,elf64
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
+diff --git a/src/asm_x86_64/tmap3.s b/src/asm_x86_64/tmap3.s
+index 867d11c..e27f05f 100644
+--- a/src/asm_x86_64/tmap3.s
++++ b/src/asm_x86_64/tmap3.s
+@@ -139,3 +139,4 @@ vltepilog:
+ 		.align 16
+ 
+ 
++		.section	.note.GNU-stack,"",@progbits
+-- 
+2.7.2
+
diff --git a/0002-Include-SHARE_DIR-in-IWADSearch.Directories.patch b/0002-Include-SHARE_DIR-in-IWADSearch.Directories.patch
new file mode 100644
index 000000000000..9bf13553f01b
--- /dev/null
+++ b/0002-Include-SHARE_DIR-in-IWADSearch.Directories.patch
@@ -0,0 +1,24 @@
+From 37ce567c941e0b625064367633063c3fab81177b Mon Sep 17 00:00:00 2001
+From: Jan Cholasta <grubber@grubber.cz>
+Date: Thu, 18 Feb 2016 13:34:59 +0100
+Subject: [PATCH 2/2] Include SHARE_DIR in IWADSearch.Directories
+
+---
+ src/gameconfigfile.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/gameconfigfile.cpp b/src/gameconfigfile.cpp
+index f162e93..91f7308 100644
+--- a/src/gameconfigfile.cpp
++++ b/src/gameconfigfile.cpp
+@@ -133,6 +133,7 @@ FGameConfigFile::FGameConfigFile ()
+ 		SetValueForKey ("Path", "$PROGDIR", true);
+ #else
+ 		SetValueForKey ("Path", "~/" GAME_DIR, true);
++		SetValueForKey ("Path", SHARE_DIR, true);
+ 		// Arch Linux likes them in /usr/share/doom
+ 		// Debian likes them in /usr/share/games/doom
+ 		// I assume other distributions don't do anything radically different
+-- 
+2.7.2
+
diff --git a/PKGBUILD b/PKGBUILD
index 7aca5358eead..7ca611556e36 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,43 @@
 # Maintainer: Jan Cholasta <grubber at grubber cz>
 
-pkgname=gzdoom-git
-pkgver=2.1.pre.r1486.g86797b4
+# Build with the recommended fmodex version:
+_fmodex=4.26.36
+# Build with the currently installed fmodex version:
+#_fmodex=$(LC_ALL=C pacman -Q fmodex | grep -Po '(?<= ).+(?=-)')
+# Build without fmodex:
+#_fmodex=
+
+# Build with OpenAL:
+_openal=1
+# Build without OpenAL:
+#_openal=
+
+_name=gzdoom
+pkgname=${_name}-git
+pkgver=2.2pre.709.g6f28735
 pkgrel=1
-pkgdesc="Doom source port based on ZDoom with an OpenGL renderer (git version)."
+_label='GZDoom'
+_desc='Advanced Doom source port with OpenGL support'
+pkgdesc="${_desc} (git version)"
 arch=('i686' 'x86_64')
-url="http://forum.drdteam.org/viewforum.php?f=22"
-license=('custom')
-depends=('fluidsynth' 'fmodex4.26.36' 'glew' 'gtk2' 'gxmessage' 'sdl2')
-makedepends=('nasm' 'cmake' 'git' 'imagemagick' 'mesa')
+url='http://www.zdoom.org/'
+license=('BSD' 'custom:BUILD' 'custom:doom' 'custom:dumb' 'LGPL')
+depends=('fluidsynth'
+         ${_fmodex:+"fmodex=$_fmodex"}
+         'gtk2'
+         'gxmessage'
+         'libgl'
+         'libgme'
+         ${_openal:+'libsndfile'}
+         ${_openal:+'mpg123'}
+         ${_openal:+'openal'}
+         'sdl2')
+makedepends=('cmake'
+             'desktop-file-utils'
+             'git'
+             'imagemagick'
+             'xdg-utils')
+makedepends_i686=('nasm')
 optdepends=('blasphemer-wad: Blasphemer (free Heretic) game data'
             'chexquest3-wad: Chex Quest 3 game data'
             'doom1-wad: Doom shareware game data'
@@ -18,64 +47,131 @@ optdepends=('blasphemer-wad: Blasphemer (free Heretic) game data'
             'heretic1-wad: Heretic shareware game data'
             'hexen1-wad: Hexen demo game data'
             'strife0-wad: Strife shareware game data'
+            'square1-wad: The Adventures of Square, Episode 1 game data'
             'urbanbrawl-wad: Urban Brawl: Action Doom 2 game data')
-provides=('gzdoom')
-conflicts=('gzdoom')
-source=(gzdoom::git://github.com/coelckers/gzdoom.git \
-        doom-share-dir.patch \
-        stack-noexec.patch \
-        gzdoom.desktop)
+provides=("${_name}")
+conflicts=("${_name}")
+install=install
+source=("${_name}::git://github.com/coelckers/${_name}.git"
+        'desktop.template'
+        '0001-Mark-stack-as-not-executable-in-assembler-sources.patch'
+        '0002-Include-SHARE_DIR-in-IWADSearch.Directories.patch')
+_srcsubdir="${_name}"
 sha256sums=('SKIP'
-            '7fa660bdff8dd0aa9151173c2ddc9122e639d3b0a2c6f98573d37b92765bab7d'
-            'a23277cc90ef8bd720417b097609ede6f5054b252843742209f794e0d1306205'
-            '2a0b837ddc423d3a6be50f60735c55ee27cd26f58c42540b44aab395030b9cc4')
-
-_fmodver=4.26.36
-_libdir=/usr/lib/gzdoom
-_sharedir=/usr/share/games/gzdoom
+            'f2c58925238fe0d01e630527c8c4431681ccaec2d763ba075429b747d1a98a8c'
+            '52d03619b1e53d0d033eabc818661406a7b623918e81f6ca395e9ff2e9f77d2b'
+            '56ef41d8f96053886919a11a44a9e8080fbbee35e65631ad4aceb204a29b2ee6')
 
 pkgver() {
-  cd gzdoom
+    cd "${_srcsubdir}"
 
-  git describe --long --tags --match '[Gg]*' | sed -r 's/^[Gg]//;s/([^-]*-g)/r\1/;s/-/./g'
+    git describe --long --tags --match '[Gg]*' | sed -r 's/^[Gg]//;s/([^-]*-g)/\1/;s/-/./g'
 }
 
 prepare() {
-  cd gzdoom
+    cd "${_srcsubdir}"
 
-  patch -p1 <"$srcdir/doom-share-dir.patch"
-  patch -p1 <"$srcdir/stack-noexec.patch"
-
-  sed -i "s|setPluginPath(progdir)|setPluginPath(\"$_libdir\")|" src/sound/fmodsound.cpp
+    local _file
+    for _file in "${source[@]}"; do
+        if [[ "${_file}" == *.patch ]]; then
+            patch -p1 <"${srcdir}/${_file}"
+        fi
+    done
 }
 
 build() {
-  cd gzdoom
+    cd "${_srcsubdir}"
+
+    cat >"${_name}.sh" <<EOF
+#!/bin/sh
+exec /usr/lib/${_name}/${_name} "\$@"
+EOF
+
+    local _nofmod _noopenal _fmodincdir
+
+    if [[ -n "${_fmodex}" ]]; then
+        _nofmod=OFF
+
+        _fmodincdir="/usr/include/fmodex-${_fmodex}"
+        if [[ ! -e "${_fmodincdir}" ]]; then
+            _fmodincdir='/usr/include/fmodex'
+        fi
+    else
+        _nofmod=ON
+    fi
+
+    if [[ -n "${_openal}" ]]; then
+        _noopenal=OFF
+    else
+        _noopenal=ON
+    fi
 
-  cmake -DFMOD_INCLUDE_DIR=/usr/include/fmodex-$_fmodver \
-        -DFMOD_LIBRARY=/usr/lib/libfmodex-$_fmodver.so \
-        -DCMAKE_C_FLAGS="$CFLAGS -DSHARE_DIR=\\\"$_sharedir\\\"" \
-        -DCMAKE_CXX_FLAGS="$CXXFLAGS -DSHARE_DIR=\\\"$_sharedir\\\"" \
-        .
-  make
+    cmake -DNO_FMOD=${_nofmod} \
+          -DNO_OPENAL=${_noopenal} \
+          -DGME_INCLUDE_DIR='/usr/include/gme' \
+          -DFMOD_INCLUDE_DIR="${_fmodincdir}" \
+          -DFMOD_LIBRARY="/usr/lib/libfmodex-${_fmodex}.so" \
+          -DFORCE_INTERNAL_GME=OFF \
+          -DCMAKE_C_FLAGS="$CFLAGS -DSHARE_DIR=\\\"/usr/share/${_name}\\\"" \
+          -DCMAKE_CXX_FLAGS="$CXXFLAGS -DSHARE_DIR=\\\"/usr/share/${_name}\\\"" \
+          .
+    make
 
-  convert "src/win32/icon1.ico[2]" gzdoom.png
+    sed -n '/\*\*-/,/\*\*-/p' 'src/version.h' >'bsd.txt'
+
+    cp "${srcdir}/desktop.template" "${_name}.desktop"
+    desktop-file-edit --set-name="${_label}" \
+                      --set-generic-name="${_desc}" \
+                      --set-icon="${_name}" \
+                      --set-key=Exec --set-value="${_name} %F" \
+                      "${_name}.desktop"
+
+    mkdir 'icons'
+    convert 'src/win32/icon1.ico[2]' 'icons/48.png'
+    convert 'src/win32/icon1.ico[3]' 'icons/32.png'
+    convert 'src/win32/icon1.ico[4]' 'icons/16.png'
 }
 
 package() {
-  cd gzdoom
-
-  install -Dm755 gzdoom "$pkgdir/usr/bin/gzdoom"
-  install -Dm755 liboutput_sdl.so "$pkgdir/$_libdir/liboutput_sdl.so"
-  install -Dm644 gzdoom.pk3 "$pkgdir/$_sharedir/gzdoom.pk3"
-  install -Dm644 brightmaps.pk3 "$pkgdir/$_sharedir/brightmaps.pk3"
-  install -Dm644 lights.pk3 "$pkgdir/$_sharedir/lights.pk3"
-  ln -s /usr/share/doom/doom.wad "$pkgdir/$_sharedir/freedoomu.wad"
-  ln -s /usr/share/doom/doom2.wad "$pkgdir/$_sharedir/freedoom.wad"
-  ln -s /usr/share/doom/hexen.wad "$pkgdir/$_sharedir/hexendemo.wad"
-
-  install -Dm644 gzdoom.png "$pkgdir/usr/share/pixmaps/gzdoom.png"
-  install -Dm644 "$srcdir/gzdoom.desktop" "$pkgdir/usr/share/applications/gzdoom.desktop"
-  install -Dm644 docs/BUILDLIC.TXT "$pkgdir/usr/share/licenses/$pkgname/buildlic.txt"
-  install -Dm644 docs/doomlic.txt "$pkgdir/usr/share/licenses/$pkgname/doomlic.txt"
+    cd "${_srcsubdir}"
+
+    install -D "${_name}.sh" "${pkgdir}/usr/bin/${_name}"
+
+    mkdir -p "${pkgdir}/usr/lib/${_name}"
+    install "${_name}" "${pkgdir}/usr/lib/${_name}/"
+    install -m644 "${_name}.pk3" "${pkgdir}/usr/lib/${_name}/"
+    if [[ -n "${_fmodex}" ]]; then
+        install 'liboutput_sdl.so' "${pkgdir}/usr/lib/${_name}/"
+    fi
+
+    mkdir -p "${pkgdir}/usr/share/${_name}"
+    install -m644 'brightmaps.pk3' "${pkgdir}/usr/share/${_name}/"
+    install -m644 'lights.pk3' "${pkgdir}/usr/share/${_name}/"
+    ln -s '/usr/share/doom/doom.wad' "${pkgdir}/usr/share/${_name}/freedoomu.wad"
+    ln -s '/usr/share/doom/doom2.wad' "${pkgdir}/usr/share/${_name}/freedoom.wad"
+    ln -s '/usr/share/doom/heretic.wad' "${pkgdir}/usr/share/${_name}/blasphemer.wad"
+    ln -s '/usr/share/doom/hexen.wad' "${pkgdir}/usr/share/${_name}/hexendemo.wad"
+
+    mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}"
+    install -m644 'bsd.txt' "${pkgdir}/usr/share/licenses/${pkgname}/bsd.txt"
+    install -m644 'docs/BUILDLIC.TXT' "${pkgdir}/usr/share/licenses/${pkgname}/buildlic.txt"
+    install -m644 'docs/doomlic.txt' "${pkgdir}/usr/share/licenses/${pkgname}/doomlic.txt"
+    install -m644 'dumb/licence.txt' "${pkgdir}/usr/share/licenses/${pkgname}/dumb.txt"
+
+    desktop-file-install --dir="${pkgdir}/usr/share/applications" "${_name}.desktop"
+
+    mkdir -p "${pkgdir}/usr/share/icons/hicolor"
+    (
+        cd 'icons'
+        export XDG_DATA_DIRS="${pkgdir}/usr/share"
+
+        local _file
+        for _file in *.png; do
+            xdg-icon-resource install --noupdate \
+                                      --novendor \
+                                      --size "${_file%.png}" \
+                                      "${_file}" \
+                                      "${_name}"
+        done
+    )
 }
diff --git a/gzdoom.desktop b/desktop.template
index 41c576528b02..172a5d7cae83 100644
--- a/gzdoom.desktop
+++ b/desktop.template
@@ -1,10 +1,6 @@
 [Desktop Entry]
-Encoding=UTF-8
-Version=1.0
 Type=Application
-Name=GZDoom
-GenericName=Enhanced Doom Engine
-Icon=gzdoom
-Exec=gzdoom %F
+Version=1.0
 Terminal=false
+MimeType=application/x-doom-wad;
 Categories=Game;ActionGame;
diff --git a/doom-share-dir.patch b/doom-share-dir.patch
deleted file mode 100644
index 8675694bf81a..000000000000
--- a/doom-share-dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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 @@
- #else

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

- 		SetValueForKey ("Path", SHARE_DIR, true);

-+		SetValueForKey ("Path", "/usr/share/doom", true);

- #endif

- 	}

- 

diff --git a/install b/install
new file mode 100644
index 000000000000..a3292a2070bc
--- /dev/null
+++ b/install
@@ -0,0 +1,16 @@
+post_install() {
+    if [[ -x usr/bin/xdg-icon-resource ]]; then
+        usr/bin/xdg-icon-resource forceupdate
+    fi
+    if [[ -x usr/bin/update-desktop-database ]]; then
+        usr/bin/update-desktop-database -q
+    fi
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/stack-noexec.patch b/stack-noexec.patch
deleted file mode 100644
index c903e79dcf5f..000000000000
--- a/stack-noexec.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-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
-@@ -810,3 +810,13 @@
- GLOBAL _rtext_a_end

- _rtext_a_end:

- %endif

-+

-+%ifidn __OUTPUT_FORMAT__,elf

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

-+%endif

-+%ifidn __OUTPUT_FORMAT__,elf32

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

-+%endif

-+%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
-@@ -198,3 +198,13 @@
- 		pop		ebx

- 		emms

- 		ret

-+

-+%ifidn __OUTPUT_FORMAT__,elf

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

-+%endif

-+%ifidn __OUTPUT_FORMAT__,elf32

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

-+%endif

-+%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
-@@ -1891,3 +1891,13 @@
- 		selfmod rtext_start, rtext_end

- 		call	setpitch3

- 		jmp		setvlinebpl_

-+

-+%ifidn __OUTPUT_FORMAT__,elf

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

-+%endif

-+%ifidn __OUTPUT_FORMAT__,elf32

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

-+%endif

-+%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
-@@ -638,3 +638,13 @@
- GLOBAL _rtext_tmap2_end

- _rtext_tmap2_end:

- %endif

-+

-+%ifidn __OUTPUT_FORMAT__,elf

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

-+%endif

-+%ifidn __OUTPUT_FORMAT__,elf32

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

-+%endif

-+%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
-@@ -342,3 +342,13 @@
- GLOBAL _rtext_tmap3_end

- _rtext_tmap3_end:

- %endif

-+

-+%ifidn __OUTPUT_FORMAT__,elf

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

-+%endif

-+%ifidn __OUTPUT_FORMAT__,elf32

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

-+%endif

-+%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
-@@ -139,3 +139,4 @@
- 		.align 16
- 
- 
-+		.section	.note.GNU-stack,"",@progbits