[arch-commits] Commit in ffmpeg/repos (6 files)
Ionut Biru
ibiru at archlinux.org
Wed Jan 11 22:55:39 UTC 2012
Date: Wednesday, January 11, 2012 @ 17:55:38
Author: ibiru
Revision: 146495
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
ffmpeg/repos/extra-i686/PKGBUILD
(from rev 146494, ffmpeg/trunk/PKGBUILD)
ffmpeg/repos/extra-i686/revert-enabling-threads.patch
(from rev 146494, ffmpeg/trunk/revert-enabling-threads.patch)
ffmpeg/repos/extra-x86_64/PKGBUILD
(from rev 146494, ffmpeg/trunk/PKGBUILD)
ffmpeg/repos/extra-x86_64/revert-enabling-threads.patch
(from rev 146494, ffmpeg/trunk/revert-enabling-threads.patch)
Deleted:
ffmpeg/repos/extra-i686/PKGBUILD
ffmpeg/repos/extra-x86_64/PKGBUILD
--------------------------------------------+
extra-i686/PKGBUILD | 120 +++++++++++++--------------
extra-i686/revert-enabling-threads.patch | 15 +++
extra-x86_64/PKGBUILD | 120 +++++++++++++--------------
extra-x86_64/revert-enabling-threads.patch | 15 +++
4 files changed, 154 insertions(+), 116 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-01-11 22:49:08 UTC (rev 146494)
+++ extra-i686/PKGBUILD 2012-01-11 22:55:38 UTC (rev 146495)
@@ -1,58 +0,0 @@
-# $Id$
-# Maintainer : Ionut Biru <ibiru at archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-# Contributor: Paul Mattal <paul at archlinux.org>
-
-pkgname=ffmpeg
-pkgver=20120110
-pkgrel=1
-pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
-arch=('i686' 'x86_64')
-url="http://ffmpeg.org/"
-license=('GPL')
-depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib)
-makedepends=('yasm' 'git' 'libvdpau')
-#git clone git://git.videolan.org/ffmpeg.git
-source=(ftp://ftp.archlinux.org/other/ffmpeg/$pkgname-$pkgver.tar.xz)
-md5sums=('a8121ae2fbe83044ac27501e3f58780d')
-
-build() {
- cd "$srcdir/$pkgname"
-
- ./configure \
- --prefix=/usr \
- --enable-libmp3lame \
- --enable-libvorbis \
- --enable-libxvid \
- --enable-libx264 \
- --enable-libvpx \
- --enable-libtheora \
- --enable-libgsm \
- --enable-libspeex \
- --enable-postproc \
- --enable-shared \
- --enable-x11grab \
- --enable-libopencore_amrnb \
- --enable-libopencore_amrwb \
- --enable-libschroedinger \
- --enable-libopenjpeg \
- --enable-librtmp \
- --enable-libpulse \
- --enable-gpl \
- --enable-version3 \
- --enable-runtime-cpudetect \
- --disable-debug \
- --disable-static
-
- make
- make tools/qt-faststart
- make doc/ff{mpeg,play,server}.1
-}
-
-package() {
- cd "$srcdir/$pkgname"
- make DESTDIR="$pkgdir" install install-man
- install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: ffmpeg/repos/extra-i686/PKGBUILD (from rev 146494, ffmpeg/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-01-11 22:55:38 UTC (rev 146495)
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer : Ionut Biru <ibiru at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+# Contributor: Paul Mattal <paul at archlinux.org>
+
+pkgname=ffmpeg
+pkgver=20120111
+pkgrel=1
+pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
+arch=('i686' 'x86_64')
+url="http://ffmpeg.org/"
+license=('GPL')
+depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib)
+makedepends=('yasm' 'git' 'libvdpau')
+#git clone git://git.videolan.org/ffmpeg.git
+source=(ftp://ftp.archlinux.org/other/ffmpeg/$pkgname-$pkgver.tar.xz
+ revert-enabling-threads.patch)
+md5sums=('7a54b2b1af86a746696d1c0b2a79979c'
+ '79cc22bc2ac3e67d96c340cb7061e64d')
+
+build() {
+ cd "$srcdir/$pkgname"
+
+ patch -Np1 -R -i "$srcdir/revert-enabling-threads.patch"
+
+ ./configure \
+ --prefix=/usr \
+ --enable-libmp3lame \
+ --enable-libvorbis \
+ --enable-libxvid \
+ --enable-libx264 \
+ --enable-libvpx \
+ --enable-libtheora \
+ --enable-libgsm \
+ --enable-libspeex \
+ --enable-postproc \
+ --enable-shared \
+ --enable-x11grab \
+ --enable-libopencore_amrnb \
+ --enable-libopencore_amrwb \
+ --enable-libschroedinger \
+ --enable-libopenjpeg \
+ --enable-librtmp \
+ --enable-libpulse \
+ --enable-gpl \
+ --enable-version3 \
+ --enable-runtime-cpudetect \
+ --disable-debug \
+ --disable-static
+
+ make
+ make tools/qt-faststart
+ make doc/ff{mpeg,play,server}.1
+}
+
+package() {
+ cd "$srcdir/$pkgname"
+ make DESTDIR="$pkgdir" install install-man
+ install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart"
+}
+
+# vim:set ts=2 sw=2 et:
Copied: ffmpeg/repos/extra-i686/revert-enabling-threads.patch (from rev 146494, ffmpeg/trunk/revert-enabling-threads.patch)
===================================================================
--- extra-i686/revert-enabling-threads.patch (rev 0)
+++ extra-i686/revert-enabling-threads.patch 2012-01-11 22:55:38 UTC (rev 146495)
@@ -0,0 +1,15 @@
+X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavcodec%2Foptions.c;h=4ac92fd29e0a4e3bb6952b27240ac65b86671b27;hp=4ac9313f274f46eae85a144d6bb6fea30e67bea2;hb=e4e30256f87f177decf59b59e923d05ef64147df;hpb=c11b92b304334b1241ee79406dca6a03131fc921
+
+diff --git a/libavcodec/options.c b/libavcodec/options.c
+index 4ac9313..4ac92fd 100644
+--- a/libavcodec/options.c
++++ b/libavcodec/options.c
+@@ -370,7 +370,7 @@ static const AVOption options[]={
+ {"float", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_AA_FLOAT }, INT_MIN, INT_MAX, V|D, "aa"},
+ #endif
+ {"qns", "quantizer noise shaping", OFFSET(quantizer_noise_shaping), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E},
+-{"threads", NULL, OFFSET(thread_count), AV_OPT_TYPE_INT, {.dbl = 1 }, 0, INT_MAX, V|E|D, "threads"},
++{"threads", NULL, OFFSET(thread_count), AV_OPT_TYPE_INT, {.dbl = 0 }, 0, INT_MAX, V|E|D, "threads"},
+ {"auto", "detect a good number of threads", 0, AV_OPT_TYPE_CONST, {.dbl = 0 }, INT_MIN, INT_MAX, V|E|D, "threads"},
+ {"me_threshold", "motion estimaton threshold", OFFSET(me_threshold), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E},
+ {"mb_threshold", "macroblock threshold", OFFSET(mb_threshold), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E},
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-01-11 22:49:08 UTC (rev 146494)
+++ extra-x86_64/PKGBUILD 2012-01-11 22:55:38 UTC (rev 146495)
@@ -1,58 +0,0 @@
-# $Id$
-# Maintainer : Ionut Biru <ibiru at archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-# Contributor: Paul Mattal <paul at archlinux.org>
-
-pkgname=ffmpeg
-pkgver=20120110
-pkgrel=1
-pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
-arch=('i686' 'x86_64')
-url="http://ffmpeg.org/"
-license=('GPL')
-depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib)
-makedepends=('yasm' 'git' 'libvdpau')
-#git clone git://git.videolan.org/ffmpeg.git
-source=(ftp://ftp.archlinux.org/other/ffmpeg/$pkgname-$pkgver.tar.xz)
-md5sums=('a8121ae2fbe83044ac27501e3f58780d')
-
-build() {
- cd "$srcdir/$pkgname"
-
- ./configure \
- --prefix=/usr \
- --enable-libmp3lame \
- --enable-libvorbis \
- --enable-libxvid \
- --enable-libx264 \
- --enable-libvpx \
- --enable-libtheora \
- --enable-libgsm \
- --enable-libspeex \
- --enable-postproc \
- --enable-shared \
- --enable-x11grab \
- --enable-libopencore_amrnb \
- --enable-libopencore_amrwb \
- --enable-libschroedinger \
- --enable-libopenjpeg \
- --enable-librtmp \
- --enable-libpulse \
- --enable-gpl \
- --enable-version3 \
- --enable-runtime-cpudetect \
- --disable-debug \
- --disable-static
-
- make
- make tools/qt-faststart
- make doc/ff{mpeg,play,server}.1
-}
-
-package() {
- cd "$srcdir/$pkgname"
- make DESTDIR="$pkgdir" install install-man
- install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: ffmpeg/repos/extra-x86_64/PKGBUILD (from rev 146494, ffmpeg/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-01-11 22:55:38 UTC (rev 146495)
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer : Ionut Biru <ibiru at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+# Contributor: Paul Mattal <paul at archlinux.org>
+
+pkgname=ffmpeg
+pkgver=20120111
+pkgrel=1
+pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
+arch=('i686' 'x86_64')
+url="http://ffmpeg.org/"
+license=('GPL')
+depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib)
+makedepends=('yasm' 'git' 'libvdpau')
+#git clone git://git.videolan.org/ffmpeg.git
+source=(ftp://ftp.archlinux.org/other/ffmpeg/$pkgname-$pkgver.tar.xz
+ revert-enabling-threads.patch)
+md5sums=('7a54b2b1af86a746696d1c0b2a79979c'
+ '79cc22bc2ac3e67d96c340cb7061e64d')
+
+build() {
+ cd "$srcdir/$pkgname"
+
+ patch -Np1 -R -i "$srcdir/revert-enabling-threads.patch"
+
+ ./configure \
+ --prefix=/usr \
+ --enable-libmp3lame \
+ --enable-libvorbis \
+ --enable-libxvid \
+ --enable-libx264 \
+ --enable-libvpx \
+ --enable-libtheora \
+ --enable-libgsm \
+ --enable-libspeex \
+ --enable-postproc \
+ --enable-shared \
+ --enable-x11grab \
+ --enable-libopencore_amrnb \
+ --enable-libopencore_amrwb \
+ --enable-libschroedinger \
+ --enable-libopenjpeg \
+ --enable-librtmp \
+ --enable-libpulse \
+ --enable-gpl \
+ --enable-version3 \
+ --enable-runtime-cpudetect \
+ --disable-debug \
+ --disable-static
+
+ make
+ make tools/qt-faststart
+ make doc/ff{mpeg,play,server}.1
+}
+
+package() {
+ cd "$srcdir/$pkgname"
+ make DESTDIR="$pkgdir" install install-man
+ install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart"
+}
+
+# vim:set ts=2 sw=2 et:
Copied: ffmpeg/repos/extra-x86_64/revert-enabling-threads.patch (from rev 146494, ffmpeg/trunk/revert-enabling-threads.patch)
===================================================================
--- extra-x86_64/revert-enabling-threads.patch (rev 0)
+++ extra-x86_64/revert-enabling-threads.patch 2012-01-11 22:55:38 UTC (rev 146495)
@@ -0,0 +1,15 @@
+X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavcodec%2Foptions.c;h=4ac92fd29e0a4e3bb6952b27240ac65b86671b27;hp=4ac9313f274f46eae85a144d6bb6fea30e67bea2;hb=e4e30256f87f177decf59b59e923d05ef64147df;hpb=c11b92b304334b1241ee79406dca6a03131fc921
+
+diff --git a/libavcodec/options.c b/libavcodec/options.c
+index 4ac9313..4ac92fd 100644
+--- a/libavcodec/options.c
++++ b/libavcodec/options.c
+@@ -370,7 +370,7 @@ static const AVOption options[]={
+ {"float", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_AA_FLOAT }, INT_MIN, INT_MAX, V|D, "aa"},
+ #endif
+ {"qns", "quantizer noise shaping", OFFSET(quantizer_noise_shaping), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E},
+-{"threads", NULL, OFFSET(thread_count), AV_OPT_TYPE_INT, {.dbl = 1 }, 0, INT_MAX, V|E|D, "threads"},
++{"threads", NULL, OFFSET(thread_count), AV_OPT_TYPE_INT, {.dbl = 0 }, 0, INT_MAX, V|E|D, "threads"},
+ {"auto", "detect a good number of threads", 0, AV_OPT_TYPE_CONST, {.dbl = 0 }, INT_MIN, INT_MAX, V|E|D, "threads"},
+ {"me_threshold", "motion estimaton threshold", OFFSET(me_threshold), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E},
+ {"mb_threshold", "macroblock threshold", OFFSET(mb_threshold), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E},
More information about the arch-commits
mailing list