From ee136367a2d9b83f63d7b914dc03ba4701e9432f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sat, 15 Jul 2017 01:23:41 +0200 Subject: [PATCH] carla: initial add 1.9.7b MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../recipes-multimedia/carla/carla_1.9.7b.bb | 59 +++++++++++++++++++ .../0001-Use-fluid-instead-of-ntk-fluid.patch | 33 +++++++++++ ...ot-try-to-cross-run-carla-lv2-export.patch | 31 ++++++++++ ...on-t-kill-LDFLAGS-set-by-build-syste.patch | 49 +++++++++++++++ 4 files changed, 172 insertions(+) create mode 100644 recipes-misc/recipes-multimedia/carla/carla_1.9.7b.bb create mode 100644 recipes-misc/recipes-multimedia/carla/files/0001-Use-fluid-instead-of-ntk-fluid.patch create mode 100644 recipes-misc/recipes-multimedia/carla/files/0002-do-not-try-to-cross-run-carla-lv2-export.patch create mode 100644 recipes-misc/recipes-multimedia/carla/files/0003-native-plugins-don-t-kill-LDFLAGS-set-by-build-syste.patch diff --git a/recipes-misc/recipes-multimedia/carla/carla_1.9.7b.bb b/recipes-misc/recipes-multimedia/carla/carla_1.9.7b.bb new file mode 100644 index 00000000..a8cc0a8b --- /dev/null +++ b/recipes-misc/recipes-multimedia/carla/carla_1.9.7b.bb @@ -0,0 +1,59 @@ +SUMMARY = "Audio plugin host" +HOMEPAGE = "http://kxstudio.linuxaudio.org/Applications:Carla" +LICENSE = "GPLv2 & LGPLv3" +LIC_FILES_CHKSUM = " \ + file://doc/GPL.txt;md5=4641e94ec96f98fabc56ff9cc48be14b \ + file://doc/LGPL.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \ +" + +SRC_URI = " \ + https://github.com/falkTX/Carla/archive/${PV}.tar.gz \ + 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 \ +" +SRC_URI[md5sum] = "d84613ea9fbc42f46cd9831b2d263e87" +SRC_URI[sha256sum] = "05160ba26a4cc8420b776da2c046aa04b1aa01b0c769059251e0e9ba41e0e325" + +S = "${WORKDIR}/Carla-${PV}" + +REQUIRED_DISTRO_FEATURES = "x11" + +inherit qmake5_base autotools-brokensep 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 +# X11-cairo. So use fluid (fltk-native) instead of ntk-fluid + +DEPENDS += " \ + fltk-native \ + ntk \ + gtk+ \ + gtk+3 \ + liblo \ + fftw \ + pulseaudio \ + file \ + fluidsynth \ + projectm \ + mxml \ +" + +EXTRA_OEMAKE += " \ + DEFAULT_QT=5 \ + PREFIX=${prefix} \ + NOOPT=true \ +" + +do_compile_append() { + cd ${S}/bin + ${@qemu_run_binary_local(d, '${STAGING_DIR_TARGET}', 'carla-lv2-export')} +} + +FILES_${PN} += " \ + ${libdir}/python3 \ + ${libdir}/lv2 \ + ${libdir}/vst \ +" + +INSANE_SKIP_${PN} = "dev-so already-stripped" diff --git a/recipes-misc/recipes-multimedia/carla/files/0001-Use-fluid-instead-of-ntk-fluid.patch b/recipes-misc/recipes-multimedia/carla/files/0001-Use-fluid-instead-of-ntk-fluid.patch new file mode 100644 index 00000000..555d7272 --- /dev/null +++ b/recipes-misc/recipes-multimedia/carla/files/0001-Use-fluid-instead-of-ntk-fluid.patch @@ -0,0 +1,33 @@ +From d9b759014b89095601b9173269b391cc646f0c0c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 14 Jul 2017 23:41:39 +0200 +Subject: [PATCH] Use fluid instead of ntk-fluid +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +ntk(-fluid) cannot be build easily: ntk requires on x11 cairo + +Upstream-Status: Inappropriate [cross specific] + +Signed-off-by: Andreas Müller +--- + source/native-plugins/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/source/native-plugins/Makefile b/source/native-plugins/Makefile +index 6392835..f28acd1 100644 +--- a/source/native-plugins/Makefile ++++ b/source/native-plugins/Makefile +@@ -44,7 +44,7 @@ ZYN_LD_FLAGS += $(shell pkg-config --libs x11) + endif + ifeq ($(HAVE_ZYN_UI_DEPS),true) + ifeq ($(HAVE_NTK),true) +-FLUID = ntk-fluid ++FLUID = fluid + ZYN_CXX_FLAGS += -DNTK_GUI + ZYN_CXX_FLAGS += $(shell pkg-config --cflags ntk_images ntk) + ZYN_LD_FLAGS += $(shell pkg-config --libs ntk_images ntk) +-- +2.9.4 + diff --git a/recipes-misc/recipes-multimedia/carla/files/0002-do-not-try-to-cross-run-carla-lv2-export.patch b/recipes-misc/recipes-multimedia/carla/files/0002-do-not-try-to-cross-run-carla-lv2-export.patch new file mode 100644 index 00000000..e61af547 --- /dev/null +++ b/recipes-misc/recipes-multimedia/carla/files/0002-do-not-try-to-cross-run-carla-lv2-export.patch @@ -0,0 +1,31 @@ +From 88c61efce068b4cfe6d4c175bd9d1b85def23708 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sat, 15 Jul 2017 00:03:36 +0200 +Subject: [PATCH] do not try to cross-run carla-lv2-export +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [cross specific] + +Signed-off-by: Andreas Müller +--- + source/plugin/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/source/plugin/Makefile b/source/plugin/Makefile +index 59b5c5d..3bcb368 100644 +--- a/source/plugin/Makefile ++++ b/source/plugin/Makefile +@@ -206,7 +206,7 @@ $(BINDIR)/carla.lv2/manifest.ttl: $(OBJDIR)/carla-lv2-export.cpp.o $(LIBS) + ifeq ($(BUILDING_FOR_WINDOWS),true) + @cd $(BINDIR) && wine ./carla-lv2-export$(APP_EXT) + else +- @cd $(BINDIR) && ./carla-lv2-export$(APP_EXT) ++ @cd $(BINDIR) + endif + @cd $(BINDIR)/carla.lv2 && ln -sf ../*bridge-* ../carla-discovery-* . + +-- +2.9.4 + diff --git a/recipes-misc/recipes-multimedia/carla/files/0003-native-plugins-don-t-kill-LDFLAGS-set-by-build-syste.patch b/recipes-misc/recipes-multimedia/carla/files/0003-native-plugins-don-t-kill-LDFLAGS-set-by-build-syste.patch new file mode 100644 index 00000000..7aa19bea --- /dev/null +++ b/recipes-misc/recipes-multimedia/carla/files/0003-native-plugins-don-t-kill-LDFLAGS-set-by-build-syste.patch @@ -0,0 +1,49 @@ +From c25739c331979d96b209aee3f97a35c99908679c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +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 +--- + 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 +