diff options
author | Jan Cholasta | 2016-02-24 21:43:39 +0100 |
---|---|---|
committer | Jan Cholasta | 2016-03-03 07:58:26 +0100 |
commit | 7214e4d13a86321a24778f9b065724ad04d2cdde (patch) | |
tree | 44ac925e185b23781a2b4e2c7d032e5021009b74 | |
parent | a211dcc18f7bc9820ebb06ec0682ee8cae3d8ff4 (diff) | |
download | aur-7214e4d13a86321a24778f9b065724ad04d2cdde.tar.gz |
Update to match the zdoom package
-rw-r--r-- | .SRCINFO | 36 | ||||
-rw-r--r-- | 0001-Mark-stack-as-not-executable-in-assembler-sources.patch | 116 | ||||
-rw-r--r-- | 0002-Include-SHARE_DIR-in-IWADSearch.Directories.patch | 24 | ||||
-rw-r--r-- | PKGBUILD | 193 | ||||
-rw-r--r-- | desktop.template (renamed from zdoom.desktop) | 8 | ||||
-rw-r--r-- | doom-share-dir.patch | 11 | ||||
-rw-r--r-- | install | 16 | ||||
-rw-r--r-- | stack-noexec.patch | 93 |
8 files changed, 326 insertions, 171 deletions
@@ -1,21 +1,31 @@ pkgbase = zdoom-git - pkgdesc = An enhanced Doom port with additional support for Heretic, Hexen and Strife (git version). - pkgver = 2.8pre.r1130.g72506fa + pkgdesc = Advanced Doom source port (git version) + pkgver = 2.9pre.332.g7f67203 pkgrel = 1 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 = xdg-utils depends = fluidsynth - depends = fmodex4.26.36 + depends = fmodex=4.26.36 depends = gtk2 depends = gxmessage + depends = libgme + depends = libsndfile + depends = mpg123 + depends = openal depends = sdl2 - optdepends = blasphemer: Blasphemer (free Heretic) game data + optdepends = blasphemer-wad: Blasphemer (free Heretic) game data optdepends = chexquest3-wad: Chex Quest 3 game data optdepends = doom1-wad: Doom shareware game data optdepends = freedoom: FreeDoom game data @@ -24,17 +34,19 @@ pkgbase = zdoom-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 = zdoom conflicts = zdoom source = zdoom::git://github.com/rheit/zdoom.git - source = doom-share-dir.patch - source = stack-noexec.patch - source = zdoom.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 = 6ee28485ecb282157134c1621f9514c29db461b2c996eeee344b6bb59e7212c0 - sha256sums = 0a6c16cbc3b7f9a23232eb8683c9d04333efec91318790bc280ce8a38dea2748 - sha256sums = 2badd2c2de643172242c441f5e4aedb8c3c6969b10a7e87f8fc83f257b64c1b0 + sha256sums = f2c58925238fe0d01e630527c8c4431681ccaec2d763ba075429b747d1a98a8c + sha256sums = deb7df04f36cffb8a4b5c38f289d95a662c25ba1644de668ef8a64965e9a9860 + sha256sums = 8798c5eaa833041ad90823439cd06a1752740b715a03ee7947b46bc247db1d1b + makedepends_i686 = nasm pkgname = zdoom-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..75ad8a1bdae0 --- /dev/null +++ b/0001-Mark-stack-as-not-executable-in-assembler-sources.patch @@ -0,0 +1,116 @@ +From 4ec44fca7500576f1d6778965504957c1837f2d7 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..4ec7ddeb36de --- /dev/null +++ b/0002-Include-SHARE_DIR-in-IWADSearch.Directories.patch @@ -0,0 +1,24 @@ +From dd17047cb5e8f6f1c74dad4650ac2a3a35da7dd5 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 + @@ -1,15 +1,43 @@ # Maintainer: Jan Cholasta <grubber at grubber cz> -pkgname=zdoom-git -pkgver=2.8pre.r1130.g72506fa +# 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=zdoom +pkgname=${_name}-git +pkgver=2.9pre.332.g7f67203 pkgrel=1 -pkgdesc="An enhanced Doom port with additional support for Heretic, Hexen and Strife (git version)." +_label='ZDoom' +_desc='Advanced Doom source port' +pkgdesc="${_desc} (git version)" arch=('i686' 'x86_64') -url="http://www.zdoom.org/" -license=('custom') -depends=('fluidsynth' 'fmodex4.26.36' 'gtk2' 'gxmessage' 'sdl2') -makedepends=('nasm' 'cmake' 'git' 'imagemagick') -optdepends=('blasphemer: Blasphemer (free Heretic) game data' +url='http://www.zdoom.org/' +license=('BSD' 'custom:BUILD' 'custom:doom' 'custom:dumb' 'LGPL') +depends=('fluidsynth' + ${_fmodex:+"fmodex=$_fmodex"} + 'gtk2' + 'gxmessage' + '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' 'freedoom: FreeDoom game data' @@ -18,62 +46,129 @@ optdepends=('blasphemer: 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=('zdoom') -conflicts=('zdoom') -source=(zdoom::git://github.com/rheit/zdoom.git \ - doom-share-dir.patch \ - stack-noexec.patch \ - zdoom.desktop) +provides=("${_name}") +conflicts=("${_name}") +install=install +source=("${_name}::git://github.com/rheit/${_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' - '6ee28485ecb282157134c1621f9514c29db461b2c996eeee344b6bb59e7212c0' - '0a6c16cbc3b7f9a23232eb8683c9d04333efec91318790bc280ce8a38dea2748' - '2badd2c2de643172242c441f5e4aedb8c3c6969b10a7e87f8fc83f257b64c1b0') - -_fmodver=4.26.36 -_libdir=/usr/lib/zdoom -_sharedir=/usr/share/games/zdoom + 'f2c58925238fe0d01e630527c8c4431681ccaec2d763ba075429b747d1a98a8c' + 'deb7df04f36cffb8a4b5c38f289d95a662c25ba1644de668ef8a64965e9a9860' + '8798c5eaa833041ad90823439cd06a1752740b715a03ee7947b46bc247db1d1b') pkgver() { - cd zdoom + cd "${_srcsubdir}" - git describe --long --tags | sed -r 's/([^-]*-g)/r\1/;s/-/./g' + git describe --long --tags | sed -r 's/([^-]*-g)/\1/;s/-/./g' } prepare() { - cd zdoom + 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 zdoom + 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]" zdoom.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 zdoom - - install -Dm755 zdoom "$pkgdir/usr/bin/zdoom" - install -Dm755 liboutput_sdl.so "$pkgdir/$_libdir/liboutput_sdl.so" - install -Dm644 zdoom.pk3 "$pkgdir/$_sharedir/zdoom.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 zdoom.png "$pkgdir/usr/share/pixmaps/zdoom.png" - install -Dm644 "$srcdir/zdoom.desktop" "$pkgdir/usr/share/applications/zdoom.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}" + 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/zdoom.desktop b/desktop.template index 541805c8cbb6..172a5d7cae83 100644 --- a/zdoom.desktop +++ b/desktop.template @@ -1,10 +1,6 @@ [Desktop Entry] -Encoding=UTF-8 -Version=1.0 Type=Application -Name=ZDoom -GenericName=Enhanced Doom Engine -Icon=zdoom -Exec=zdoom %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 945f96501c9e..000000000000 --- a/doom-share-dir.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur zdoom-2.6.1.orig/src/gameconfigfile.cpp zdoom-2.6.1/src/gameconfigfile.cpp ---- zdoom-2.6.1.orig/src/gameconfigfile.cpp 2012-07-02 00:49:26.000000000 +0200 -+++ zdoom-2.6.1/src/gameconfigfile.cpp 2012-07-29 16:23:11.755232082 +0200 -@@ -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 d7ca8289b108..000000000000 --- a/stack-noexec.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff -ur zdoom-2.6.1.orig/src/asm_ia32/a.asm zdoom-2.6.1/src/asm_ia32/a.asm ---- zdoom-2.6.1.orig/src/asm_ia32/a.asm 2012-07-02 00:49:34.000000000 +0200 -+++ zdoom-2.6.1/src/asm_ia32/a.asm 2012-11-06 14:43:00.501239342 +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 zdoom-2.6.1.orig/src/asm_ia32/misc.asm zdoom-2.6.1/src/asm_ia32/misc.asm ---- zdoom-2.6.1.orig/src/asm_ia32/misc.asm 2012-07-02 00:49:34.000000000 +0200 -+++ zdoom-2.6.1/src/asm_ia32/misc.asm 2012-11-06 14:43:10.124572789 +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 zdoom-2.6.1.orig/src/asm_ia32/tmap2.asm zdoom-2.6.1/src/asm_ia32/tmap2.asm ---- zdoom-2.6.1.orig/src/asm_ia32/tmap2.asm 2012-07-02 00:49:34.000000000 +0200 -+++ zdoom-2.6.1/src/asm_ia32/tmap2.asm 2012-11-06 14:43:39.091239794 +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 zdoom-2.6.1.orig/src/asm_ia32/tmap3.asm zdoom-2.6.1/src/asm_ia32/tmap3.asm ---- zdoom-2.6.1.orig/src/asm_ia32/tmap3.asm 2012-07-02 00:49:34.000000000 +0200 -+++ zdoom-2.6.1/src/asm_ia32/tmap3.asm 2012-11-06 14:35:26.421234034 +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 zdoom-2.6.1.orig/src/asm_ia32/tmap.asm zdoom-2.6.1/src/asm_ia32/tmap.asm ---- zdoom-2.6.1.orig/src/asm_ia32/tmap.asm 2012-07-02 00:49:34.000000000 +0200 -+++ zdoom-2.6.1/src/asm_ia32/tmap.asm 2012-11-06 14:43:28.244573001 +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 zdoom-2.6.1.orig/src/asm_x86_64/tmap3.s zdoom-2.6.1/src/asm_x86_64/tmap3.s ---- zdoom-2.6.1.orig/src/asm_x86_64/tmap3.s 2012-07-02 00:49:36.000000000 +0200 -+++ zdoom-2.6.1/src/asm_x86_64/tmap3.s 2012-11-06 14:34:28.807900032 +0100 -@@ -139,3 +139,4 @@ - .align 16 - - -+ .section .note.GNU-stack,"",@progbits |