Thu Jun 12 03:35:06 UTC 2014

2 files changed, 8 insertions, 65 deletions

diff --git a/extra/ffmpeg-compat/PKGBUILD b/extra/ffmpeg-compat/PKGBUILD
index c350ff2d9..d419484ca 100644
--- a/extra/ffmpeg-compat/PKGBUILD
+++ b/extra/ffmpeg-compat/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 208906 2014-03-28 15:46:20Z bpiotrowski $
+# $Id: PKGBUILD 215000 2014-06-11 12:40:06Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
@@ -6,8 +6,8 @@
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=ffmpeg-compat
-pkgver=0.10.12
-pkgrel=2
+pkgver=0.10.13
+pkgrel=1
 epoch=1
 pkgdesc='Complete and free Internet live audio and video broadcasting solution'
 arch=('i686' 'x86_64')
@@ -17,18 +17,11 @@ depends=(
       'alsa-lib' 'bzip2' 'gsm' 'lame' 'libass'
       'libmodplug' 'libpulse' 'libtheora' 'libva' 'libvorbis' 'libvpx'
       'opencore-amr' 'openjpeg' 'rtmpdump' 'schroedinger' 'sdl' 'speex'
-      'v4l-utils' 'x264' 'xvidcore' 'zlib'
-      )
-makedepends=('libvdpau' 'yasm')
-source=(http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2
-        ffmpeg-0.10.10-freetype2.patch)
-sha256sums=('118d82ca182871a9599202362106f03348dc335e2aec7d998d1f59ede3a8db02'
-            '05cf516b292c3815ecaaf72f12c0c73891b62b47d83f5d81f09380949e691988')
-
-prepare() {
-  cd ffmpeg-$pkgver
-  patch -p1 -i ../ffmpeg-0.10.10-freetype2.patch
-}
+      'v4l-utils' 'libx264' 'xvidcore' 'zlib'
+)
+makedepends=('libvdpau' 'yasm' 'x264')
+source=(http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2)
+sha256sums=('3835c195ff0ce9e7b5b4888dcda391b6f2c44a5a216cc784d27fb6c3d1df5002')
 
 build() {
   cd ffmpeg-$pkgver
diff --git a/extra/ffmpeg-compat/ffmpeg-0.10.10-freetype2.patch b/extra/ffmpeg-compat/ffmpeg-0.10.10-freetype2.patch
deleted file mode 100644
index 1e8cc6547..000000000
--- a/extra/ffmpeg-compat/ffmpeg-0.10.10-freetype2.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -rupN a/configure b/configure
---- a/configure	2013-11-06 00:55:13.000000000 +0000
-+++ b/configure	2013-12-28 22:06:00.925551644 +0000
-@@ -943,6 +943,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)
-+}
-+
- check_host_cc(){
-     log check_host_cc "$@"
-     cat > $TMPC
-@@ -3134,7 +3154,7 @@ enabled libdirac   && require_pkg_config
-     "libdirac_decoder/dirac_parser.h libdirac_encoder/dirac_encoder.h"  \
-     "dirac_decoder_init dirac_encoder_init"
- enabled libfaac    && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
--enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType
-+enabled libfreetype && require_libfreetype
- enabled libgsm     && require  libgsm gsm/gsm.h gsm_create -lgsm
- enabled libmodplug && require  libmodplug libmodplug/modplug.h ModPlug_Load -lmodplug
- enabled libmp3lame && require  "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame
-diff -rupN a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
---- a/libavfilter/vf_drawtext.c	2013-11-06 00:55:16.000000000 +0000
-+++ b/libavfilter/vf_drawtext.c	2013-12-28 22:06:16.495450750 +0000
-@@ -47,7 +47,6 @@
- #undef time
- 
- #include <ft2build.h>
--#include <freetype/config/ftheader.h>
- #include FT_FREETYPE_H
- #include FT_GLYPH_H
-