gzdoom1-1.9.1-3

* Build with the last fmodex version by default
* Fix compilation with clang

3 files changed, 63 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3852a389d8a0..9b50ae7136ec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gzdoom1
 	pkgdesc = Advanced Doom source port with OpenGL support (legacy version)
 	pkgver = 1.9.1
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.zdoom.org/
 	arch = i686
 	arch = x86_64
@@ -16,7 +16,7 @@ pkgbase = gzdoom1
 	makedepends = imagemagick
 	makedepends = xdg-utils
 	depends = fluidsynth
-	depends = fmodex4.26.36
+	depends = fmodex=4.44.62
 	depends = gtk2
 	depends = libgl
 	depends = libgme
@@ -42,8 +42,10 @@ pkgbase = gzdoom1
 	conflicts = gzdoom
 	source = gzdoom::git://github.com/coelckers/gzdoom.git#tag=g1.9.1
 	source = launcher.desktop
+	source = 0001-Improve-Mac-GCC-errors-fix-to-work-only-for-GCC.patch
 	sha256sums = SKIP
 	sha256sums = 59122e670f72aa2531aff370e7aaab2d886a7642e79e91f27a533d3b4cad4f6d
+	sha256sums = 0d2d7ec04d35359b20a927c5afed87e3aaaf3836953cfe534861a92316188174
 	makedepends_i686 = nasm
 
 pkgname = gzdoom1
diff --git a/0001-Improve-Mac-GCC-errors-fix-to-work-only-for-GCC.patch b/0001-Improve-Mac-GCC-errors-fix-to-work-only-for-GCC.patch
new file mode 100644
index 000000000000..6a8dcbed4b70
--- /dev/null
+++ b/0001-Improve-Mac-GCC-errors-fix-to-work-only-for-GCC.patch
@@ -0,0 +1,41 @@
+From d62e7aa3d68235d6667cb4880df03188013f276b Mon Sep 17 00:00:00 2001
+From: Edoardo Prezioso <edo88@email.it>
+Date: Sat, 27 Feb 2016 22:15:29 +0100
+Subject: [PATCH] - Improve Mac GCC errors fix to work only for GCC.
+
+This fixes Clang complaining about unknown command option '-Wno-unused-but-set-variable' when compiling dumb.
+Also I got no new warnings on Clang by excluding '-Wno-unused-result'.
+---
+ dumb/CMakeLists.txt | 2 +-
+ src/CMakeLists.txt  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/dumb/CMakeLists.txt b/dumb/CMakeLists.txt
+index 7b303297c..dd1fd5e58 100644
+--- a/dumb/CMakeLists.txt
++++ b/dumb/CMakeLists.txt
+@@ -9,7 +9,7 @@ set( CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -DDEBUGMODE=1" )
+ 
+ if( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE )
+ 	set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-pointer-sign -Wno-uninitialized" )
+-	if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.5")
++	if( CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER "4.5" )
+ 		set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-but-set-variable" )
+ 	endif(NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.5")
+ endif( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE )
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index b6a8021f9..8ceb8a9fa 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -488,7 +488,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
+ 	set( CMAKE_CXX_FLAGS_MINSIZEREL "${REL_CXX_FLAGS} ${CMAKE_CXX_FLAGS_MINSIZEREL}" )
+ 	set( CMAKE_CXX_FLAGS_RELWITHDEBINFO "${REL_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}" )
+ 
+-	if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.5")
++	if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.5")
+                 set( CMAKE_C_FLAGS "-Wno-unused-result ${CMAKE_C_FLAGS}" )
+ 		set( CMAKE_CXX_FLAGS "-Wno-unused-result ${CMAKE_CXX_FLAGS}" )
+         endif(NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.5")
+-- 
+2.11.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 431bcf7076d5..b1d7f402cbba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,7 @@
 # Maintainer: Jan Cholasta <grubber at grubber cz>
 
-# Build with the recommended fmodex version:
-_fmodex=fmodex4.26.36
-# Build with the currently installed fmodex version:
-#_fmodex=$(LC_ALL=C pacman -Q fmodex | sed -r 's/ /=/;s/-.*$//')
+# Build with fmodex:
+_fmodex=fmodex
 # Build without fmodex:
 #_fmodex=
 
@@ -15,15 +13,13 @@ _openal=openal
 _name=gzdoom
 pkgname=${_name}1
 pkgver=1.9.1
-pkgrel=2
-_label='GZDoom'
-_desc='Advanced Doom source port with OpenGL support'
-pkgdesc="${_desc} (legacy version)"
+pkgrel=3
+pkgdesc='Advanced Doom source port with OpenGL support (legacy version)'
 arch=('i686' 'x86_64')
 url='http://www.zdoom.org/'
 license=('BSD' 'custom:BUILD' 'custom:doom' 'custom:dumb' 'LGPL')
 depends=('fluidsynth'
-         ${_fmodex}
+         ${_fmodex:+$(LC_ALL=C pacman -Q $_fmodex | sed -r 's/ /=/;s/-.*$//')}
          'gtk2'
          'libgl'
          'libgme'
@@ -54,20 +50,28 @@ optdepends=('blasphemer-wad: Blasphemer (free Heretic) game data'
 provides=("${_name}")
 conflicts=("${_name}")
 source=("${_name}::git://github.com/coelckers/${_name}.git#tag=g${pkgver}"
-        'launcher.desktop')
+        'launcher.desktop'
+        '0001-Improve-Mac-GCC-errors-fix-to-work-only-for-GCC.patch')
 _srcsubdir="${_name}"
 sha256sums=('SKIP'
-            '59122e670f72aa2531aff370e7aaab2d886a7642e79e91f27a533d3b4cad4f6d')
+            '59122e670f72aa2531aff370e7aaab2d886a7642e79e91f27a533d3b4cad4f6d'
+            '0d2d7ec04d35359b20a927c5afed87e3aaaf3836953cfe534861a92316188174')
 
 prepare() {
     cd "${_srcsubdir}"
 
+    patch -p 1 -i "$srcdir"/0001-Improve-Mac-GCC-errors-fix-to-work-only-for-GCC.patch
+}
+
+build() {
+    cd "${_srcsubdir}"
+
     local _nofmod _noopenal _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$')
+        _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
@@ -88,18 +92,13 @@ prepare() {
           -DCMAKE_CXX_FLAGS="$CXXFLAGS -DSHARE_DIR=\\\"/usr/share/${_name}\\\"" \
           -DCMAKE_EXE_LINKER_FLAGS="$LDFLAGS -Wl,-z,noexecstack" \
           .
-}
-
-build() {
-    cd "${_srcsubdir}"
+    make
 
     cat >"${_name}.sh" <<EOF
 #!/bin/sh
 exec /usr/lib/${_name}/${_name} "\$@"
 EOF
 
-    make
-
     sed -n '/\*\*-/,/\*\*-/p' 'src/version.h' >'bsd.txt'
 
     cp "${srcdir}/launcher.desktop" "${_name}.desktop"