From 22f873a6e3ac2c585a28a1ab2561eaea9765cdc6 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 1 Nov 2013 01:14:52 -0700 Subject: Fri Nov 1 01:13:45 PDT 2013 --- extra/ffmpeg/PKGBUILD | 24 ++++++++++++------- .../ffmpeg-2.1-avformat-http.fix-cookies.patch | 28 ++++++++++++++++++++++ 2 files changed, 44 insertions(+), 8 deletions(-) create mode 100644 extra/ffmpeg/ffmpeg-2.1-avformat-http.fix-cookies.patch (limited to 'extra/ffmpeg') diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 2fd2009b4..b6a02cb9d 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 197751 2013-10-29 17:42:37Z bpiotrowski $ -# Maintainer : Ionut Biru +# $Id: PKGBUILD 198639 2013-10-31 16:28:32Z bpiotrowski $ +# Maintainer: Ionut Biru +# Maintainer: Bartłomiej Piotrowski # Contributor: Tom Newsom # Contributor: Paul Mattal pkgname=ffmpeg pkgver=2.1 -pkgrel=1 +pkgrel=2 epoch=1 -pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" +pkgdesc='Complete and free Internet live audio and video broadcasting solution' arch=('i686' 'x86_64') -url="http://ffmpeg.org/" +url='http://ffmpeg.org/' license=('GPL') depends=( 'alsa-lib' 'bzip2' 'fontconfig' 'gnutls' 'gsm' 'lame' 'libass' @@ -18,8 +19,15 @@ depends=( 'v4l-utils' 'x264' 'xvidcore' 'zlib' ) makedepends=('libvdpau' 'yasm') -source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2) -sha256sums=('926603fd974e9b38071a5cfc6fd0d93857801d1968145dfce7fdc627ab1d68df') +source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2 + ffmpeg-2.1-avformat-http.fix-cookies.patch) +sha256sums=('926603fd974e9b38071a5cfc6fd0d93857801d1968145dfce7fdc627ab1d68df' + '0168bc6f77115ef6f3bd428b1b05a1543d0dd53d8d74c15a24879b119ce8655c') + +prepare() { + cd $pkgname-$pkgver + patch -p1 -i ../ffmpeg-2.1-avformat-http.fix-cookies.patch +} build() { cd $pkgname-$pkgver @@ -70,7 +78,7 @@ build() { package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install install-man - install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart" + install -D -m755 tools/qt-faststart "$pkgdir"/usr/bin/qt-faststart } # vim:set ts=2 sw=2 et: diff --git a/extra/ffmpeg/ffmpeg-2.1-avformat-http.fix-cookies.patch b/extra/ffmpeg/ffmpeg-2.1-avformat-http.fix-cookies.patch new file mode 100644 index 000000000..7c826a3b8 --- /dev/null +++ b/extra/ffmpeg/ffmpeg-2.1-avformat-http.fix-cookies.patch @@ -0,0 +1,28 @@ +From b73900b8a6c0a23e63e84a5eed0a5b9b3ffe1198 Mon Sep 17 00:00:00 2001 +From: Michael Niedermayer +Date: Thu, 31 Oct 2013 01:42:13 +0100 +Subject: [PATCH] avformat/http: fix cookies + +Fixes Ticket3096 + +Signed-off-by: Michael Niedermayer +--- + libavformat/http.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libavformat/http.c b/libavformat/http.c +index c5b5c53..9be1181 100644 +--- a/libavformat/http.c ++++ b/libavformat/http.c +@@ -95,7 +95,7 @@ static const AVOption options[] = { + {"multiple_requests", "use persistent connections", OFFSET(multiple_requests), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, D|E }, + {"post_data", "set custom HTTP post data", OFFSET(post_data), AV_OPT_TYPE_BINARY, .flags = D|E }, + {"mime_type", "set MIME type", OFFSET(mime_type), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 }, +-{"cookies", "set cookies to be sent in applicable future requests, use newline delimited Set-Cookie HTTP field value syntax", OFFSET(cookies), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 }, ++{"cookies", "set cookies to be sent in applicable future requests, use newline delimited Set-Cookie HTTP field value syntax", OFFSET(cookies), AV_OPT_TYPE_STRING, {0}, 0, 0, D }, + {"icy", "request ICY metadata", OFFSET(icy), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, D }, + {"icy_metadata_headers", "return ICY metadata headers", OFFSET(icy_metadata_headers), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 }, + {"icy_metadata_packet", "return current ICY metadata packet", OFFSET(icy_metadata_packet), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 }, +-- +1.8.4.1 + -- cgit v1.2.3-54-g00ecf