diff --git a/srcpkgs/Carla/patches/musl.patch b/srcpkgs/Carla/patches/musl.patch index 7914395ba4e..4d5af4a98a6 100644 --- a/srcpkgs/Carla/patches/musl.patch +++ b/srcpkgs/Carla/patches/musl.patch @@ -1,62 +1,23 @@ -diff --git a/source/includes/vst3sdk/pluginterfaces/base/fplatform.h b/source/includes/vst3sdk/pluginterfaces/base/fplatform.h -index 3a9373893..6e1599345 100644 ---- a/source/includes/vst3sdk/pluginterfaces/base/fplatform.h -+++ b/source/includes/vst3sdk/pluginterfaces/base/fplatform.h -@@ -86,7 +86,7 @@ - //----------------------------------------------------------------------------- - // LINUX - //----------------------------------------------------------------------------- --#elif __gnu_linux__ -+#elif __linux__ - #define SMTG_OS_LINUX 1 - #define SMTG_OS_MACOS 0 - #define SMTG_OS_WINDOWS 0 -diff --git a/source/modules/juce_core/juce_core.cpp b/source/modules/juce_core/juce_core.cpp -index 914cae680..4b1f20b00 100644 ---- a/source/modules/juce_core/juce_core.cpp -+++ b/source/modules/juce_core/juce_core.cpp -@@ -90,10 +90,6 @@ - #include - #include - #include -- -- #if ! JUCE_ANDROID -- #include -- #endif - #endif - - #if JUCE_MAC || JUCE_IOS -diff --git a/source/modules/juce_core/native/juce_linux_SystemStats.cpp b/source/modules/juce_core/native/juce_linux_SystemStats.cpp -index cd3068e6e..607ed29c0 100644 --- a/source/modules/juce_core/native/juce_linux_SystemStats.cpp +++ b/source/modules/juce_core/native/juce_linux_SystemStats.cpp -@@ -139,8 +139,24 @@ static String getLocaleValue (nl_item key) - return result; - } +@@ -198,7 +198,7 @@ --String SystemStats::getUserLanguage() { return getLocaleValue (_NL_IDENTIFICATION_LANGUAGE); } --String SystemStats::getUserRegion() { return getLocaleValue (_NL_IDENTIFICATION_TERRITORY); } -+String SystemStats::getUserLanguage() -+{ -+#if defined(_NL_IDENTIFICATION_LANGUAGE) -+ return getLocaleValue (_NL_IDENTIFICATION_LANGUAGE); -+#else -+ return ""; -+#endif -+} -+ -+String SystemStats::getUserRegion() -+{ -+#if defined(_NL_IDENTIFICATION_TERRITORY) -+ return getLocaleValue (_NL_IDENTIFICATION_TERRITORY); -+#else -+ return ""; -+#endif -+} -+ - String SystemStats::getDisplayLanguage() { return getUserLanguage() + "-" + getUserRegion(); } + String SystemStats::getUserLanguage() + { +- #if JUCE_BSD ++ #if JUCE_BSD || !defined(__GLIBC__) + if (auto langEnv = getenv ("LANG")) + return String::fromUTF8 (langEnv).upToLastOccurrenceOf (".UTF-8", false, true); - //============================================================================== +@@ -210,7 +210,7 @@ + + String SystemStats::getUserRegion() + { +- #if JUCE_BSD ++ #if JUCE_BSD || !defined(__GLIBC__) + return {}; + #else + return getLocaleValue (_NL_IDENTIFICATION_TERRITORY); diff --git a/source/modules/juce_core/system/juce_SystemStats.cpp b/source/modules/juce_core/system/juce_SystemStats.cpp index 847127162..815ead97c 100644 --- a/source/modules/juce_core/system/juce_SystemStats.cpp @@ -65,8 +26,8 @@ index 847127162..815ead97c 100644 { String result; -- #if JUCE_ANDROID || JUCE_MINGW -+// #if JUCE_ANDROID || JUCE_MINGW +- #if JUCE_ANDROID || JUCE_MINGW || JUCE_WASM ++// #if JUCE_ANDROID || JUCE_MINGW || JUCE_WASM + #if 1 jassertfalse; // sorry, not implemented yet! diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template index 6d25e6bb048..1da734fc6c6 100644 --- a/srcpkgs/Carla/template +++ b/srcpkgs/Carla/template @@ -1,6 +1,6 @@ # Template file for 'Carla' pkgname=Carla -version=2.4.3 +version=2.5.1 revision=1 archs="x86_64* i686* aarch64* arm*" build_style=gnu-makefile @@ -16,7 +16,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://kx.studio/Applications:Carla" distfiles="https://github.com/falkTX/Carla/archive/v${version}.tar.gz" -checksum=0092926e5167f3a5eb592f0055e5491803354ae42947e706db0dc548d9e786d3 +checksum=c47eea999b2880bde035fbc30d7b42b49234a81327127048a56967ec884dfdba python_version=3 case $XBPS_TARGET_MACHINE in @@ -29,6 +29,11 @@ if [ "$CROSS_BUILD" ]; then hostmakedepends+=" Carla-devel" fi +if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + makedepends+=" libexecinfo-devel musl-fts-devel" + export LDFLAGS="-lfts" +fi + post_patch() { if [ "$CROSS_BUILD" ]; then vsed -i -e 's#\./carla-lv2-export#/usr/bin/carla-lv2-export#g' \