From 0cd9148747ecea541aab34bd49b035a8998b480a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 7 Aug 2017 18:50:21 +0200 Subject: [PATCH] mlt: fix build with glibc 2.26+ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ....h-Do-not-include-unneeded-xlocale.h.patch | 31 +++++++++++++++++++ recipes-support/mlt/mlt_6.4.1.bb | 17 +++++----- 2 files changed, 41 insertions(+), 7 deletions(-) create mode 100644 recipes-support/mlt/files/0001-mlt_property.h-Do-not-include-unneeded-xlocale.h.patch diff --git a/recipes-support/mlt/files/0001-mlt_property.h-Do-not-include-unneeded-xlocale.h.patch b/recipes-support/mlt/files/0001-mlt_property.h-Do-not-include-unneeded-xlocale.h.patch new file mode 100644 index 00000000..b7e437b4 --- /dev/null +++ b/recipes-support/mlt/files/0001-mlt_property.h-Do-not-include-unneeded-xlocale.h.patch @@ -0,0 +1,31 @@ +From 6f8a87cdb95c611a7f0193aaa623c8e936ac0b6e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Mon, 7 Aug 2017 18:41:07 +0200 +Subject: [PATCH] mlt_property.h: Replace include xlocale.h by locale.h +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + src/framework/mlt_property.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/framework/mlt_property.h b/src/framework/mlt_property.h +index 404d513..8e772f2 100644 +--- a/src/framework/mlt_property.h ++++ b/src/framework/mlt_property.h +@@ -31,7 +31,7 @@ + #endif + + #if defined(__GLIBC__) || defined(__APPLE__) || (__FreeBSD_version >= 900506) +-#include ++#include + #else + typedef char* locale_t; + #endif +-- +2.9.4 + diff --git a/recipes-support/mlt/mlt_6.4.1.bb b/recipes-support/mlt/mlt_6.4.1.bb index ba20b006..7dc14c55 100644 --- a/recipes-support/mlt/mlt_6.4.1.bb +++ b/recipes-support/mlt/mlt_6.4.1.bb @@ -7,7 +7,16 @@ LIC_FILES_CHKSUM = " \ file://GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ " -DEPENDS = " \ +SRC_URI = " \ + https://github.com/mltframework/${BPN}/archive/v${PV}.tar.gz \ + file://0001-mlt_property.h-Do-not-include-unneeded-xlocale.h.patch \ +" +SRC_URI[md5sum] = "e9f0584739369c40b8f91f8cf50ea3ea" +SRC_URI[sha256sum] = "87583af552695b2235f4ee3fc1e645d69e31702b109331d7e8785fb180cfa382" + +inherit autotools-brokensep pkgconfig + +DEPENDS += " \ gtk+ \ qtbase \ qtsvg \ @@ -23,12 +32,6 @@ DEPENDS = " \ ladspa-sdk \ " -SRC_URI = "https://github.com/mltframework/${BPN}/archive/v${PV}.tar.gz" -SRC_URI[md5sum] = "e9f0584739369c40b8f91f8cf50ea3ea" -SRC_URI[sha256sum] = "87583af552695b2235f4ee3fc1e645d69e31702b109331d7e8785fb180cfa382" - -inherit autotools-brokensep pkgconfig - CLEANBROKEN = "1" CXXFLAGS += "--std=c++11"