From 76c2b555372f47047233a3cb380f5454c24def83 Mon Sep 17 00:00:00 2001 From: Animesh Sahu Date: Fri, 29 Oct 2021 17:55:43 +0530 Subject: [PATCH] Carla: update to 2.4.1 + rm fixed upstream patches + add musl patch remove already fixed patches in upstream fix musl build --- srcpkgs/Carla/patches/libmagic.patch | 14 ----- srcpkgs/Carla/patches/musl.patch | 73 ++++++++++++++++++++++++++ srcpkgs/Carla/patches/qt5-5.15.0.patch | 10 ---- srcpkgs/Carla/template | 6 +-- 4 files changed, 76 insertions(+), 27 deletions(-) delete mode 100644 srcpkgs/Carla/patches/libmagic.patch create mode 100644 srcpkgs/Carla/patches/musl.patch delete mode 100644 srcpkgs/Carla/patches/qt5-5.15.0.patch diff --git a/srcpkgs/Carla/patches/libmagic.patch b/srcpkgs/Carla/patches/libmagic.patch deleted file mode 100644 index f116eadc68ce..000000000000 --- a/srcpkgs/Carla/patches/libmagic.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/source/Makefile.mk -+++ b/source/Makefile.mk -@@ -233,10 +233,7 @@ - # Check for optional libs (special non-pkgconfig tests) - - ifneq ($(WIN32),true) -- --# libmagic doesn't have a pkg-config file, so we need to call the compiler to test it --HAVE_LIBMAGIC = $(shell echo '\#include ' | $(CC) $(CFLAGS) -x c -w -c - -o .libmagic-tmp 2>/dev/null && echo true) -- -+HAVE_LIBMAGIC = true - endif - - # --------------------------------------------------------------------------------------------------------------------- diff --git a/srcpkgs/Carla/patches/musl.patch b/srcpkgs/Carla/patches/musl.patch new file mode 100644 index 000000000000..7914395ba4e1 --- /dev/null +++ b/srcpkgs/Carla/patches/musl.patch @@ -0,0 +1,73 @@ +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; + } + +-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(); } + + //============================================================================== +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 ++++ b/source/modules/juce_core/system/juce_SystemStats.cpp +@@ -138,7 +138,8 @@ String SystemStats::getStackBacktrace() + { + String result; + +- #if JUCE_ANDROID || JUCE_MINGW ++// #if JUCE_ANDROID || JUCE_MINGW ++ #if 1 + jassertfalse; // sorry, not implemented yet! + + #elif JUCE_WINDOWS diff --git a/srcpkgs/Carla/patches/qt5-5.15.0.patch b/srcpkgs/Carla/patches/qt5-5.15.0.patch deleted file mode 100644 index ed58b7f6e69e..000000000000 --- a/srcpkgs/Carla/patches/qt5-5.15.0.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/source/theme/CarlaStyle.cpp 2020-04-13 05:29:06.000000000 +0200 -+++ b/source/theme/CarlaStyle.cpp 2020-08-23 20:32:26.157269175 +0200 -@@ -22,6 +22,7 @@ - - #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) - # include -+# include - # include - # include - # include diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template index 7ab456abe988..9a4cd39bc647 100644 --- a/srcpkgs/Carla/template +++ b/srcpkgs/Carla/template @@ -1,7 +1,7 @@ # Template file for 'Carla' pkgname=Carla -version=2.1 -revision=4 +version=2.4.1 +revision=1 archs="x86_64* i686* aarch64* arm*" build_style=gnu-makefile pycompile_dirs="usr/share/carla" @@ -16,7 +16,7 @@ maintainer="nutcase84 " license="GPL-2.0-or-later" homepage="https://kxstudio.linuxaudio.org/Applications:Carla" distfiles="https://github.com/falkTX/Carla/archive/v${version}.tar.gz" -checksum=a82ce08f3a82db9d878c8cb7e7e2f3b80834bf21801c6ec4ed95c0cfee25b963 +checksum=bbb188a672ea8871b11648d36770ba013497d03407ca9c73ed68429016f7536f python_version=3 case $XBPS_TARGET_MACHINE in