gzdoom1-git-1.10pre+1359+g6a8e60c5b

* drop fmodex support
* update pkgver()
* remove cruft

4 files changed, 30 insertions, 85 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c543c242f610..9591c897dae1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gzdoom1-git
 	pkgdesc = Advanced Doom source port with OpenGL support (git legacy version)
-	pkgver = 1.10pre.1359.g6a8e60c5b
+	pkgver = 1.10pre+1359+g6a8e60c5b
 	pkgrel = 1
 	url = http://www.zdoom.org/
 	arch = i686
@@ -16,7 +16,6 @@ pkgbase = gzdoom1-git
 	makedepends = git
 	makedepends = imagemagick
 	makedepends = openal
-	makedepends = xdg-utils
 	depends = gtk2
 	depends = libgl
 	depends = libgme
@@ -36,7 +35,7 @@ pkgbase = gzdoom1-git
 	optdepends = heretic1-wad: Heretic shareware game data
 	optdepends = hexen1-wad: Hexen demo game data
 	optdepends = kdialog: crash dialog (KDE)
-	optdepends = openal: OpenAL sound backend
+	optdepends = openal: in-game sound
 	optdepends = strife0-wad: Strife shareware game data
 	optdepends = square1-wad: The Adventures of Square, Episode 1 game data
 	optdepends = timidity++: Timidity MIDI device
@@ -45,7 +44,7 @@ pkgbase = gzdoom1-git
 	provides = gzdoom
 	conflicts = gzdoom
 	source = gzdoom::git://github.com/coelckers/gzdoom.git#branch=g1.x
-	source = launcher.desktop
+	source = gzdoom.desktop
 	sha256sums = SKIP
 	sha256sums = 59122e670f72aa2531aff370e7aaab2d886a7642e79e91f27a533d3b4cad4f6d
 	makedepends_i686 = nasm
