[arch-commits] Commit in mlt/trunk (PKGBUILD mlt-glibc-2.26.patch)

[Antonio Rojas]

    Date: Tuesday, January 23, 2018 @ 16:30:46
  Author: arojas
Revision: 315307

Update to 6.6.0

Modified:
  mlt/trunk/PKGBUILD
Deleted:
  mlt/trunk/mlt-glibc-2.26.patch

----------------------+
 PKGBUILD             |   33 +++++++++------------------------
 mlt-glibc-2.26.patch |   28 ----------------------------
 2 files changed, 9 insertions(+), 52 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-23 16:02:55 UTC (rev 315306)
+++ PKGBUILD	2018-01-23 16:30:46 UTC (rev 315307)
@@ -9,37 +9,21 @@
 
 pkgbase=mlt
 pkgname=(mlt mlt-python-bindings)
-pkgver=6.4.1
-pkgrel=9
+pkgver=6.6.0
+pkgrel=1
 pkgdesc="An open source multimedia framework"
 arch=(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=($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
-        mlt-multithread.patch::"https://github.com/mltframework/mlt/commit/0f8e807a.patch")
-sha256sums=('87583af552695b2235f4ee3fc1e645d69e31702b109331d7e8785fb180cfa382'
-            '53e1f7c343ac8b9eb1b1bfa4aad2fa11f2bdf166e8d8dc72880cc68b41354fd5'
-            '1bb3d01264033e194887897c158931299d60100b030f2cfe4b8a69af8d3110fa'
-            '8a240062fcb474b3796dea5a3dd6bcb098675e775c5714166b9031e90b9ae4b5')
+makedepends=(ladspa frei0r-plugins libdv sdl_image libsamplerate sox ffmpeg vid.stab qt5-svg
+             jack libexif python2 swig movit eigen opencv libebur128)
+source=($pkgname-$pkgver.tar.gz::"https://github.com/mltframework/mlt/archive/v$pkgver.tar.gz")
+sha256sums=('11515546516b3c54719b6b402cacf46e8d5172450d6e9fe2655b237582490315')
 
-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
-# Fix ffmpeg multi-threading
-  patch -p1 -i ../mlt-multithread.patch
-}
-
 build() {
   # mlt
   cd mlt-$pkgver
 
-  msg "SSE2=$SSE2"
   ./configure --prefix=/usr \
 	--avformat-swscale \
 	--enable-gpl --enable-gpl3 \
@@ -66,8 +50,9 @@
         'ladspa: for LADSPA plugins'
 	'libexif: for auto rotate plugin'
 	'frei0r-plugins: for additional effects'
-	'movit: opengl plugin')
-  conflicts=('mlt++<=0.3.8')
+	'movit: opengl plugin'
+        'opencv: openCV plugin'
+        'libebur128: plus module')
 
   cd mlt-$pkgver
   make DESTDIR="$pkgdir" install

Deleted: mlt-glibc-2.26.patch
===================================================================
--- mlt-glibc-2.26.patch	2018-01-23 16:02:55 UTC (rev 315306)
+++ mlt-glibc-2.26.patch	2018-01-23 16:30:46 UTC (rev 315307)
@@ -1,28 +0,0 @@
-From 2377c8665f93f87aa86fabbfd8e596572aacdf6c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony at 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 at 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