Commit f1909d63 authored by Kirill Radzikhovskyy's avatar Kirill Radzikhovskyy
Browse files

libsForQt5.libopenshot-audio: 0.3.3 -> 0.4.0 

release: https://github.com/OpenShot/libopenshot-audio/releases/tag/v0.4.0
parent 4564976c

pkgs/development/libraries/libopenshot-audio/0001-undef-fpret-on-aarch64-darwin.patch

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
diff --git a/JuceLibraryCode/modules/juce_core/native/juce_osx_ObjCHelpers.h b/JuceLibraryCode/modules/juce_core/native/juce_osx_ObjCHelpers.h

index 2593790..0b5983d 100644

--- a/JuceLibraryCode/modules/juce_core/native/juce_osx_ObjCHelpers.h

+++ b/JuceLibraryCode/modules/juce_core/native/juce_osx_ObjCHelpers.h

@@ -209,7 +209,7 @@ static inline ReturnValue ObjCMsgSendSuper (struct objc_super* s, SEL sel, Param

 typedef id (*MsgSendSuperFn) (struct objc_super*, SEL, ...);

 static inline MsgSendSuperFn getMsgSendSuperFn() noexcept   { return (MsgSendSuperFn) (void*) objc_msgSendSuper; }

 

-#if ! JUCE_IOS

+#if JUCE_INTEL && ! JUCE_IOS

 typedef double (*MsgSendFPRetFn) (id, SEL op, ...);

 static inline MsgSendFPRetFn getMsgSendFPRetFn() noexcept   { return (MsgSendFPRetFn) (void*) objc_msgSend_fpret; }

 #endif

pkgs/development/libraries/libopenshot-audio/default.nix

+2 −7
Original line number Diff line number Diff line
@@ -17,20 +17,15 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "libopenshot-audio";

  version = "0.3.3";

  version = "0.4.0";



  src = fetchFromGitHub {

    owner = "OpenShot";

    repo = "libopenshot-audio";

    rev = "v${finalAttrs.version}";

    hash = "sha256-9iHeVMoyzTQae/PVYJqON0qOPo3SJlhrqbcp2u1Y8MA=";

    hash = "sha256-FTSITx6GoH1cGWeWNWtz1Ih+zozK8aA+u54Y4s0DylQ=";

  };



  patches = [

    # https://forum.juce.com/t/juce-and-macos-11-arm/40285/24

    ./0001-undef-fpret-on-aarch64-darwin.patch

  ];



  nativeBuildInputs = [

    cmake

    doxygen