Click here to go back to the commit logs for zmusic.

Commit:

---

Hash: 9f3c666a64613a6fd427c9349c8ba24b000c75ff

Message: Updated to most recent version

Diff

---

diff --git a/.SRCINFO b/.SRCINFO
index 7076b34..e2186a5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,25 @@
-generated-by = makedeb-makepkg
-
-pkgbase = zmusic
-	pkgdesc = GZDoom is music system as a standalone library
-	pkgver = 1.1.8
-	pkgrel = 2
-	url = https://github.com/coelckers/ZMusic
-	arch = x86_64
-	license = BSD
-	license = GPL3
-	license = LGPL2.1
-	license = LGPL3
-	license = custom:dumb
-	makedepends = cmake
-	makedepends = git
-	depends = libasound2-dev
-	depends = libfluidsynth-dev>=2.1
-	depends = libsndfile1-dev
-	depends = libmpg123-dev
-	depends = zlib1g-dev
-	source = ZMusic-1.1.8.tar.gz::https://github.com/coelckers/ZMusic/archive/1.1.8.tar.gz
-	source = 0001-Use-correct-soundfont-path.patch
-	sha256sums = 73082f661b7b0bb33348d1d186c132deec9132a1613480348a00172b49c9fd68
-	sha256sums = 6c1b5bf589e5c36186869276ade865d35fdf860241dcd2e0f557e5a82dfd066f
-
+generated-by = makedeb
 pkgname = zmusic
+pkgbase = zmusic
+pkgdesc = GZDoom is music system as a standalone library
+pkgrel = 2
+pkgver = 1.1.14
+url = https://github.com/ZDoom/ZMusic
+arch = amd64
+arch = aarch64
+depends = libasound2-dev
+depends = libfluidsynth-dev>=2.1
+depends = libsndfile1-dev
+depends = libmpg123-dev
+depends = zlib1g-dev
+license = BSD
+license = GPL3
+license = LGPL2.1
+license = LGPL3
+license = custom:dumb
+makedepends = cmake
+makedepends = git
+source = ZMusic-1.1.14.tar.gz::https://github.com/ZDoom/ZMusic/archive/1.1.14.tar.gz
+sha256sums = f04410fe4ea08136f37703e7715c27df4c8532ace1e721cf40c6f303a93acc54
+makedepends = cmake
+makedepends = git
diff --git a/0001-Use-correct-soundfont-path.patch b/0001-Use-correct-soundfont-path.patch
deleted file mode 100644
index 943ab07..0000000
--- a/0001-Use-correct-soundfont-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 174eb60580c9ffedad91951eefe65a517e040d4e Mon Sep 17 00:00:00 2001
-From: Jan Cholasta <jan@cholasta.net>
-Date: Tue, 11 Feb 2020 14:26:04 +0100
-Subject: [PATCH] Use correct soundfont path
-
----
- source/mididevices/music_fluidsynth_mididevice.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/source/mididevices/music_fluidsynth_mididevice.cpp b/source/mididevices/music_fluidsynth_mididevice.cpp
-index 675b4f9..8a11198 100644
---- a/source/mididevices/music_fluidsynth_mididevice.cpp
-+++ b/source/mididevices/music_fluidsynth_mididevice.cpp
-@@ -644,7 +644,7 @@ void Fluid_SetupConfig(const char* patches, std::vector<std::string> &patch_path
- 		// The following will only be used if no soundfont at all is provided, i.e. even the standard one coming with GZDoom is missing.
- #ifdef __unix__
- 		// This is the standard location on Ubuntu.
--		Fluid_SetupConfig("/usr/share/sounds/sf2/FluidR3_GS.sf2:/usr/share/sounds/sf2/FluidR3_GM.sf2", patch_paths, false);
-+		Fluid_SetupConfig("/usr/share/soundfonts/FluidR3_GS.sf2:/usr/share/soundfonts/FluidR3_GM.sf2", patch_paths, false);
- #endif
- #ifdef _WIN32
- 		// On Windows, look for the 4 megabyte patch set installed by Creative's drivers as a default.
--- 
-2.25.0
-
diff --git a/PKGBUILD b/PKGBUILD
index a975478..46bca08 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,17 @@
-# Maintainer: Tobias Zindl <zie.develop@gmail.com>
-# Maintainer: Jan Cholasta <grubber at grubber cz>
+# Maintainer: Kay <lambdadeltacommunism@gmail.com>
 
 pkgname=zmusic
-pkgver=1.1.8
+pkgver=1.1.14
 pkgrel=2
 pkgdesc="GZDoom is music system as a standalone library"
-arch=('x86_64')
-url='https://github.com/coelckers/ZMusic'
+arch=('amd64' 'aarch64')
+url='https://github.com/ZDoom/ZMusic'
 license=('BSD' 'GPL3' 'LGPL2.1' 'LGPL3' 'custom:dumb')
 depends=('libasound2-dev' 'libfluidsynth-dev>=2.1' 'libsndfile1-dev' 'libmpg123-dev' 'zlib1g-dev')
 makedepends=('cmake' 'git')
 _srcname=ZMusic-${pkgver}
-source=("${_srcname}.tar.gz::https://github.com/coelckers/ZMusic/archive/${pkgver}.tar.gz"
-        '0001-Use-correct-soundfont-path.patch')
-sha256sums=('73082f661b7b0bb33348d1d186c132deec9132a1613480348a00172b49c9fd68'
-            '6c1b5bf589e5c36186869276ade865d35fdf860241dcd2e0f557e5a82dfd066f')
-
-prepare() {
-    cd $_srcname
-    patch -i "$srcdir"/0001-Use-correct-soundfont-path.patch -p 1
-}
+source=("${_srcname}.tar.gz::https://github.com/ZDoom/ZMusic/archive/${pkgver}.tar.gz")
+sha256sums=('f04410fe4ea08136f37703e7715c27df4c8532ace1e721cf40c6f303a93acc54')
 
 build() {
     cd $_srcname
@@ -27,7 +19,6 @@ build() {
     cmake -B build \
           -D CMAKE_BUILD_TYPE=Release \
           -D CMAKE_INSTALL_PREFIX=/usr \
-          -D DYN_FLUIDSYNTH=OFF \
           -D DYN_MPG123=OFF \
           -D DYN_SNDFILE=OFF
     make -C build