[arch-commits] Commit in ffmpeg/repos (6 files)
Bartłomiej Piotrowski
bpiotrowski at archlinux.org
Sat May 30 08:27:40 UTC 2015
Date: Saturday, May 30, 2015 @ 10:27:40
Author: bpiotrowski
Revision: 239899
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
ffmpeg/repos/extra-i686/PKGBUILD
(from rev 239898, ffmpeg/trunk/PKGBUILD)
ffmpeg/repos/extra-i686/ffmpeg-2.6.3-lavd-xcbgrab-fix-comparison-with-screen-size.patch
(from rev 239898, ffmpeg/trunk/ffmpeg-2.6.3-lavd-xcbgrab-fix-comparison-with-screen-size.patch)
ffmpeg/repos/extra-x86_64/PKGBUILD
(from rev 239898, ffmpeg/trunk/PKGBUILD)
ffmpeg/repos/extra-x86_64/ffmpeg-2.6.3-lavd-xcbgrab-fix-comparison-with-screen-size.patch
(from rev 239898, ffmpeg/trunk/ffmpeg-2.6.3-lavd-xcbgrab-fix-comparison-with-screen-size.patch)
Deleted:
ffmpeg/repos/extra-i686/PKGBUILD
ffmpeg/repos/extra-x86_64/PKGBUILD
------------------------------------------------------------------------------+
/PKGBUILD | 166 ++++++++++
extra-i686/PKGBUILD | 76 ----
extra-i686/ffmpeg-2.6.3-lavd-xcbgrab-fix-comparison-with-screen-size.patch | 29 +
extra-x86_64/PKGBUILD | 76 ----
extra-x86_64/ffmpeg-2.6.3-lavd-xcbgrab-fix-comparison-with-screen-size.patch | 29 +
5 files changed, 224 insertions(+), 152 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-05-30 08:27:30 UTC (rev 239898)
+++ extra-i686/PKGBUILD 2015-05-30 08:27:40 UTC (rev 239899)
@@ -1,76 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-# Contributor: Paul Mattal <paul at archlinux.org>
-
-pkgname=ffmpeg
-pkgver=2.6.3
-pkgrel=1
-epoch=1
-pkgdesc='Complete and free Internet live audio and video broadcasting solution'
-arch=('i686' 'x86_64')
-url='http://ffmpeg.org/'
-license=('GPL')
-depends=(
- 'alsa-lib' 'bzip2' 'fontconfig' 'gnutls' 'gsm' 'lame' 'libass' 'libvdpau'
- 'libbluray' 'libmodplug' 'libpulse' 'libtheora' 'libva' 'opencore-amr'
- 'openjpeg' 'opus' 'schroedinger' 'sdl' 'speex' 'v4l-utils' 'xvidcore'
- 'zlib' 'fribidi' 'libssh'
- 'libvorbisenc.so' 'libvorbis.so' 'libvpx.so' 'libx264.so' 'libx265.so'
-)
-makedepends=('libvdpau' 'yasm' 'hardening-wrapper')
-source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2{,.asc})
-validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') # ffmpeg-devel
-md5sums=('e2cc3c209f91393d35ab58598e41cf22'
- 'SKIP')
-
-build() {
- cd $pkgname-$pkgver
-
- ./configure \
- --prefix=/usr \
- --disable-debug \
- --disable-static \
- --disable-stripping \
- --enable-avisynth \
- --enable-avresample \
- --enable-fontconfig \
- --enable-gnutls \
- --enable-gpl \
- --enable-libass \
- --enable-libbluray \
- --enable-libfreetype \
- --enable-libfribidi \
- --enable-libgsm \
- --enable-libmodplug \
- --enable-libmp3lame \
- --enable-libopencore_amrnb \
- --enable-libopencore_amrwb \
- --enable-libopenjpeg \
- --enable-libopus \
- --enable-libpulse \
- --enable-libschroedinger \
- --enable-libspeex \
- --enable-libssh \
- --enable-libtheora \
- --enable-libv4l2 \
- --enable-libvorbis \
- --enable-libvpx \
- --enable-libx264 \
- --enable-libx265 \
- --enable-libxvid \
- --enable-shared \
- --enable-version3 \
- --enable-x11grab \
-
- make
- make tools/qt-faststart
- make doc/ff{mpeg,play,server}.1
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install install-man
- install -Dm755 tools/qt-faststart "$pkgdir"/usr/bin/qt-faststart
-}
Copied: ffmpeg/repos/extra-i686/PKGBUILD (from rev 239898, ffmpeg/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-05-30 08:27:40 UTC (rev 239899)
@@ -0,0 +1,83 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+# Contributor: Paul Mattal <paul at archlinux.org>
+
+pkgname=ffmpeg
+pkgver=2.6.3
+pkgrel=2
+epoch=1
+pkgdesc='Complete and free Internet live audio and video broadcasting solution'
+arch=('i686' 'x86_64')
+url='http://ffmpeg.org/'
+license=('GPL')
+depends=(
+ 'alsa-lib' 'bzip2' 'fontconfig' 'gnutls' 'gsm' 'lame' 'libass' 'libvdpau'
+ 'libbluray' 'libmodplug' 'libpulse' 'libtheora' 'libva' 'opencore-amr'
+ 'openjpeg' 'opus' 'schroedinger' 'sdl' 'speex' 'v4l-utils' 'xvidcore'
+ 'zlib' 'fribidi' 'libssh'
+ 'libvorbisenc.so' 'libvorbis.so' 'libvpx.so' 'libx264.so' 'libx265.so'
+)
+makedepends=('libvdpau' 'yasm' 'hardening-wrapper')
+source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2{,.asc}
+ ffmpeg-2.6.3-lavd-xcbgrab-fix-comparison-with-screen-size.patch)
+validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') # ffmpeg-devel
+md5sums=('e2cc3c209f91393d35ab58598e41cf22'
+ 'SKIP'
+ 'ac9f115dced48b66e36249349a29347e')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -p1 -i ../ffmpeg-2.6.3-lavd-xcbgrab-fix-comparison-with-screen-size.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+
+ ./configure \
+ --prefix=/usr \
+ --disable-debug \
+ --disable-static \
+ --disable-stripping \
+ --enable-avisynth \
+ --enable-avresample \
+ --enable-fontconfig \
+ --enable-gnutls \
+ --enable-gpl \
+ --enable-libass \
+ --enable-libbluray \
+ --enable-libfreetype \
+ --enable-libfribidi \
+ --enable-libgsm \
+ --enable-libmodplug \
+ --enable-libmp3lame \
+ --enable-libopencore_amrnb \
+ --enable-libopencore_amrwb \
+ --enable-libopenjpeg \
+ --enable-libopus \
+ --enable-libpulse \
+ --enable-libschroedinger \
+ --enable-libspeex \
+ --enable-libssh \
+ --enable-libtheora \
+ --enable-libv4l2 \
+ --enable-libvorbis \
+ --enable-libvpx \
+ --enable-libx264 \
+ --enable-libx265 \
+ --enable-libxvid \
+ --enable-shared \
+ --enable-version3 \
+ --enable-x11grab \
+
+ make
+ make tools/qt-faststart
+ make doc/ff{mpeg,play,server}.1
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install install-man
+ install -Dm755 tools/qt-faststart "$pkgdir"/usr/bin/qt-faststart
+}
Copied: ffmpeg/repos/extra-i686/ffmpeg-2.6.3-lavd-xcbgrab-fix-comparison-with-screen-size.patch (from rev 239898, ffmpeg/trunk/ffmpeg-2.6.3-lavd-xcbgrab-fix-comparison-with-screen-size.patch)
===================================================================
--- extra-i686/ffmpeg-2.6.3-lavd-xcbgrab-fix-comparison-with-screen-size.patch (rev 0)
+++ extra-i686/ffmpeg-2.6.3-lavd-xcbgrab-fix-comparison-with-screen-size.patch 2015-05-30 08:27:40 UTC (rev 239899)
@@ -0,0 +1,29 @@
+From 7971fa9ce0ead8d2e8a79dbe422e91dcef8222ba Mon Sep 17 00:00:00 2001
+From: Nicolas George <george at nsup.org>
+Date: Wed, 6 May 2015 11:53:19 +0200
+Subject: [PATCH] lavd/xcbgrab: fix comparison with screen size.
+
+Signed-off-by: Nicolas George <george at nsup.org>
+Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
+---
+ libavdevice/xcbgrab.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libavdevice/xcbgrab.c b/libavdevice/xcbgrab.c
+index 15512cd..166575c 100644
+--- a/libavdevice/xcbgrab.c
++++ b/libavdevice/xcbgrab.c
+@@ -533,8 +533,8 @@ static int create_stream(AVFormatContext *s)
+ gc = xcb_get_geometry(c->conn, c->screen->root);
+ geo = xcb_get_geometry_reply(c->conn, gc, NULL);
+
+- if (c->x + c->width >= geo->width ||
+- c->y + c->height >= geo->height) {
++ if (c->x + c->width > geo->width ||
++ c->y + c->height > geo->height) {
+ av_log(s, AV_LOG_ERROR,
+ "Capture area %dx%d at position %d.%d "
+ "outside the screen size %dx%d\n",
+--
+1.7.10.4
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-05-30 08:27:30 UTC (rev 239898)
+++ extra-x86_64/PKGBUILD 2015-05-30 08:27:40 UTC (rev 239899)
@@ -1,76 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-# Contributor: Paul Mattal <paul at archlinux.org>
-
-pkgname=ffmpeg
-pkgver=2.6.3
-pkgrel=1
-epoch=1
-pkgdesc='Complete and free Internet live audio and video broadcasting solution'
-arch=('i686' 'x86_64')
-url='http://ffmpeg.org/'
-license=('GPL')
-depends=(
- 'alsa-lib' 'bzip2' 'fontconfig' 'gnutls' 'gsm' 'lame' 'libass' 'libvdpau'
- 'libbluray' 'libmodplug' 'libpulse' 'libtheora' 'libva' 'opencore-amr'
- 'openjpeg' 'opus' 'schroedinger' 'sdl' 'speex' 'v4l-utils' 'xvidcore'
- 'zlib' 'fribidi' 'libssh'
- 'libvorbisenc.so' 'libvorbis.so' 'libvpx.so' 'libx264.so' 'libx265.so'
-)
-makedepends=('libvdpau' 'yasm' 'hardening-wrapper')
-source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2{,.asc})
-validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') # ffmpeg-devel
-md5sums=('e2cc3c209f91393d35ab58598e41cf22'
- 'SKIP')
-
-build() {
- cd $pkgname-$pkgver
-
- ./configure \
- --prefix=/usr \
- --disable-debug \
- --disable-static \
- --disable-stripping \
- --enable-avisynth \
- --enable-avresample \
- --enable-fontconfig \
- --enable-gnutls \
- --enable-gpl \
- --enable-libass \
- --enable-libbluray \
- --enable-libfreetype \
- --enable-libfribidi \
- --enable-libgsm \
- --enable-libmodplug \
- --enable-libmp3lame \
- --enable-libopencore_amrnb \
- --enable-libopencore_amrwb \
- --enable-libopenjpeg \
- --enable-libopus \
- --enable-libpulse \
- --enable-libschroedinger \
- --enable-libspeex \
- --enable-libssh \
- --enable-libtheora \
- --enable-libv4l2 \
- --enable-libvorbis \
- --enable-libvpx \
- --enable-libx264 \
- --enable-libx265 \
- --enable-libxvid \
- --enable-shared \
- --enable-version3 \
- --enable-x11grab \
-
- make
- make tools/qt-faststart
- make doc/ff{mpeg,play,server}.1
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install install-man
- install -Dm755 tools/qt-faststart "$pkgdir"/usr/bin/qt-faststart
-}
Copied: ffmpeg/repos/extra-x86_64/PKGBUILD (from rev 239898, ffmpeg/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-05-30 08:27:40 UTC (rev 239899)
@@ -0,0 +1,83 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+# Contributor: Paul Mattal <paul at archlinux.org>
+
+pkgname=ffmpeg
+pkgver=2.6.3
+pkgrel=2
+epoch=1
+pkgdesc='Complete and free Internet live audio and video broadcasting solution'
+arch=('i686' 'x86_64')
+url='http://ffmpeg.org/'
+license=('GPL')
+depends=(
+ 'alsa-lib' 'bzip2' 'fontconfig' 'gnutls' 'gsm' 'lame' 'libass' 'libvdpau'
+ 'libbluray' 'libmodplug' 'libpulse' 'libtheora' 'libva' 'opencore-amr'
+ 'openjpeg' 'opus' 'schroedinger' 'sdl' 'speex' 'v4l-utils' 'xvidcore'
+ 'zlib' 'fribidi' 'libssh'
+ 'libvorbisenc.so' 'libvorbis.so' 'libvpx.so' 'libx264.so' 'libx265.so'
+)
+makedepends=('libvdpau' 'yasm' 'hardening-wrapper')
+source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2{,.asc}
+ ffmpeg-2.6.3-lavd-xcbgrab-fix-comparison-with-screen-size.patch)
+validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') # ffmpeg-devel
+md5sums=('e2cc3c209f91393d35ab58598e41cf22'
+ 'SKIP'
+ 'ac9f115dced48b66e36249349a29347e')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -p1 -i ../ffmpeg-2.6.3-lavd-xcbgrab-fix-comparison-with-screen-size.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+
+ ./configure \
+ --prefix=/usr \
+ --disable-debug \
+ --disable-static \
+ --disable-stripping \
+ --enable-avisynth \
+ --enable-avresample \
+ --enable-fontconfig \
+ --enable-gnutls \
+ --enable-gpl \
+ --enable-libass \
+ --enable-libbluray \
+ --enable-libfreetype \
+ --enable-libfribidi \
+ --enable-libgsm \
+ --enable-libmodplug \
+ --enable-libmp3lame \
+ --enable-libopencore_amrnb \
+ --enable-libopencore_amrwb \
+ --enable-libopenjpeg \
+ --enable-libopus \
+ --enable-libpulse \
+ --enable-libschroedinger \
+ --enable-libspeex \
+ --enable-libssh \
+ --enable-libtheora \
+ --enable-libv4l2 \
+ --enable-libvorbis \
+ --enable-libvpx \
+ --enable-libx264 \
+ --enable-libx265 \
+ --enable-libxvid \
+ --enable-shared \
+ --enable-version3 \
+ --enable-x11grab \
+
+ make
+ make tools/qt-faststart
+ make doc/ff{mpeg,play,server}.1
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install install-man
+ install -Dm755 tools/qt-faststart "$pkgdir"/usr/bin/qt-faststart
+}
Copied: ffmpeg/repos/extra-x86_64/ffmpeg-2.6.3-lavd-xcbgrab-fix-comparison-with-screen-size.patch (from rev 239898, ffmpeg/trunk/ffmpeg-2.6.3-lavd-xcbgrab-fix-comparison-with-screen-size.patch)
===================================================================
--- extra-x86_64/ffmpeg-2.6.3-lavd-xcbgrab-fix-comparison-with-screen-size.patch (rev 0)
+++ extra-x86_64/ffmpeg-2.6.3-lavd-xcbgrab-fix-comparison-with-screen-size.patch 2015-05-30 08:27:40 UTC (rev 239899)
@@ -0,0 +1,29 @@
+From 7971fa9ce0ead8d2e8a79dbe422e91dcef8222ba Mon Sep 17 00:00:00 2001
+From: Nicolas George <george at nsup.org>
+Date: Wed, 6 May 2015 11:53:19 +0200
+Subject: [PATCH] lavd/xcbgrab: fix comparison with screen size.
+
+Signed-off-by: Nicolas George <george at nsup.org>
+Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
+---
+ libavdevice/xcbgrab.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libavdevice/xcbgrab.c b/libavdevice/xcbgrab.c
+index 15512cd..166575c 100644
+--- a/libavdevice/xcbgrab.c
++++ b/libavdevice/xcbgrab.c
+@@ -533,8 +533,8 @@ static int create_stream(AVFormatContext *s)
+ gc = xcb_get_geometry(c->conn, c->screen->root);
+ geo = xcb_get_geometry_reply(c->conn, gc, NULL);
+
+- if (c->x + c->width >= geo->width ||
+- c->y + c->height >= geo->height) {
++ if (c->x + c->width > geo->width ||
++ c->y + c->height > geo->height) {
+ av_log(s, AV_LOG_ERROR,
+ "Capture area %dx%d at position %d.%d "
+ "outside the screen size %dx%d\n",
+--
+1.7.10.4
+
More information about the arch-commits
mailing list