Unverified Commit af2e71bd authored by Azat Bahawi's avatar Azat Bahawi Committed by GitHub
Browse files

gzdoom: 4.12.2 -> 4.13.0; zmusic: 1.1.13 -> 1.1.14, add Gliczy as maintainer, reformat (#348072)

parents 5a92d785 e8ab0922

pkgs/by-name/gz/gzdoom/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 = [

pkgs/development/libraries/zmusic/default.nix

+28 −25
Original line number Diff line number Diff line 
{ 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 {

  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" ];

  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 = ''
@@ -54,16 +53,20 @@ 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

      Gliczy

    ];

  };

}

pkgs/development/libraries/zmusic/fluidsynth.patch

0 → 100644
+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)