patches: cleanup iteration

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

@@ -1,8 +1,8 @@
-From e0331a82064591a0d05d6d69b3bcb6d3abfc07ab Mon Sep 17 00:00:00 2001
+From 45f58af5e06564a3b161ddcee2cda2a4bd8dd123 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/15] 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.7.12.4 (Apple Git-37)
+1.8.3.4 (Apple Git-47)
 

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

@@ -1,7 +1,7 @@
-From a134eabed7206a87c552e1568861728af9348f15 Mon Sep 17 00:00:00 2001
+From b695837cc67bf404332f68e90b828387f01510eb 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
+Subject: [PATCH 02/15] arm_neon: use a macro to fix compilation for iOS
 
 ---
  modules/arm_neon/amplify.S              |  9 +++---
@@ -204,5 +204,5 @@ index dcc51ed..4722be4 100644
  	pop {r4,pc}
 +endfunc
 -- 
-1.7.12.4 (Apple Git-37)
+1.8.3.4 (Apple Git-47)
 

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

@@ -1,7 +1,7 @@
-From 19add3aca90d4e39685fcbf19fd18452414858b8 Mon Sep 17 00:00:00 2001
+From 050e919944b842b9c84f217ac75c396ea2b8f34b 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
+Subject: [PATCH 03/15] deinterlace/merge: use a macro to fix compilation for
  iOS
 
 ---
@@ -82,5 +82,5 @@ index dd77902..03e5042 100644
  	b		1b
 +endfunc
 -- 
-1.7.12.4 (Apple Git-37)
+1.8.3.4 (Apple Git-47)
 

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

@@ -1,7 +1,7 @@
-From 097634356ea62b7483fe5ea2b748d1623e77c077 Mon Sep 17 00:00:00 2001
+From d9c5a7316ec8565bef6da6c387ecf139fde1c31b 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 05/17] contrib/ebml+mkv: compile with hidden symbols on iOS
+Subject: [PATCH 04/15] 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.7.12.4 (Apple Git-37)
+1.8.3.4 (Apple Git-47)
 

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

@@ -1,7 +1,7 @@
-From bd6149f3aeb1698b43619ee06d93db6be1be472d Mon Sep 17 00:00:00 2001
+From f168369d2ba1b2b6ccaa2303eb9b1ecc7febbb16 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 06/17] posix/thread: add a hack to work-around crashes when
+Subject: [PATCH 05/15] 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.7.12.4 (Apple Git-37)
+1.8.3.4 (Apple Git-47)
 

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

@@ -1,8 +1,8 @@
-From 41a258acadf2f56da167e998362faeecc6d11524 Mon Sep 17 00:00:00 2001
+From cecc12556227e0c28fdb5d8841e6101e7160a5f2 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 07/17] freetype: added a fake font lookup mechanism for iOS
- to use the packaged demo fonts
+Subject: [PATCH 06/15] freetype: added a fake font lookup mechanism for iOS to
+ use the packaged demo fonts
 
 ---
  modules/text_renderer/freetype.c | 42 ++++++++++++++++++++++++++++++++++++++++
@@ -83,5 +83,5 @@ index 05fa2a2..9a00739 100644
  #elif defined(_WIN32)
      psz_fontfile = Win32_Select( p_filter, psz_fontfamily, false, false,
 -- 
-1.7.12.4 (Apple Git-37)
+1.8.3.4 (Apple Git-47)
 

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

@@ -1,7 +1,7 @@
-From 077b66236c75d6a1c8f201cd5b31681c52e2deef Mon Sep 17 00:00:00 2001
+From 905187dae126c16116f4a47a3f0af7aad8f6682f 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 08/17] libass: fix text rendering on iOS by providing a font
+Subject: [PATCH 07/15] 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.7.12.4 (Apple Git-37)
+1.8.3.4 (Apple Git-47)
 

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

@@ -1,7 +1,7 @@
-From b37dd26f2da17193f0b9dcff23649330792f2cc9 Mon Sep 17 00:00:00 2001
+From 5840a570de7bb46601d9ec1b43d01a9d4875fa59 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 09/17] freetype: fix corner-case crash
+Subject: [PATCH 08/15] freetype: fix corner-case crash
 
 ---
  modules/text_renderer/freetype.c | 2 ++
@@ -21,5 +21,5 @@ index 9a00739..c7f3c1f 100644
      CFRelease(fileURL);
  
 -- 
