patches: reorder the patches and merge 2 of them

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

@@ -1,11 +1,11 @@
-From 1d816363fdeb48c5c3e7aa398d2599b008f380ab Mon Sep 17 00:00:00 2001
+From 1376783453cd2a58c0fd44124b332189c22da771 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/10] arm_neon: added function macro to handle the
- underscore prefix for the iOS ARM ABI
+Subject: [PATCH 1/8] arm_neon: added function macro to handle the underscore
+ prefix for the iOS ARM ABI
 
 ---
- modules/arm_neon/asm.S | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
+ modules/arm_neon/asm.S |   49 ++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 49 insertions(+)
  create mode 100644 modules/arm_neon/asm.S
 
@@ -65,5 +65,5 @@ index 0000000..d853255
 +.endm
 +
 -- 
-1.7.12.4 (Apple Git-37)
+1.7.10.2 (Apple Git-33)
 

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

@@ -1,11 +1,11 @@
-From bac6f36e8e76d149c3f4df993b6e13f443555cb9 Mon Sep 17 00:00:00 2001
+From d14a4728d99e59baec3361e8f8778b41f6fb0904 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/10] arm_neon: use a macro to fix compilation for iOS
+Subject: [PATCH 2/8] arm_neon: use a macro to fix compilation for iOS
 
 ---
- modules/arm_neon/amplify.S              |  9 +++---
- modules/arm_neon/simple_channel_mixer.S | 57 +++++++++++++++------------------
+ modules/arm_neon/amplify.S              |    9 ++---
+ modules/arm_neon/simple_channel_mixer.S |   57 ++++++++++++++-----------------
  2 files changed, 31 insertions(+), 35 deletions(-)
 
 diff --git a/modules/arm_neon/amplify.S b/modules/arm_neon/amplify.S
@@ -204,5 +204,5 @@ index dcc51ed..4722be4 100644
  	pop {r4,pc}
 +endfunc
 -- 
-1.7.12.4 (Apple Git-37)
+1.7.10.2 (Apple Git-33)
 

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

@@ -1,11 +1,11 @@
-From 1ba34f66bf7f73358069e7ba9d6022be08e47bf6 Mon Sep 17 00:00:00 2001
+From 91ba88834cc99e4c6ee2280147cdf23ee5b5d0e7 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/10] deinterlace/merge: use a macro to fix compilation for
+Subject: [PATCH 3/8] deinterlace/merge: use a macro to fix compilation for
  iOS
 
 ---
- modules/video_filter/deinterlace/merge_arm.S | 26 ++++++++++----------------
+ modules/video_filter/deinterlace/merge_arm.S |   26 ++++++++++----------------
  1 file changed, 10 insertions(+), 16 deletions(-)
 
 diff --git a/modules/video_filter/deinterlace/merge_arm.S b/modules/video_filter/deinterlace/merge_arm.S
@@ -82,5 +82,5 @@ index dd77902..03e5042 100644
  	b		1b
 +endfunc
 -- 
-1.7.12.4 (Apple Git-37)
+1.7.10.2 (Apple Git-33)
 

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

@@ -1,14 +1,14 @@
-From 8fb3cb11dcc6ddb6bc1520b0ca856a837eeff5d8 Mon Sep 17 00:00:00 2001
+From 3c224ced6b5de1c3ddc93545dfd0b61182ef6520 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 04/10] deinterlace: added a hack to work-around a libtool bug
+Subject: [PATCH 4/8] deinterlace: added a hack to work-around a libtool bug
 
 ---
- modules/video_filter/Modules.am | 4 ++++
+ 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 9810c21..eeb752d 100644
+index 183009a..e5facc1 100644
 --- a/modules/video_filter/Modules.am
 +++ b/modules/video_filter/Modules.am
 @@ -1,3 +1,7 @@
@@ -20,5 +20,5 @@ index 9810c21..eeb752d 100644
  SOURCES_transform = transform.c
  SOURCES_invert = invert.c
 -- 
-1.7.12.4 (Apple Git-37)
+1.7.10.2 (Apple Git-33)
 

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

@@ -1,26 +1,27 @@
-From 2ddc656d08a49df7c16a12ccd143e96c584c104f Mon Sep 17 00:00:00 2001
+From 6641efb6f09db3d9b67c64590d365985c1dda8fd 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/10] contrib/ebml+mkv: compile with hidden symbols on iOS
+Subject: [PATCH 5/8] contrib/ebml+mkv: compile with hidden symbols on iOS
 
 ---
- contrib/src/ebml/rules.mak     | 6 ++++--
- contrib/src/matroska/rules.mak | 6 +++++-
- 2 files changed, 9 insertions(+), 3 deletions(-)
+ contrib/src/ebml/rules.mak     |    7 +++++--
+ contrib/src/matroska/rules.mak |    6 +++++-
+ 2 files changed, 10 insertions(+), 3 deletions(-)
 
 diff --git a/contrib/src/ebml/rules.mak b/contrib/src/ebml/rules.mak
-index 3708b33..f4f01c7 100644
+index 3708b33..862553c 100644
 --- a/contrib/src/ebml/rules.mak
 +++ b/contrib/src/ebml/rules.mak
-@@ -16,8 +16,10 @@ libebml: libebml-$(EBML_VERSION).tar.bz2 .sum-ebml
+@@ -16,8 +16,11 @@ libebml: libebml-$(EBML_VERSION).tar.bz2 .sum-ebml
  	$(MOVE)
  
  # libebml requires exceptions
 -EBML_EXTRA_FLAGS = CXXFLAGS="${CXXFLAGS} -fexceptions" \
 -					CPPFLAGS=""
