From 0ec4aaf46adc9b7dd96f3da3616d5b5c3a15cc54 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 23 Feb 2022 00:41:38 +0100 Subject: [PATCH] libopenshot-audio: update to 0.2.2. --- common/shlibs | 2 +- .../libopenshot-audio/patches/fix-musl.patch | 86 ++++++++++--------- srcpkgs/libopenshot-audio/template | 7 +- 3 files changed, 51 insertions(+), 44 deletions(-) diff --git a/common/shlibs b/common/shlibs index 0196182059..8e2feccbee 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2597,7 +2597,7 @@ libax25io.so.0 libax25-0.0.12rc4_1 libmill.so.18 libmill-1.14_1 libges-1.0.so.0 gst1-editing-services-1.6.2_1 libykneomgr.so.0 libykneomgr-0.1.8_1 -libopenshot-audio.so.7 libopenshot-audio-0.2.0_1 +libopenshot-audio.so.8 libopenshot-audio-0.2.2_1 libopenshot.so.19 libopenshot-0.2.5_3 libpqxx-6.3.so libpqxx-6.3.3_1 libndpi.so.3 ndpi-3.4_1 diff --git a/srcpkgs/libopenshot-audio/patches/fix-musl.patch b/srcpkgs/libopenshot-audio/patches/fix-musl.patch index b5f178d92d..532248c862 100644 --- a/srcpkgs/libopenshot-audio/patches/fix-musl.patch +++ b/srcpkgs/libopenshot-audio/patches/fix-musl.patch @@ -1,40 +1,46 @@ ---- a/JuceLibraryCode/modules/juce_core/juce_core.cpp 2016-08-30 06:24:27.000000000 +0200 -+++ b/JuceLibraryCode/modules/juce_core/juce_core.cpp 2016-12-12 14:53:23.532613378 +0100 -@@ -97,7 +97,7 @@ - #include - #include - -- #if ! JUCE_ANDROID -+ #if ! JUCE_ANDROID && defined(__GLIBC__) - #include - #endif - #endif ---- a/JuceLibraryCode/modules/juce_core/system/juce_SystemStats.cpp 2016-08-30 06:24:27.000000000 +0200 -+++ b/JuceLibraryCode/modules/juce_core/system/juce_SystemStats.cpp 2016-12-12 14:58:35.988986030 +0100 -@@ -134,6 +134,8 @@ - } - } - -+ #elif !defined(__GLIBC__) -+ jassertfalse; // sorry, not implemented yet! - #else - void* stack[128]; - int frames = backtrace (stack, numElementsInArray (stack)); ---- a/JuceLibraryCode/modules/juce_core/native/juce_linux_SystemStats.cpp 2016-08-30 06:24:27.000000000 +0200 -+++ b/JuceLibraryCode/modules/juce_core/native/juce_linux_SystemStats.cpp 2016-12-12 15:07:35.046607788 +0100 -@@ -142,8 +142,15 @@ - return result; - } - -+#if defined(__GLIBC__) - String SystemStats::getUserLanguage() { return getLocaleValue (_NL_IDENTIFICATION_LANGUAGE); } - String SystemStats::getUserRegion() { return getLocaleValue (_NL_IDENTIFICATION_TERRITORY); } -+#else -+// The identifiers _NL_INDENTIFICATION_LANGUAGE and _TERRIRTORY are not defined in musl libc. -+// TODO: Find a better fix than just returning nonsense. Inspect env("LANG") perhaps? -+String SystemStats::getUserLanguage() { return String("en"); } -+String SystemStats::getUserRegion() { return String("US"); } -+#endif - String SystemStats::getDisplayLanguage() { return getUserLanguage() + "-" + getUserRegion(); } - - //============================================================================== +diff --git a/JuceLibraryCode/modules/juce_core/juce_core.cpp b/JuceLibraryCode/modules/juce_core/juce_core.cpp +index 8bac812..e23b422 100644 +--- a/JuceLibraryCode/modules/juce_core/juce_core.cpp ++++ b/JuceLibraryCode/modules/juce_core/juce_core.cpp +@@ -92,7 +92,7 @@ + #include + #include + +- #if ! JUCE_ANDROID ++ #if ! JUCE_ANDROID && defined(__GLIBC__) + #include + #endif + #endif +diff --git a/JuceLibraryCode/modules/juce_core/native/juce_linux_SystemStats.cpp b/JuceLibraryCode/modules/juce_core/native/juce_linux_SystemStats.cpp +index 2d7faa3..f132405 100644 +--- a/JuceLibraryCode/modules/juce_core/native/juce_linux_SystemStats.cpp ++++ b/JuceLibraryCode/modules/juce_core/native/juce_linux_SystemStats.cpp +@@ -139,8 +139,15 @@ static String getLocaleValue (nl_item key) + return result; + } + ++#if defined(__GLIBC__) + String SystemStats::getUserLanguage() { return getLocaleValue (_NL_IDENTIFICATION_LANGUAGE); } + String SystemStats::getUserRegion() { return getLocaleValue (_NL_IDENTIFICATION_TERRITORY); } ++#else ++// The identifiers _NL_INDENTIFICATION_LANGUAGE and _TERRIRTORY are not defined in musl libc. ++// TODO: Find a better fix than just returning nonsense. Inspect env("LANG") perhaps? ++String SystemStats::getUserLanguage() { return String("en"); } ++String SystemStats::getUserRegion() { return String("US"); } ++#endif + String SystemStats::getDisplayLanguage() { return getUserLanguage() + "-" + getUserRegion(); } + + //============================================================================== +diff --git a/JuceLibraryCode/modules/juce_core/system/juce_SystemStats.cpp b/JuceLibraryCode/modules/juce_core/system/juce_SystemStats.cpp +index 757ea24..6b61e16 100644 +--- a/JuceLibraryCode/modules/juce_core/system/juce_SystemStats.cpp ++++ b/JuceLibraryCode/modules/juce_core/system/juce_SystemStats.cpp +@@ -138,7 +138,7 @@ String SystemStats::getStackBacktrace() + { + String result; + +- #if JUCE_ANDROID || JUCE_MINGW ++ #if JUCE_ANDROID || JUCE_MINGW || !defined(__GLIBC__) + jassertfalse; // sorry, not implemented yet! + + #elif JUCE_WINDOWS diff --git a/srcpkgs/libopenshot-audio/template b/srcpkgs/libopenshot-audio/template index 56c330eafc..254f8b6283 100644 --- a/srcpkgs/libopenshot-audio/template +++ b/srcpkgs/libopenshot-audio/template @@ -1,6 +1,6 @@ # Template file for 'libopenshot-audio' pkgname=libopenshot-audio -version=0.2.0 +version=0.2.2 revision=1 build_style=cmake hostmakedepends="doxygen" @@ -11,7 +11,7 @@ maintainer="Spencer Hill " license="GPL-3.0-or-later" homepage="https://github.com/OpenShot/libopenshot-audio" distfiles="https://github.com/OpenShot/libopenshot-audio/archive/v${version}.tar.gz" -checksum=937ff4f1c2dfb8ab5d56ad85beacaa29dfd5a79af0d9cf647386034fe9882309 +checksum=66bedfda0d8d430598b21bc2dde6c0016a758a6c83467d0273a9d692de10baaf if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" @@ -20,9 +20,10 @@ fi libopenshot-audio-devel_package() { short_desc+=" - development files" - depends+=" ${sourcepkg}>=${version}_${revision}" + depends+=" ${sourcepkg}>=${version}_${revision} alsa-lib-devel zlib-devel" pkg_install() { vmove usr/include + vmove usr/lib/cmake vmove "usr/lib/*.so" } }