mirror of
https://github.com/void-linux/void-packages.git
synced 2025-04-16 06:07:00 +02:00
Carla: add patch for gcc 9
Bump revision to trigger rebuild for platform that were cross-compiled.
This commit is contained in:
parent
22e2004a99
commit
f6fcc31847
3 changed files with 48 additions and 7 deletions
29
srcpkgs/Carla/patches/gcc-9.2.0.patch
Normal file
29
srcpkgs/Carla/patches/gcc-9.2.0.patch
Normal file
|
@ -0,0 +1,29 @@
|
|||
--- source/bridges-ui/CarlaBridgeToolkitQt.cpp
|
||||
+++ source/bridges-ui/CarlaBridgeToolkitQt.cpp
|
||||
@@ -256,12 +256,6 @@
|
||||
#endif
|
||||
};
|
||||
|
||||
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
|
||||
-# include "CarlaBridgeToolkitQt5.moc"
|
||||
-#else
|
||||
-# include "CarlaBridgeToolkitQt4.moc"
|
||||
-#endif
|
||||
-
|
||||
// -------------------------------------------------------------------------
|
||||
|
||||
CarlaBridgeToolkit* CarlaBridgeToolkit::createNew(CarlaBridgeFormat* const format)
|
||||
@@ -279,9 +273,13 @@
|
||||
int qInitResources();
|
||||
int qCleanupResources();
|
||||
|
||||
+CARLA_BRIDGE_UI_USE_NAMESPACE
|
||||
+
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
|
||||
+# include "CarlaBridgeToolkitQt5.moc"
|
||||
# include "resources.qt5.cpp"
|
||||
#else
|
||||
+# include "CarlaBridgeToolkitQt4.moc"
|
||||
# include "resources.qt4.cpp"
|
||||
#endif
|
||||
|
14
srcpkgs/Carla/patches/libmagic.patch
Normal file
14
srcpkgs/Carla/patches/libmagic.patch
Normal file
|
@ -0,0 +1,14 @@
|
|||
--- source/Makefile.mk
|
||||
+++ 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
|
||||
|
||||
# ---------------------------------------------------------------------------------------------------------------------
|
|
@ -1,25 +1,23 @@
|
|||
# Template file for 'Carla'
|
||||
pkgname=Carla
|
||||
version=2.0.0
|
||||
revision=2
|
||||
revision=3
|
||||
archs="x86_64* i686* aarch64* arm*"
|
||||
build_style=gnu-makefile
|
||||
make_build_args="DEFAULT_QT=5"
|
||||
make_install_args="DEFAULT_QT=5"
|
||||
pycompile_module="carla_utils.py carla_backend.py"
|
||||
pycompile_dirs="usr/share/carla"
|
||||
hostmakedepends="pkg-config python3"
|
||||
makedepends="python3-PyQt5-devel-tools python3-PyQt5 libmagic file-devel
|
||||
hostmakedepends="pkg-config python3-PyQt5-devel-tools which"
|
||||
makedepends="python3-PyQt5 libmagic file-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"
|
||||
depends="python3 python3-PyQt5 python3-PyQt5-svg which"
|
||||
short_desc="Audio plugin host"
|
||||
maintainer="nutcase84 <nutcase84@protonmail.com>"
|
||||
license="GPL-2.0-or-later"
|
||||
homepage="http://kxstudio.linuxaudio.org/Applications:Carla"
|
||||
distfiles="https://github.com/falkTX/Carla/archive/v${version}.tar.gz"
|
||||
checksum=d0c8d8417f8cce9abe807f6359231f187d60db7121ec1dccce3b596a22ef6c41
|
||||
pycompile_version=$py3_ver
|
||||
|
||||
case $XBPS_TARGET_MACHINE in
|
||||
x86_64* | i686*);;
|
||||
|
|
Loading…
Add table
Reference in a new issue