From 714f4056e8636d47e8cec5148de0a1027a88350a Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sat, 12 Oct 2024 12:34:52 +0200
Subject: [PATCH] zmusic: 1.1.13 -> 1.1.14

---
 pkgs/development/libraries/zmusic/default.nix | 10 +++------
 .../libraries/zmusic/fluidsynth.patch         | 22 +++++++++++++++++++
 2 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/development/libraries/zmusic/fluidsynth.patch

diff --git a/pkgs/development/libraries/zmusic/default.nix b/pkgs/development/libraries/zmusic/default.nix
index 1b504515f9e6..b2457863fe9f 100644
--- a/pkgs/development/libraries/zmusic/default.nix
+++ b/pkgs/development/libraries/zmusic/default.nix
@@ -15,23 +15,19 @@
 
 stdenv.mkDerivation rec {
   pname = "zmusic";
-  version = "1.1.13";
+  version = "1.1.14";
 
   src = fetchFromGitHub {
     owner = "ZDoom";
     repo = "ZMusic";
     rev = version;
-    hash = "sha256-rvvMS5KciHEvoY4hSfgAEyWJiDMqBto4o09oIpQIGTQ=";
+    hash = "sha256-rEE3MZLwqnvn5MqbSTCErbsGRjKMK8cC3wTJxtf8WaU=";
   };
 
   outputs = [ "out" "dev" ];
 
   patches = [
-    (fetchpatch {
-      name = "system-fluidsynth.patch";
-      url = "https://git.alpinelinux.org/aports/plain/community/zmusic/system-fluidsynth.patch?id=ca353107ef4f2e5c55c3cc824b0840e2838fb894";
-      hash = "sha256-xKaqiNk1Kt9yNLB22IVmSEtGeOtxrCi7YtFCmhNr0MI=";
-    })
+    ./fluidsynth.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/development/libraries/zmusic/fluidsynth.patch b/pkgs/development/libraries/zmusic/fluidsynth.patch
new file mode 100644
index 000000000000..20f97accdd22
--- /dev/null
+++ b/pkgs/development/libraries/zmusic/fluidsynth.patch
@@ -0,0 +1,22 @@
+diff --git a/source/mididevices/music_fluidsynth_mididevice.cpp b/source/mididevices/music_fluidsynth_mididevice.cpp
+index 1a33d3c..496d842 100644
+--- a/source/mididevices/music_fluidsynth_mididevice.cpp
++++ b/source/mididevices/music_fluidsynth_mididevice.cpp
+@@ -47,7 +47,7 @@
+ 
+ FluidConfig fluidConfig;
+ 
+-#include "../thirdparty/fluidsynth/include/fluidsynth.h"
++#include <fluidsynth.h>
+ 
+ class FluidSynthMIDIDevice : public SoftSynthMIDIDevice
+ {
+diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
+index dd791db..c59b40d 100644
+--- a/thirdparty/CMakeLists.txt
++++ b/thirdparty/CMakeLists.txt
+@@ -28,4 +28,3 @@ add_subdirectory(timidityplus)
+ add_subdirectory(wildmidi)
+ add_subdirectory(oplsynth)
+ add_subdirectory(libxmp)
+-add_subdirectory(fluidsynth/src)