diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-11-06 20:10:41 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-11-06 20:10:41 -0300 |
commit | 385fda403f286573a778ee525fe56a86d11fc967 (patch) | |
tree | 1aabb3a26d366ffa745a559409bcbe91b04dc240 /extra/ffmpeg/PKGBUILD | |
parent | 922fd0a3c35beb57adbef0b4c4c122dd29563c97 (diff) | |
parent | fbe5d27eadf86b85244a5ffff62c132cb9a4a158 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/adns/PKGBUILD
community/afpfs-ng/PKGBUILD
community/aqbanking/PKGBUILD
community/arp-scan/PKGBUILD
community/arpack/PKGBUILD
community/bind/PKGBUILD
community/bird/PKGBUILD
community/cairo-dock/PKGBUILD
community/cinnamon-control-center/PKGBUILD
community/commoncpp2/PKGBUILD
community/cuetools/PKGBUILD
community/erlang/PKGBUILD
community/fxdesktop/PKGBUILD
community/gavl/PKGBUILD
community/google-gadgets/PKGBUILD
community/gpicview/PKGBUILD
community/gtk-aurora-engine/PKGBUILD
community/icewm-utils/PKGBUILD
community/inotify-tools/PKGBUILD
community/jack2/PKGBUILD
community/judy/PKGBUILD
community/lash/PKGBUILD
community/libdlna/PKGBUILD
community/libgexiv2/PKGBUILD
community/libgig/PKGBUILD
community/liblinebreak/PKGBUILD
community/liblockfile/PKGBUILD
community/libopenraw/PKGBUILD
community/librcd/PKGBUILD
community/librsync/PKGBUILD
community/libvirt/PKGBUILD
community/libyaml/PKGBUILD
community/linux-tools/PKGBUILD
community/lomoco/PKGBUILD
community/luasec/PKGBUILD
community/luasocket/PKGBUILD
community/lwp/PKGBUILD
community/lxappearance-obconf/PKGBUILD
community/lxappearance/PKGBUILD
community/lxsplit/PKGBUILD
community/metamail/PKGBUILD
community/mg/PKGBUILD
community/nemo-fileroller/PKGBUILD
community/nsd/PKGBUILD
community/obby/PKGBUILD
community/openarena/PKGBUILD
community/opensc/PKGBUILD
community/osmo/PKGBUILD
community/perl-json-xs/PKGBUILD
community/pyqt3/PKGBUILD
community/python-pymongo/PKGBUILD
community/python-pytables/PKGBUILD
community/qscintilla-qt3/PKGBUILD
community/qtcurve-gtk2/PKGBUILD
community/qtcurve-kde4/PKGBUILD
community/rxvt-unicode/PKGBUILD
community/smalltalk/PKGBUILD
community/xmlrpc-c/PKGBUILD
community/xpad/PKGBUILD
community/xsettings-client/PKGBUILD
community/yaws/PKGBUILD
core/bzip2/PKGBUILD
core/gcc/PKGBUILD
core/glibc/PKGBUILD
core/keyutils/PKGBUILD
core/ldns/PKGBUILD
core/libmpc/PKGBUILD
core/librpcsecgss/PKGBUILD
core/libtool/PKGBUILD
core/lvm2/PKGBUILD
core/lzo2/PKGBUILD
core/openssl/PKGBUILD
core/systemd/PKGBUILD
core/sysvinit-tools/PKGBUILD
cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
extra/aalib/PKGBUILD
extra/aiksaurus/PKGBUILD
extra/alsa-oss/PKGBUILD
extra/alsa-tools/PKGBUILD
extra/apache/PKGBUILD
extra/autopano-sift-c/PKGBUILD
extra/avahi/PKGBUILD
extra/cfitsio/PKGBUILD
extra/clamav/PKGBUILD
extra/compface/PKGBUILD
extra/dotconf/PKGBUILD
extra/enca/PKGBUILD
extra/eventlog/PKGBUILD
extra/exiv2/PKGBUILD
extra/faad2/PKGBUILD
extra/fcgi/PKGBUILD
extra/ffcall/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/flac/PKGBUILD
extra/fltk/PKGBUILD
extra/freealut/PKGBUILD
extra/freetds/PKGBUILD
extra/gc/PKGBUILD
extra/gdome2/PKGBUILD
extra/giblib/PKGBUILD
extra/gmime/PKGBUILD
extra/gnome-python-desktop/PKGBUILD
extra/gnome-python-extras/PKGBUILD
extra/gnome-speech/PKGBUILD
extra/graphviz/PKGBUILD
extra/gsasl/PKGBUILD
extra/gsl/PKGBUILD
extra/gtkspell/PKGBUILD
extra/gupnp-igd/PKGBUILD
extra/htdig/PKGBUILD
extra/hugin/PKGBUILD
extra/id3lib/PKGBUILD
extra/ilmbase/PKGBUILD
extra/imagemagick/PKGBUILD
extra/iptraf-ng/PKGBUILD
extra/jade/PKGBUILD
extra/jasper/PKGBUILD
extra/kdesdk-thumbnailers/PKGBUILD
extra/kdevelop-php/PKGBUILD
extra/lablgtk/PKGBUILD
extra/lame/PKGBUILD
extra/lcms2/PKGBUILD
extra/lesstif/PKGBUILD
extra/libaio/PKGBUILD
extra/libart-lgpl/PKGBUILD
extra/libass/PKGBUILD
extra/libasyncns/PKGBUILD
extra/libavc1394/PKGBUILD
extra/libbluray/PKGBUILD
extra/libcaca/PKGBUILD
extra/libcddb/PKGBUILD
extra/libchamplain/PKGBUILD
extra/libdca/PKGBUILD
extra/libdv/PKGBUILD
extra/libglade/PKGBUILD
extra/libgtkhtml/PKGBUILD
extra/libice/PKGBUILD
extra/libid3tag/PKGBUILD
extra/libidl2/PKGBUILD
extra/libieee1284/PKGBUILD
extra/libjpeg-turbo/PKGBUILD
extra/liblo/PKGBUILD
extra/libmad/PKGBUILD
extra/libmikmod/PKGBUILD
extra/libmowgli/PKGBUILD
extra/libmpd/PKGBUILD
extra/libmpdclient/PKGBUILD
extra/libofa/PKGBUILD
extra/liboil/PKGBUILD
extra/libotf/PKGBUILD
extra/libpeas/PKGBUILD
extra/libqalculate/PKGBUILD
extra/libraw1394/PKGBUILD
extra/libsndfile/PKGBUILD
extra/libstroke/PKGBUILD
extra/libvncserver/PKGBUILD
extra/libxkbui/PKGBUILD
extra/libxss/PKGBUILD
extra/libytnef/PKGBUILD
extra/libzvt/PKGBUILD
extra/lynx/PKGBUILD
extra/lzo/PKGBUILD
extra/mariadb/PKGBUILD
extra/mesa/PKGBUILD
extra/mhash/PKGBUILD
extra/musicbrainz/PKGBUILD
extra/ocaml/PKGBUILD
extra/openal/PKGBUILD
extra/openmpi/PKGBUILD
extra/pavucontrol/PKGBUILD
extra/perl-dbi/PKGBUILD
extra/phonon-vlc/PKGBUILD
extra/phonon/PKGBUILD
extra/ppl/PKGBUILD
extra/progsreiserfs/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/pycurl/PKGBUILD
extra/pyopenssl/PKGBUILD
extra/pyxml/PKGBUILD
extra/qt4/PKGBUILD
extra/qt5/PKGBUILD
extra/qtwebkit/PKGBUILD
extra/schroedinger/PKGBUILD
extra/sdl_gfx/PKGBUILD
extra/signon/PKGBUILD
extra/slang/PKGBUILD
extra/sofia-sip/PKGBUILD
extra/spandsp/PKGBUILD
extra/speech-dispatcher/PKGBUILD
extra/sqlite/PKGBUILD
extra/t1lib/PKGBUILD
extra/taglib/PKGBUILD
extra/tidyhtml/PKGBUILD
extra/totem/PKGBUILD
extra/unixodbc/PKGBUILD
extra/vigra/PKGBUILD
extra/virtuoso/PKGBUILD
extra/wavpack/PKGBUILD
extra/webkitgtk/PKGBUILD
extra/webrtc-audio-processing/PKGBUILD
extra/xfce4-mailwatch-plugin/PKGBUILD
extra/xine-lib/PKGBUILD
extra/xmms/PKGBUILD
extra/xorg-server/PKGBUILD
extra/yajl/PKGBUILD
extra/yasm/PKGBUILD
extra/zenity/PKGBUILD
extra/zziplib/PKGBUILD
libre/blackbox-libre/PKGBUILD
libre/linux-libre/PKGBUILD
libre/sdl-libre/PKGBUILD
Diffstat (limited to 'extra/ffmpeg/PKGBUILD')
-rw-r--r-- | extra/ffmpeg/PKGBUILD | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index c533c25eb..e9d34e53f 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 196252 2013-10-09 20:32:23Z bpiotrowski $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> +# $Id: PKGBUILD 198639 2013-10-31 16:28:32Z 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.0.2 +pkgver=2.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' 'mips64el') -url="http://ffmpeg.org/" +url='http://ffmpeg.org/' license=('GPL') depends=( 'alsa-lib' 'bzip2' 'fontconfig' 'gnutls' 'gsm' 'lame' 'libass' @@ -21,8 +22,15 @@ if [ "${CARCH}" != "mips64el" ]; then depends+=('libva') makedepends=('yasm' 'libvdpau') fi -source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2) -sha256sums=('986f63dc0785f473b1832d0eead502e39c9706fbe7f9677bbea0dad6fe0fab4a') +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 @@ -81,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 -D -m755 tools/qt-faststart "$pkgdir"/usr/bin/qt-faststart } # vim:set ts=2 sw=2 et: |