diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-01-01 16:37:20 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-01-01 16:37:20 -0300 |
commit | 6124dfa10e2a69fc79efc85f611c8db582caf711 (patch) | |
tree | e9706ae64164967e8448140e9cb6534dfbb0a2a3 /extra/ffmpeg | |
parent | 385fda403f286573a778ee525fe56a86d11fc967 (diff) | |
parent | 5a81550adad5ccde4ad6924cfee2b2ef96d02c98 (diff) |
Merge branch 'master' of gparabola:abslibre/abslibre-pre-mips64el
Conflicts:
community/almanah/PKGBUILD
community/audit/PKGBUILD
community/bird/PKGBUILD
community/blobby2/PKGBUILD
community/blueman/PKGBUILD
community/bomberclone/PKGBUILD
community/botan/PKGBUILD
community/cantata/PKGBUILD
community/cinnamon-desktop/PKGBUILD
community/cinnamon-settings-daemon/PKGBUILD
community/cinnamon/PKGBUILD
community/clearsilver/PKGBUILD
community/clinica/PKGBUILD
community/confuse/PKGBUILD
community/deadbeef/PKGBUILD
community/dvdrtools/PKGBUILD
community/etl/PKGBUILD
community/extremetuxracer/PKGBUILD
community/fcitx-mozc/PKGBUILD
community/flashrom/PKGBUILD
community/freedroidrpg/PKGBUILD
community/gcolor2/PKGBUILD
community/geary/PKGBUILD
community/glob2/PKGBUILD
community/gnash/PKGBUILD
community/gnome-commander/PKGBUILD
community/gnome-settings-daemon-updates/PKGBUILD
community/gnuchess/PKGBUILD
community/haskell-bytestring-show/PKGBUILD
community/haskell-hslogger/PKGBUILD
community/haskell-vector/PKGBUILD
community/hedgewars/PKGBUILD
community/hitori/PKGBUILD
community/inputattach/PKGBUILD
community/jack2/PKGBUILD
community/kid3/PKGBUILD
community/lcdproc/PKGBUILD
community/libcec/PKGBUILD
community/libvirt/PKGBUILD
community/libwww/PKGBUILD
community/lightdm/PKGBUILD
community/lincity-ng/PKGBUILD
community/linux-tools/PKGBUILD
community/linuxtv-dvb-apps/PKGBUILD
community/lockdev/PKGBUILD
community/log4cpp/PKGBUILD
community/love/PKGBUILD
community/luajit/PKGBUILD
community/lxc/PKGBUILD
community/metamail/PKGBUILD
community/mingw32-binutils/PKGBUILD
community/mingw32-gcc/PKGBUILD
community/mingw32-pthreads/PKGBUILD
community/mongodb/PKGBUILD
community/nemo/PKGBUILD
community/par2cmdline/PKGBUILD
community/pdfedit/PKGBUILD
community/perl-json-xs/PKGBUILD
community/pidgin-talkfilters/PKGBUILD
community/pokerth/PKGBUILD
community/setconf/PKGBUILD
community/stfl/PKGBUILD
community/talkfilters/PKGBUILD
community/tre/PKGBUILD
community/ubuntuone-client-gnome/PKGBUILD
community/ubuntuone-client/PKGBUILD
community/vor/PKGBUILD
community/warmux/PKGBUILD
community/wdm/PKGBUILD
community/xbmc-pvr-addons/PKGBUILD
core/gcc/PKGBUILD
core/lvm2/PKGBUILD
core/systemd/PKGBUILD
core/sysvinit-tools/PKGBUILD
extra/aubio/PKGBUILD
extra/avidemux/PKGBUILD
extra/bluez4/PKGBUILD
extra/boost/PKGBUILD
extra/calligra/PKGBUILD
extra/caribou/PKGBUILD
extra/chemtool/PKGBUILD
extra/cinepaint/PKGBUILD
extra/conky/PKGBUILD
extra/cups/PKGBUILD
extra/enlightenment16/PKGBUILD
extra/exo/PKGBUILD
extra/fakechroot/PKGBUILD
extra/farstream-0.1/PKGBUILD
extra/ffmpeg-compat/PKGBUILD
extra/fltk/PKGBUILD
extra/git/PKGBUILD
extra/gpart/PKGBUILD
extra/gstreamer0.10-base/PKGBUILD
extra/gstreamer0.10-ffmpeg/PKGBUILD
extra/gstreamer0.10-good/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/gtk-vnc/PKGBUILD
extra/haveged/PKGBUILD
extra/icewm/PKGBUILD
extra/imagemagick/PKGBUILD
extra/kactivities/PKGBUILD
extra/kdeaccessibility-jovie/PKGBUILD
extra/kdeaccessibility-kaccessible/PKGBUILD
extra/kdeaccessibility-kmag/PKGBUILD
extra/kdeaccessibility-kmousetool/PKGBUILD
extra/kdeaccessibility-kmouth/PKGBUILD
extra/kdeadmin-kcron/PKGBUILD
extra/kdeadmin-ksystemlog/PKGBUILD
extra/kdeadmin-kuser/PKGBUILD
extra/kdeartwork/PKGBUILD
extra/kdebase-konsole/PKGBUILD
extra/kdebase-workspace/PKGBUILD
extra/kdebase/PKGBUILD
extra/kdebindings-kimono/PKGBUILD
extra/kdebindings-korundum/PKGBUILD
extra/kdebindings-kross/PKGBUILD
extra/kdebindings-perlkde/PKGBUILD
extra/kdebindings-perlqt/PKGBUILD
extra/kdebindings-python/PKGBUILD
extra/kdebindings-qtruby/PKGBUILD
extra/kdebindings-qyoto/PKGBUILD
extra/kdebindings-smokegen/PKGBUILD
extra/kdebindings-smokekde/PKGBUILD
extra/kdebindings-smokeqt/PKGBUILD
extra/kdeedu-analitza/PKGBUILD
extra/kdeedu-blinken/PKGBUILD
extra/kdeedu-cantor/PKGBUILD
extra/kdeedu-kalgebra/PKGBUILD
extra/kdeedu-kalzium/PKGBUILD
extra/kdeedu-kanagram/PKGBUILD
extra/kdeedu-kbruch/PKGBUILD
extra/kdeedu-kgeography/PKGBUILD
extra/kdeedu-khangman/PKGBUILD
extra/kdeedu-kig/PKGBUILD
extra/kdeedu-kiten/PKGBUILD
extra/kdeedu-klettres/PKGBUILD
extra/kdeedu-kmplot/PKGBUILD
extra/kdeedu-kstars/PKGBUILD
extra/kdeedu-ktouch/PKGBUILD
extra/kdeedu-kturtle/PKGBUILD
extra/kdeedu-kwordquiz/PKGBUILD
extra/kdeedu-marble/PKGBUILD
extra/kdeedu-pairs/PKGBUILD
extra/kdeedu-parley/PKGBUILD
extra/kdeedu-rocs/PKGBUILD
extra/kdeedu-step/PKGBUILD
extra/kdegames-bomber/PKGBUILD
extra/kdegames-bovo/PKGBUILD
extra/kdegames-granatier/PKGBUILD
extra/kdegames-kapman/PKGBUILD
extra/kdegames-katomic/PKGBUILD
extra/kdegames-kblackbox/PKGBUILD
extra/kdegames-kblocks/PKGBUILD
extra/kdegames-kbounce/PKGBUILD
extra/kdegames-kbreakout/PKGBUILD
extra/kdegames-kdiamond/PKGBUILD
extra/kdegames-kfourinline/PKGBUILD
extra/kdegames-kgoldrunner/PKGBUILD
extra/kdegames-kigo/PKGBUILD
extra/kdegames-killbots/PKGBUILD
extra/kdegames-kiriki/PKGBUILD
extra/kdegames-kjumpingcube/PKGBUILD
extra/kdegames-klickety/PKGBUILD
extra/kdegames-klines/PKGBUILD
extra/kdegames-kmahjongg/PKGBUILD
extra/kdegames-kmines/PKGBUILD
extra/kdegames-knavalbattle/PKGBUILD
extra/kdegames-knetwalk/PKGBUILD
extra/kdegames-kolf/PKGBUILD
extra/kdegames-kollision/PKGBUILD
extra/kdegames-konquest/PKGBUILD
extra/kdegames-kpatience/PKGBUILD
extra/kdegames-kreversi/PKGBUILD
extra/kdegames-kshisen/PKGBUILD
extra/kdegames-ksirk/PKGBUILD
extra/kdegames-ksnakeduel/PKGBUILD
extra/kdegames-kspaceduel/PKGBUILD
extra/kdegames-ksquares/PKGBUILD
extra/kdegames-ksudoku/PKGBUILD
extra/kdegames-ktuberling/PKGBUILD
extra/kdegames-kubrick/PKGBUILD
extra/kdegames-lskat/PKGBUILD
extra/kdegames-palapeli/PKGBUILD
extra/kdegames-picmi/PKGBUILD
extra/kdegraphics-gwenview/PKGBUILD
extra/kdegraphics-kamera/PKGBUILD
extra/kdegraphics-kcolorchooser/PKGBUILD
extra/kdegraphics-kgamma/PKGBUILD
extra/kdegraphics-kolourpaint/PKGBUILD
extra/kdegraphics-kruler/PKGBUILD
extra/kdegraphics-ksaneplugin/PKGBUILD
extra/kdegraphics-ksnapshot/PKGBUILD
extra/kdegraphics-mobipocket/PKGBUILD
extra/kdegraphics-okular/PKGBUILD
extra/kdegraphics-strigi-analyzer/PKGBUILD
extra/kdegraphics-svgpart/PKGBUILD
extra/kdegraphics-thumbnailers/PKGBUILD
extra/kdemultimedia-audiocd-kio/PKGBUILD
extra/kdemultimedia-dragonplayer/PKGBUILD
extra/kdemultimedia-ffmpegthumbs/PKGBUILD
extra/kdemultimedia-juk/PKGBUILD
extra/kdemultimedia-kmix/PKGBUILD
extra/kdemultimedia-kscd/PKGBUILD
extra/kdemultimedia-mplayerthumbs/PKGBUILD
extra/kdenetwork-filesharing/PKGBUILD
extra/kdenetwork-kdnssd/PKGBUILD
extra/kdenetwork-kget/PKGBUILD
extra/kdenetwork-kppp/PKGBUILD
extra/kdenetwork-krdc/PKGBUILD
extra/kdenetwork-krfb/PKGBUILD
extra/kdenetwork-strigi-analyzers/PKGBUILD
extra/kdepim-runtime/PKGBUILD
extra/kdepim/PKGBUILD
extra/kdepimlibs/PKGBUILD
extra/kdeplasma-addons/PKGBUILD
extra/kdesdk-cervisia/PKGBUILD
extra/kdesdk-dev-scripts/PKGBUILD
extra/kdesdk-dev-utils/PKGBUILD
extra/kdesdk-dolphin-plugins/PKGBUILD
extra/kdesdk-kapptemplate/PKGBUILD
extra/kdesdk-kate/PKGBUILD
extra/kdesdk-kcachegrind/PKGBUILD
extra/kdesdk-kioslaves/PKGBUILD
extra/kdesdk-kompare/PKGBUILD
extra/kdesdk-lokalize/PKGBUILD
extra/kdesdk-okteta/PKGBUILD
extra/kdesdk-poxml/PKGBUILD
extra/kdesdk-strigi-analyzers/PKGBUILD
extra/kdesdk-thumbnailers/PKGBUILD
extra/kdesdk-umbrello/PKGBUILD
extra/kdetoys-amor/PKGBUILD
extra/kdetoys-kteatime/PKGBUILD
extra/kdetoys-ktux/PKGBUILD
extra/kdeutils-filelight/PKGBUILD
extra/kdeutils-kcalc/PKGBUILD
extra/kdeutils-kcharselect/PKGBUILD
extra/kdeutils-kdf/PKGBUILD
extra/kdeutils-kfloppy/PKGBUILD
extra/kdeutils-kgpg/PKGBUILD
extra/kdeutils-kremotecontrol/PKGBUILD
extra/kdeutils-ktimer/PKGBUILD
extra/kdeutils-kwallet/PKGBUILD
extra/kdeutils-print-manager/PKGBUILD
extra/kdeutils-superkaramba/PKGBUILD
extra/kdeutils-sweeper/PKGBUILD
extra/kdewebdev/PKGBUILD
extra/kino/PKGBUILD
extra/libdrm/PKGBUILD
extra/libiec61883/PKGBUILD
extra/libkcddb/PKGBUILD
extra/libkcompactdisc/PKGBUILD
extra/libkdcraw/PKGBUILD
extra/libkdeedu/PKGBUILD
extra/libkdegames/PKGBUILD
extra/libkexiv2/PKGBUILD
extra/libkipi/PKGBUILD
extra/libkmahjongg/PKGBUILD
extra/libksane/PKGBUILD
extra/libmikmod/PKGBUILD
extra/libmp4v2/PKGBUILD
extra/libnet/PKGBUILD
extra/libpst/PKGBUILD
extra/libsidplay/PKGBUILD
extra/libsigsegv/PKGBUILD
extra/libvpx/PKGBUILD
extra/libxmi/PKGBUILD
extra/lua51/PKGBUILD
extra/mariadb/PKGBUILD
extra/maxima/PKGBUILD
extra/mesa/PKGBUILD
extra/mjpegtools/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/nepomuk-core/PKGBUILD
extra/nepomuk-widgets/PKGBUILD
extra/obexd/PKGBUILD
extra/opencv/PKGBUILD
extra/perl-dbd-mysql/PKGBUILD
extra/phonon-gstreamer/PKGBUILD
extra/phonon-vlc/PKGBUILD
extra/phonon/PKGBUILD
extra/plotutils/PKGBUILD
extra/postgresql/PKGBUILD
extra/pycrypto/PKGBUILD
extra/python/PKGBUILD
extra/qt4/PKGBUILD
extra/qt5/PKGBUILD
extra/rcs/PKGBUILD
extra/rdesktop/PKGBUILD
extra/rtmpdump/PKGBUILD
extra/ruby/PKGBUILD
extra/signon/PKGBUILD
extra/sqlite/PKGBUILD
extra/vigra/PKGBUILD
extra/vim/PKGBUILD
extra/vlc/PKGBUILD
extra/w3m/PKGBUILD
extra/wcslib/PKGBUILD
extra/windowmaker/PKGBUILD
extra/x264/PKGBUILD
extra/xaos/PKGBUILD
extra/xmlto/PKGBUILD
libre/angband-libre/PKGBUILD
libre/hplip-libre/PKGBUILD
libre/kdebase-konqueror-libre/PKGBUILD
libre/kdebase-runtime-libre/PKGBUILD
libre/kdelibs-libre/PKGBUILD
libre/kdenetwork-kopete-libre/PKGBUILD
libre/kdepim-libre/PKGBUILD
libre/kdeutils-ark-libre/PKGBUILD
libre/linux-libre/PKGBUILD
libre/mc-libre/PKGBUILD
libre/xbmc-libre/PKGBUILD
nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
nonprism/kdepim-runtime-nonprism/PKGBUILD
pcr/libquvi-scripts-current/PKGBUILD
Diffstat (limited to 'extra/ffmpeg')
-rw-r--r-- | extra/ffmpeg/PKGBUILD | 16 | ||||
-rw-r--r-- | extra/ffmpeg/ffmpeg-2.1-avformat-http.fix-cookies.patch | 28 | ||||
-rw-r--r-- | extra/ffmpeg/ffmpeg-2.1.1-freetype2.patch | 73 |
3 files changed, 81 insertions, 36 deletions
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index e9d34e53f..c72b8665a 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 198639 2013-10-31 16:28:32Z bpiotrowski $ +# $Id: PKGBUILD 202971 2013-12-29 17:17:29Z bpiotrowski $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=2.1 -pkgrel=2 +pkgver=2.1.1 +pkgrel=3 epoch=1 pkgdesc='Complete and free Internet live audio and video broadcasting solution' arch=('i686' 'x86_64' 'mips64el') @@ -23,13 +23,13 @@ if [ "${CARCH}" != "mips64el" ]; then makedepends=('yasm' 'libvdpau') fi 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() { @@ -89,7 +89,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 <michaelni@gmx.at> -Date: Thu, 31 Oct 2013 01:42:13 +0100 -Subject: [PATCH] avformat/http: fix cookies - -Fixes Ticket3096 - -Signed-off-by: Michael Niedermayer <michaelni@gmx.at> ---- - 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 <eclipse7@gmx.net> +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 <eclipse7@gmx.net> +--- + 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 <ft2build.h>" ++ 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 <ft2build.h> +-#include <freetype/config/ftheader.h> + #include FT_FREETYPE_H + #include FT_GLYPH_H + #if CONFIG_FONTCONFIG +-- +1.7.10.4 + |