[arch-commits] Commit in mlt/repos (6 files)
Antonio Rojas
arojas at archlinux.org
Sat Aug 19 03:18:36 UTC 2017
Date: Saturday, August 19, 2017 @ 03:18:35
Author: arojas
Revision: 302388
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
mlt/repos/extra-i686/PKGBUILD
(from rev 302387, mlt/trunk/PKGBUILD)
mlt/repos/extra-i686/mlt-glibc-2.26.patch
(from rev 302387, mlt/trunk/mlt-glibc-2.26.patch)
mlt/repos/extra-x86_64/PKGBUILD
(from rev 302387, mlt/trunk/PKGBUILD)
mlt/repos/extra-x86_64/mlt-glibc-2.26.patch
(from rev 302387, mlt/trunk/mlt-glibc-2.26.patch)
Deleted:
mlt/repos/extra-i686/PKGBUILD
mlt/repos/extra-x86_64/PKGBUILD
-----------------------------------+
/PKGBUILD | 160 ++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 76 -----------------
extra-i686/mlt-glibc-2.26.patch | 28 ++++++
extra-x86_64/PKGBUILD | 76 -----------------
extra-x86_64/mlt-glibc-2.26.patch | 28 ++++++
5 files changed, 216 insertions(+), 152 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-08-19 03:18:05 UTC (rev 302387)
+++ extra-i686/PKGBUILD 2017-08-19 03:18:35 UTC (rev 302388)
@@ -1,76 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Fabian Schoelzel <myfirstname.mylastname at googlemail.com>
-# Contributor: funkyou <spamopfer at nickname.berlin.de>
-# Contributor: tardo <tardo at nagi-fanboi.net>
-# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
-# Contributor: Gustavo Alvarez <sl1pkn07 at gmail.com>
-
-pkgbase=mlt
-pkgname=(mlt mlt-python-bindings)
-pkgver=6.4.1
-pkgrel=7
-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")
-sha256sums=('87583af552695b2235f4ee3fc1e645d69e31702b109331d7e8785fb180cfa382'
- '537562790e64d818c8ca9c410632662b6cd383335198ba36f3909e10217b14d7')
-
-prepare() {
- cd $pkgname-$pkgver
-# Fix kdenlive cash on exit
- patch -p1 -i ../kdenlive-crash-on-exit.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-i686/PKGBUILD (from rev 302387, mlt/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-08-19 03:18:35 UTC (rev 302388)
@@ -0,0 +1,80 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Fabian Schoelzel <myfirstname.mylastname at googlemail.com>
+# Contributor: funkyou <spamopfer at nickname.berlin.de>
+# Contributor: tardo <tardo at nagi-fanboi.net>
+# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
+# Contributor: Gustavo Alvarez <sl1pkn07 at gmail.com>
+
+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-i686/mlt-glibc-2.26.patch (from rev 302387, mlt/trunk/mlt-glibc-2.26.patch)
===================================================================
--- extra-i686/mlt-glibc-2.26.patch (rev 0)
+++ extra-i686/mlt-glibc-2.26.patch 2017-08-19 03:18:35 UTC (rev 302388)
@@ -0,0 +1,28 @@
+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
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-08-19 03:18:05 UTC (rev 302387)
+++ extra-x86_64/PKGBUILD 2017-08-19 03:18:35 UTC (rev 302388)
@@ -1,76 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Fabian Schoelzel <myfirstname.mylastname at googlemail.com>
-# Contributor: funkyou <spamopfer at nickname.berlin.de>
-# Contributor: tardo <tardo at nagi-fanboi.net>
-# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
-# Contributor: Gustavo Alvarez <sl1pkn07 at gmail.com>
-
-pkgbase=mlt
-pkgname=(mlt mlt-python-bindings)
-pkgver=6.4.1
-pkgrel=7
-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")
-sha256sums=('87583af552695b2235f4ee3fc1e645d69e31702b109331d7e8785fb180cfa382'
- '537562790e64d818c8ca9c410632662b6cd383335198ba36f3909e10217b14d7')
-
-prepare() {
- cd $pkgname-$pkgver
-# Fix kdenlive cash on exit
- patch -p1 -i ../kdenlive-crash-on-exit.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 302387, mlt/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-08-19 03:18:35 UTC (rev 302388)
@@ -0,0 +1,80 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Fabian Schoelzel <myfirstname.mylastname at googlemail.com>
+# Contributor: funkyou <spamopfer at nickname.berlin.de>
+# Contributor: tardo <tardo at nagi-fanboi.net>
+# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
+# Contributor: Gustavo Alvarez <sl1pkn07 at gmail.com>
+
+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/mlt-glibc-2.26.patch (from rev 302387, mlt/trunk/mlt-glibc-2.26.patch)
===================================================================
--- extra-x86_64/mlt-glibc-2.26.patch (rev 0)
+++ extra-x86_64/mlt-glibc-2.26.patch 2017-08-19 03:18:35 UTC (rev 302388)
@@ -0,0 +1,28 @@
+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
More information about the arch-commits
mailing list