-+EBML_EXTRA_FLAGS = CXXFLAGS="${CXXFLAGS} -fexceptions" CPPFLAGS=""
 +ifdef HAVE_IOS
-+EBML_EXTRA_FLAGS += " -fvisibility=hidden"
++EBML_EXTRA_FLAGS = CXXFLAGS="${CXXFLAGS} -fexceptions -fvisibility=hidden" CPPFLAGS=""
++else
++EBML_EXTRA_FLAGS = CXXFLAGS="${CXXFLAGS} -fexceptions" CPPFLAGS=""
 +endif
  
  .ebml: libebml
@@ -47,5 +48,5 @@ index 62ecf0d..cfd6a2e 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.7.10.2 (Apple Git-33)
 

patches/0006-contrib-ebml-fix-CXXFLAG-visibility-hack.patch

@@ -1,29 +0,0 @@
-From f6f81f5294e0ec195901599404d0d47127b7f4a9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
-Date: Thu, 13 Sep 2012 01:36:39 +0200
-Subject: [PATCH 06/10] contrib/ebml: fix CXXFLAG visibility hack
-
----
- contrib/src/ebml/rules.mak | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/contrib/src/ebml/rules.mak b/contrib/src/ebml/rules.mak
-index f4f01c7..862553c 100644
---- a/contrib/src/ebml/rules.mak
-+++ b/contrib/src/ebml/rules.mak
-@@ -16,9 +16,10 @@ libebml: libebml-$(EBML_VERSION).tar.bz2 .sum-ebml
- 	$(MOVE)
- 
- # libebml requires exceptions
--EBML_EXTRA_FLAGS = CXXFLAGS="${CXXFLAGS} -fexceptions" CPPFLAGS=""
- ifdef HAVE_IOS
--EBML_EXTRA_FLAGS += " -fvisibility=hidden"
-+EBML_EXTRA_FLAGS = CXXFLAGS="${CXXFLAGS} -fexceptions -fvisibility=hidden" CPPFLAGS=""
-+else
-+EBML_EXTRA_FLAGS = CXXFLAGS="${CXXFLAGS} -fexceptions" CPPFLAGS=""
- endif
- 
- .ebml: libebml
-1.7.12.4 (Apple Git-37)
-

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

@@ -1,11 +1,11 @@
-From a07116b26e2ba8a937bfb068fc0d1ab33609568a Mon Sep 17 00:00:00 2001
+From 3f8a7690dd27e55abc087894f1998be7f8418047 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 08/10] posix/thread: add a hack to work-around crashes when
+Subject: [PATCH 6/8] posix/thread: add a hack to work-around crashes when
  using the buggy iOS 6 runtime
 
 ---
- src/posix/thread.c | 12 ++++++++++++
+ src/posix/thread.c |   12 ++++++++++++
  1 file changed, 12 insertions(+)
 
 diff --git a/src/posix/thread.c b/src/posix/thread.c
@@ -32,5 +32,5 @@ index 514f592..6a95bb0 100644
  }
  
 -- 
-1.7.12.4 (Apple Git-37)
+1.7.10.2 (Apple Git-33)
 

patches/0012-HACK-freetype-added-a-fake-font-lookup-mechanism-for.patch

@@ -1,11 +1,11 @@
-From 37a0eb47e096280e612740c90d0e02d362554160 Mon Sep 17 00:00:00 2001
+From 6a3762687d7c0e44e0a321c8a614bbe16ec1740e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Fri, 3 May 2013 14:21:19 +0200
-Subject: [PATCH 12/12] [HACK] freetype: added a fake font lookup mechanism
- for iOS to use the packaged demo fonts
+Subject: [PATCH 7/8] freetype: added a fake font lookup mechanism for iOS to
+ use the packaged demo fonts
 
 ---
- modules/text_renderer/freetype.c | 42 ++++++++++++++++++++++++++++++++++++++++
+ 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
@@ -83,5 +83,5 @@ index 1325d3e..a070edd 100644
  #elif defined(WIN32)
      psz_fontfile = Win32_Select( p_filter, psz_fontfamily, false, false,
 -- 
-1.7.12.4 (Apple Git-37)
+1.7.10.2 (Apple Git-33)
 

patches/0014-contrib-disable-some-ARM-ASM-in-libav-until.patch

@@ -1,10 +1,10 @@
-From 21f48a547078381a52f9254985441f10a69e957d Mon Sep 17 00:00:00 2001
+From bfcce2524eace6982d93eece92e2bbfc98618043 Mon Sep 17 00:00:00 2001
 From: Gleb Pinigin <gpinigin@gmail.com>
 Date: Mon, 13 May 2013 21:09:24 +0700
-Subject: [PATCH 14/14] contrib: disable some ARM ASM in libav until
+Subject: [PATCH 8/8] contrib: disable some ARM ASM in libav until
 
 ---
- contrib/src/ffmpeg/rules.mak | 6 ++++++
+ contrib/src/ffmpeg/rules.mak |    6 ++++++
  1 file changed, 6 insertions(+)
 
 diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
@@ -25,5 +25,5 @@ index 36b491c..2cabd40 100644
  ifdef HAVE_ARMV7A
  FFMPEGCONF += --cpu=cortex-a8
 -- 
-1.7.12.4 (Apple Git-37)
+1.7.10.2 (Apple Git-33)