summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Cholasta2017-10-07 11:48:44 +0200
committerJan Cholasta2017-10-16 20:17:45 +0200
commitd07f26b4aa907026d02015ff413023d92622c3fb (patch)
tree55fd00ea1f2342b92e362499168f441a59e39b90
parent2f422b41b09488d6e6e9b40c79c5c279b7fe9489 (diff)
downloadaur-d07f26b4aa907026d02015ff413023d92622c3fb.tar.gz
gzdoom-3.2.0-1
* add soundfont-fluid optdepend
-rw-r--r--.SRCINFO9
-rw-r--r--0001-Fix-path-to-FluidR3-soundfont.patch25
-rw-r--r--PKGBUILD17
-rwxr-xr-xgzdoom.sh2
4 files changed, 44 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bf2b6049b1b..c67883055b3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = gzdoom
pkgdesc = Advanced Doom source port with OpenGL support
- pkgver = 3.1.0
+ pkgver = 3.2.0
pkgrel = 1
url = http://www.zdoom.org/
arch = i686
@@ -16,8 +16,8 @@ pkgbase = gzdoom
makedepends = gtk3
depends = hicolor-icon-theme
depends = libgl
- depends = libjpeg
depends = libgme
+ depends = libjpeg
depends = sdl2
optdepends = blasphemer-wad: Blasphemer (free Heretic) game data
optdepends = chexquest3-wad: Chex Quest 3 game data
@@ -36,15 +36,18 @@ pkgbase = gzdoom
optdepends = libsndfile: WAV/FLAC/OGG audio support
optdepends = mpg123: MP3 audio support
optdepends = openal: in-game sound
+ optdepends = soundfont-fluid: FluidR3 soundfont for FluidSynth
optdepends = strife0-wad: Strife shareware game data
optdepends = square1-wad: The Adventures of Square, Episode 1 game data
optdepends = timidity++: Timidity MIDI device
optdepends = urbanbrawl-wad: Urban Brawl: Action Doom 2 game data
optdepends = xorg-xmessage: crash dialog (other)
- source = gzdoom::git://github.com/coelckers/gzdoom.git#tag=g3.1.0
+ source = gzdoom::git://github.com/coelckers/gzdoom.git#tag=g3.2.0
source = gzdoom.desktop
+ source = 0001-Fix-path-to-FluidR3-soundfont.patch
sha256sums = SKIP
sha256sums = 59122e670f72aa2531aff370e7aaab2d886a7642e79e91f27a533d3b4cad4f6d
+ sha256sums = 94834c91230c5c3743d47fc83b7d143d827e11e10b528a7d4f2b96e577c1123d
pkgname = gzdoom
diff --git a/0001-Fix-path-to-FluidR3-soundfont.patch b/0001-Fix-path-to-FluidR3-soundfont.patch
new file mode 100644
index 00000000000..309efc880f9
--- /dev/null
+++ b/0001-Fix-path-to-FluidR3-soundfont.patch
@@ -0,0 +1,25 @@
+From a5061668fe18fa8b234cd09780a41f7542169b99 Mon Sep 17 00:00:00 2001
+From: Jan Cholasta <jan@cholasta.net>
+Date: Sun, 17 Sep 2017 10:45:32 +0200
+Subject: [PATCH] Fix path to FluidR3 soundfont
+
+---
+ src/sound/mididevices/music_fluidsynth_mididevice.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/sound/mididevices/music_fluidsynth_mididevice.cpp b/src/sound/mididevices/music_fluidsynth_mididevice.cpp
+index 07102c43d..c32a17d8b 100644
+--- a/src/sound/mididevices/music_fluidsynth_mididevice.cpp
++++ b/src/sound/mididevices/music_fluidsynth_mididevice.cpp
+@@ -327,7 +327,7 @@ FluidSynthMIDIDevice::FluidSynthMIDIDevice(const char *args)
+ }
+ #ifdef __unix__
+ // This is the standard location on Ubuntu.
+- if (LoadPatchSets("/usr/share/sounds/sf2/FluidR3_GS.sf2:/usr/share/sounds/sf2/FluidR3_GM.sf2"))
++ if (LoadPatchSets("/usr/share/soundfonts/FluidR3_GS.sf2:/usr/share/soundfonts/FluidR3_GM.sf2"))
+ {
+ return;
+ }
+--
+2.14.2
+
diff --git a/PKGBUILD b/PKGBUILD
index 1bfbe5f11df..8e778de5021 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_name=gzdoom
pkgname=${_name}
-pkgver=3.1.0
+pkgver=3.2.0
pkgrel=1
pkgdesc='Advanced Doom source port with OpenGL support'
arch=('i686' 'x86_64')
@@ -11,8 +11,8 @@ url='http://www.zdoom.org/'
license=('BSD' 'custom:dumb' 'GPL3' 'LGPL3')
depends=('hicolor-icon-theme'
'libgl'
- 'libjpeg'
'libgme'
+ 'libjpeg'
'sdl2')
makedepends=('cmake'
'desktop-file-utils'
@@ -36,15 +36,24 @@ optdepends=('blasphemer-wad: Blasphemer (free Heretic) game data'
'libsndfile: WAV/FLAC/OGG audio support'
'mpg123: MP3 audio support'
'openal: in-game sound'
+ 'soundfont-fluid: FluidR3 soundfont for FluidSynth'
'strife0-wad: Strife shareware game data'
'square1-wad: The Adventures of Square, Episode 1 game data'
'timidity++: Timidity MIDI device'
'urbanbrawl-wad: Urban Brawl: Action Doom 2 game data'
'xorg-xmessage: crash dialog (other)')
source=("${_name}::git://github.com/coelckers/${_name}.git#tag=g${pkgver}"
- "${_name}.desktop")
+ "${_name}.desktop"
+ '0001-Fix-path-to-FluidR3-soundfont.patch')
sha256sums=('SKIP'
- '59122e670f72aa2531aff370e7aaab2d886a7642e79e91f27a533d3b4cad4f6d')
+ '59122e670f72aa2531aff370e7aaab2d886a7642e79e91f27a533d3b4cad4f6d'
+ '94834c91230c5c3743d47fc83b7d143d827e11e10b528a7d4f2b96e577c1123d')
+
+prepare() {
+ cd $_name
+
+ patch -p1 -i"$srcdir"/0001-Fix-path-to-FluidR3-soundfont.patch
+}
build() {
cd $_name
diff --git a/gzdoom.sh b/gzdoom.sh
deleted file mode 100755
index 4ce9012671e..00000000000
--- a/gzdoom.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/lib/gzdoom/gzdoom "$@"