diff --git a/recipes-musicians/carla/carla.bb b/recipes-musicians/carla/carla.bb index c4dfbdc..1a93ba3 100644 --- a/recipes-musicians/carla/carla.bb +++ b/recipes-musicians/carla/carla.bb @@ -9,11 +9,10 @@ LIC_FILES_CHKSUM = " \ SRC_URI = " \ git://github.com/falkTX/Carla.git;branch=main;protocol=https \ file://0001-do-not-try-to-cross-run-carla-lv2-export.patch \ - file://0002-Do-not-try-to-find-Qt5-host-bins-it-won-t-work.patch \ " -SRCREV = "b02121e9a2cc6229b3863a54405c52614471895c" +SRCREV = "f22915f6ec0093a0d27c4b3e3cf27724d5bc536b" S = "${WORKDIR}/git" -PV = "2.4.0" +PV = "2.4.3" REQUIRED_DISTRO_FEATURES = "x11" @@ -51,6 +50,7 @@ do_configure() { do_compile:append() { cd ${S}/bin ${@qemu_run_binary_local(d, '${STAGING_DIR_TARGET}', 'carla-lv2-export')} + cd ${S}/bin/carla.lv2 && ln -sf ../*bridge-* ../carla-discovery-* . } do_install() { @@ -58,6 +58,7 @@ do_install() { } FILES:${PN} += " \ + ${datadir}/appdata \ ${datadir}/icons \ ${datadir}/mime \ ${libdir}/jack \ diff --git a/recipes-musicians/carla/carla/0001-do-not-try-to-cross-run-carla-lv2-export.patch b/recipes-musicians/carla/carla/0001-do-not-try-to-cross-run-carla-lv2-export.patch index dc8729c..bd35061 100644 --- a/recipes-musicians/carla/carla/0001-do-not-try-to-cross-run-carla-lv2-export.patch +++ b/recipes-musicians/carla/carla/0001-do-not-try-to-cross-run-carla-lv2-export.patch @@ -10,23 +10,24 @@ Upstream-Status: Inappropriate [cross specific] Signed-off-by: Andreas Müller --- - source/plugin/Makefile | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) + source/plugin/Makefile | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/source/plugin/Makefile b/source/plugin/Makefile -index 2ec4eb305..726ec32c0 100644 +index 19a23ff40..57aa47341 100644 --- a/source/plugin/Makefile +++ b/source/plugin/Makefile -@@ -478,8 +478,7 @@ $(BINDIR)/carla.lv2/manifest.ttl: $(OBJDIR)/carla-lv2-export.cpp.o $(BINDIR)/car +@@ -481,9 +481,7 @@ $(BINDIR)/carla.lv2/manifest.ttl: $(OBJDIR)/carla-lv2-export.cpp.o $(BINDIR)/car @echo "Linking carla-lv2-export$(APP_EXT)" - @$(CXX) $< $(LIBS_START) $(LIBS) $(LIBS_END) $(NATIVE_LINK_FLAGS) -o $(BINDIR)/carla-lv2-export$(APP_EXT) + $(SILENT)$(CXX) $< $(LIBS_START) $(LIBS) $(LIBS_END) $(NATIVE_LINK_FLAGS) -o $(BINDIR)/carla-lv2-export$(APP_EXT) - @echo "Generating LV2 ttl data" -- @cd $(BINDIR) && $(EXE_WRAPPER) ./carla-lv2-export$(APP_EXT) +- $(SILENT)cd $(BINDIR) && $(EXE_WRAPPER) ./carla-lv2-export$(APP_EXT) +- $(SILENT)cd $(BINDIR)/carla.lv2 && ln -sf ../*bridge-* ../carla-discovery-* . + @echo "LV2 ttl data creation is postponed" - @cd $(BINDIR)/carla.lv2 && ln -sf ../*bridge-* ../carla-discovery-* . $(BINDIR)/carla-lv2-export$(APP_EXT): $(OBJDIR)/carla-lv2-export.cpp.o + -@mkdir -p $(BINDIR) -- -2.30.2 +2.34.3 diff --git a/recipes-musicians/carla/carla/0002-Do-not-try-to-find-Qt5-host-bins-it-won-t-work.patch b/recipes-musicians/carla/carla/0002-Do-not-try-to-find-Qt5-host-bins-it-won-t-work.patch deleted file mode 100644 index 886c2a6..0000000 --- a/recipes-musicians/carla/carla/0002-Do-not-try-to-find-Qt5-host-bins-it-won-t-work.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 079d1a1b34394b76d23ce7d92254cb785333d3e7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Thu, 20 Sep 2018 22:44:48 +0200 -Subject: [PATCH] Do not try to find Qt5 host bins - it won't work -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/Makefile.mk | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/source/Makefile.mk b/source/Makefile.mk -index 6d1b24859..37518ef96 100644 ---- a/source/Makefile.mk -+++ b/source/Makefile.mk -@@ -285,7 +285,6 @@ endif - endif - - ifeq ($(HAVE_QT5),true) --QT5_HOSTBINS = $(shell $(PKG_CONFIG) --variable=host_bins Qt5Core) - MOC_QT5 ?= $(QT5_HOSTBINS)/moc - RCC_QT5 ?= $(QT5_HOSTBINS)/rcc - UIC_QT5 ?= $(QT5_HOSTBINS)/uic --- -2.26.2 -