patches: remove patches merged upstream

patches/0010-extras-tools-disable-contrib-compilation-of-gpg-erro.patch

@@ -1,28 +0,0 @@
-From 7522c24bfb02fc61b4a56eb46b6dec40735f45b8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20Ku=CC=88hne?= <fkuehne@videolan.org>
-Date: Sat, 27 Jul 2013 19:38:44 +0200
-Subject: [PATCH 10/17] extras/tools: disable contrib compilation of
- gpg-error, gcrypt and lua since we don't use it for
- now
-
----
- extras/package/ios/build.sh | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
-index 8155062..fa99c2d 100755
---- a/extras/package/ios/build.sh
-+++ b/extras/package/ios/build.sh
-@@ -215,6 +215,9 @@ fi
-     --enable-freetype2 \
-     --enable-ass \
-     --disable-fontconfig \
-+    --disable-gpg-error \
-+    --disable-gcrypt \
-+    --disable-lua \
-     --disable-taglib > ${out}
- 
- echo "EXTRA_CFLAGS += ${EXTRA_CFLAGS}" >> config.mak
-1.7.12.4 (Apple Git-37)
-

patches/0011-extras-package-compile-quartztext-module-for-iOS.patch

@@ -1,25 +0,0 @@
-From 2e19907ceb0dd6cb5ab86bb755fefe352689963c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20Ku=CC=88hne?= <fkuehne@videolan.org>
-Date: Sun, 28 Jul 2013 19:24:30 +0200
-Subject: [PATCH 11/17] extras/package: compile quartztext module for iOS
-
----
- extras/package/ios/build.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
-index fa99c2d..0181585 100755
---- a/extras/package/ios/build.sh
-+++ b/extras/package/ios/build.sh
-@@ -268,7 +268,7 @@ ${VLCROOT}/configure \
-     --enable-ios-vout \
-     --enable-ios-vout2 \
-     --disable-shared \
--    --disable-macosx-quartztext \
-+    --enable-macosx-quartztext \
-     --enable-avcodec \
-     --enable-mkv \
-     --enable-opus \
-1.7.12.4 (Apple Git-37)
-

patches/0012-quartztext-fix-relative-font-size-handling.patch

@@ -1,54 +0,0 @@
-From d3a307653b0406f9c10bb24e879adf08cdcdd19d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
-Date: Sun, 4 Aug 2013 19:50:19 +0200
-Subject: [PATCH 12/17] quartztext: fix relative font size handling
-
----
- modules/text_renderer/quartztext.c | 17 ++++++++++++++---
- 1 file changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/modules/text_renderer/quartztext.c b/modules/text_renderer/quartztext.c
-index 4b25caa..eb5da4a 100644
---- a/modules/text_renderer/quartztext.c
-+++ b/modules/text_renderer/quartztext.c
-@@ -205,7 +205,7 @@ static int Create(vlc_object_t *p_this)
-     p_sys->psz_font_name  = var_CreateGetString(p_this, "quartztext-font");
-     p_sys->i_font_opacity = 255;
-     p_sys->i_font_color = VLC_CLIP(var_CreateGetInteger(p_this, "quartztext-color") , 0, 0xFFFFFF);
--    p_sys->i_font_size    = GetFontSize(p_filter);
-+    p_sys->i_font_size = GetFontSize(p_filter);
- 
-     p_filter->pf_render_text = RenderText;
-     p_filter->pf_render_html = RenderHtml;
-@@ -317,7 +317,7 @@ static int RenderText(filter_t *p_filter, subpicture_region_t *p_region_out,
-     b_bold = b_uline = b_italic = FALSE;
-     VLC_UNUSED(p_chroma_list);
- 
--    p_sys->i_font_size    = GetFontSize(p_filter);
-+    p_sys->i_font_size = GetFontSize(p_filter);
- 
-     // Sanity check
-     if (!p_region_in || !p_region_out)
-@@ -950,7 +950,18 @@ static offscreen_bitmap_t *Compose(int i_text_align,
- 
- static int GetFontSize(filter_t *p_filter)
- {
--    return p_filter->fmt_out.video.i_height / DEFAULT_REL_FONT_SIZE;
-+    int i_size = 0;
-+
-+    int i_ratio = var_CreateGetInteger( p_filter, "quartztext-rel-fontsize" );
-+    if( i_ratio > 0 )
-+        i_size = (int)p_filter->fmt_out.video.i_height / i_ratio;
-+
-+    if( i_size <= 0 )
-+    {
-+        msg_Warn( p_filter, "invalid fontsize, using 12" );
-+        i_size = 12;
-+    }
-+    return i_size;
- }
- 
- static int RenderYUVA(filter_t *p_filter, subpicture_region_t *p_region,
-1.7.12.4 (Apple Git-37)
-