[SCM] libav/master: drop patches applied upstream

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5dea15c407ceb2c3ed9c5d05aef9e273082b6870
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Mar 15 02:07:27 2014 +0000

    drop patches applied upstream

diff --git a/debian/patches/freetype-api.patch b/debian/patches/freetype-api.patch
deleted file mode 100644
index 08b08e0..0000000
--- a/debian/patches/freetype-api.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Author: Fabian Greffrath <fabian+debian at greffrath.com>
-Description: Use the freetype API correctly.
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=731307
-
---- a/configure
-+++ b/configure
-@@ -3481,7 +3481,7 @@ enabled frei0r     && { check_header fre
- enabled gnutls     && require_pkg_config gnutls gnutls/gnutls.h gnutls_global_init
- enabled libfaac    && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
- enabled libfdk_aac && require  libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac
--enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType
-+enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype.h" FT_Init_FreeType
- enabled libgsm     && require  libgsm gsm/gsm.h gsm_create -lgsm
- enabled libilbc    && require  libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc
- enabled libmp3lame && require  "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame
---- a/libavfilter/vf_drawtext.c
-+++ b/libavfilter/vf_drawtext.c
-@@ -47,7 +47,6 @@
- #include "video.h"
- 
- #include <ft2build.h>
--#include <freetype/config/ftheader.h>
- #include FT_FREETYPE_H
- #include FT_GLYPH_H
- 
diff --git a/debian/patches/s390x-pic.patch b/debian/patches/s390x-pic.patch
deleted file mode 100644
index 7119d60..0000000
--- a/debian/patches/s390x-pic.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 798c715f4fa5cde37456af6202a32ee62cfb96d9 Mon Sep 17 00:00:00 2001
-From: Reinhard Tartler <siretart at tauware.de>
-Date: Sun, 2 Mar 2014 02:11:05 -0500
-Subject: [PATCH] configure: enable PIC on s390(x)
-Bug-Debian: http://bugs.debian.org/726733
-Origin: upstream
-
-The s390 architecture requires shared libraries to be built in PIC mode.
-Otherwise applications will get wrong relocations at run-time, leading
-to confusing segmentation faults.
-
-CC: libav-stable at libav.org
-(cherry picked from commit 5ddc9f5052316608799b932c604f9e7561f8ce24)
-(cherry picked from commit 7509c2c4ea2180733cc60ab1a0e0fe4ce2f02a69)
----
- configure |    4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/configure b/configure
-index d2b4122..d65c112 100755
---- a/configure
-+++ b/configure
-@@ -2818,6 +2818,10 @@ case "$arch" in
-         check_64bit ppc ppc64 'sizeof(void *) > 4'
-         spic=$shared
-     ;;
-+    s390)
-+        check_64bit s390 s390x 'sizeof(void *) > 4'
-+        spic=$shared
-+    ;;
-     sparc)
-         check_64bit sparc sparc64 'sizeof(void *) > 4'
-         spic=$shared
--- 
-1.7.10.4
-
diff --git a/debian/patches/series b/debian/patches/series
index 66cadf5..558a130 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
 03-disable-configuration-warnings.patch
 spelling-errors.patch
-freetype-api.patch
 support-opus-in-ogg.patch
-s390x-pic.patch

-- 
Libav/FFmpeg packaging