zepto-forks/meta-qt5-extra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

carla: move to git and build experimental plugins

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2017-08-02 21:48:17 +02:00
parent 39300b3e76
commit 5dfc1d8a98
3 changed files with 44 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
recipes-misc/recipes-multimedia/carla/carla_1.9.7b.bb → recipes-misc/recipes-multimedia/carla/carla_git.bb
View File

@@ -7,19 +7,18 @@ LIC_FILES_CHKSUM = " \
"
SRC_URI = " \
https://github.com/falkTX/Carla/archive/${PV}.tar.gz \
git://github.com/falkTX/Carla.git \
file://0001-Use-fluid-instead-of-ntk-fluid.patch \
file://0002-do-not-try-to-cross-run-carla-lv2-export.patch \
file://0003-native-plugins-don-t-kill-LDFLAGS-set-by-build-syste.patch \
file://0003-Don-t-disable-EXPERIMENTAL_PLUGINS.patch \
"
SRC_URI[md5sum] = "d84613ea9fbc42f46cd9831b2d263e87"
SRC_URI[sha256sum] = "05160ba26a4cc8420b776da2c046aa04b1aa01b0c769059251e0e9ba41e0e325"
S = "${WORKDIR}/Carla-${PV}"
SRCREV = "4a1e17888fc9abb0a4ea4a83d8f7020a5eabda1c"
S = "${WORKDIR}/git"
PV = "1.9.7b+git${SRCPV}"
REQUIRED_DISTRO_FEATURES = "x11"
inherit qmake5_base autotools-brokensep qemu-ext distro_features_check
inherit qmake5_base autotools-brokensep pkgconfig qemu-ext distro_features_check
# Notes on fltk-native / ntk
# Ntk is a fork of fltk using cairo. Ntk cannot be build native easily without
@@ -37,14 +36,21 @@ DEPENDS += " \
fluidsynth \
projectm \
mxml \
clthreads \
clxclient \
zita-resampler \
zita-convolver \
"
EXTRA_OEMAKE += " \
DEFAULT_QT=5 \
PREFIX=${prefix} \
NOOPT=true \
EXPERIMENTAL_PLUGINS=true \
"
LDFLAGS += "-lpng"
do_compile_append() {
cd ${S}/bin
${@qemu_run_binary_local(d, '${STAGING_DIR_TARGET}', 'carla-lv2-export')}

31
recipes-misc/recipes-multimedia/carla/files/0003-Don-t-disable-EXPERIMENTAL_PLUGINS.patch Normal file
View File

@@ -0,0 +1,31 @@
From cfecefeea4d3d895442466c10ce4813a4ef548c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 2 Aug 2017 15:47:30 +0200
Subject: [PATCH] Don't disable EXPERIMENTAL_PLUGINS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
source/Makefile.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/source/Makefile.mk b/source/Makefile.mk
index 5db2b76..fd320e1 100644
--- a/source/Makefile.mk
+++ b/source/Makefile.mk
@@ -11,7 +11,7 @@
CARLA_VESTIGE_HEADER = true
# Enable experimental plugins, don't complain if the build fails when using this!
-EXPERIMENTAL_PLUGINS = false
+#EXPERIMENTAL_PLUGINS = false
# --------------------------------------------------------------
# DO NOT MODIFY PAST THIS POINT!
--
2.9.4

49
recipes-misc/recipes-multimedia/carla/files/0003-native-plugins-don-t-kill-LDFLAGS-set-by-build-syste.patch
View File

@@ -1,49 +0,0 @@
From c25739c331979d96b209aee3f97a35c99908679c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 2 Aug 2017 01:29:39 +0200
Subject: [PATCH] native-plugins: don't kill LDFLAGS set by build system
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
source/native-plugins/Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/source/native-plugins/Makefile b/source/native-plugins/Makefile
index f28acd1..fd6347c 100644
--- a/source/native-plugins/Makefile
+++ b/source/native-plugins/Makefile
@@ -207,22 +207,22 @@ $(MODULEDIR)/$(MODULENAME).a: $(OBJS)
resources/at1-ui$(APP_EXT): $(OBJDIR)/zita-at1-ui.cpp.o
-@mkdir -p $(OBJDIR)
@echo "Linking at1-ui"
- @$(CXX) $^ $(ZITA_UI_LINK_FLAGS) -o $@
+ @$(CXX) $^ $(LDFLAGS) $(ZITA_UI_LINK_FLAGS) -o $@
resources/bls1-ui$(APP_EXT): $(OBJDIR)/zita-bls1-ui.cpp.o
-@mkdir -p $(OBJDIR)
@echo "Linking bls1-ui"
- @$(CXX) $^ $(ZITA_UI_LINK_FLAGS) -o $@
+ @$(CXX) $^ $(LDFLAGS) $(ZITA_UI_LINK_FLAGS) -o $@
resources/rev1-ui$(APP_EXT): $(OBJDIR)/zita-rev1-ui.cpp.o
-@mkdir -p $(OBJDIR)
@echo "Linking rev1-ui"
- @$(CXX) $^ $(ZITA_UI_LINK_FLAGS) -o $@
+ @$(CXX) $^ $(LDFLAGS) $(ZITA_UI_LINK_FLAGS) -o $@
resources/zynaddsubfx-ui$(APP_EXT): $(OBJDIR)/zynaddsubfx-ui.cpp.o
-@mkdir -p $(OBJDIR)
@echo "Linking zynaddsubfx-ui"
- @$(CXX) $^ $(ZYN_LD_FLAGS) -o $@
+ @$(CXX) $^ $(LDFLAGS) $(ZYN_LD_FLAGS) -o $@
# ----------------------------------------------------------------------------------------------------------------------------
--
2.9.4