Commit a4a80b00 authored by Felix Paul Kühne's avatar Felix Paul Kühne

patches: update numbering, etc.

parent cac7c35d
From 2c8df7ab333b16d80c3661916095d5c6e4b31956 Mon Sep 17 00:00:00 2001
From fe6503ede5f689c64ff60e1c2c4868f667f975a2 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/13] 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.7.12.4 (Apple Git-37)
1.8.3.4 (Apple Git-47)
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)
From 4964d356a904775ff12f1ecca2659cf101dc073e Mon Sep 17 00:00:00 2001
From 5771223af5c3a15bea6f4c984c13c2572fc4c5be 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/13] arm_neon: use a macro to fix compilation for iOS
Subject: [PATCH 02/17] 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)
From 38bd78f7f540c1515b20c75f35c563cd660c0961 Mon Sep 17 00:00:00 2001
From 585cfc4d3e5874f4df17dc74860c2a546c798026 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/13] deinterlace/merge: use a macro to fix compilation for
Subject: [PATCH 03/17] 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)
From bc62127aa0b11b6158d801416b2be35bed67f8f7 Mon Sep 17 00:00:00 2001
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 04/13] deinterlace: added a hack to work-around a libtool bug
Subject: [PATCH 05/17] deinterlace: added a hack to work-around a libtool bug
---
modules/video_filter/Modules.am | 4 ++++
......@@ -20,5 +20,5 @@ index 6bb5eac..acfe695 100644
SOURCES_transform = transform.c
SOURCES_invert = invert.c
--
1.7.12.4 (Apple Git-37)
1.8.3.4 (Apple Git-47)
From 911dd115fc15af8799679b8959d6ae17eb56ef5c Mon Sep 17 00:00:00 2001
From eb5be17c09f650d4ef8803bd74b512dda1418a6d 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/13] contrib/ebml+mkv: compile with hidden symbols on iOS
Subject: [PATCH 06/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.7.12.4 (Apple Git-37)
1.8.3.4 (Apple Git-47)
From c9b99082369aaae71dcaf3bed0a34bb7962a6f71 Mon Sep 17 00:00:00 2001
From 2683d8a132a7ca3d836b68b91792be150325fd09 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/13] posix/thread: add a hack to work-around crashes when
Subject: [PATCH 07/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.7.12.4 (Apple Git-37)
1.8.3.4 (Apple Git-47)
From d1d3cb8b6529848bd5facf640e9eb6f8f2769c6d Mon Sep 17 00:00:00 2001
From 9ea4f35d454c219ddf96135fd29c2108fd98ec20 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/13] freetype: added a fake font lookup mechanism for iOS
to use the packaged demo fonts
Subject: [PATCH 08/17] 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 cdc9243..e1dfea2 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)
From 264af962ad8e5509d3816a79640687c4fe136a2b Mon Sep 17 00:00:00 2001
From ee6637a68ac08ec0190464f6004cf42588c6e140 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/13] libass: fix text rendering on iOS by providing a font
Subject: [PATCH 09/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.7.12.4 (Apple Git-37)
1.8.3.4 (Apple Git-47)
From 5fcd0e59a12452800b2e2ca892a4266b90798355 Mon Sep 17 00:00:00 2001
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 1/2] contrib/png: fix ARM assembly for iOS
Subject: [PATCH 10/17] contrib/png: fix ARM assembly for iOS
---
contrib/src/png/ios.patch | 66 +++++++++++++++++++++++++++++++++++++++++++++++
......
From fe9790bd9cafdcb2f36c9c78eeb0275fb29d947d Mon Sep 17 00:00:00 2001
From c6c78862cdef49cd550abff2b1d29eb40bc8a830 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 10/13] freetype: fix corner-case crash
Subject: [PATCH 11/17] freetype: fix corner-case crash
---
modules/text_renderer/freetype.c | 2 ++
......@@ -21,5 +21,5 @@ index e1dfea2..098c67b 100644
CFRelease(fileURL);
--
1.7.12.4 (Apple Git-37)
1.8.3.4 (Apple Git-47)
From e3ddf7f33188ecabe648080b41b0962d6ac7be7c Mon Sep 17 00:00:00 2001
From 5204bc4f8d1713de5361556f8d6379035ef41bae 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 13/13] extras/tools: disable contrib compilation of
gpg-error, gcrypt and lua since we don't use it for
now
Subject: [PATCH 12/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 5919682..f6317c2 100755
index 8155062..fa99c2d 100755
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@ -214,6 +214,9 @@ fi
@@ -215,6 +215,9 @@ fi
--enable-freetype2 \
--enable-ass \
--disable-fontconfig \
......@@ -24,5 +23,5 @@ index 5919682..f6317c2 100755
echo "EXTRA_CFLAGS += ${EXTRA_CFLAGS}" >> config.mak
--
1.7.12.4 (Apple Git-37)
1.8.3.4 (Apple Git-47)
From 594d49bc20592652a1905b158491e8b728ce9ec0 Mon Sep 17 00:00:00 2001
From 031dc9818598c87fa7bc0970e6b9b5e79d6e34a9 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 14/14] extras/package: compile quartztext module for iOS
Subject: [PATCH 13/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 f6317c2..c3c0497 100755
index fa99c2d..0181585 100755
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@ -267,7 +267,7 @@ ${VLCROOT}/configure \
@@ -268,7 +268,7 @@ ${VLCROOT}/configure \
--enable-ios-vout \
--enable-ios-vout2 \
--disable-shared \
......@@ -21,5 +21,5 @@ index f6317c2..c3c0497 100755
--enable-mkv \
--enable-opus \
--
1.7.12.4 (Apple Git-37)
1.8.3.4 (Apple Git-47)
From 99883592144c553b280a0138426d5f37e13f7c16 Mon Sep 17 00:00:00 2001
From 0c8633b1b61274c527c25cd8ab71d6034a3ea2be 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/15] quartztext: fix relative font size handling
Subject: [PATCH 14/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.1 (Apple Git-46)
1.8.3.4 (Apple Git-47)
From 55b98dedd7f2c5b7703f66dd5409f5e16ff99215 Mon Sep 17 00:00:00 2001
From 9ccf37b1a093e2460633f69ce484d2fd31ccdc8c Mon Sep 17 00:00:00 2001
From: Gleb Pinigin <gpinigin@gmail.com>
Date: Sun, 28 Jul 2013 18:32:51 +0700
Subject: [PATCH 14/16] io: implement network timeout(default 60s)
Subject: [PATCH 15/17] 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 21bf82b..a062b72 100644
index a8ea870..6df06e1 100644
--- a/src/network/io.c
+++ b/src/network/io.c
@@ -33,6 +33,7 @@
......@@ -38,7 +38,7 @@ index 21bf82b..a062b72 100644
do
{
@@ -288,6 +293,13 @@ net_Read (vlc_object_t *restrict p_this, int fd, const v_socket_t *vs,
if (n < 0)
{
+ if (i_timepassed >= MAX_TIMEOUT && i_total == 0)
......@@ -63,5 +63,5 @@ index 21bf82b..a062b72 100644
if (errno == EINTR)
continue;
--
1.7.12.4 (Apple Git-37)
1.8.3.4 (Apple Git-47)
From bdb8e1579896b8787115b759d34d1a000649b126 Mon Sep 17 00:00:00 2001
From e43b98d5af891c4a5df3e21e947753077ebd34a2 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 2/2] contrib/zvbi: fix compilation with clang
Subject: [PATCH 16/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.1 (Apple Git-46)
1.8.3.4 (Apple Git-47)
From 11ed0e98d218dc5c6d5193748c8ee234f0e7dd3a Mon Sep 17 00:00:00 2001
From 33c2399e4bd491d06f3440268e33f48cc8181f58 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] contribs/zvbi: don't reconf after decompressing the source
code so we don't need to compile gettext just for this
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
---
contrib/src/zvbi/rules.mak | 2 ++
......@@ -23,5 +23,5 @@ index 7584eed..627ae7c 100644
cd $</src && $(MAKE) install
cd $< && $(MAKE) SUBDIRS=. install
--
1.8.3.1 (Apple Git-46)
1.8.3.4 (Apple Git-47)
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