From 65eeff79fff8a1bfdf67ca51d147384f46f4d5c0 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Fri, 27 Dec 2013 23:55:53 +0000 Subject: Fri Dec 27 23:54:04 UTC 2013 --- extra/ffmpeg/PKGBUILD | 14 ++--- .../ffmpeg-2.1-avformat-http.fix-cookies.patch | 28 --------- extra/ffmpeg/ffmpeg-2.1.1-freetype2.patch | 73 ++++++++++++++++++++++ 3 files changed, 80 insertions(+), 35 deletions(-) delete mode 100644 extra/ffmpeg/ffmpeg-2.1-avformat-http.fix-cookies.patch create mode 100644 extra/ffmpeg/ffmpeg-2.1.1-freetype2.patch (limited to 'extra/ffmpeg') diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index b6a02cb9d..0c548149f 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 198639 2013-10-31 16:28:32Z bpiotrowski $ +# $Id: PKGBUILD 201402 2013-12-10 17:38:51Z bpiotrowski $ # Maintainer: Ionut Biru # Maintainer: Bartłomiej Piotrowski # Contributor: Tom Newsom # Contributor: Paul Mattal pkgname=ffmpeg -pkgver=2.1 +pkgver=2.1.1 pkgrel=2 epoch=1 pkgdesc='Complete and free Internet live audio and video broadcasting solution' @@ -20,13 +20,13 @@ depends=( ) makedepends=('libvdpau' 'yasm') source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2 - ffmpeg-2.1-avformat-http.fix-cookies.patch) -sha256sums=('926603fd974e9b38071a5cfc6fd0d93857801d1968145dfce7fdc627ab1d68df' - '0168bc6f77115ef6f3bd428b1b05a1543d0dd53d8d74c15a24879b119ce8655c') + ffmpeg-2.1.1-freetype2.patch) +md5sums=('2719ab2b3311ac3775b9cdeb66c54849' + '4b5dd079a40f44f4e0d00cdbc9d52ec3') prepare() { cd $pkgname-$pkgver - patch -p1 -i ../ffmpeg-2.1-avformat-http.fix-cookies.patch + patch -p1 -i ../ffmpeg-2.1.1-freetype2.patch } build() { @@ -78,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 -Dm755 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 deleted file mode 100644 index 7c826a3b8..000000000 --- a/extra/ffmpeg/ffmpeg-2.1-avformat-http.fix-cookies.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 - diff --git a/extra/ffmpeg/ffmpeg-2.1.1-freetype2.patch b/extra/ffmpeg/ffmpeg-2.1.1-freetype2.patch new file mode 100644 index 000000000..2ff9f87cc --- /dev/null +++ b/extra/ffmpeg/ffmpeg-2.1.1-freetype2.patch @@ -0,0 +1,73 @@ +From cea5812fa723c08b89d929eeba73462e05de2973 Mon Sep 17 00:00:00 2001 +From: Alexander Strasser +Date: Fri, 6 Dec 2013 17:20:26 +0100 +Subject: [PATCH] configure: Special case libfreetype test + +Include the freetype header, in-directly through a macro, like it +is done in the drawtext filter. Do not break if the header is moved. + +Unfortunately the drawtext filter included the file where the include +macros are defined in a wrong way. This is not needed and breaks the +build. Remove that #include line too. + +Signed-off-by: Alexander Strasser +--- + configure | 22 +++++++++++++++++++++- + libavfilter/vf_drawtext.c | 1 - + 2 files changed, 21 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 205cfc9..0b00684 100755 +--- a/configure ++++ b/configure +@@ -1128,6 +1128,26 @@ require_pkg_config(){ + add_extralibs $(get_safe ${pkg}_libs) + } + ++require_libfreetype(){ ++ log require_libfreetype "$@" ++ pkg="freetype2" ++ check_cmd $pkg_config --exists --print-errors $pkg \ ++ || die "ERROR: $pkg not found" ++ pkg_cflags=$($pkg_config --cflags $pkg) ++ pkg_libs=$($pkg_config --libs $pkg) ++ { ++ echo "#include " ++ echo "#include FT_FREETYPE_H" ++ echo "long check_func(void) { return (long) FT_Init_FreeType; }" ++ echo "int main(void) { return 0; }" ++ } | check_ld "cc" $pkg_cflags $pkg_libs \ ++ && set_safe ${pkg}_cflags $pkg_cflags \ ++ && set_safe ${pkg}_libs $pkg_libs \ ++ || die "ERROR: $pkg not found" ++ add_cflags $(get_safe ${pkg}_cflags) ++ add_extralibs $(get_safe ${pkg}_libs) ++} ++ + hostcc_o(){ + eval printf '%s\\n' $HOSTCC_O + } +@@ -4322,7 +4342,7 @@ enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersio + enabled libfdk_aac && require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac + flite_libs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite" + enabled libflite && require2 libflite "flite/flite.h" flite_init $flite_libs +-enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType ++enabled libfreetype && require_libfreetype + enabled libgme && require libgme gme/gme.h gme_new_emu -lgme -lstdc++ + enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do + check_lib "${gsm_hdr}" gsm_create -lgsm && break; +diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c +index dde3b0a..91b8218 100644 +--- a/libavfilter/vf_drawtext.c ++++ b/libavfilter/vf_drawtext.c +@@ -48,7 +48,6 @@ + #include "video.h" + + #include +-#include + #include FT_FREETYPE_H + #include FT_GLYPH_H + #if CONFIG_FONTCONFIG +-- +1.7.10.4 + -- cgit v1.2.3-54-g00ecf