remove unused patches

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

3 files changed, 5 insertions, 103 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index c790e7dc6063..62a7dec336d0 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.711 2014/02/12 13:19:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.712 2014/02/12 13:22:09 aballier Exp $
+
+  12 Feb 2014; Alexis Ballier <aballier@gentoo.org>
+  -files/ffmpeg-1.2.4-freetype251.patch, -files/ffmpeg-2.0.2-freetype251.patch:
+  remove unused patches
 
   12 Feb 2014; Alexis Ballier <aballier@gentoo.org> -ffmpeg-0.10.9.ebuild,
   -ffmpeg-0.10.10.ebuild, -ffmpeg-1.0.7.ebuild, -ffmpeg-1.2.3.ebuild,
diff --git a/media-video/ffmpeg/files/ffmpeg-1.2.4-freetype251.patch b/media-video/ffmpeg/files/ffmpeg-1.2.4-freetype251.patch
deleted file mode 100644
index c809ff16824c..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-1.2.4-freetype251.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Patch based on
-http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=cea5812fa723c08b89d929eeba73462e05de2973
-
---- ffmpeg-1.2.4/configure
-+++ ffmpeg-1.2.4/configure
-@@ -1075,6 +1075,26 @@
-     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
- }
-@@ -3902,7 +3922,7 @@
- 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 libgsm     && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
-                             check_lib "${gsm_hdr}" gsm_create -lgsm && break;
-                         done || die "ERROR: libgsm not found"; }
---- ffmpeg-1.2.4/libavfilter/vf_drawtext.c
-+++ ffmpeg-1.2.4/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
diff --git a/media-video/ffmpeg/files/ffmpeg-2.0.2-freetype251.patch b/media-video/ffmpeg/files/ffmpeg-2.0.2-freetype251.patch
deleted file mode 100644
index 3b88c3a69ff9..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-2.0.2-freetype251.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Patch based on 
-http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=cea5812fa723c08b89d929eeba73462e05de2973
-
---- ffmpeg-2.0.2/configure
-+++ ffmpeg-2.0.2/configure
-@@ -1096,6 +1096,26 @@
-     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
- }
-@@ -4143,7 +4163,7 @@
- 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
- enabled libgsm            && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
-                                    check_lib "${gsm_hdr}" gsm_create -lgsm && break;
---- ffmpeg-2.0.2/libavfilter/vf_drawtext.c
-+++ ffmpeg-2.0.2/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