libopenshot-audio: update to 0.4.0

common/shlibs

@@ -2669,7 +2669,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.9 libopenshot-audio-0.3.0_1
+libopenshot-audio.so.10 libopenshot-audio-0.4.0_1
 libopenshot.so.25 libopenshot-0.3.2_1
 libpqxx-6.3.so libpqxx-6.3.3_1
 libndpi.so.3 ndpi-3.4_1

srcpkgs/libopenshot-audio/patches/fix-musl.patch

@@ -1,46 +1,53 @@
-diff --git a/JuceLibraryCode/modules/juce_core/juce_core.cpp b/JuceLibraryCode/modules/juce_core/juce_core.cpp
+This patch disables some glibc-specific features on musl. Upstream appears to support
-index 8bac812..e23b422 100644
+many different platforms, some of which also lack the features musl lacks, but
+upstream provides no musl specific checks. This means that no extra code has to be
+added to support musl, only some of the preprocessor conditional statements have to
+be altered to also take musl into consideration.
+
+This patch only fixes compilation errors, there may still be some musl-related
+runtime errors.
+
+This patch is inspired by
+void-linux/void-packages@da8876faa6fc1792f4d2ea2d4b667d3bbe46d868.
 --- a/JuceLibraryCode/modules/juce_core/juce_core.cpp
 +++ b/JuceLibraryCode/modules/juce_core/juce_core.cpp
-@@ -92,7 +92,7 @@
+@@ -102,7 +102,7 @@
   #include <net/if.h>
   #include <sys/ioctl.h>
  
-- #if ! JUCE_ANDROID
+- #if ! (JUCE_ANDROID || JUCE_WASM)
-+ #if ! JUCE_ANDROID && defined(__GLIBC__)
++ #if ! (JUCE_ANDROID || JUCE_WASM) && defined(__GLIBC__)
    #include <execinfo.h>
   #endif
  #endif
-diff --git a/JuceLibraryCode/modules/juce_core/native/juce_linux_SystemStats.cpp b/JuceLibraryCode/modules/juce_core/native/juce_linux_SystemStats.cpp
+--- a/JuceLibraryCode/modules/juce_core/native/juce_SystemStats_linux.cpp
-index 2d7faa3..f132405 100644
++++ b/JuceLibraryCode/modules/juce_core/native/juce_SystemStats_linux.cpp
---- a/JuceLibraryCode/modules/juce_core/native/juce_linux_SystemStats.cpp
+@@ -198,7 +198,7 @@
-+++ 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()
- String SystemStats::getUserLanguage()     { return getLocaleValue (_NL_IDENTIFICATION_LANGUAGE); }
+ {
- String SystemStats::getUserRegion()       { return getLocaleValue (_NL_IDENTIFICATION_TERRITORY); }
+-   #if JUCE_BSD
-+#else
++   #if JUCE_BSD || !defined(__GLIBC__)
-+// The identifiers _NL_INDENTIFICATION_LANGUAGE and _TERRIRTORY are not defined in musl libc.
+     if (auto langEnv = getenv ("LANG"))
-+// TODO: Find a better fix than just returning nonsense. Inspect env("LANG") perhaps?
+         return String::fromUTF8 (langEnv).upToLastOccurrenceOf (".UTF-8", false, true);
-+String SystemStats::getUserLanguage()     { return String("en"); }
-+String SystemStats::getUserRegion()       { return String("US"); }
-+#endif
- String SystemStats::getDisplayLanguage()  { return getUserLanguage() + "-" + getUserRegion(); }
  
- //==============================================================================
+@@ -210,7 +210,7 @@
-diff --git a/JuceLibraryCode/modules/juce_core/system/juce_SystemStats.cpp b/JuceLibraryCode/modules/juce_core/system/juce_SystemStats.cpp
+ 
-index 757ea24..6b61e16 100644
+ String SystemStats::getUserRegion()
+ {
+-   #if JUCE_BSD
++   #if JUCE_BSD || !defined(__GLIBC__)
+     return {};
+    #else
+     return getLocaleValue (_NL_ADDRESS_COUNTRY_AB2);
 --- 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()
+@@ -178,7 +178,7 @@
  {
      String result;
  
--   #if JUCE_ANDROID || JUCE_MINGW
+-   #if JUCE_ANDROID || JUCE_MINGW || JUCE_WASM
-+   #if JUCE_ANDROID || JUCE_MINGW || !defined(__GLIBC__)
++   #if JUCE_ANDROID || JUCE_MINGW || JUCE_WASM || !defined(__GLIBC__)
      jassertfalse; // sorry, not implemented yet!
  
     #elif JUCE_WINDOWS

srcpkgs/libopenshot-audio/template

@@ -1,6 +1,6 @@
 # Template file for 'libopenshot-audio'
 pkgname=libopenshot-audio
-version=0.3.2
+version=0.4.0
 revision=1
 build_style=cmake
 hostmakedepends="doxygen"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 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=f09d5251c934e6c14d98217b44574c508318c8575e47f5c48ffaf54d9bbce3e9
+checksum=1abdedf9c8686c972c42225a283f518ed2ade445c2e454996b6709d8cc8d1704
 
 libopenshot-audio-devel_package() {
 	short_desc+=" - development files"