From 99170aadca625fcecccde94a633bec8baf4cb7f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Wed, 30 Nov 2016 23:19:18 +0100 Subject: [PATCH] libopenshot_audio: fix build on x86_64. * also fix devel requires. --- .../libopenshot_audio-0.1.1.recipe | 4 +++- .../patches/libopenshot_audio-0.1.1.patchset | 15 ++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/media-libs/libopenshot-audio/libopenshot_audio-0.1.1.recipe b/media-libs/libopenshot-audio/libopenshot_audio-0.1.1.recipe index b7e268b70..db3dd6e07 100644 --- a/media-libs/libopenshot-audio/libopenshot_audio-0.1.1.recipe +++ b/media-libs/libopenshot-audio/libopenshot_audio-0.1.1.recipe @@ -9,7 +9,7 @@ SOURCE_URI="https://github.com/OpenShot/libopenshot-audio/archive/v$portVersion. SOURCE_FILENAME="libopenshot-audio-$portVersion.tar.gz" CHECKSUM_SHA256="64295d61e985e045dbb4cb525cde9afe6fba9f053302c4154a1ab1b7f6de9820" SOURCE_DIR="libopenshot-audio-$portVersion" -REVISION="1" +REVISION="2" PATCHES="libopenshot_audio-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" @@ -32,6 +32,8 @@ PROVIDES_devel=" " REQUIRES_devel=" libopenshot_audio$secondaryArchSuffix == $portVersion base + haiku$secondaryArchSuffix + lib:libcurl$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix " diff --git a/media-libs/libopenshot-audio/patches/libopenshot_audio-0.1.1.patchset b/media-libs/libopenshot-audio/patches/libopenshot_audio-0.1.1.patchset index 6412c685c..73b5729fd 100644 --- a/media-libs/libopenshot-audio/patches/libopenshot_audio-0.1.1.patchset +++ b/media-libs/libopenshot-audio/patches/libopenshot_audio-0.1.1.patchset @@ -1,4 +1,4 @@ -From b3f1dc9af38d2eb5dd6c629b5c310fbba756364e Mon Sep 17 00:00:00 2001 +From 23ae5c691964ebcbfc2e55be95c19afc23448ce4 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 1 Jun 2016 10:54:45 +0200 Subject: Haiku patch @@ -644,7 +644,7 @@ index 540bf73..e246b6c 100644 MacOSX_10_4 = MacOSX | 4, MacOSX_10_5 = MacOSX | 5, diff --git a/JuceLibraryCode/modules/juce_core/system/juce_TargetPlatform.h b/JuceLibraryCode/modules/juce_core/system/juce_TargetPlatform.h -index 75e363f..6c09c3a 100644 +index 75e363f..f69f96a 100644 --- a/JuceLibraryCode/modules/juce_core/system/juce_TargetPlatform.h +++ b/JuceLibraryCode/modules/juce_core/system/juce_TargetPlatform.h @@ -66,6 +66,8 @@ @@ -656,6 +656,15 @@ index 75e363f..6c09c3a 100644 #else #error "Unknown platform!" #endif +@@ -140,7 +142,7 @@ + #endif + + //============================================================================== +-#if JUCE_LINUX || JUCE_ANDROID ++#if JUCE_LINUX || JUCE_ANDROID || JUCE_HAIKU + + #ifdef _DEBUG + #define JUCE_DEBUG 1 diff --git a/JuceLibraryCode/modules/juce_data_structures/app_properties/juce_PropertiesFile.cpp b/JuceLibraryCode/modules/juce_data_structures/app_properties/juce_PropertiesFile.cpp index bd14b66..dfee386 100644 --- a/JuceLibraryCode/modules/juce_data_structures/app_properties/juce_PropertiesFile.cpp @@ -1635,5 +1644,5 @@ index 0000000..b5c0a4d +const int KeyPress::fastForwardKey = extendedKeyModifier + 47; +const int KeyPress::rewindKey = extendedKeyModifier + 48; -- -2.2.2 +2.10.2