Carla: update to 2.1.

This commit is contained in:
Daniel Eyßer 2020-04-23 02:24:51 +02:00 committed by Helmut Pozimski
parent ebd028a84f
commit 0ae81dd745
2 changed files with 7 additions and 36 deletions

View file

@ -1,29 +0,0 @@
--- 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

View file

@ -1,12 +1,12 @@
# Template file for 'Carla'
pkgname=Carla
version=2.0.0
revision=3
version=2.1
revision=1
archs="x86_64* i686* aarch64* arm*"
build_style=gnu-makefile
pycompile_dirs="usr/share/carla"
hostmakedepends="pkg-config python3-PyQt5-devel-tools which"
makedepends="python3-PyQt5 libmagic file-devel
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"
@ -14,9 +14,9 @@ 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"
homepage="https://kxstudio.linuxaudio.org/Applications:Carla"
distfiles="https://github.com/falkTX/Carla/archive/v${version}.tar.gz"
checksum=d0c8d8417f8cce9abe807f6359231f187d60db7121ec1dccce3b596a22ef6c41
checksum=a82ce08f3a82db9d878c8cb7e7e2f3b80834bf21801c6ec4ed95c0cfee25b963
python_version=3
case $XBPS_TARGET_MACHINE in
@ -30,11 +30,11 @@ if [ "$CROSS_BUILD" ]; then
fi
pre_build() {
sed -e '1,1i#include <unistd.h>' \
vsed -e '1,1i#include <unistd.h>' \
-i source/modules/water/text/CharacterFunctions.h
if [ "$CROSS_BUILD" ]; then
sed -i -e 's#\./carla-lv2-export#/usr/bin/carla-lv2-export#g' \
vsed -i -e 's#\./carla-lv2-export#/usr/bin/carla-lv2-export#g' \
source/plugin/Makefile
fi