[arch-commits] Commit in mlt/repos (8 files)
Sergej Pupykin
spupykin at nymeria.archlinux.org
Thu Mar 21 12:08:21 UTC 2013
Date: Thursday, March 21, 2013 @ 13:08:21
Author: spupykin
Revision: 86716
archrelease: copy trunk to community-i686, community-x86_64
Added:
mlt/repos/community-i686/PKGBUILD
(from rev 86715, mlt/trunk/PKGBUILD)
mlt/repos/community-i686/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch
(from rev 86715, mlt/trunk/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch)
mlt/repos/community-x86_64/PKGBUILD
(from rev 86715, mlt/trunk/PKGBUILD)
mlt/repos/community-x86_64/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch
(from rev 86715, mlt/trunk/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch)
Deleted:
mlt/repos/community-i686/PKGBUILD
mlt/repos/community-i686/ffmpeg.patch
mlt/repos/community-x86_64/PKGBUILD
mlt/repos/community-x86_64/ffmpeg.patch
-----------------------------------------------------------------------------+
/PKGBUILD | 128 ++++++++++
community-i686/PKGBUILD | 64 -----
community-i686/ffmpeg.patch | 29 --
community-i686/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch | 37 ++
community-x86_64/PKGBUILD | 64 -----
community-x86_64/ffmpeg.patch | 29 --
community-x86_64/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch | 37 ++
7 files changed, 202 insertions(+), 186 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-03-21 12:07:54 UTC (rev 86715)
+++ community-i686/PKGBUILD 2013-03-21 12:08:21 UTC (rev 86716)
@@ -1,64 +0,0 @@
-# $Id$
-# Maintainer: 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>
-
-pkgbase=mlt
-pkgname=('mlt' 'mlt-python-bindings')
-pkgver=0.8.8
-pkgrel=3
-pkgdesc="An open source multimedia framework"
-arch=('i686' 'x86_64')
-url="http://www.mltframework.org"
-license=('GPL')
-makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt4' 'sox' 'libxml2' 'gtk2' 'ffmpeg'
- 'frei0r-plugins' 'swig' 'python2' "jack" "ladspa")
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
- ffmpeg.patch)
-md5sums=('06de4052cffd6760c468d7da9557edae'
- 'c28b4691d1715432d4de0055f4e2f5eb')
-
-build() {
- # mlt
- cd "$srcdir/mlt-$pkgver"
-
-# patch -p1 <$srcdir/ffmpeg.patch
-
- [ $CARCH == "i686" ] && SSE2=--disable-sse2 || SSE2=
-# SSE2=--disable-sse2
-
- msg "SSE2=$SSE2"
- ./configure --prefix=/usr --enable-gpl --enable-gpl3 \
- --qimage-libdir=/usr/lib/ --qimage-includedir=/usr/include/qt4 \
- --avformat-vdpau \
- --avformat-swscale $SSE2
- make
-
- # mlt python bindings
- cd "$srcdir/mlt-$pkgver/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() {
- depends=('sdl_image' 'libsamplerate' 'libdv' 'sox' 'libxml2' 'ffmpeg' 'frei0r-plugins')
- optdepends=('jack' 'libexif' 'qt4' 'gtk2' "ladspa")
- conflicts=('mlt++<=0.3.8')
-
- cd "$srcdir/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/community-i686/PKGBUILD (from rev 86715, mlt/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-03-21 12:08:21 UTC (rev 86716)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: 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>
+
+pkgbase=mlt
+pkgname=('mlt' 'mlt-python-bindings')
+pkgver=0.8.8
+pkgrel=4
+pkgdesc="An open source multimedia framework"
+arch=('i686' 'x86_64')
+url="http://www.mltframework.org"
+license=('GPL')
+makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt4' 'sox' 'libxml2' 'gtk2' 'ffmpeg'
+ 'frei0r-plugins' 'swig' 'python2' "jack" "ladspa")
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
+ fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch)
+md5sums=('06de4052cffd6760c468d7da9557edae'
+ '8227e7a1b059b1b16901166d2a508317')
+
+build() {
+ # mlt
+ cd "$srcdir/mlt-$pkgver"
+
+ patch -p1 <$srcdir/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch
+
+ [ $CARCH == "i686" ] && SSE2=--disable-sse2 || SSE2=
+# SSE2=--disable-sse2
+
+ msg "SSE2=$SSE2"
+ ./configure --prefix=/usr --enable-gpl --enable-gpl3 \
+ --qimage-libdir=/usr/lib/ --qimage-includedir=/usr/include/qt4 \
+ --avformat-vdpau \
+ --avformat-swscale $SSE2
+ make
+
+ # mlt python bindings
+ cd "$srcdir/mlt-$pkgver/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() {
+ depends=('sdl_image' 'libsamplerate' 'libdv' 'sox' 'libxml2' 'ffmpeg' 'frei0r-plugins')
+ optdepends=('jack' 'libexif' 'qt4' 'gtk2' "ladspa")
+ conflicts=('mlt++<=0.3.8')
+
+ cd "$srcdir/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: community-i686/ffmpeg.patch
===================================================================
--- community-i686/ffmpeg.patch 2013-03-21 12:07:54 UTC (rev 86715)
+++ community-i686/ffmpeg.patch 2013-03-21 12:08:21 UTC (rev 86716)
@@ -1,29 +0,0 @@
-diff -wbBur mlt-0.8.2/src/modules/avformat/consumer_avformat.c mlt-0.8.2.my/src/modules/avformat/consumer_avformat.c
---- mlt-0.8.2/src/modules/avformat/consumer_avformat.c 2012-08-28 20:25:58.000000000 +0400
-+++ mlt-0.8.2.my/src/modules/avformat/consumer_avformat.c 2012-11-06 16:03:07.269782436 +0400
-@@ -237,11 +237,7 @@
- mlt_properties_set_data( properties, "acodec", codecs, 0, (mlt_destructor) mlt_properties_close, NULL );
- mlt_properties_set_data( doc, "audio_codecs", codecs, 0, NULL, NULL );
- while ( ( codec = av_codec_next( codec ) ) )
--#if LIBAVCODEC_VERSION_INT >= ((54<<16)+(0<<8)+0)
-- if ( ( codec->encode || codec->encode2 ) && codec->type == CODEC_TYPE_AUDIO )
--#else
-- if ( codec->encode && codec->type == CODEC_TYPE_AUDIO )
--#endif
-+ if ( ( codec->encode2 ) && codec->type == CODEC_TYPE_AUDIO )
- {
- snprintf( key, sizeof(key), "%d", mlt_properties_count( codecs ) );
- mlt_properties_set( codecs, key, codec->name );
-@@ -261,11 +257,7 @@
- mlt_properties_set_data( properties, "vcodec", codecs, 0, (mlt_destructor) mlt_properties_close, NULL );
- mlt_properties_set_data( doc, "video_codecs", codecs, 0, NULL, NULL );
- while ( ( codec = av_codec_next( codec ) ) )
--#if LIBAVCODEC_VERSION_INT >= ((54<<16)+(0<<8)+0)
-- if ( (codec->encode || codec->encode2) && codec->type == CODEC_TYPE_VIDEO )
--#else
-- if ( codec->encode && codec->type == CODEC_TYPE_VIDEO )
--#endif
-+ if ( (codec->encode2) && codec->type == CODEC_TYPE_VIDEO )
- {
- snprintf( key, sizeof(key), "%d", mlt_properties_count( codecs ) );
- mlt_properties_set( codecs, key, codec->name );
Copied: mlt/repos/community-i686/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch (from rev 86715, mlt/trunk/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch)
===================================================================
--- community-i686/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch (rev 0)
+++ community-i686/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch 2013-03-21 12:08:21 UTC (rev 86716)
@@ -0,0 +1,37 @@
+From ef749d7b526f0762a00a369ea35b5b12c18142fb Mon Sep 17 00:00:00 2001
+From: Nicolas Boichat <nicolas at boichat.ch>
+Date: Wed, 20 Mar 2013 16:50:56 +0800
+Subject: [PATCH] Fix Segmentation fault at exit by calling
+ av_lockmgr_register( NULL );
+
+---
+ src/modules/avformat/factory.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/modules/avformat/factory.c b/src/modules/avformat/factory.c
+index ddf05fe..a273537 100644
+--- a/src/modules/avformat/factory.c
++++ b/src/modules/avformat/factory.c
+@@ -83,6 +83,11 @@ static int avformat_lockmgr(void **mutex, enum AVLockOp op)
+ return 0;
+ }
+
++static void avformat_exit( )
++{
++ av_lockmgr_register( NULL );
++}
++
+ static void avformat_init( )
+ {
+ // Initialise avformat if necessary
+@@ -98,6 +103,7 @@ static void avformat_init( )
+ avformat_network_init();
+ #endif
+ av_log_set_level( mlt_log_get_level() );
++ atexit(avformat_exit);
+ }
+ }
+
+--
+1.8.1.5
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-03-21 12:07:54 UTC (rev 86715)
+++ community-x86_64/PKGBUILD 2013-03-21 12:08:21 UTC (rev 86716)
@@ -1,64 +0,0 @@
-# $Id$
-# Maintainer: 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>
-
-pkgbase=mlt
-pkgname=('mlt' 'mlt-python-bindings')
-pkgver=0.8.8
-pkgrel=3
-pkgdesc="An open source multimedia framework"
-arch=('i686' 'x86_64')
-url="http://www.mltframework.org"
-license=('GPL')
-makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt4' 'sox' 'libxml2' 'gtk2' 'ffmpeg'
- 'frei0r-plugins' 'swig' 'python2' "jack" "ladspa")
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
- ffmpeg.patch)
-md5sums=('06de4052cffd6760c468d7da9557edae'
- 'c28b4691d1715432d4de0055f4e2f5eb')
-
-build() {
- # mlt
- cd "$srcdir/mlt-$pkgver"
-
-# patch -p1 <$srcdir/ffmpeg.patch
-
- [ $CARCH == "i686" ] && SSE2=--disable-sse2 || SSE2=
-# SSE2=--disable-sse2
-
- msg "SSE2=$SSE2"
- ./configure --prefix=/usr --enable-gpl --enable-gpl3 \
- --qimage-libdir=/usr/lib/ --qimage-includedir=/usr/include/qt4 \
- --avformat-vdpau \
- --avformat-swscale $SSE2
- make
-
- # mlt python bindings
- cd "$srcdir/mlt-$pkgver/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() {
- depends=('sdl_image' 'libsamplerate' 'libdv' 'sox' 'libxml2' 'ffmpeg' 'frei0r-plugins')
- optdepends=('jack' 'libexif' 'qt4' 'gtk2' "ladspa")
- conflicts=('mlt++<=0.3.8')
-
- cd "$srcdir/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/community-x86_64/PKGBUILD (from rev 86715, mlt/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-03-21 12:08:21 UTC (rev 86716)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: 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>
+
+pkgbase=mlt
+pkgname=('mlt' 'mlt-python-bindings')
+pkgver=0.8.8
+pkgrel=4
+pkgdesc="An open source multimedia framework"
+arch=('i686' 'x86_64')
+url="http://www.mltframework.org"
+license=('GPL')
+makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt4' 'sox' 'libxml2' 'gtk2' 'ffmpeg'
+ 'frei0r-plugins' 'swig' 'python2' "jack" "ladspa")
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
+ fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch)
+md5sums=('06de4052cffd6760c468d7da9557edae'
+ '8227e7a1b059b1b16901166d2a508317')
+
+build() {
+ # mlt
+ cd "$srcdir/mlt-$pkgver"
+
+ patch -p1 <$srcdir/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch
+
+ [ $CARCH == "i686" ] && SSE2=--disable-sse2 || SSE2=
+# SSE2=--disable-sse2
+
+ msg "SSE2=$SSE2"
+ ./configure --prefix=/usr --enable-gpl --enable-gpl3 \
+ --qimage-libdir=/usr/lib/ --qimage-includedir=/usr/include/qt4 \
+ --avformat-vdpau \
+ --avformat-swscale $SSE2
+ make
+
+ # mlt python bindings
+ cd "$srcdir/mlt-$pkgver/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() {
+ depends=('sdl_image' 'libsamplerate' 'libdv' 'sox' 'libxml2' 'ffmpeg' 'frei0r-plugins')
+ optdepends=('jack' 'libexif' 'qt4' 'gtk2' "ladspa")
+ conflicts=('mlt++<=0.3.8')
+
+ cd "$srcdir/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: community-x86_64/ffmpeg.patch
===================================================================
--- community-x86_64/ffmpeg.patch 2013-03-21 12:07:54 UTC (rev 86715)
+++ community-x86_64/ffmpeg.patch 2013-03-21 12:08:21 UTC (rev 86716)
@@ -1,29 +0,0 @@
-diff -wbBur mlt-0.8.2/src/modules/avformat/consumer_avformat.c mlt-0.8.2.my/src/modules/avformat/consumer_avformat.c
---- mlt-0.8.2/src/modules/avformat/consumer_avformat.c 2012-08-28 20:25:58.000000000 +0400
-+++ mlt-0.8.2.my/src/modules/avformat/consumer_avformat.c 2012-11-06 16:03:07.269782436 +0400
-@@ -237,11 +237,7 @@
- mlt_properties_set_data( properties, "acodec", codecs, 0, (mlt_destructor) mlt_properties_close, NULL );
- mlt_properties_set_data( doc, "audio_codecs", codecs, 0, NULL, NULL );
- while ( ( codec = av_codec_next( codec ) ) )
--#if LIBAVCODEC_VERSION_INT >= ((54<<16)+(0<<8)+0)
-- if ( ( codec->encode || codec->encode2 ) && codec->type == CODEC_TYPE_AUDIO )
--#else
-- if ( codec->encode && codec->type == CODEC_TYPE_AUDIO )
--#endif
-+ if ( ( codec->encode2 ) && codec->type == CODEC_TYPE_AUDIO )
- {
- snprintf( key, sizeof(key), "%d", mlt_properties_count( codecs ) );
- mlt_properties_set( codecs, key, codec->name );
-@@ -261,11 +257,7 @@
- mlt_properties_set_data( properties, "vcodec", codecs, 0, (mlt_destructor) mlt_properties_close, NULL );
- mlt_properties_set_data( doc, "video_codecs", codecs, 0, NULL, NULL );
- while ( ( codec = av_codec_next( codec ) ) )
--#if LIBAVCODEC_VERSION_INT >= ((54<<16)+(0<<8)+0)
-- if ( (codec->encode || codec->encode2) && codec->type == CODEC_TYPE_VIDEO )
--#else
-- if ( codec->encode && codec->type == CODEC_TYPE_VIDEO )
--#endif
-+ if ( (codec->encode2) && codec->type == CODEC_TYPE_VIDEO )
- {
- snprintf( key, sizeof(key), "%d", mlt_properties_count( codecs ) );
- mlt_properties_set( codecs, key, codec->name );
Copied: mlt/repos/community-x86_64/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch (from rev 86715, mlt/trunk/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch)
===================================================================
--- community-x86_64/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch (rev 0)
+++ community-x86_64/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch 2013-03-21 12:08:21 UTC (rev 86716)
@@ -0,0 +1,37 @@
+From ef749d7b526f0762a00a369ea35b5b12c18142fb Mon Sep 17 00:00:00 2001
+From: Nicolas Boichat <nicolas at boichat.ch>
+Date: Wed, 20 Mar 2013 16:50:56 +0800
+Subject: [PATCH] Fix Segmentation fault at exit by calling
+ av_lockmgr_register( NULL );
+
+---
+ src/modules/avformat/factory.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/modules/avformat/factory.c b/src/modules/avformat/factory.c
+index ddf05fe..a273537 100644
+--- a/src/modules/avformat/factory.c
++++ b/src/modules/avformat/factory.c
+@@ -83,6 +83,11 @@ static int avformat_lockmgr(void **mutex, enum AVLockOp op)
+ return 0;
+ }
+
++static void avformat_exit( )
++{
++ av_lockmgr_register( NULL );
++}
++
+ static void avformat_init( )
+ {
+ // Initialise avformat if necessary
+@@ -98,6 +103,7 @@ static void avformat_init( )
+ avformat_network_init();
+ #endif
+ av_log_set_level( mlt_log_get_level() );
++ atexit(avformat_exit);
+ }
+ }
+
+--
+1.8.1.5
+
More information about the arch-commits
mailing list