-1.7.12.4 (Apple Git-37)
+1.8.3.4 (Apple Git-47)
 

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

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

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

@@ -1,7 +1,7 @@
-From d87e1fd3e59249ab7ae6b04b1d463278fa4dfcee Mon Sep 17 00:00:00 2001
+From 82297ff8f0a69efec4af8d905aea72554bebe9e8 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 16/17] deinterlace: added a hack to work-around a libtool bug
+Subject: [PATCH 10/15] deinterlace: added a hack to work-around a libtool bug
 
 ---
  modules/video_filter/Modules.am | 4 ++++

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

@@ -1,7 +1,7 @@
-From af20b65405e206dbba61952e99f03f7aca9d2653 Mon Sep 17 00:00:00 2001
+From aac20542b6b752a32bf61cd4c2dda56cf081f4cc 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
+Subject: [PATCH 11/15] contrib/png: fix ARM assembly for iOS
 
 ---
  contrib/src/png/ios.patch | 66 +++++++++++++++++++++++++++++++++++++++++++++++
@@ -96,5 +96,5 @@ index d1adc34..701e3a8 100644
  
  DEPS_png = zlib $(DEPS_zlib)
 -- 
-1.7.12.4 (Apple Git-37)
+1.8.3.4 (Apple Git-47)
 

patches/0018-contrib-add-arch-option-for-platforms-where-the-arch.patch

@@ -1,7 +1,7 @@
-From 4ea994835ec0f0bfcf3ad1852b8c03129697c1de Mon Sep 17 00:00:00 2001
+From 428ecc9c3c98c37501d9bf79fb4025f51e67f0d8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Thu, 3 Oct 2013 18:27:43 +0200
-Subject: [PATCH 2/3] contrib: add arch option for platforms where the arch
+Subject: [PATCH 12/15] contrib: add arch option for platforms where the arch
  triplet would be ambigous
 
 ---
@@ -60,7 +60,7 @@ index 6bf7bd5..8bbb167 100755
  		;;
  	*bsd*)
 diff --git a/contrib/src/main.mak b/contrib/src/main.mak
-index 3022b1d..ec615f3 100644
+index 66cc31e..9026819 100644
 --- a/contrib/src/main.mak
 +++ b/contrib/src/main.mak
 @@ -35,7 +35,9 @@ PREFIX := $(abspath $(PREFIX))

patches/0019-extras-deploy-arch-option-for-iOS.patch

@@ -1,17 +1,17 @@
-From 7eb28b095ccbb1c0f4a096f4f1d3cbe4f0f80c1e Mon Sep 17 00:00:00 2001
+From 74e06034414965dc7fda4afe9423f8d15ee8ee49 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Thu, 3 Oct 2013 18:28:26 +0200
-Subject: [PATCH 3/3] extras: deploy arch option for iOS
+Subject: [PATCH 13/15] extras: deploy arch option 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 0e060bb..529a15c 100755
+index 25dbf17..92efdb1 100755
 --- a/extras/package/ios/build.sh
 +++ b/extras/package/ios/build.sh
-@@ -188,7 +188,7 @@ else
+@@ -183,7 +183,7 @@ else
    export ASCPP="xcrun as"
  fi
  

patches/0020-contrib-png-fix-compilation-for-arm64-which-is-unkno.patch

@@ -1,7 +1,7 @@
-From bd0ca136089eecbc0ca73db8c7f5c7cb4c041729 Mon Sep 17 00:00:00 2001
+From 41be58aaf400c392d9fd0ccaa20e257217663838 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Thu, 3 Oct 2013 18:38:25 +0200
-Subject: [PATCH 1/2] contrib/png: fix compilation for arm64 which is unknown
+Subject: [PATCH 14/15] contrib/png: fix compilation for arm64 which is unknown
  to the libpng developers
 
 ---

patches/0021-contrib-speex-fix-compilation-for-arm64.patch

@@ -1,7 +1,7 @@
-From 44fdb4bf7908d73ff641ec2c062f08a9f513db78 Mon Sep 17 00:00:00 2001
+From e64761818aafac5509f9bf120b1bab4a5300d3a7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Thu, 3 Oct 2013 19:30:01 +0200
-Subject: [PATCH 2/2] contrib/speex: fix compilation for arm64
+Subject: [PATCH 15/15] contrib/speex: fix compilation for arm64
 
 ---
  contrib/src/speex/rules.mak | 5 +++++