From a9c2f66f2b3c77910d46373a537e0ec49730ff68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 6 Aug 2017 20:05:19 +0200 Subject: [PATCH] carla: fix build with libpng - libpng12 is gone 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_git.bb | 1 + ...on-t-pin-version-when-finding-libpng.patch | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 recipes-misc/recipes-multimedia/carla/files/0005-don-t-pin-version-when-finding-libpng.patch diff --git a/recipes-misc/recipes-multimedia/carla/carla_git.bb b/recipes-misc/recipes-multimedia/carla/carla_git.bb index 67ea0d29..e5ae1ba1 100644 --- a/recipes-misc/recipes-multimedia/carla/carla_git.bb +++ b/recipes-misc/recipes-multimedia/carla/carla_git.bb @@ -12,6 +12,7 @@ SRC_URI = " \ file://0002-do-not-try-to-cross-run-carla-lv2-export.patch \ file://0003-Don-t-disable-EXPERIMENTAL_PLUGINS.patch \ file://0004-do-not-autodetect-pyqt-it-won-t-work-in-oe.patch \ + file://0005-don-t-pin-version-when-finding-libpng.patch \ " SRCREV = "4a1e17888fc9abb0a4ea4a83d8f7020a5eabda1c" S = "${WORKDIR}/git" diff --git a/recipes-misc/recipes-multimedia/carla/files/0005-don-t-pin-version-when-finding-libpng.patch b/recipes-misc/recipes-multimedia/carla/files/0005-don-t-pin-version-when-finding-libpng.patch new file mode 100644 index 00000000..6ac90075 --- /dev/null +++ b/recipes-misc/recipes-multimedia/carla/files/0005-don-t-pin-version-when-finding-libpng.patch @@ -0,0 +1,34 @@ +From 10d05c874dd22faa5f979ede6e597195b33b4f1d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sun, 6 Aug 2017 19:53:27 +0200 +Subject: [PATCH] don't pin version when finding libpng +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 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/source/native-plugins/Makefile b/source/native-plugins/Makefile +index c31b865..206735f 100644 +--- a/source/native-plugins/Makefile ++++ b/source/native-plugins/Makefile +@@ -20,9 +20,9 @@ ifeq ($(EXPERIMENTAL_PLUGINS),true) + ZITA_DSP_CXX_FLAGS = $(BUILD_CXX_FLAGS) -Wno-unused-parameter + ZITA_DSP_CXX_FLAGS += $(shell pkg-config --cflags fftw3f) + ZITA_UI_CXX_FLAGS = $(BUILD_CXX_FLAGS) -Wno-ignored-qualifiers -Wno-unused-parameter -Wno-unused-result +-ZITA_UI_CXX_FLAGS += $(shell pkg-config --cflags cairo libpng12 freetype2 x11 xft zlib) ++ZITA_UI_CXX_FLAGS += $(shell pkg-config --cflags cairo libpng freetype2 x11 xft zlib) + ZITA_UI_LINK_FLAGS = $(LINK_FLAGS) -lclxclient -lclthreads +-ZITA_UI_LINK_FLAGS += $(shell pkg-config --libs cairo libpng12 freetype2 x11 xft zlib) ++ZITA_UI_LINK_FLAGS += $(shell pkg-config --libs cairo libpng freetype2 x11 xft zlib) + ZITA_UI_LINK_FLAGS += -ldl -lpthread -lrt + endif # EXPERIMENTAL_PLUGINS + +-- +2.9.4 +