jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Carla: update to 2.4.1.

Browse source 
musl patch: we disable backtrace functionality unconditionally.

Add pyliblo to depends to fix the carla-control program.
This commit is contained in:
Animesh Sahu 2021-10-29 17:55:43 +05:30 committed by Érico Nogueira Rolim
parent d64b020598
commit 032a0f8df0
4 changed files with 77 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
srcpkgs/Carla/patches/libmagic.patch
View file

@ -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 <magic.h>' | $(CC) $(CFLAGS) -x c -w -c - -o .libmagic-tmp 2>/dev/null && echo true)
-
+HAVE_LIBMAGIC = true
endif
# ---------------------------------------------------------------------------------------------------------------------

73
srcpkgs/Carla/patches/musl.patch Normal file
View file

@ -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 <sys/time.h>
#include <net/if.h>
#include <sys/ioctl.h>
-
- #if ! JUCE_ANDROID
- #include <execinfo.h>
- #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

10
srcpkgs/Carla/patches/qt5-5.15.0.patch
View file

@ -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 <QtGui/QPainter>
+# include <QtGui/QPainterPath>
# include <QtGui/QPixmapCache>
# include <QtWidgets/qdrawutil.h>
# include <QtWidgets/QApplication>

8
srcpkgs/Carla/template
View file

@ -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"
@ -10,13 +10,13 @@ makedepends="python3-PyQt5 libmagic file-devel libsndfile-devel
liblo-devel alsa-lib-devel pulseaudio-devel libX11-devel gtk+3-devel
gtk+-devel qt5-devel fluidsynth-devel fftw-devel zlib-devel
python3-rdflib"
depends="python3 python3-PyQt5 python3-PyQt5-svg which"
depends="python3 python3-PyQt5 python3-PyQt5-svg pyliblo which"
short_desc="Audio plugin host"
maintainer="nutcase84 <nutcase84@protonmail.com>"
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