diff options
author | Jan Cholasta | 2016-12-27 18:38:46 +0100 |
---|---|---|
committer | Jan Cholasta | 2016-12-27 18:55:21 +0100 |
commit | e8052963d779477800d2e007888eecaba3526c82 (patch) | |
tree | 83c02213237a02f680dc669fa5864e68281e5668 | |
parent | 605654d95315221b69987e0a71feb1c3d932f523 (diff) | |
download | aur-e8052963d779477800d2e007888eecaba3526c82.tar.gz |
zdoom-2.8.1-3
* Build with the last fmodex version by default
* Fix compilation with clang
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | 0001-Improve-Mac-GCC-errors-fix-to-work-only-for-GCC.patch | 41 | ||||
-rw-r--r-- | PKGBUILD | 37 |
3 files changed, 63 insertions, 21 deletions
@@ -1,7 +1,7 @@ pkgbase = zdoom pkgdesc = Advanced Doom source port pkgver = 2.8.1 - pkgrel = 2 + pkgrel = 3 url = http://www.zdoom.org/ arch = i686 arch = x86_64 @@ -16,7 +16,7 @@ pkgbase = zdoom makedepends = p7zip makedepends = xdg-utils depends = fluidsynth - depends = fmodex4.26.36 + depends = fmodex=4.44.62 depends = gtk2 depends = libgme depends = libsndfile @@ -40,8 +40,10 @@ pkgbase = zdoom noextract = zdoom-2.8.1-src.7z source = http://zdoom.org/files/zdoom/2.8/zdoom-2.8.1-src.7z source = launcher.desktop + source = 0001-Improve-Mac-GCC-errors-fix-to-work-only-for-GCC.patch sha256sums = 782179d4667d2e56e26e21d7a0872523f8e4262ed176072fef00d0043376a310 sha256sums = e8932a559baf30ecbfc062546ca014c6dfb70f76d1570549654209d39157e350 + sha256sums = 3de616393fa2eea8540c59c983a4394b29a0a0220095297a3f47e4f721b8d9fb makedepends_i686 = nasm pkgname = zdoom 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..d28d9abf2993 --- /dev/null +++ b/0001-Improve-Mac-GCC-errors-fix-to-work-only-for-GCC.patch @@ -0,0 +1,41 @@ +From 30714fdaeabd9369ff0d4b4290dd2a99c7c5ecd9 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 74b83e5fc..b2402b96b 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -458,7 +458,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 + @@ -1,10 +1,8 @@ # Maintainer: Jan Cholasta <grubber at grubber cz> # Contributor: Andrew Rabert <arabert@nullsum.net> -# 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= @@ -16,15 +14,13 @@ _openal=openal _name=zdoom pkgname=${_name} pkgver=2.8.1 -pkgrel=2 -_label='ZDoom' -_desc='Advanced Doom source port' -pkgdesc="${_desc}" +pkgrel=3 +pkgdesc='Advanced Doom source port' 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' 'libgme' ${_openal:+'libsndfile'} @@ -52,23 +48,31 @@ optdepends=('blasphemer-wad: Blasphemer (free Heretic) game data' 'urbanbrawl-wad: Urban Brawl: Action Doom 2 game data' 'xorg-xmessage: crash dialog (other)') source=("http://zdoom.org/files/${_name}/${pkgver%.${pkgver#*.*.}}/${_name}-${pkgver}-src.7z" - 'launcher.desktop') + 'launcher.desktop' + '0001-Improve-Mac-GCC-errors-fix-to-work-only-for-GCC.patch') noextract=("${source[0]##*/}") _srcsubdir='.' sha256sums=('782179d4667d2e56e26e21d7a0872523f8e4262ed176072fef00d0043376a310' - 'e8932a559baf30ecbfc062546ca014c6dfb70f76d1570549654209d39157e350') + 'e8932a559baf30ecbfc062546ca014c6dfb70f76d1570549654209d39157e350' + '3de616393fa2eea8540c59c983a4394b29a0a0220095297a3f47e4f721b8d9fb') prepare() { 7z x -y "${source[0]##*/}" >/dev/null cd "${_srcsubdir}" + patch -p 1 -i 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 @@ -89,18 +93,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" |