git » mlt.git » commit a329a62

Fix build with glibc 2.26

author Antonio Rojas
2017-08-19 03:18:05 UTC
committer Antonio Rojas
2017-08-19 03:18:05 UTC
parent d3641f8982997eaca65a9e16f9891253599ddacf

Fix build with glibc 2.26

PKGBUILD +8 -4
mlt-glibc-2.26.patch +28 -0

diff --git a/PKGBUILD b/PKGBUILD
index 35dea67..4fbc4ef 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,21 +9,25 @@
 pkgbase=mlt
 pkgname=(mlt mlt-python-bindings)
 pkgver=6.4.1
-pkgrel=7
+pkgrel=8
 pkgdesc="An open source multimedia framework"
 arch=(i686 x86_64)
 url="http://www.mltframework.org"
 license=(GPL)
 makedepends=(ladspa frei0r-plugins libdv sdl_image libsamplerate sox ffmpeg vid.stab qt5-svg jack libexif python2 swig movit eigen)
-source=("https://github.com/mltframework/mlt/archive/v$pkgver.tar.gz"
-        kdenlive-crash-on-exit.patch::"https://github.com/mltframework/mlt/commit/a3188e30.patch")
+source=($pkgname-$pkgver.tar.gz::"https://github.com/mltframework/mlt/archive/v$pkgver.tar.gz"
+        kdenlive-crash-on-exit.patch::"https://github.com/mltframework/mlt/commit/a3188e30.patch"
+        mlt-glibc-2.26.patch)
 sha256sums=('87583af552695b2235f4ee3fc1e645d69e31702b109331d7e8785fb180cfa382'
-            '537562790e64d818c8ca9c410632662b6cd383335198ba36f3909e10217b14d7')
+            '537562790e64d818c8ca9c410632662b6cd383335198ba36f3909e10217b14d7'
+            '1bb3d01264033e194887897c158931299d60100b030f2cfe4b8a69af8d3110fa')
 
 prepare() {
   cd $pkgname-$pkgver
 # Fix kdenlive cash on exit
   patch -p1 -i ../kdenlive-crash-on-exit.patch
+# Fix build with glibc 2.26
+  patch -p1 -i ../mlt-glibc-2.26.patch
 }
 
 build() {
diff --git a/mlt-glibc-2.26.patch b/mlt-glibc-2.26.patch
new file mode 100644
index 0000000..255a604
--- /dev/null
+++ b/mlt-glibc-2.26.patch
@@ -0,0 +1,28 @@
+From 2377c8665f93f87aa86fabbfd8e596572aacdf6c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+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
+
+xlocale.h was removed in glibc 2.26
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ 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 404d513f..156e0734 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 <xlocale.h>
++#include <locale.h>
+ #else
+ typedef char* locale_t;
+ #endif