Commit c7c60b92 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files

patches: rename patches so the ordering makes sense

parent 549ef123
From 1376783453cd2a58c0fd44124b332189c22da771 Mon Sep 17 00:00:00 2001
From 2c8df7ab333b16d80c3661916095d5c6e4b31956 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 1/8] arm_neon: added function macro to handle the underscore
prefix for the iOS ARM ABI
Subject: [PATCH 01/13] 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.10.2 (Apple Git-33)
1.7.12.4 (Apple Git-37)
From d14a4728d99e59baec3361e8f8778b41f6fb0904 Mon Sep 17 00:00:00 2001
From 4964d356a904775ff12f1ecca2659cf101dc073e 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 2/8] arm_neon: use a macro to fix compilation for iOS
Subject: [PATCH 02/13] 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.10.2 (Apple Git-33)
1.7.12.4 (Apple Git-37)
From 91ba88834cc99e4c6ee2280147cdf23ee5b5d0e7 Mon Sep 17 00:00:00 2001
From 38bd78f7f540c1515b20c75f35c563cd660c0961 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 3/8] deinterlace/merge: use a macro to fix compilation for
Subject: [PATCH 03/13] 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.10.2 (Apple Git-33)
1.7.12.4 (Apple Git-37)
From 3c224ced6b5de1c3ddc93545dfd0b61182ef6520 Mon Sep 17 00:00:00 2001
From bc62127aa0b11b6158d801416b2be35bed67f8f7 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 4/8] deinterlace: added a hack to work-around a libtool bug
Subject: [PATCH 04/13] 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 183009a..e5facc1 100644
index 6bb5eac..acfe695 100644
--- a/modules/video_filter/Modules.am
+++ b/modules/video_filter/Modules.am
@@ -1,3 +1,7 @@
......@@ -20,5 +20,5 @@ index 183009a..e5facc1 100644
SOURCES_transform = transform.c
SOURCES_invert = invert.c
--
1.7.10.2 (Apple Git-33)
1.7.12.4 (Apple Git-37)
From 6641efb6f09db3d9b67c64590d365985c1dda8fd Mon Sep 17 00:00:00 2001
From 911dd115fc15af8799679b8959d6ae17eb56ef5c 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 5/8] contrib/ebml+mkv: compile with hidden symbols on iOS
Subject: [PATCH 05/13] contrib/ebml+mkv: compile with hidden symbols on iOS
---
contrib/src/ebml/rules.mak | 7 +++++--
contrib/src/matroska/rules.mak | 6 +++++-
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..862553c 100644
index 1d01818..a36727c 100644
--- a/contrib/src/ebml/rules.mak
+++ b/contrib/src/ebml/rules.mak
@@ -16,8 +16,11 @@ libebml: libebml-$(EBML_VERSION).tar.bz2 .sum-ebml
......@@ -27,7 +27,7 @@ index 3708b33..862553c 100644
.ebml: libebml
ifdef HAVE_WIN32
diff --git a/contrib/src/matroska/rules.mak b/contrib/src/matroska/rules.mak
index 62ecf0d..cfd6a2e 100644
index 57d7f15..5e63db6 100644
--- a/contrib/src/matroska/rules.mak
+++ b/contrib/src/matroska/rules.mak
@@ -18,11 +18,15 @@ libmatroska: libmatroska-$(MATROSKA_VERSION).tar.bz2 .sum-matroska
......@@ -48,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.10.2 (Apple Git-33)
1.7.12.4 (Apple Git-37)
From 3f8a7690dd27e55abc087894f1998be7f8418047 Mon Sep 17 00:00:00 2001
From c9b99082369aaae71dcaf3bed0a34bb7962a6f71 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 6/8] posix/thread: add a hack to work-around crashes when
Subject: [PATCH 06/13] 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.10.2 (Apple Git-33)
1.7.12.4 (Apple Git-37)
From b2f5ba57d4d16b11d6e0016fd1f1d93d86743878 Mon Sep 17 00:00:00 2001
From d1d3cb8b6529848bd5facf640e9eb6f8f2769c6d 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] freetype: added a fake font lookup mechanism for iOS to use
the packaged demo fonts
Subject: [PATCH 07/13] 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..bc0a535 100644
index cdc9243..e1dfea2 100644
--- a/modules/text_renderer/freetype.c
+++ b/modules/text_renderer/freetype.c
@@ -106,6 +106,9 @@
......
From 4b3e2f0a17466c066f94db0c6acd155d571e72fe Mon Sep 17 00:00:00 2001
From 264af962ad8e5509d3816a79640687c4fe136a2b 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 9/9] libass: fix text rendering on iOS by providing a font
Subject: [PATCH 08/13] libass: fix text rendering on iOS by providing a font
lookup mechanism for the font shipped with Aspen
---
......@@ -9,7 +9,7 @@ Subject: [PATCH 9/9] libass: fix text rendering on iOS by providing a font
1 file changed, 35 insertions(+)
diff --git a/modules/codec/libass.c b/modules/codec/libass.c
index b32791c..b3fee5f 100644
index aa38f1b..38961bc 100644
--- a/modules/codec/libass.c
+++ b/modules/codec/libass.c
@@ -29,6 +29,13 @@
......
From aed9ea7ff096921d4e8f5c2704e445686ca578d8 Mon Sep 17 00:00:00 2001
From 75b5e301e3299effb53724d6426463f29273ef9d 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 13/13] contrib/png: fix ARM assembly for iOS
Subject: [PATCH 09/13] contrib/png: fix ARM assembly for iOS
---
contrib/src/png/ios.patch | 66 +++++++++++++++++++++++++++++++++++++++++++++++
......@@ -96,5 +96,5 @@ index 89bb4e0..d380ce1 100644
DEPS_png = zlib $(DEPS_zlib)
--
1.8.3.1 (Apple Git-46)
1.7.12.4 (Apple Git-37)
From a6ef28d8028280a4e5a53ca2a47bad045d17b18c Mon Sep 17 00:00:00 2001
From fe9790bd9cafdcb2f36c9c78eeb0275fb29d947d 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 14/14] freetype: fix corner-case crash
Subject: [PATCH 10/13] freetype: fix corner-case crash
---
modules/text_renderer/freetype.c | 2 ++
......@@ -21,5 +21,5 @@ index e1dfea2..098c67b 100644
CFRelease(fileURL);
--
1.8.3.1 (Apple Git-46)
1.7.12.4 (Apple Git-37)
From 50d11f576c5ef6bda8cad157f737fe571da4bcb7 Mon Sep 17 00:00:00 2001
From 088da4f6c2f44e725e9c4ab3166010ff32cfab71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Tue, 23 Jul 2013 16:39:30 +0300
Subject: [PATCH 15/16] Revert "audiounit_ios: try to handle data drops more
Subject: [PATCH 11/13] Revert "audiounit_ios: try to handle data drops more
efficiently"
This (more or less) reverts commit
......@@ -12,7 +12,7 @@ lead to deadlocks, where AudioOutputUnitStop in the callback thread
and AudioOutputUnitStart in the audio decoder thread blocked each
other (noticed at startup of playback on a 3GS with iOS 6.0).
---
modules/audio_output/audiounit_ios.c | 4 ++--
modules/audio_output/audiounit_ios.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/audio_output/audiounit_ios.c b/modules/audio_output/audiounit_ios.c
......@@ -31,5 +31,5 @@ index 1faaf58..974d172 100644
memcpy(targetBuffer, buffer, __MIN(bytesToCopy, availableBytes));
TPCircularBufferConsume(&p_sys->circular_buffer, __MIN(bytesToCopy, availableBytes));
--
1.7.9.4
1.7.12.4 (Apple Git-37)
From ce1447cd2334fa3af8f770a3041c5ad1b9aeac1a Mon Sep 17 00:00:00 2001
From 9b81c559d754f5e75b61fbc43e1c467d89bb9f10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Tue, 23 Jul 2013 16:58:36 +0300
Subject: [PATCH 16/16] audiounit_ios: Fill the remainder of the buffer with
Subject: [PATCH 12/13] audiounit_ios: Fill the remainder of the buffer with
zeros
If we didn't have enough data to fill the buffer, fill the rest
of it with zeros. This is better than playing back whatever happened
to be there from before.
---
modules/audio_output/audiounit_ios.c | 2 ++
modules/audio_output/audiounit_ios.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/modules/audio_output/audiounit_ios.c b/modules/audio_output/audiounit_ios.c
......@@ -25,5 +25,5 @@ index 974d172..b780fd0 100644
return noErr;
--
1.7.9.4
1.7.12.4 (Apple Git-37)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment