From 82cee11aba7070873af50dd7585dd57c2505107c Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sat, 12 Oct 2024 12:33:52 +0200
Subject: [PATCH 1/4] gzdoom: 4.12.2 -> 4.13.0

---
 pkgs/by-name/gz/gzdoom/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gz/gzdoom/package.nix b/pkgs/by-name/gz/gzdoom/package.nix
index 1856d479426d..c7d5d81e36b7 100644
--- a/pkgs/by-name/gz/gzdoom/package.nix
+++ b/pkgs/by-name/gz/gzdoom/package.nix
@@ -28,14 +28,14 @@
 
 stdenv.mkDerivation rec {
   pname = "gzdoom";
-  version = "4.12.2";
+  version = "4.13.0";
 
   src = fetchFromGitHub {
     owner = "ZDoom";
     repo = "gzdoom";
     rev = "g${version}";
     fetchSubmodules = true;
-    hash = "sha256-taie1Iod3pXvuxxBC7AArmtndkIV0Di9mtJoPvPkioo=";
+    hash = "sha256-Cm4ww/QXTzRiSojeGtZ+CwAL2oSxKaTaTLiGkcNjxaE=";
   };
 
   outputs = [

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 2/4] 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)

From 6f711cc1bd05384902b2ae938e76218692dbe789 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sat, 12 Oct 2024 12:38:51 +0200
Subject: [PATCH 3/4] zmusic: reformat

---
 pkgs/development/libraries/zmusic/default.nix | 42 +++++++++++--------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/libraries/zmusic/default.nix b/pkgs/development/libraries/zmusic/default.nix
index b2457863fe9f..f643608b8219 100644
--- a/pkgs/development/libraries/zmusic/default.nix
+++ b/pkgs/development/libraries/zmusic/default.nix
@@ -1,16 +1,16 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, fetchpatch
-, alsa-lib
-, cmake
-, fluidsynth
-, libsndfile
-, mpg123
-, ninja
-, pkg-config
-, soundfont-fluid
-, zlib
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  alsa-lib,
+  cmake,
+  fluidsynth,
+  libsndfile,
+  mpg123,
+  ninja,
+  pkg-config,
+  soundfont-fluid,
+  zlib,
 }:
 
 stdenv.mkDerivation rec {
@@ -24,7 +24,10 @@ stdenv.mkDerivation rec {
     hash = "sha256-rEE3MZLwqnvn5MqbSTCErbsGRjKMK8cC3wTJxtf8WaU=";
   };
 
-  outputs = [ "out" "dev" ];
+  outputs = [
+    "out"
+    "dev"
+  ];
 
   patches = [
     ./fluidsynth.patch
@@ -50,16 +53,19 @@ stdenv.mkDerivation rec {
     zlib
   ];
 
-  meta = with lib; {
+  meta = {
     description = "GZDoom's music system as a standalone library";
     homepage = "https://github.com/ZDoom/ZMusic";
-    license = with licenses; [
+    license = with lib.licenses; [
       free
       gpl3Plus
       lgpl21Plus
       lgpl3Plus
     ];
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ azahi lassulus ];
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [
+      azahi
+      lassulus
+    ];
   };
 }

From e8ab09226bd583597313b2b42c3fe231f0be039a Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sat, 12 Oct 2024 12:40:34 +0200
Subject: [PATCH 4/4] zmusic: add Gliczy as maintainer

---
 pkgs/development/libraries/zmusic/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/zmusic/default.nix b/pkgs/development/libraries/zmusic/default.nix
index f643608b8219..6c7c04f4a648 100644
--- a/pkgs/development/libraries/zmusic/default.nix
+++ b/pkgs/development/libraries/zmusic/default.nix
@@ -66,6 +66,7 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [
       azahi
       lassulus
+      Gliczy
     ];
   };
 }