added patch to fix devel with glibc 2.26 (xlocale.h removed) [release 6.4.1-2mamba;Tue Oct 24 2017]
This commit is contained in:
parent
81573a883e
commit
51c3f684be
40
mlt-6.4.1-glibc-2.26.patch
Normal file
40
mlt-6.4.1-glibc-2.26.patch
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
From 2125e3955a0d0be61571cf43b674f74b4b93c6f8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Dan Dennedy <dan@dennedy.org>
|
||||||
|
Date: Sat, 26 Aug 2017 18:31:47 -0700
|
||||||
|
Subject: [PATCH] Fix #248 xlocale.h was removed in glibc 2.26.
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
Reported by schnitzeltony on Andreas Müller.
|
||||||
|
Patch by Dave Plater.
|
||||||
|
---
|
||||||
|
src/framework/mlt_property.h | 8 ++++++--
|
||||||
|
1 file changed, 6 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/framework/mlt_property.h b/src/framework/mlt_property.h
|
||||||
|
index 404d513f..043f530b 100644
|
||||||
|
--- a/src/framework/mlt_property.h
|
||||||
|
+++ b/src/framework/mlt_property.h
|
||||||
|
@@ -3,7 +3,7 @@
|
||||||
|
* \brief Property class declaration
|
||||||
|
* \see mlt_property_s
|
||||||
|
*
|
||||||
|
- * Copyright (C) 2003-2014 Meltytech, LLC
|
||||||
|
+ * Copyright (C) 2003-2017 Meltytech, LLC
|
||||||
|
*
|
||||||
|
* This library is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
|
@@ -31,7 +31,11 @@
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(__GLIBC__) || defined(__APPLE__) || (__FreeBSD_version >= 900506)
|
||||||
|
-#include <xlocale.h>
|
||||||
|
+# if __GLIBC_MINOR__ >= 26 && !defined(__APPLE__)
|
||||||
|
+# include <locale.h>
|
||||||
|
+# else
|
||||||
|
+# include <xlocale.h>
|
||||||
|
+# endif
|
||||||
|
#else
|
||||||
|
typedef char* locale_t;
|
||||||
|
#endif
|
13
mlt.spec
13
mlt.spec
@ -1,6 +1,6 @@
|
|||||||
Name: mlt
|
Name: mlt
|
||||||
Version: 6.4.1
|
Version: 6.4.1
|
||||||
Release: 1mamba
|
Release: 2mamba
|
||||||
Summary: An open source multimedia framework, designed and developed for television broadcasting
|
Summary: An open source multimedia framework, designed and developed for television broadcasting
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
Vendor: openmamba
|
Vendor: openmamba
|
||||||
@ -10,19 +10,22 @@ URL: http://www.mltframework.org
|
|||||||
Source: https://github.com/mltframework/mlt.git/v%{version}/mlt-%{version}.tar.bz2
|
Source: https://github.com/mltframework/mlt.git/v%{version}/mlt-%{version}.tar.bz2
|
||||||
Patch0: %{name}-0.3.0-sox1420.patch
|
Patch0: %{name}-0.3.0-sox1420.patch
|
||||||
Patch1: %{name}-0.3.8-ffmpeg-headers.patch
|
Patch1: %{name}-0.3.8-ffmpeg-headers.patch
|
||||||
|
Patch2: mlt-6.4.1-glibc-2.26.patch
|
||||||
License: LGPL
|
License: LGPL
|
||||||
## AUTOBUILDREQ-BEGIN
|
## AUTOBUILDREQ-BEGIN
|
||||||
BuildRequires: glibc-devel
|
BuildRequires: glibc-devel
|
||||||
BuildRequires: libSDL-devel
|
BuildRequires: libSDL-devel
|
||||||
BuildRequires: libSDL_image-devel
|
BuildRequires: libSDL_image-devel
|
||||||
BuildRequires: libX11-devel
|
BuildRequires: libX11-devel
|
||||||
BuildRequires: libalsa-devel
|
|
||||||
BuildRequires: libavcodec-ffmpeg-devel
|
BuildRequires: libavcodec-ffmpeg-devel
|
||||||
BuildRequires: libavdevice-ffmpeg-devel
|
BuildRequires: libavdevice-ffmpeg-devel
|
||||||
|
BuildRequires: libavfilter-ffmpeg-devel
|
||||||
BuildRequires: libavformat-ffmpeg-devel
|
BuildRequires: libavformat-ffmpeg-devel
|
||||||
BuildRequires: libavutil-ffmpeg-devel
|
BuildRequires: libavutil-ffmpeg-devel
|
||||||
BuildRequires: libcairo-devel
|
BuildRequires: libcairo-devel
|
||||||
BuildRequires: libexif-devel
|
BuildRequires: libexif-devel
|
||||||
|
BuildRequires: libfftw-devel
|
||||||
|
BuildRequires: libfontconfig-devel
|
||||||
BuildRequires: libgcc
|
BuildRequires: libgcc
|
||||||
BuildRequires: libgdk-pixbuf-devel
|
BuildRequires: libgdk-pixbuf-devel
|
||||||
BuildRequires: libglib-devel
|
BuildRequires: libglib-devel
|
||||||
@ -30,6 +33,7 @@ BuildRequires: libgtk2-devel
|
|||||||
BuildRequires: libjack-devel
|
BuildRequires: libjack-devel
|
||||||
BuildRequires: libpango-devel
|
BuildRequires: libpango-devel
|
||||||
BuildRequires: libqt5-devel
|
BuildRequires: libqt5-devel
|
||||||
|
BuildRequires: librtaudio-devel
|
||||||
BuildRequires: libsamplerate-devel
|
BuildRequires: libsamplerate-devel
|
||||||
BuildRequires: libstdc++6-devel
|
BuildRequires: libstdc++6-devel
|
||||||
BuildRequires: libswfdec-devel
|
BuildRequires: libswfdec-devel
|
||||||
@ -59,8 +63,8 @@ MLT is an open source multimedia framework, designed and developed for televisio
|
|||||||
This package contains static files and headers used for development.
|
This package contains static files and headers used for development.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
|
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch2 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export KDEDIR=%{kdedir}
|
export KDEDIR=%{kdedir}
|
||||||
@ -103,6 +107,9 @@ CFLAGS="-I%{_includedir}/ffmpeg" %make
|
|||||||
%{_libdir}/libmlt++.so
|
%{_libdir}/libmlt++.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Oct 24 2017 Silvan Calarco <silvan.calarco@mambasoft.it> 6.4.1-2mamba
|
||||||
|
- added patch to fix devel with glibc 2.26 (xlocale.h removed)
|
||||||
|
|
||||||
* Wed Nov 16 2016 Automatic Build System <autodist@mambasoft.it> 6.4.1-1mamba
|
* Wed Nov 16 2016 Automatic Build System <autodist@mambasoft.it> 6.4.1-1mamba
|
||||||
- automatic version update by autodist
|
- automatic version update by autodist
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user