diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-17 17:07:32 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-17 17:07:32 -0300 |
commit | 87b9cca463a1dbf2b5026c9dc770b5591b2d3fdc (patch) | |
tree | e3d31e01c79dc0e68742716887ed07c5f6a1015e /extra/ffmpeg | |
parent | c09bfc90e874607edab8e77d50d9aa15ea145b53 (diff) | |
parent | 35e9f8bc93db9e691bf6d00950956ca3e5d86e83 (diff) |
Merge branch 'master' of gparabola:abslibre/abslibre-pre-mips64el
Conflicts:
community/acpi/PKGBUILD
community/alure/PKGBUILD
community/ario/PKGBUILD
community/cantata/PKGBUILD
community/cgit/PKGBUILD
community/chntpw/PKGBUILD
community/clamz/PKGBUILD
community/deadbeef/PKGBUILD
community/dunst/PKGBUILD
community/erlang/PKGBUILD
community/ettercap/PKGBUILD
community/fcitx-mozc/PKGBUILD
community/gnome-commander/PKGBUILD
community/gq/PKGBUILD
community/gtkimageview/PKGBUILD
community/i3status/PKGBUILD
community/iasl/PKGBUILD
community/krename/PKGBUILD
community/libesmtp/PKGBUILD
community/liblinebreak/PKGBUILD
community/libmilter/PKGBUILD
community/libpaper/PKGBUILD
community/libvirt/PKGBUILD
community/libx86emu/PKGBUILD
community/libxdg-basedir/PKGBUILD
community/lightdm-gtk2-greeter/PKGBUILD
community/lightdm-gtk3-greeter/PKGBUILD
community/lightdm/PKGBUILD
community/luakit/PKGBUILD
community/lxtask/PKGBUILD
community/marisa/PKGBUILD
community/megaglest/PKGBUILD
community/mumble/PKGBUILD
community/opencolorio/PKGBUILD
community/openssh-askpass/PKGBUILD
community/pdf2svg/PKGBUILD
community/pidgin-toobars/PKGBUILD
community/powerdns/PKGBUILD
community/python-numexpr/PKGBUILD
community/python-pybox2d/PKGBUILD
community/python-pytables/PKGBUILD
community/python2-imaging/PKGBUILD
community/python2-pybluez/PKGBUILD
community/remmina/PKGBUILD
community/ruby-gtk2/PKGBUILD
community/ruby-iconv/PKGBUILD
community/scummvm-tools/PKGBUILD
community/shapelib/PKGBUILD
community/sshfs/PKGBUILD
community/subtle/PKGBUILD
community/teeworlds/PKGBUILD
community/uget/PKGBUILD
community/wireshark/PKGBUILD
community/wxcam/PKGBUILD
community/wxgtk2.9/PKGBUILD
community/xchm/PKGBUILD
community/xdelta3/PKGBUILD
community/zynaddsubfx/PKGBUILD
core/gcc/PKGBUILD
core/gcc/gcc_mips64el_lib.patch
core/gdbm/PKGBUILD
core/ldns/PKGBUILD
core/pth/PKGBUILD
core/systemd/PKGBUILD
core/wireless_tools/PKGBUILD
elementary/gtk-engine-equinox/PKGBUILD
elementary/postler/PKGBUILD
elementary/vala-010/PKGBUILD
extra/aubio/PKGBUILD
extra/audacity/PKGBUILD
extra/bc/PKGBUILD
extra/cagibi/PKGBUILD
extra/calligra/PKGBUILD
extra/chmlib/PKGBUILD
extra/clamav/PKGBUILD
extra/clisp/PKGBUILD
extra/crypto++/PKGBUILD
extra/cups/PKGBUILD
extra/dhcp/PKGBUILD
extra/ecore/PKGBUILD
extra/edje/PKGBUILD
extra/eet/PKGBUILD
extra/eeze/PKGBUILD
extra/efreet/PKGBUILD
extra/eina/PKGBUILD
extra/eio/PKGBUILD
extra/embryo/PKGBUILD
extra/emotion/PKGBUILD
extra/enlightenment17/PKGBUILD
extra/ethumb/PKGBUILD
extra/evas/PKGBUILD
extra/festival/PKGBUILD
extra/ffcall/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/git/PKGBUILD
extra/gmetadom/PKGBUILD
extra/gnutls/PKGBUILD
extra/graphviz/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/gtkmathview/PKGBUILD
extra/gvfs/PKGBUILD
extra/hugin/PKGBUILD
extra/i8kutils/PKGBUILD
extra/id3lib/PKGBUILD
extra/imagemagick/PKGBUILD
extra/jack/PKGBUILD
extra/ktorrent/PKGBUILD
extra/libaccounts-qt/PKGBUILD
extra/libdvdnav/PKGBUILD
extra/libdvdread/PKGBUILD
extra/libetpan/PKGBUILD
extra/libgadu/PKGBUILD
extra/libmikmod/PKGBUILD
extra/libpst/PKGBUILD
extra/libsecret/PKGBUILD
extra/libssh/PKGBUILD
extra/libvorbis/PKGBUILD
extra/lilv/PKGBUILD
extra/mariadb/PKGBUILD
extra/maxima/PKGBUILD
extra/mesa/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/msmtp/PKGBUILD
extra/obex-data-server/PKGBUILD
extra/openbabel/PKGBUILD
extra/opencv/PKGBUILD
extra/opengtl/PKGBUILD
extra/perl-net-dns/PKGBUILD
extra/perl-socket6/PKGBUILD
extra/pidgin/PKGBUILD
extra/poppler/PKGBUILD
extra/postfix/PKGBUILD
extra/purple-plugin-pack/PKGBUILD
extra/pycurl/PKGBUILD
extra/python-geoip/PKGBUILD
extra/qt5/PKGBUILD
extra/redland/PKGBUILD
extra/ruby/PKGBUILD
extra/shared-mime-info/PKGBUILD
extra/sqlite/PKGBUILD
extra/texmacs/PKGBUILD
extra/v4l-utils/PKGBUILD
extra/vigra/PKGBUILD
extra/vim/PKGBUILD
extra/wildmidi/PKGBUILD
extra/wxpython/PKGBUILD
extra/x2goclient/PKGBUILD
extra/xf86-video-siliconmotion/0001-Remove-miInitializeBackingStore.patch
extra/xf86-video-siliconmotion/PKGBUILD
extra/xfce4-taskmanager/PKGBUILD
extra/xine-lib/PKGBUILD
extra/xorg-server/PKGBUILD
extra/xsane/PKGBUILD
extra/zsh/PKGBUILD
libre-testing/unace-libre/PKGBUILD
libre/abuse-libre/PKGBUILD
libre/audacity-libre/PKGBUILD
libre/audex-libre/PKGBUILD
libre/blackbox-libre/PKGBUILD
libre/bogofilter-libre/PKGBUILD
libre/bumblebee-libre/PKGBUILD
libre/crosstool-ng/PKGBUILD
libre/dvdrip-libre/PKGBUILD
libre/ecasound-libre/PKGBUILD
libre/enscript/PKGBUILD
libre/epdfview-libre/PKGBUILD
libre/hardinfo/PKGBUILD
libre/kile-libre/PKGBUILD
libre/lesspipe-libre/PKGBUILD
libre/libquicktime-libre/PKGBUILD
libre/linux-libre-tools/PKGBUILD
libre/linux-libre/PKGBUILD
libre/mc-libre/PKGBUILD
libre/mesa-demos-libre/PKGBUILD
libre/midori-libre/PKGBUILD
libre/oss-libre/PKGBUILD
libre/p7zip-libre/PKGBUILD
libre/python2-reportlab-libre/PKGBUILD
libre/sdl-libre/PKGBUILD
libre/seamonkey-libre/PKGBUILD
libre/unzip-libre/PKGBUILD
libre/xarchiver-libre/PKGBUILD
libre/xmlstarlet/PKGBUILD
pcr/a2jmidid/PKGBUILD
pcr/amsynth/PKGBUILD
pcr/anyremote/PKGBUILD
pcr/azr3-jack/PKGBUILD
pcr/bambus/PKGBUILD
pcr/bamf2/PKGBUILD
pcr/barnyard2/PKGBUILD
pcr/bison++/PKGBUILD
pcr/bup/PKGBUILD
pcr/din/PKGBUILD
pcr/django-tagging/PKGBUILD
pcr/doxymacs/PKGBUILD
pcr/emacs-js2-mode/PKGBUILD
pcr/eterm/PKGBUILD
pcr/frame/PKGBUILD
pcr/freeipmi/PKGBUILD
pcr/geis/PKGBUILD
pcr/ginn/PKGBUILD
pcr/grail/PKGBUILD
pcr/libast/PKGBUILD
pcr/libdshconfig/PKGBUILD
pcr/networkmanager-openswan/PKGBUILD
pcr/networkmanager-strongswan/PKGBUILD
pcr/openswan/PKGBUILD
pcr/par/PKGBUILD
pcr/snort/PKGBUILD
pcr/strongswan/PKGBUILD
social/batctl/PKGBUILD
social/bip/PKGBUILD
social/bitcoin-daemon/PKGBUILD
social/dropbear/PKGBUILD
social/ffingerd/PKGBUILD
social/haveged/PKGBUILD
social/inadyn-opendns/PKGBUILD
social/liblockfile/PKGBUILD
social/libowfat/PKGBUILD
social/lockfile-progs/PKGBUILD
social/netatalk/PKGBUILD
social/olsrd/PKGBUILD
social/poco/PKGBUILD
social/spectrum/PKGBUILD
social/squirm/PKGBUILD
social/tokyotyrant/PKGBUILD
social/tomoyo-tools/PKGBUILD
Diffstat (limited to 'extra/ffmpeg')
-rw-r--r-- | extra/ffmpeg/PKGBUILD | 10 | ||||
-rw-r--r-- | extra/ffmpeg/ffmpeg-2.1.1-freetype2.patch | 73 |
2 files changed, 5 insertions, 78 deletions
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index c72b8665a..098929b0c 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 202971 2013-12-29 17:17:29Z bpiotrowski $ +# $Id: PKGBUILD 204259 2014-01-15 20:56:02Z bpiotrowski $ # Maintainer: Ionut Biru <ibiru@archlinux.org> -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=2.1.1 -pkgrel=3 +pkgver=2.1.3 +pkgrel=1 epoch=1 pkgdesc='Complete and free Internet live audio and video broadcasting solution' arch=('i686' 'x86_64' 'mips64el') @@ -24,7 +24,7 @@ if [ "${CARCH}" != "mips64el" ]; then fi source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2 ffmpeg-2.1.1-freetype2.patch) -md5sums=('2719ab2b3311ac3775b9cdeb66c54849' +md5sums=('711b795bbc7b527c0f4a1828f324fd5a' '4b5dd079a40f44f4e0d00cdbc9d52ec3') prepare() { diff --git a/extra/ffmpeg/ffmpeg-2.1.1-freetype2.patch b/extra/ffmpeg/ffmpeg-2.1.1-freetype2.patch deleted file mode 100644 index 2ff9f87cc..000000000 --- a/extra/ffmpeg/ffmpeg-2.1.1-freetype2.patch +++ /dev/null @@ -1,73 +0,0 @@ -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 - |