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

carla: fix build with libpng - libpng12 is gone

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2017-08-06 20:05:19 +02:00
parent be6e331749
commit a9c2f66f2b
2 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
recipes-misc/recipes-multimedia/carla/carla_git.bb
View File

@@ -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"

34
recipes-misc/recipes-multimedia/carla/files/0005-don-t-pin-version-when-finding-libpng.patch Normal file
View File

@@ -0,0 +1,34 @@
From 10d05c874dd22faa5f979ede6e597195b33b4f1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
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 <schnitzeltony@googlemail.com>
---
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