diff --git a/.gitignore b/.gitignore
index 7bb10554e78c..6f9e91a4d264 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,4 @@
-gzdoom
-
-/*.tar.gz
-/*.tar.bz2
-/*.tar.xz
-/*.zip
-/*.7z
+/gzdoom
 /pkg/
 /src/
+/*.pkg.tar.*
diff --git a/PKGBUILD b/PKGBUILD
index 39e36e7f590b..2c8960912df4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,14 @@
 # Maintainer: Jan Cholasta <grubber at grubber cz>
 
-# Build without fmodex:
-_fmodex=
-# Build with fmodex:
-#_fmodex=fmodex
-
 _name=gzdoom
 pkgname=${_name}1-git
-pkgver=1.10pre.1359.g6a8e60c5b
+pkgver=1.10pre+1359+g6a8e60c5b
 pkgrel=1
 pkgdesc='Advanced Doom source port with OpenGL support (git legacy version)'
 arch=('i686' 'x86_64')
 url='http://www.zdoom.org/'
 license=('BSD' 'custom:BUILD' 'custom:doom' 'custom:dumb' 'LGPL')
-depends=(${_fmodex:+$(LC_ALL=C pacman -Q $_fmodex | sed -r 's/ /=/;s/-.*$//')}
-         'gtk2'
+depends=('gtk2'
          'libgl'
          'libgme'
          'libsndfile'
@@ -25,8 +19,7 @@ makedepends=('cmake'
              'fluidsynth'
              'git'
              'imagemagick'
-             'openal'
-             'xdg-utils')
+             'openal')
 makedepends_i686=('nasm')
 optdepends=('blasphemer-wad: Blasphemer (free Heretic) game data'
             'chexquest3-wad: Chex Quest 3 game data'
@@ -41,7 +34,7 @@ optdepends=('blasphemer-wad: Blasphemer (free Heretic) game data'
             'heretic1-wad: Heretic shareware game data'
             'hexen1-wad: Hexen demo game data'
             'kdialog: crash dialog (KDE)'
-            'openal: OpenAL sound backend'
+            'openal: in-game sound'
             'strife0-wad: Strife shareware game data'
             'square1-wad: The Adventures of Square, Episode 1 game data'
             'timidity++: Timidity MIDI device'
@@ -50,33 +43,21 @@ optdepends=('blasphemer-wad: Blasphemer (free Heretic) game data'
 provides=("${_name}")
 conflicts=("${_name}")
 source=("${_name}::git://github.com/coelckers/${_name}.git#branch=g1.x"
-        'launcher.desktop')
+        "${_name}.desktop")
 sha256sums=('SKIP'
             '59122e670f72aa2531aff370e7aaab2d886a7642e79e91f27a533d3b4cad4f6d')
 
 pkgver() {
     cd $_name
 
-    git describe --long --tags --match '[Gg]*' | sed -r 's/^[Gg]//;s/([^-]*-g)/\1/;s/-/./g'
+    git describe --tags --match '[Gg]*' | sed -r 's/^[Gg]//;s/-/+/g'
 }
 
 build() {
     cd $_name
 
-    local _nofmod _fmodincdir _fmodlib
-
-    if [[ -n "${_fmodex}" ]]; then
-        _nofmod=OFF
-        _fmodincdir=$(LC_ALL=C pacman -Ql $_fmodex | grep -Eo '/usr/include/fmodex[^/]*/$')
-        _fmodlib=$(LC_ALL=C pacman -Ql $_fmodex | grep -Eo '/usr/lib/libfmodex-[^/]*\.so$')
-    else
-        _nofmod=ON
-    fi
-
-    cmake -DNO_FMOD=${_nofmod} \
-          -DGME_INCLUDE_DIR='/usr/include/gme' \
-          -DFMOD_INCLUDE_DIR="${_fmodincdir}" \
-          -DFMOD_LIBRARY="${_fmodlib}" \
+    cmake -DCMAKE_BUILD_TYPE=Release \
+          -DNO_FMOD=ON \
           -DFORCE_INTERNAL_GME=OFF \
           -DCMAKE_C_FLAGS="$CFLAGS -DSHARE_DIR=\\\"/usr/share/${_name}\\\"" \
           -DCMAKE_CXX_FLAGS="$CXXFLAGS -DSHARE_DIR=\\\"/usr/share/${_name}\\\"" \
@@ -84,57 +65,27 @@ build() {
           .
     make
 
-    cat >"${_name}.sh" <<EOF
-#!/bin/sh
-exec /usr/lib/${_name}/${_name} "\$@"
-EOF
+    sed -n '/\*\*-/,/\*\*-/p' src/version.h >bsd.txt
 
-    sed -n '/\*\*-/,/\*\*-/p' 'src/version.h' >'bsd.txt'
-
-    cp "${srcdir}/launcher.desktop" "${_name}.desktop"
-
-    mkdir -p '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'
+    convert 'src/win32/icon1.ico[2]' ${_name}.xpm
 }
 
 package() {
     cd $_name
 
-    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}/"
-
-    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
-    )
+    install -D $_name "$pkgdir"/usr/bin/$_name
+    install -D -m644 ${_name}.pk3 "$pkgdir"/usr/share/$_name/${_name}.pk3
+    install -D -m644 brightmaps.pk3 "$pkgdir"/usr/share/$_name/brightmaps.pk3
+    install -D -m644 lights.pk3 "$pkgdir"/usr/share/$_name/lights.pk3
+
+    desktop-file-install --dir="$pkgdir"/usr/share/applications \
+                         "$srcdir"/${_name}.desktop
+    install -D -m644 ${_name}.xpm \
+            "$pkgdir"/usr/share/icons/hicolor/48x48/apps/${_name}.xpm
+
+    install -d "$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
 }
diff --git a/launcher.desktop b/gzdoom.desktop
index 4de1fa826af6..4de1fa826af6 100644
--- a/launcher.desktop
+++ b/gzdoom.desktop