[packages/mlt] Fix build and header compatibility for glibc 2.26

jajcus jajcus at pld-linux.org
Sun Dec 10 21:12:48 CET 2017


commit a2919108ec8237d0e31e5674f044b8b5933a6562
Author: Jacek Konieczny <jajcus at jajcus.net>
Date:   Sun Dec 10 21:11:53 2017 +0100

    Fix build and header compatibility for glibc 2.26
    
    xlocale.h is no more
    
    Release: 4

 mlt.spec      |  4 +++-
 xlocale.patch | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
---
diff --git a/mlt.spec b/mlt.spec
index e6f609a..79358ee 100644
--- a/mlt.spec
+++ b/mlt.spec
@@ -11,12 +11,13 @@ Summary:	MLT - open source multimedia framework
 Summary(pl.UTF-8):	MLT - szkielet multimedialny o otwartych źródłach
 Name:		mlt
 Version:	6.4.1
-Release:	3
+Release:	4
 License:	GPL v3+ (LGPL v2.1+ code linked with GPL v2/GPL v3 libraries)
 Group:		X11/Applications/Multimedia
 Source0:	http://downloads.sourceforge.net/mlt/%{name}-%{version}.tar.gz
 # Source0-md5:	bfa7b4009be616d6f858393a88fbbb32
 Patch0:		%{name}-qt5.patch
+Patch1:		xlocale.patch
 URL:		http://www.mltframework.org/
 BuildRequires:	OpenGL-devel
 BuildRequires:	Qt5Core-devel >= 5
@@ -102,6 +103,7 @@ Wiązadania Pythona do MLT - szkieletu multimedialnego o otwartych
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 # Don't overoptimize (breaks debugging)
 sed -i -e '/fomit-frame-pointer/d' configure
diff --git a/xlocale.patch b/xlocale.patch
new file mode 100644
index 0000000..d4414b3
--- /dev/null
+++ b/xlocale.patch
@@ -0,0 +1,15 @@
+diff -dur -x '*~' -x '*.orig' mlt-6.4.1.orig/src/framework/mlt_property.h mlt-6.4.1/src/framework/mlt_property.h
+--- mlt-6.4.1.orig/src/framework/mlt_property.h	2016-11-16 07:53:11.000000000 +0100
++++ mlt-6.4.1/src/framework/mlt_property.h	2017-12-10 21:08:17.725929886 +0100
+@@ -30,8 +30,10 @@
+ #include <sys/param.h>
+ #endif
+ 
+-#if defined(__GLIBC__) || defined(__APPLE__) || (__FreeBSD_version >= 900506)
++#if defined(__APPLE__) || (__FreeBSD_version >= 900506)
+ #include <xlocale.h>
++#elif defined(__GLIBC__)
++#include <locale.h>
+ #else
+ typedef char* locale_t;
+ #endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mlt.git/commitdiff/a2919108ec8237d0e31e5674f044b8b5933a6562



More information about the pld-cvs-commit mailing list