carla: upgrade 2.1.1 -> 2.3.0

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2021-05-01 23:07:10 +02:00
parent 9f3e89aeb1
commit f84064df37
2 changed files with 18 additions and 17 deletions

View File

@@ -1,5 +1,5 @@
From 88c61efce068b4cfe6d4c175bd9d1b85def23708 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sat, 15 Jul 2017 00:03:36 +0200
Subject: [PATCH] do not try to cross-run carla-lv2-export
MIME-Version: 1.0
@@ -8,24 +8,25 @@ Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [cross specific]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
source/plugin/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
source/plugin/Makefile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/source/plugin/Makefile b/source/plugin/Makefile
index 59b5c5d..3bcb368 100644
index 2ec4eb305..726ec32c0 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
@@ -478,8 +478,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)
- @echo "Generating LV2 ttl data"
- @cd $(BINDIR) && $(EXE_WRAPPER) ./carla-lv2-export$(APP_EXT)
+ @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
--
2.9.4
2.30.2

View File

@@ -7,17 +7,17 @@ LIC_FILES_CHKSUM = " \
"
SRC_URI = " \
git://github.com/falkTX/Carla.git;nobranch=1 \
git://github.com/falkTX/Carla.git;branch=main \
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 = "1b5080dff02b1e751e32f0582e4aee7bc2c74a67"
SRCREV = "74ee581a3c68cb4b3c13c83bb3f215a8d114b5a7"
S = "${WORKDIR}/git"
PV = "2.1.1"
PV = "2.3.0"
REQUIRED_DISTRO_FEATURES = "x11"
inherit qmake5_base pkgconfig qemu-ext-musicians features_check mime mime-xdg gtk-icon-cache
inherit qmake5_base python3native qemu-ext-musicians features_check mime mime-xdg gtk-icon-cache
B = "${S}"