Date: Wednesday, November 20, 2013 @ 16:54:26 Author: bpiotrowski Revision: 199989
upgpkg: ffmpeg 1:2.1.1-1 - new upstream release Modified: ffmpeg/trunk/PKGBUILD Deleted: ffmpeg/trunk/ffmpeg-2.1-avformat-http.fix-cookies.patch --------------------------------------------+ PKGBUILD | 17 ++++------------ ffmpeg-2.1-avformat-http.fix-cookies.patch | 28 --------------------------- 2 files changed, 5 insertions(+), 40 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-11-20 15:51:14 UTC (rev 199988) +++ PKGBUILD 2013-11-20 15:54:26 UTC (rev 199989) @@ -5,8 +5,8 @@ # Contributor: Paul Mattal <[email protected]> pkgname=ffmpeg -pkgver=2.1 -pkgrel=3 +pkgver=2.1.1 +pkgrel=1 epoch=1 pkgdesc='Complete and free Internet live audio and video broadcasting solution' arch=('i686' 'x86_64') @@ -19,16 +19,9 @@ 'v4l-utils' 'x264' 'xvidcore' 'zlib' ) makedepends=('libvdpau' 'yasm') -source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2 - ffmpeg-2.1-avformat-http.fix-cookies.patch) -sha256sums=('926603fd974e9b38071a5cfc6fd0d93857801d1968145dfce7fdc627ab1d68df' - '0168bc6f77115ef6f3bd428b1b05a1543d0dd53d8d74c15a24879b119ce8655c') +source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2) +sha256sums=('bef95e5b9aac45adec7ef434537504a63b4bbc22a8ce6a96a68e19c5efbadae2') -prepare() { - cd $pkgname-$pkgver - patch -p1 -i ../ffmpeg-2.1-avformat-http.fix-cookies.patch -} - build() { cd $pkgname-$pkgver @@ -78,7 +71,7 @@ package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install install-man - install -D -m755 tools/qt-faststart "$pkgdir"/usr/bin/qt-faststart + install -Dm755 tools/qt-faststart "$pkgdir"/usr/bin/qt-faststart } # vim:set ts=2 sw=2 et: Deleted: ffmpeg-2.1-avformat-http.fix-cookies.patch =================================================================== --- ffmpeg-2.1-avformat-http.fix-cookies.patch 2013-11-20 15:51:14 UTC (rev 199988) +++ ffmpeg-2.1-avformat-http.fix-cookies.patch 2013-11-20 15:54:26 UTC (rev 199989) @@ -1,28 +0,0 @@ -From b73900b8a6c0a23e63e84a5eed0a5b9b3ffe1198 Mon Sep 17 00:00:00 2001 -From: Michael Niedermayer <[email protected]> -Date: Thu, 31 Oct 2013 01:42:13 +0100 -Subject: [PATCH] avformat/http: fix cookies - -Fixes Ticket3096 - -Signed-off-by: Michael Niedermayer <[email protected]> ---- - 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 -
