Commit 714f4056 authored by Gliczy's avatar Gliczy
Browse files

zmusic: 1.1.13 -> 1.1.14

parent 82cee11a
Loading
Loading
Loading
Loading
+3 −7
Original line number Diff line number Diff line
@@ -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 = ''
+22 −0
Original line number Diff line number Diff line
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)