summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Cholasta2019-03-01 08:19:44 +0100
committerJan Cholasta2019-03-01 08:19:44 +0100
commit264ec693526d7c2ae6e962a81f5f535b71d9a35b (patch)
treee5f71fb6fd217964492bbd6aa5cf734eff221f66
parentd9b7108462fe386e461b9afb2e806aea191e5709 (diff)
downloadaur-264ec693526d7c2ae6e962a81f5f535b71d9a35b.tar.gz
gzdoom-git-g3.8pre+548+gcad2f49ce-1
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD16
2 files changed, 12 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 29e25c3b28b..0cb06b38152 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = gzdoom-git
pkgdesc = Advanced Doom source port with OpenGL support (git version)
- pkgver = g3.8pre+52+g8bbbd95df
+ pkgver = g3.8pre+548+gcad2f49ce
pkgrel = 1
url = http://www.zdoom.org/
arch = i686
@@ -11,7 +11,7 @@ pkgbase = gzdoom-git
license = LGPL3
makedepends = cmake
makedepends = desktop-file-utils
- makedepends = fluidsynth
+ makedepends = fluidsynth>=2
makedepends = git
makedepends = gtk3
depends = hicolor-icon-theme
@@ -22,7 +22,7 @@ pkgbase = gzdoom-git
optdepends = blasphemer-wad: Blasphemer (free Heretic) game data
optdepends = chexquest3-wad: Chex Quest 3 game data
optdepends = doom1-wad: Doom shareware game data
- optdepends = fluidsynth: FluidSynth MIDI device
+ optdepends = fluidsynth>=2: FluidSynth MIDI device
optdepends = freedm: FreeDM game data
optdepends = freedoom1: Freedoom: Phase 1 game data
optdepends = freedoom2: Freedoom: Phase 2 game data
diff --git a/PKGBUILD b/PKGBUILD
index f3c7481efea..5892a849d55 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
_name=gzdoom
pkgname=${_name}-git
-pkgver=g3.8pre+52+g8bbbd95df
+pkgver=g3.8pre+548+gcad2f49ce
pkgrel=1
pkgdesc='Advanced Doom source port with OpenGL support (git version)'
arch=('i686' 'x86_64')
@@ -15,13 +15,13 @@ depends=('hicolor-icon-theme'
'sdl2')
makedepends=('cmake'
'desktop-file-utils'
- 'fluidsynth'
+ 'fluidsynth>=2'
'git'
'gtk3')
optdepends=('blasphemer-wad: Blasphemer (free Heretic) game data'
'chexquest3-wad: Chex Quest 3 game data'
'doom1-wad: Doom shareware game data'
- 'fluidsynth: FluidSynth MIDI device'
+ 'fluidsynth>=2: FluidSynth MIDI device'
'freedm: FreeDM game data'
'freedoom1: Freedoom: Phase 1 game data'
'freedoom2: Freedoom: Phase 2 game data'
@@ -53,7 +53,7 @@ sha256sums=('SKIP'
pkgver() {
cd $_name
- git describe --tags --match '[Gg]*' | tr - +
+ git describe --long --tags --match '[Gg]*' | tr - +
}
prepare() {
@@ -65,10 +65,12 @@ prepare() {
build() {
cd $_name
+ local _cflags="-DSHARE_DIR=\\\"/usr/share/$_name\\\" \
+ -DFLUIDSYNTHLIB2=\\\"libfluidsynth.so.2\\\""
cmake -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_C_FLAGS="$CFLAGS -DSHARE_DIR=\\\"/usr/share/$_name\\\"" \
- -DCMAKE_CXX_FLAGS="$CXXFLAGS -DSHARE_DIR=\\\"/usr/share/$_name\\\"" \
- -DCMAKE_EXE_LINKER_FLAGS="$LDFLAGS -Wl,-z,noexecstack" \
+ -DCMAKE_C_FLAGS="${CFLAGS} ${_cflags}" \
+ -DCMAKE_CXX_FLAGS="${CXXFLAGS} ${_cflags}" \
+ -DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS} -Wl,-z,noexecstack" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DINSTALL_PATH=bin \
-DINSTALL_PK3_PATH=share/$_name \