patches: rebased for new libvlc hash

patches/0001-arm_neon-added-function-macro-to-handle-the-undersco.patch

@@ -1,8 +1,8 @@
-From fe6503ede5f689c64ff60e1c2c4868f667f975a2 Mon Sep 17 00:00:00 2001
+From e0331a82064591a0d05d6d69b3bcb6d3abfc07ab Mon Sep 17 00:00:00 2001
 From: David Geldreich <david.geldreich@free.fr>
 Date: Fri, 20 Apr 2012 16:41:19 +0200
-Subject: [PATCH 01/17] arm_neon: added function macro to handle the underscore
- prefix for the iOS ARM ABI
+Subject: [PATCH 01/17] arm_neon: added function macro to handle the
+ underscore prefix for the iOS ARM ABI
 
 ---
  modules/arm_neon/asm.S | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
@@ -65,5 +65,5 @@ index 0000000..d853255
 +.endm
 +
 -- 
-1.8.3.4 (Apple Git-47)
+1.7.12.4 (Apple Git-37)
 

patches/0001-fixed-png-patch.patch

@@ -1,100 +0,0 @@
-From 33519fb95407c83962d2d84062de65a7ba9452c8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
-Date: Sat, 24 Aug 2013 19:28:20 +0200
-Subject: [PATCH] fixed png patch
-
----
- contrib/src/png/ios.patch | 66 +++++++++++++++++++++++++++++++++++++++++++++++
- contrib/src/png/rules.mak |  3 +++
- 2 files changed, 69 insertions(+)
- create mode 100644 contrib/src/png/ios.patch
-
-diff --git a/contrib/src/png/ios.patch b/contrib/src/png/ios.patch
-new file mode 100644
-index 0000000..f4b8bc1
---- /dev/null
-+++ b/contrib/src/png/ios.patch
-@@ -0,0 +1,66 @@
-+diff -ru png/arm/filter_neon.S png-fixed/arm/filter_neon.S
-+--- png/arm/filter_neon.S	2013-06-27 05:25:41.000000000 +0200
-++++ png-fixed/arm/filter_neon.S	2013-07-20 23:33:23.000000000 +0200
-+@@ -46,7 +46,7 @@
-+ \name:
-+ .endm
-+ 
-+-func    png_read_filter_row_sub4_neon, export=1
-++func    _png_read_filter_row_sub4_neon, export=1
-+         ldr             r3,  [r0, #4]           @ rowbytes
-+         vmov.i8         d3,  #0
-+ 1:
-+@@ -62,7 +62,7 @@
-+         bx              lr
-+ endfunc
-+ 
-+-func    png_read_filter_row_sub3_neon, export=1
-++func    _png_read_filter_row_sub3_neon, export=1
-+         ldr             r3,  [r0, #4]           @ rowbytes
-+         vmov.i8         d3,  #0
-+         mov             r0,  r1
-+@@ -88,7 +88,7 @@
-+         bx              lr
-+ endfunc
-+ 
-+-func    png_read_filter_row_up_neon, export=1
-++func    _png_read_filter_row_up_neon, export=1
-+         ldr             r3,  [r0, #4]           @ rowbytes
-+ 1:
-+         vld1.8          {q0}, [r1,:128]
-+@@ -101,7 +101,7 @@
-+         bx              lr
-+ endfunc
-+ 
-+-func    png_read_filter_row_avg4_neon, export=1
-++func    _png_read_filter_row_avg4_neon, export=1
-+         ldr             r12, [r0, #4]           @ rowbytes
-+         vmov.i8         d3,  #0
-+ 1:
-+@@ -122,7 +122,7 @@
-+         bx              lr
-+ endfunc
-+ 
-+-func    png_read_filter_row_avg3_neon, export=1
-++func    _png_read_filter_row_avg3_neon, export=1
-+         push            {r4,lr}
-+         ldr             r12, [r0, #4]           @ rowbytes
-+         vmov.i8         d3,  #0
-+@@ -173,7 +173,7 @@
-+         vbsl            \rx, \ra, d28
-+ .endm
-+ 
-+-func    png_read_filter_row_paeth4_neon, export=1
-++func    _png_read_filter_row_paeth4_neon, export=1
-+         ldr             r12, [r0, #4]           @ rowbytes
-+         vmov.i8         d3,  #0
-+         vmov.i8         d20, #0
-+@@ -196,7 +196,7 @@
-+         bx              lr
-+ endfunc
-+ 
-+-func    png_read_filter_row_paeth3_neon, export=1
-++func    _png_read_filter_row_paeth3_neon, export=1
-+         push            {r4,lr}
-+         ldr             r12, [r0, #4]           @ rowbytes
-+         vmov.i8         d3,  #0
-diff --git a/contrib/src/png/rules.mak b/contrib/src/png/rules.mak
-index ae6ae5b..f42780f 100644
---- a/contrib/src/png/rules.mak
-+++ b/contrib/src/png/rules.mak
-@@ -16,6 +16,9 @@ png: libpng-$(PNG_VERSION).tar.xz .sum-png
- 	$(UNPACK)
- 	$(APPLY) $(SRC)/png/winrt.patch
- 	$(APPLY) $(SRC)/png/bins.patch
-+ifdef HAVE_IOS
-+	$(APPLY) $(SRC)/png/ios.patch
-+endif
- 	$(MOVE)
- 
- DEPS_png = zlib $(DEPS_zlib)
-1.8.3.4 (Apple Git-47)
-

patches/0002-arm_neon-use-a-macro-to-fix-compilation-for-iOS.patch

@@ -1,4 +1,4 @@
-From 5771223af5c3a15bea6f4c984c13c2572fc4c5be Mon Sep 17 00:00:00 2001
+From a134eabed7206a87c552e1568861728af9348f15 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Fri, 10 Aug 2012 16:01:49 +0200
 Subject: [PATCH 02/17] arm_neon: use a macro to fix compilation for iOS
@@ -204,5 +204,5 @@ index dcc51ed..4722be4 100644
  	pop {r4,pc}
 +endfunc
 -- 
-1.8.3.4 (Apple Git-47)
+1.7.12.4 (Apple Git-37)
 

patches/0003-deinterlace-merge-use-a-macro-to-fix-compilation-for.patch

@@ -1,4 +1,4 @@
-From 585cfc4d3e5874f4df17dc74860c2a546c798026 Mon Sep 17 00:00:00 2001
+From 19add3aca90d4e39685fcbf19fd18452414858b8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Fri, 10 Aug 2012 16:02:07 +0200
 Subject: [PATCH 03/17] deinterlace/merge: use a macro to fix compilation for
@@ -82,5 +82,5 @@ index dd77902..03e5042 100644
  	b		1b
 +endfunc
 -- 
-1.8.3.4 (Apple Git-47)
+1.7.12.4 (Apple Git-37)
 

patches/0004-extras-ios-enable-zvbi-compilation.patch

@@ -1,4 +1,4 @@
-From a7b5513ac94b70154d0e7a53d981af76254afa61 Mon Sep 17 00:00:00 2001
+From 0b437a1b4aec64429b9f8fc759e1834110ba2a36 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Thu, 8 Aug 2013 22:12:57 +0200
 Subject: [PATCH 04/17] extras/ios: enable zvbi compilation
@@ -21,5 +21,5 @@ index 39d90bd..8155062 100755
      --disable-caca \
      --disable-gettext \
 -- 
-1.8.3.4 (Apple Git-47)
+1.7.12.4 (Apple Git-37)
 

patches/0006-contrib-ebml-mkv-compile-with-hidden-symbols-on-iOS.patch

@@ -1,7 +1,7 @@
-From eb5be17c09f650d4ef8803bd74b512dda1418a6d Mon Sep 17 00:00:00 2001
+From 097634356ea62b7483fe5ea2b748d1623e77c077 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Sat, 11 Aug 2012 13:29:25 +0200
-Subject: [PATCH 06/17] contrib/ebml+mkv: compile with hidden symbols on iOS
+Subject: [PATCH 05/17] contrib/ebml+mkv: compile with hidden symbols on iOS
 
 ---
  contrib/src/ebml/rules.mak     | 7 +++++--
@@ -48,5 +48,5 @@ index 57d7f15..5e63db6 100644
  	cd $< && $(MAKE) -C make/linux install_staticlib install_headers prefix="$(PREFIX)" $(HOSTVARS)
  	$(RANLIB) "$(PREFIX)/lib/libmatroska.a"
 -- 
-1.8.3.4 (Apple Git-47)
+1.7.12.4 (Apple Git-37)
 

patches/0005-deinterlace-added-a-hack-to-work-around-a-libtool-bu.patch

@@ -1,24 +0,0 @@
-From 0f4584f101e657cc87406faa04bebe256bceaa10 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
-Date: Fri, 10 Aug 2012 16:02:33 +0200
-Subject: [PATCH 05/17] deinterlace: added a hack to work-around a libtool bug
-
----
- modules/video_filter/Modules.am | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/modules/video_filter/Modules.am b/modules/video_filter/Modules.am
-index 6bb5eac..acfe695 100644
---- a/modules/video_filter/Modules.am
-+++ b/modules/video_filter/Modules.am
-@@ -1,3 +1,7 @@
-+# When using a specific AS tool instead of gcc libtool goes mad
-+# without this. (This is the case with iOS).
-+LIBTOOL=@LIBTOOL@ --tag=CC
-+
- SOURCES_mosaic = mosaic.c mosaic.h
- SOURCES_transform = transform.c
- SOURCES_invert = invert.c
-1.8.3.4 (Apple Git-47)
-

patches/0007-posix-thread-add-a-hack-to-work-around-crashes-when-.patch

@@ -1,7 +1,7 @@
-From 2683d8a132a7ca3d836b68b91792be150325fd09 Mon Sep 17 00:00:00 2001
+From bd6149f3aeb1698b43619ee06d93db6be1be472d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Thu, 18 Oct 2012 18:38:17 +0200
-Subject: [PATCH 07/17] posix/thread: add a hack to work-around crashes when
+Subject: [PATCH 06/17] posix/thread: add a hack to work-around crashes when
  using the buggy iOS 6 runtime
 
 ---
@@ -32,5 +32,5 @@ index 514f592..6a95bb0 100644
  }
  
 -- 
-1.8.3.4 (Apple Git-47)
+1.7.12.4 (Apple Git-37)
 

patches/0008-freetype-added-a-fake-font-lookup-mechanism-for-iOS-.patch

@@ -1,15 +1,15 @@
-From 9ea4f35d454c219ddf96135fd29c2108fd98ec20 Mon Sep 17 00:00:00 2001
+From 41a258acadf2f56da167e998362faeecc6d11524 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Fri, 19 Jul 2013 18:38:41 +0700
-Subject: [PATCH 08/17] freetype: added a fake font lookup mechanism for iOS to
- use the packaged demo fonts
+Subject: [PATCH 07/17] freetype: added a fake font lookup mechanism for iOS
+ to use the packaged demo fonts
 
 ---
  modules/text_renderer/freetype.c | 42 ++++++++++++++++++++++++++++++++++++++++
  1 file changed, 42 insertions(+)
 
 diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype.c
-index cdc9243..e1dfea2 100644
+index 05fa2a2..9a00739 100644
 --- a/modules/text_renderer/freetype.c
 +++ b/modules/text_renderer/freetype.c
 @@ -106,6 +106,9 @@
@@ -72,7 +72,7 @@ index cdc9243..e1dfea2 100644
  #endif
  #elif defined( _WIN32 )
          psz_fontfile = Win32_Select( p_filter,
-@@ -2889,6 +2928,9 @@ static int Create( vlc_object_t *p_this )
+@@ -2890,6 +2929,9 @@ static int Create( vlc_object_t *p_this )
  #elif defined(__APPLE__)
  #if !TARGET_OS_IPHONE
      psz_fontfile = MacLegacy_Select( p_filter, psz_fontfamily, false, false, 0, &fontindex );
@@ -83,5 +83,5 @@ index cdc9243..e1dfea2 100644
  #elif defined(_WIN32)
      psz_fontfile = Win32_Select( p_filter, psz_fontfamily, false, false,
 -- 
-1.8.3.4 (Apple Git-47)
+1.7.12.4 (Apple Git-37)
 

patches/0009-libass-fix-text-rendering-on-iOS-by-providing-a-font.patch

@@ -1,7 +1,7 @@
-From ee6637a68ac08ec0190464f6004cf42588c6e140 Mon Sep 17 00:00:00 2001
+From 077b66236c75d6a1c8f201cd5b31681c52e2deef Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 29 May 2013 13:25:54 +0200
-Subject: [PATCH 09/17] libass: fix text rendering on iOS by providing a font
+Subject: [PATCH 08/17] libass: fix text rendering on iOS by providing a font
  lookup mechanism for the font shipped with Aspen
 
 ---
@@ -62,5 +62,5 @@ index aa38f1b..38961bc 100644
      const char *psz_font = NULL; /* We don't ship a default font with VLC */
      const char *psz_family = "Arial"; /* Use Arial if we can't find anything more suitable */
 -- 
-1.8.3.4 (Apple Git-47)
+1.7.12.4 (Apple Git-37)
 

patches/0011-freetype-fix-corner-case-crash.patch

@@ -1,14 +1,14 @@
-From c6c78862cdef49cd550abff2b1d29eb40bc8a830 Mon Sep 17 00:00:00 2001
+From b37dd26f2da17193f0b9dcff23649330792f2cc9 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Sun, 21 Jul 2013 18:18:33 +0200
-Subject: [PATCH 11/17] freetype: fix corner-case crash
+Subject: [PATCH 09/17] freetype: fix corner-case crash
 
 ---
  modules/text_renderer/freetype.c | 2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype.c
-index e1dfea2..098c67b 100644
+index 9a00739..c7f3c1f 100644
 --- a/modules/text_renderer/freetype.c
 +++ b/modules/text_renderer/freetype.c
 @@ -825,6 +825,8 @@ static char *iOSFake_Select( filter_t *p_filter, bool b_monospace, bool b_bold,
@@ -21,5 +21,5 @@ index e1dfea2..098c67b 100644
      CFRelease(fileURL);
  
 -- 
-1.8.3.4 (Apple Git-47)
+1.7.12.4 (Apple Git-37)
 

patches/0010-contrib-png-fix-ARM-assembly-for-iOS.patch

@@ -1,100 +0,0 @@
-From f7a9998bf879903e3e6257ab6d482e863fe8f4b4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
-Date: Sat, 20 Jul 2013 23:35:05 +0200
-Subject: [PATCH 10/17] contrib/png: fix ARM assembly for iOS
-
----
- contrib/src/png/ios.patch | 66 +++++++++++++++++++++++++++++++++++++++++++++++
- contrib/src/png/rules.mak |  3 +++
- 2 files changed, 69 insertions(+)
- create mode 100644 contrib/src/png/ios.patch
-
-diff --git a/contrib/src/png/ios.patch b/contrib/src/png/ios.patch
-new file mode 100644
-index 0000000..f4b8bc1
---- /dev/null
-+++ b/contrib/src/png/ios.patch
-@@ -0,0 +1,66 @@
-+diff -ru png/arm/filter_neon.S png-fixed/arm/filter_neon.S
-+--- png/arm/filter_neon.S	2013-06-27 05:25:41.000000000 +0200
-++++ png-fixed/arm/filter_neon.S	2013-07-20 23:33:23.000000000 +0200
-+@@ -46,7 +46,7 @@
-+ \name:
-+ .endm
-+ 
-+-func    png_read_filter_row_sub4_neon, export=1
-++func    _png_read_filter_row_sub4_neon, export=1
-+         ldr             r3,  [r0, #4]           @ rowbytes
-+         vmov.i8         d3,  #0
-+ 1:
-+@@ -62,7 +62,7 @@
-+         bx              lr
-+ endfunc
-+ 
-+-func    png_read_filter_row_sub3_neon, export=1
-++func    _png_read_filter_row_sub3_neon, export=1
-+         ldr             r3,  [r0, #4]           @ rowbytes
-+         vmov.i8         d3,  #0
-+         mov             r0,  r1
-+@@ -88,7 +88,7 @@
-+         bx              lr
-+ endfunc
-+ 
-+-func    png_read_filter_row_up_neon, export=1
-++func    _png_read_filter_row_up_neon, export=1
-+         ldr             r3,  [r0, #4]           @ rowbytes
-+ 1:
-+         vld1.8          {q0}, [r1,:128]
-+@@ -101,7 +101,7 @@
-+         bx              lr
-+ endfunc
-+ 
-+-func    png_read_filter_row_avg4_neon, export=1
-++func    _png_read_filter_row_avg4_neon, export=1
-+         ldr             r12, [r0, #4]           @ rowbytes
-+         vmov.i8         d3,  #0
-+ 1:
-+@@ -122,7 +122,7 @@
-+         bx              lr
-+ endfunc
-+ 
-+-func    png_read_filter_row_avg3_neon, export=1
-++func    _png_read_filter_row_avg3_neon, export=1
-+         push            {r4,lr}
-+         ldr             r12, [r0, #4]           @ rowbytes
-+         vmov.i8         d3,  #0
-+@@ -173,7 +173,7 @@
-+         vbsl            \rx, \ra, d28
-+ .endm
-+ 
-+-func    png_read_filter_row_paeth4_neon, export=1
-++func    _png_read_filter_row_paeth4_neon, export=1
-+         ldr             r12, [r0, #4]           @ rowbytes
-+         vmov.i8         d3,  #0
-+         vmov.i8         d20, #0
-+@@ -196,7 +196,7 @@
-+         bx              lr
-+ endfunc
-+ 
-+-func    png_read_filter_row_paeth3_neon, export=1
-++func    _png_read_filter_row_paeth3_neon, export=1
-+         push            {r4,lr}
-+         ldr             r12, [r0, #4]           @ rowbytes
-+         vmov.i8         d3,  #0
-diff --git a/contrib/src/png/rules.mak b/contrib/src/png/rules.mak
-index ae6ae5b..f42780f 100644
---- a/contrib/src/png/rules.mak
-+++ b/contrib/src/png/rules.mak
-@@ -16,6 +16,9 @@ png: libpng-$(PNG_VERSION).tar.xz .sum-png
- 	$(UNPACK)
- 	$(APPLY) $(SRC)/png/winrt.patch
- 	$(APPLY) $(SRC)/png/bins.patch
-+ifdef HAVE_IOS
-+	$(APPLY) $(SRC)/png/ios.patch
-+endif
- 	$(MOVE)
- 
- DEPS_png = zlib $(DEPS_zlib)
-1.8.3.4 (Apple Git-47)
-

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

@@ -1,8 +1,9 @@
-From 5204bc4f8d1713de5361556f8d6379035ef41bae Mon Sep 17 00:00:00 2001
+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 12/17] extras/tools: disable contrib compilation of gpg-error,
- gcrypt and lua since we don't use it for now
+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 +++
@@ -23,5 +24,5 @@ index 8155062..fa99c2d 100755
  
  echo "EXTRA_CFLAGS += ${EXTRA_CFLAGS}" >> config.mak
 -- 
-1.8.3.4 (Apple Git-47)
+1.7.12.4 (Apple Git-37)
 

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

@@ -1,7 +1,7 @@
-From 031dc9818598c87fa7bc0970e6b9b5e79d6e34a9 Mon Sep 17 00:00:00 2001
+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 13/17] extras/package: compile quartztext module for iOS
+Subject: [PATCH 11/17] extras/package: compile quartztext module for iOS
 
 ---
  extras/package/ios/build.sh | 2 +-
@@ -21,5 +21,5 @@ index fa99c2d..0181585 100755
      --enable-mkv \
      --enable-opus \
 -- 
-1.8.3.4 (Apple Git-47)
+1.7.12.4 (Apple Git-37)
 

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

@@ -1,7 +1,7 @@
-From 0c8633b1b61274c527c25cd8ab71d6034a3ea2be Mon Sep 17 00:00:00 2001
+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 14/17] quartztext: fix relative font size handling
+Subject: [PATCH 12/17] quartztext: fix relative font size handling
 
 ---
  modules/text_renderer/quartztext.c | 17 ++++++++++++++---
@@ -50,5 +50,5 @@ index 4b25caa..eb5da4a 100644
  
  static int RenderYUVA(filter_t *p_filter, subpicture_region_t *p_region,
 -- 
-1.8.3.4 (Apple Git-47)
+1.7.12.4 (Apple Git-37)
 

patches/0015-io-implement-network-timeout-default-60s.patch

@@ -1,7 +1,7 @@
-From 9ccf37b1a093e2460633f69ce484d2fd31ccdc8c Mon Sep 17 00:00:00 2001
+From 8627251257ded66c6dd8c7fd4b5dcd33927b80d4 Mon Sep 17 00:00:00 2001
 From: Gleb Pinigin <gpinigin@gmail.com>
 Date: Sun, 28 Jul 2013 18:32:51 +0700
-Subject: [PATCH 15/17] io: implement network timeout(default 60s)
+Subject: [PATCH 13/17] io: implement network timeout(default 60s)
 
 ---
  src/network/io.c | 15 ++++++++++++++-
@@ -63,5 +63,5 @@ index a8ea870..6df06e1 100644
              if (errno == EINTR)
                  continue;
 -- 
-1.8.3.4 (Apple Git-47)
+1.7.12.4 (Apple Git-37)
 

patches/0016-contrib-zvbi-fix-compilation-with-clang.patch

@@ -1,7 +1,7 @@
-From e43b98d5af891c4a5df3e21e947753077ebd34a2 Mon Sep 17 00:00:00 2001
+From d0181a5b81f7312b91c971da85e38455e475be77 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Thu, 8 Aug 2013 21:41:46 +0200
-Subject: [PATCH 16/17] contrib/zvbi: fix compilation with clang
+Subject: [PATCH 14/17] contrib/zvbi: fix compilation with clang
 
 ---
  contrib/src/zvbi/rules.mak                    |   3 +
@@ -485,5 +485,5 @@ index 0000000..5226a3c
 + 				goto swedish;
 + 			}
 -- 
-1.8.3.4 (Apple Git-47)
+1.7.12.4 (Apple Git-37)
 

patches/0017-contribs-zvbi-don-t-reconf-after-decompressing-the-s.patch

@@ -1,8 +1,9 @@
-From 33c2399e4bd491d06f3440268e33f48cc8181f58 Mon Sep 17 00:00:00 2001
+From dd8ba1147111e9a80938d9ce107384678d296e6a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Thu, 8 Aug 2013 21:47:46 +0200
-Subject: [PATCH 17/17] contribs/zvbi: don't reconf after decompressing the
- source code so we don't need to compile gettext just for this
+Subject: [PATCH 15/17] contribs/zvbi: don't reconf after decompressing the
+ source code so we don't need to compile gettext just
+ for this
 
 ---
  contrib/src/zvbi/rules.mak | 2 ++
@@ -23,5 +24,5 @@ index 7584eed..627ae7c 100644
  	cd $</src && $(MAKE) install
  	cd $< && $(MAKE) SUBDIRS=. install
 -- 
-1.8.3.4 (Apple Git-47)
+1.7.12.4 (Apple Git-37)
 

patches/0016-deinterlace-added-a-hack-to-work-around-a-libtool-bu.patch

@@ -0,0 +1,23 @@
+From 730dfad637f7906f90c3ac2f0f824f8f4dccad63 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Felix=20Paul=20Ku=CC=88hne?= <fkuehne@videolan.org>
+Date: Fri, 10 Aug 2012 16:02:33 +0200
+Subject: [PATCH 16/17] deinterlace: added a hack to work-around a libtool bug
+
+---
+ modules/video_filter/Modules.am | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/modules/video_filter/Modules.am b/modules/video_filter/Modules.am
+index 9fbe1bd..d62d3de 100644
+--- a/modules/video_filter/Modules.am
++++ b/modules/video_filter/Modules.am
+@@ -1,3 +1,6 @@
++# When using a specific AS tool instead of gcc libtool goes mad
++# without this. (This is the case with iOS).
++LIBTOOL=@LIBTOOL@ --tag=CC
+ AUTOMAKE_OPTIONS = subdir-objects
+ 
+ SOURCES_mosaic = mosaic.c mosaic.h
+-- 
+1.7.12.4 (Apple Git-37)
+

patches/0017-contrib-png-fix-ARM-assembly-for-iOS.patch

@@ -0,0 +1,100 @@
+From 69ffe0b92d91261aafc59d9d451c02a07bc5cd2e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Felix=20Paul=20Ku=CC=88hne?= <fkuehne@videolan.org>
+Date: Sat, 20 Jul 2013 23:35:05 +0200
+Subject: [PATCH 17/17] contrib/png: fix ARM assembly for iOS
+
+---
+ contrib/src/png/ios.patch | 66 +++++++++++++++++++++++++++++++++++++++++++++++
+ contrib/src/png/rules.mak |  3 +++
+ 2 files changed, 69 insertions(+)
+ create mode 100644 contrib/src/png/ios.patch
+
+diff --git a/contrib/src/png/ios.patch b/contrib/src/png/ios.patch
+new file mode 100644
+index 0000000..1d7ee04
+--- /dev/null
++++ b/contrib/src/png/ios.patch
+@@ -0,0 +1,66 @@
+diff --git a/contrib/src/png/rules.mak b/contrib/src/png/rules.mak
+index d1adc34..701e3a8 100644
+--- a/contrib/src/png/rules.mak
++++ b/contrib/src/png/rules.mak
+@@ -17,6 +17,9 @@ png: libpng-$(PNG_VERSION).tar.xz .sum-png
+ 	$(APPLY) $(SRC)/png/winrt.patch
+ 	$(APPLY) $(SRC)/png/bins.patch
+ 	$(APPLY) $(SRC)/png/automake.patch
++ifdef HAVE_IOS
++	$(APPLY) $(SRC)/png/ios.patch
++endif
+ 	$(MOVE)
+ 
+ DEPS_png = zlib $(DEPS_zlib)
+-- 
+1.7.12.4 (Apple Git-37)
+