Date: Monday, January 15, 2018 @ 08:06:36
Author: arojas
Revision: 314796
archrelease: copy trunk to extra-x86_64
Added:
mlt/repos/extra-x86_64/PKGBUILD
(from rev 314795, mlt/trunk/PKGBUILD)
mlt/repos/extra-x86_64/mlt-glibc-2.26.patch
(from rev 314795, mlt/trunk/mlt-glibc-2.26.patch)
Deleted:
mlt/repos/extra-x86_64/PKGBUILD
mlt/repos/extra-x86_64/mlt-glibc-2.26.patch
----------------------+
PKGBUILD | 164 +++++++++++++++++++++++++------------------------
mlt-glibc-2.26.patch | 56 ++++++++--------
2 files changed, 112 insertions(+), 108 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-01-15 08:06:12 UTC (rev 314795)
+++ PKGBUILD 2018-01-15 08:06:36 UTC (rev 314796)
@@ -1,80 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <[email protected]>
-# Contributor: Sergej Pupykin <[email protected]>
-# Contributor: Fabian Schoelzel <[email protected]>
-# Contributor: funkyou <[email protected]>
-# Contributor: tardo <[email protected]>
-# Contributor: Stefan Husmann <[email protected]>
-# Contributor: Gustavo Alvarez <[email protected]>
-
-pkgbase=mlt
-pkgname=(mlt mlt-python-bindings)
-pkgver=6.4.1
-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=($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'
- '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() {
- # mlt
- cd mlt-$pkgver
-
- msg "SSE2=$SSE2"
- ./configure --prefix=/usr \
- --avformat-swscale \
- --enable-gpl --enable-gpl3 \
- --qt-libdir=/usr/lib --qt-includedir=/usr/include/qt
- make
-
- # mlt python bindings
- cd src/swig/python
- sed -i 's_path=`which python_path=`which python2_' build
- sed -i 's_`python -c_`python2 -c_' build
- sed -i 's#python-config#python2-config#' build
- ./build
-}
-
-package_mlt() {
- optdepends=('sdl_image: for SDL plugin'
- 'libsamplerate: for libavresample plugin'
- 'sox: for SOX (Audio Swiss Army Knife) plugin'
- 'ffmpeg: for ffmpeg plugin'
- 'vid.stab: for video stabilize plugin'
- 'gtk2: Gtk plugin'
- 'qt5-svg: for Qt5 plugins'
- 'jack: for JACK sound output plugin'
- 'ladspa: for LADSPA plugins'
- 'libexif: for auto rotate plugin'
- 'frei0r-plugins: for additional effects'
- 'movit: opengl plugin')
- conflicts=('mlt++<=0.3.8')
-
- cd mlt-$pkgver
- make DESTDIR="$pkgdir" install
-}
-
-package_mlt-python-bindings() {
- depends=(python2 mlt)
-
- cd "$srcdir/mlt-$pkgver/src/swig/python"
- mkdir -p "$pkgdir/usr/lib/python2.7/"
- install -m755 mlt.py "$pkgdir/usr/lib/python2.7/"
- install -m755 _mlt.so "$pkgdir/usr/lib/python2.7/"
- install -m755 mlt_wrap.o "$pkgdir/usr/lib/python2.7/"
-}
Copied: mlt/repos/extra-x86_64/PKGBUILD (from rev 314795, mlt/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-01-15 08:06:36 UTC (rev 314796)
@@ -0,0 +1,84 @@
+# $Id$
+# Maintainer: Antonio Rojas <[email protected]>
+# Contributor: Sergej Pupykin <[email protected]>
+# Contributor: Fabian Schoelzel <[email protected]>
+# Contributor: funkyou <[email protected]>
+# Contributor: tardo <[email protected]>
+# Contributor: Stefan Husmann <[email protected]>
+# Contributor: Gustavo Alvarez <[email protected]>
+
+pkgbase=mlt
+pkgname=(mlt mlt-python-bindings)
+pkgver=6.4.1
+pkgrel=9
+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')
+
+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 \
+ --qt-libdir=/usr/lib --qt-includedir=/usr/include/qt
+ make
+
+ # mlt python bindings
+ cd src/swig/python
+ sed -i 's_path=`which python_path=`which python2_' build
+ sed -i 's_`python -c_`python2 -c_' build
+ sed -i 's#python-config#python2-config#' build
+ ./build
+}
+
+package_mlt() {
+ optdepends=('sdl_image: for SDL plugin'
+ 'libsamplerate: for libavresample plugin'
+ 'sox: for SOX (Audio Swiss Army Knife) plugin'
+ 'ffmpeg: for ffmpeg plugin'
+ 'vid.stab: for video stabilize plugin'
+ 'gtk2: Gtk plugin'
+ 'qt5-svg: for Qt5 plugins'
+ 'jack: for JACK sound output plugin'
+ 'ladspa: for LADSPA plugins'
+ 'libexif: for auto rotate plugin'
+ 'frei0r-plugins: for additional effects'
+ 'movit: opengl plugin')
+ conflicts=('mlt++<=0.3.8')
+
+ cd mlt-$pkgver
+ make DESTDIR="$pkgdir" install
+}
+
+package_mlt-python-bindings() {
+ depends=(python2 mlt)
+
+ cd "$srcdir/mlt-$pkgver/src/swig/python"
+ mkdir -p "$pkgdir/usr/lib/python2.7/"
+ install -m755 mlt.py "$pkgdir/usr/lib/python2.7/"
+ install -m755 _mlt.so "$pkgdir/usr/lib/python2.7/"
+ install -m755 mlt_wrap.o "$pkgdir/usr/lib/python2.7/"
+}
Deleted: mlt-glibc-2.26.patch
===================================================================
--- mlt-glibc-2.26.patch 2018-01-15 08:06:12 UTC (rev 314795)
+++ mlt-glibc-2.26.patch 2018-01-15 08:06:36 UTC (rev 314796)
@@ -1,28 +0,0 @@
-From 2377c8665f93f87aa86fabbfd8e596572aacdf6c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]>
-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 <[email protected]>
----
- 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
Copied: mlt/repos/extra-x86_64/mlt-glibc-2.26.patch (from rev 314795,
mlt/trunk/mlt-glibc-2.26.patch)
===================================================================
--- mlt-glibc-2.26.patch (rev 0)
+++ mlt-glibc-2.26.patch 2018-01-15 08:06:36 UTC (rev 314796)
@@ -0,0 +1,28 @@
+From 2377c8665f93f87aa86fabbfd8e596572aacdf6c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]>
+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 <[email protected]>
+---
+ 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
