summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Cholasta2018-03-05 16:43:17 +0100
committerJan Cholasta2018-03-05 16:46:28 +0100
commited57151cf10757e240c09feb7946176bc697916e (patch)
tree01dc1c3dcf72ec56b4466389980b07278e1cb3e2
parent4d8e993ee0779cfea2ae1ed7d68627ceea1dc938 (diff)
downloadaur-ed57151cf10757e240c09feb7946176bc697916e.tar.gz
gzdoom-git-3.3pre+560+gadae6c19b-1
-rw-r--r--.SRCINFO6
-rw-r--r--0001-Fix-path-to-FluidR3-soundfont.patch25
-rw-r--r--0001-Fix-soundfont-search-path.patch24
-rw-r--r--PKGBUILD11
4 files changed, 33 insertions, 33 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d8e62e6efba..6684c7c4053 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = gzdoom-git
pkgdesc = Advanced Doom source port with OpenGL support (git version)
- pkgver = 3.3pre+287+gee9736fbb
+ pkgver = 3.3pre+560+gadae6c19b
pkgrel = 1
url = http://www.zdoom.org/
arch = i686
@@ -47,10 +47,10 @@ pkgbase = gzdoom-git
replaces = gzdoom1-git
source = gzdoom::git://github.com/coelckers/gzdoom.git
source = gzdoom.desktop
- source = 0001-Fix-path-to-FluidR3-soundfont.patch
+ source = 0001-Fix-soundfont-search-path.patch
sha256sums = SKIP
sha256sums = 59122e670f72aa2531aff370e7aaab2d886a7642e79e91f27a533d3b4cad4f6d
- sha256sums = 30c431cbf51602581bf2bdc66552c1228c50bcf4a4bb5d63eb80d6bc3c79abcf
+ sha256sums = 066f1e3433ec3762ab9f91b72f6ec89bdb140a990d338d63fda68b33e4d19e22
pkgname = gzdoom-git
diff --git a/0001-Fix-path-to-FluidR3-soundfont.patch b/0001-Fix-path-to-FluidR3-soundfont.patch
deleted file mode 100644
index 7c2e35768b6..00000000000
--- a/0001-Fix-path-to-FluidR3-soundfont.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From bb6019e8022a6983a34927ace17516b680ecc7e3 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.1
-
diff --git a/0001-Fix-soundfont-search-path.patch b/0001-Fix-soundfont-search-path.patch
new file mode 100644
index 00000000000..4477a58ca58
--- /dev/null
+++ b/0001-Fix-soundfont-search-path.patch
@@ -0,0 +1,24 @@
+From 8ff9b58295be9920534069344380e9f4d3c8b732 Mon Sep 17 00:00:00 2001
+From: Jan Cholasta <jan@cholasta.net>
+Date: Mon, 5 Mar 2018 16:17:24 +0100
+Subject: [PATCH] Fix soundfont search path
+
+---
+ src/gameconfigfile.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/gameconfigfile.cpp b/src/gameconfigfile.cpp
+index c2655c359..f429fdbeb 100644
+--- a/src/gameconfigfile.cpp
++++ b/src/gameconfigfile.cpp
+@@ -181,6 +181,7 @@ FGameConfigFile::FGameConfigFile ()
+ SetValueForKey("Path", "$PROGDIR/soundfonts", true);
+ #else
+ SetValueForKey("Path", "$HOME/" GAME_DIR "/soundfonts", true);
++ SetValueForKey("Path", SHARE_DIR "/soundfonts", true);
+ SetValueForKey("Path", "/usr/local/share/doom/soundfonts", true);
+ SetValueForKey("Path", "/usr/local/share/games/doom/soundfonts", true);
+ SetValueForKey("Path", "/usr/share/doom/soundfonts", true);
+--
+2.16.2
+
diff --git a/PKGBUILD b/PKGBUILD
index 6345f690fe4..13061f73de3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
_name=gzdoom
pkgname=${_name}-git
-pkgver=3.3pre+287+gee9736fbb
+pkgver=3.3pre+560+gadae6c19b
pkgrel=1
pkgdesc='Advanced Doom source port with OpenGL support (git version)'
arch=('i686' 'x86_64')
@@ -46,10 +46,10 @@ conflicts=("${_name}")
replaces=("${_name}1-git")
source=("${_name}::git://github.com/coelckers/${_name}.git"
"${_name}.desktop"
- '0001-Fix-path-to-FluidR3-soundfont.patch')
+ '0001-Fix-soundfont-search-path.patch')
sha256sums=('SKIP'
'59122e670f72aa2531aff370e7aaab2d886a7642e79e91f27a533d3b4cad4f6d'
- '30c431cbf51602581bf2bdc66552c1228c50bcf4a4bb5d63eb80d6bc3c79abcf')
+ '066f1e3433ec3762ab9f91b72f6ec89bdb140a990d338d63fda68b33e4d19e22')
pkgver() {
cd $_name
@@ -60,7 +60,7 @@ pkgver() {
prepare() {
cd $_name
- patch -p1 -i"$srcdir"/0001-Fix-path-to-FluidR3-soundfont.patch
+ patch -p1 -i"$srcdir"/0001-Fix-soundfont-search-path.patch
}
build() {
@@ -81,7 +81,8 @@ package() {
cd $_name
make install DESTDIR="$pkgdir"
- install -D -m644 ${_name}.sf2 "$pkgdir"/usr/share/$_name
+ install -D -m644 soundfonts/gzdoom.sf2 \
+ "$pkgdir"/usr/share/$_name/soundfonts/gzdoom.sf2
desktop-file-install --dir="$pkgdir"/usr/share/applications \
"$srcdir"/${_name}.desktop