Hello community, here is the log from the commit of package libmlt for openSUSE:Factory checked in at 2017-08-26 10:41:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmlt (Old) and /work/SRC/openSUSE:Factory/.libmlt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libmlt" Sat Aug 26 10:41:18 2017 rev:34 rq:518760 version:6.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libmlt/libmlt.changes 2017-08-24 18:48:17.460125237 +0200 +++ /work/SRC/openSUSE:Factory/.libmlt.new/libmlt.changes 2017-08-26 10:41:21.144577867 +0200 @@ -1,0 +2,8 @@ +Fri Aug 25 11:35:59 UTC 2017 - [email protected] + +- Fix build against glibc-2.26 with libmlt-nomorexlocale_h.patch. +- Rebased 6c658e5d8cd11933bf799a2a985aa4b24cfbcb60.patch, + libmlt-0.8.2-vdpau.patch, rem_close.patch and + use-recommended-freetype-include.patch. + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/libmlt/webvfx.changes 2017-08-24 18:48:17.812075682 +0200 +++ /work/SRC/openSUSE:Factory/.libmlt.new/webvfx.changes 2017-08-26 10:41:23.296273848 +0200 @@ -1,0 +2,5 @@ +Fri Aug 25 11:40:56 UTC 2017 - [email protected] + +- Apply all mlt patches before building. + +------------------------------------------------------------------- New: ---- libmlt-nomorexlocale_h.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmlt.spec ++++++ --- /var/tmp/diff_new_pack.2R8Pza/_old 2017-08-26 10:41:24.732070980 +0200 +++ /var/tmp/diff_new_pack.2R8Pza/_new 2017-08-26 10:41:24.748068719 +0200 @@ -47,6 +47,8 @@ Patch3: 6c658e5d8cd11933bf799a2a985aa4b24cfbcb60.patch # PATCH-FIX-UPSTREAM remove superflous close to avoid crashes in for example kdenlive Patch4: rem_close.patch +# PATCH-FIX-UPSTREAM see patch header, remove when upstream resolves the issue check before rebase. +Patch5: libmlt-nomorexlocale_h.patch BuildRequires: fdupes %if 0%{?suse_version} > 1320 BuildRequires: gcc-c++ @@ -236,6 +238,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 # To complement libmlt-0.8.0-vdpau.patch. # When vdpau support is not compiled it will break the code. Doesn't matter because the code will not be used anyway. ++++++ webvfx.spec ++++++ --- /var/tmp/diff_new_pack.2R8Pza/_old 2017-08-26 10:41:24.824057983 +0200 +++ /var/tmp/diff_new_pack.2R8Pza/_new 2017-08-26 10:41:24.868051767 +0200 @@ -36,8 +36,18 @@ Source0: %{_name}-%{mltversion}.tar.gz # This is needed by shotcut and will only build within the mlt sources. Source1: https://github.com/mltframework/webvfx/archive/%{_rev}.tar.gz#/webvfx-%{version}.tar.gz +# PATCH-FIX-OPENSUSE libmlt-0.8.2-vdpau.patch [email protected] -- Make VDPAU support work without the devel package +Patch1: libmlt-0.8.2-vdpau.patch +# PATCH-FIX-UPSTREAM use-recommended-freetype-include.patch -- Freetype upstream recommends using their macros together with +# ft2build include. Positive sideeffect is that this patch makes it build with both freetype2 2.5.1, and older versions +Patch2: use-recommended-freetype-include.patch +Patch3: 6c658e5d8cd11933bf799a2a985aa4b24cfbcb60.patch +# PATCH-FIX-UPSTREAM remove superflous close to avoid crashes in for example kdenlive +Patch4: rem_close.patch #PATCH-FIX-UPSTREAM webvfx-versioned-libdir.patch [email protected] -- install webvfx lib in versioned _libdir -Patch4: webvfx-versioned-libdir.patch +Patch10: webvfx-versioned-libdir.patch +# PATCH-FIX-UPSTREAM see patch header, remove when upstream resolves the issue check before rebase. +Patch5: libmlt-nomorexlocale_h.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: help2man @@ -97,7 +107,12 @@ %prep %setup -q -n %{_name}-%{mltversion} -a 1 -%patch4 +%patch1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 +%patch10 %build pushd webvfx-%{_rev} ++++++ 6c658e5d8cd11933bf799a2a985aa4b24cfbcb60.patch ++++++ --- /var/tmp/diff_new_pack.2R8Pza/_old 2017-08-26 10:41:24.996033684 +0200 +++ /var/tmp/diff_new_pack.2R8Pza/_new 2017-08-26 10:41:25.016030858 +0200 @@ -7,11 +7,11 @@ src/modules/opengl/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/src/modules/opengl/Makefile b/src/modules/opengl/Makefile -index ffe542b..65a7b34 100644 ---- a/src/modules/opengl/Makefile -+++ b/src/modules/opengl/Makefile -@@ -69,9 +69,9 @@ clean: +Index: mlt-6.4.1/src/modules/opengl/Makefile +=================================================================== +--- mlt-6.4.1.orig/src/modules/opengl/Makefile 2017-08-25 10:06:04.243313347 +0200 ++++ mlt-6.4.1/src/modules/opengl/Makefile 2017-08-25 10:08:16.387836875 +0200 +@@ -68,9 +68,9 @@ clean: rm -f $(OBJS) $(TARGET) $(CPPOBJS) install: all ++++++ libmlt-0.8.2-vdpau.patch ++++++ --- /var/tmp/diff_new_pack.2R8Pza/_old 2017-08-26 10:41:25.124015601 +0200 +++ /var/tmp/diff_new_pack.2R8Pza/_new 2017-08-26 10:41:25.124015601 +0200 @@ -1,8 +1,8 @@ Index: src/modules/avformat/vdpau.c =================================================================== ---- src/modules/avformat/vdpau.c.orig -+++ src/modules/avformat/vdpau.c -@@ -74,18 +74,7 @@ static int vdpau_init( producer_avformat +--- src/modules/avformat/vdpau.c.orig 2017-08-25 10:06:04.343316776 +0200 ++++ src/modules/avformat/vdpau.c 2017-08-25 10:06:22.887952653 +0200 +@@ -73,18 +73,7 @@ static int vdpau_init( producer_avformat if ( !vdpau_init_done ) { int flags = RTLD_NOW; ++++++ libmlt-nomorexlocale_h.patch ++++++ From: [email protected] Date: 25-08-2017 Reference: https://github.com/mltframework/mlt/pull/248 Upstream: in progress xlocale.h is removed from glibc-26 which is now in Factory. Temporary patch until upstream resolves.Index: src/framework/mlt_property.h =================================================================== Index: src/framework/mlt_property.h =================================================================== --- src/framework/mlt_property.h.orig 2016-11-16 08:53:11.000000000 +0200 +++ src/framework/mlt_property.h 2017-08-25 14:37:05.144802219 +0200 @@ -31,7 +31,11 @@ #endif #if defined(__GLIBC__) || defined(__APPLE__) || (__FreeBSD_version >= 900506) +#if __GLIBC_MINOR__ >= 26 && !defined(__APPLE__) +#include <locale.h> +#else #include <xlocale.h> +#endif #else typedef char* locale_t; #endif ++++++ rem_close.patch ++++++ --- /var/tmp/diff_new_pack.2R8Pza/_old 2017-08-26 10:41:25.188006559 +0200 +++ /var/tmp/diff_new_pack.2R8Pza/_new 2017-08-26 10:41:25.188006559 +0200 @@ -10,11 +10,11 @@ src/mlt++/MltRepository.cpp | 2 -- 1 file changed, 2 deletions(-) -diff --git a/src/mlt++/MltRepository.cpp b/src/mlt++/MltRepository.cpp -index 47a598bc..45522e40 100644 ---- a/src/mlt++/MltRepository.cpp -+++ b/src/mlt++/MltRepository.cpp -@@ -35,8 +35,6 @@ Repository::Repository( mlt_repository repository ) : +Index: mlt-6.4.1/src/mlt++/MltRepository.cpp +=================================================================== +--- mlt-6.4.1.orig/src/mlt++/MltRepository.cpp 2017-08-25 10:06:04.183311289 +0200 ++++ mlt-6.4.1/src/mlt++/MltRepository.cpp 2017-08-25 10:10:14.811876020 +0200 +@@ -35,8 +35,6 @@ Repository::Repository( mlt_repository r Repository::~Repository( ) { ++++++ use-recommended-freetype-include.patch ++++++ --- /var/tmp/diff_new_pack.2R8Pza/_old 2017-08-26 10:41:25.263995823 +0200 +++ /var/tmp/diff_new_pack.2R8Pza/_new 2017-08-26 10:41:25.263995823 +0200 @@ -1,7 +1,8 @@ -diff -U 3 -H -d -r -N -- mlt-0.9.2.orig/src/modules/gtk2/producer_pango.c mlt-0.9.2/src/modules/gtk2/producer_pango.c ---- mlt-0.9.2.orig/src/modules/gtk2/producer_pango.c 2014-06-29 22:23:17.000000000 +0200 -+++ mlt-0.9.2/src/modules/gtk2/producer_pango.c 2014-10-16 17:51:03.421118657 +0200 -@@ -26,7 +26,8 @@ +Index: mlt-6.4.1/src/modules/gtk2/producer_pango.c +=================================================================== +--- mlt-6.4.1.orig/src/modules/gtk2/producer_pango.c 2017-08-25 10:06:04.295315130 +0200 ++++ mlt-6.4.1/src/modules/gtk2/producer_pango.c 2017-08-25 10:08:00.459292543 +0200 +@@ -25,7 +25,8 @@ #include <string.h> #include <gdk-pixbuf/gdk-pixbuf.h> #include <pango/pangoft2.h> ++++++ webvfx-versioned-libdir.patch ++++++ --- /var/tmp/diff_new_pack.2R8Pza/_old 2017-08-26 10:41:25.295991302 +0200 +++ /var/tmp/diff_new_pack.2R8Pza/_new 2017-08-26 10:41:25.295991302 +0200 @@ -1,7 +1,7 @@ Index: webvfx-e918ce4667e623c3d60735cb898223e730c6d7af/webvfx/webvfx.pro =================================================================== --- webvfx-e918ce4667e623c3d60735cb898223e730c6d7af/webvfx/webvfx.pro.orig 2016-08-23 20:36:10.000000000 +0200 -+++ webvfx-e918ce4667e623c3d60735cb898223e730c6d7af/webvfx/webvfx.pro 2017-06-08 13:45:28.132171602 +0200 ++++ webvfx-e918ce4667e623c3d60735cb898223e730c6d7af/webvfx/webvfx.pro 2017-08-25 11:00:29.435492908 +0200 @@ -47,5 +47,5 @@ QT += opengl quick TARGET = webvfx @@ -9,3 +9,4 @@ -target.path = $$PREFIX/lib +target.path = $$PREFIX/$$WLIB INSTALLS += target +
