Commit 24f9e57c authored by Felix Paul Kühne's avatar Felix Paul Kühne

MVK: update libvlc to 2.2.2-pre1

parent 7c402965
From 118fd3749f4269873a5ffb4c17d3c9fd8d8b7131 Mon Sep 17 00:00:00 2001
From 5d69e229e9485d2b5ebd9fba67693db7481e842d 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/15] arm_neon: added function macro to handle the underscore
......@@ -65,5 +65,5 @@ index 0000000..d853255
+.endm
+
--
2.3.2
2.3.5
From fb23aad296a0b5c6ad0b72b619313cbc524848c4 Mon Sep 17 00:00:00 2001
From 67f9bbc152d27ea63526b38286fe5e86bb3b6176 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/15] arm_neon: use a macro to fix compilation for iOS
......@@ -204,5 +204,5 @@ index dcc51ed..4722be4 100644
pop {r4,pc}
+endfunc
--
2.3.2
2.3.5
From f8bc4a8fc785cba68c84f388d9a0678eb0e32e59 Mon Sep 17 00:00:00 2001
From b35eb1c4311008e5ac21570dbfa14da5656c9005 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/15] deinterlace/merge: use a macro to fix compilation for
......@@ -82,5 +82,5 @@ index dd77902..03e5042 100644
b 1b
+endfunc
--
2.3.2
2.3.5
From 8051881530e0f4c3b0d8022d15959f595a79cf93 Mon Sep 17 00:00:00 2001
From fa97f3a20b2c7d907980976e83ac2d44b26e6b2d 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 04/15] libass: fix text rendering on iOS by providing a font
......@@ -9,7 +9,7 @@ Subject: [PATCH 04/15] 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 dc247f4..dffe14e 100644
index 8e32d64..21cdadc 100644
--- a/modules/codec/libass.c
+++ b/modules/codec/libass.c
@@ -29,6 +29,13 @@
......@@ -62,5 +62,5 @@ index dc247f4..dffe14e 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 */
--
2.3.2
2.3.5
From c6eb25a963d03a5a137ea3a464f99155ee9ab417 Mon Sep 17 00:00:00 2001
From b5c938710a4e08b74c3baa2a708ef90204f1ed35 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 05/15] contrib/png: fix ARM assembly for iOS
......@@ -119,5 +119,5 @@ index c5a3fba..7649c4b 100644
cd $< && $(MAKE) install
touch $@
--
2.3.2
2.3.5
From 66ddb686d2be5b6dec1609dcf94ac6807ef72e2d Mon Sep 17 00:00:00 2001
From 64988039503781a856705df67a09e209df5ddf2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 21 Nov 2013 16:26:40 +0100
Subject: [PATCH 06/15] lib/media_player: inherit deinterlace and vbi variables
......@@ -27,5 +27,5 @@ index b4a5f10..5691345 100644
var_Create (mp, "marq-marquee", VLC_VAR_STRING);
var_Create (mp, "marq-color", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
--
2.3.2
2.3.5
From e5d0eb1cb4a11c1b832e7d940999eb8e5aacbcdf Mon Sep 17 00:00:00 2001
From 5d0bd486cf2fde0ea3d4b9ea8222a78c238d075f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 15 Jan 2014 15:26:46 +0100
Subject: [PATCH 07/15] contrib/opus disable asm on arm
......@@ -22,5 +22,5 @@ index 56f0933..273521f 100644
.opus: opus
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(OPUS_CONF)
--
2.3.2
2.3.5
From 859dce39d1b8ba6ef906d44ca4ce43fc4e4b9675 Mon Sep 17 00:00:00 2001
From f7944efdc3dcb10b0750399973838a134eb9d556 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 22 Jan 2014 09:56:23 +0100
Subject: [PATCH 08/15] contrib/gcrypt: disable asm on iOS
......@@ -22,5 +22,5 @@ index 0cc1222..7e67319 100644
ifdef HAVE_BSD
GCRYPT_CONF += --disable-asm --disable-aesni-support
--
2.3.2
2.3.5
From eb2e857794ccc1b75b398ef6fabd57f74fc686f3 Mon Sep 17 00:00:00 2001
From cea9eef64cb21754532e109b0162d9b8ecbebeb7 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 09/15] fix libtool
......@@ -33,5 +33,5 @@ index 3bb8cdb..542abaa 100644
SOURCES_transform = transform.c
SOURCES_invert = invert.c
--
2.3.2
2.3.5
From 6690fbcd6833360e7ca307acf18aa41a9df600bd Mon Sep 17 00:00:00 2001
From a02b31e828145362d222f03219fc1b4d4d43cea0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 22 Jan 2014 13:55:16 +0100
Subject: [PATCH 10/15] freetype: added a fake font lookup mechanism for iOS to
......@@ -96,5 +96,5 @@ index cff52b1..40b25fb 100644
#endif
--
2.3.2
2.3.5
From df4089b6d3193a15a656a2e6f4376de37883fc41 Mon Sep 17 00:00:00 2001
From 8ee6f8ef83e7e36e828ae7b49b2b846dcec7c102 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 22 Jan 2014 15:19:43 +0100
Subject: [PATCH 11/15] contrib/speexdsp: disable neon for AArch64
......@@ -24,5 +24,5 @@ index e82c6ba..658a72e 100644
.speexdsp: speexdsp
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(SPEEXDSP_CONF)
--
2.3.2
2.3.5
From 304ea3a9f8ff7fd1593fa95f6bc7967749f3b308 Mon Sep 17 00:00:00 2001
From 34f1dd5d0214205f25f6ec9ba43f17780c48151a 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 12/15] contrib: add arch option for platforms where the arch
......@@ -79,5 +79,5 @@ index c9f409a..1ae11e9 100644
ifeq ($(ARCH)-$(HAVE_WIN32),x86_64-1)
HAVE_WIN64 := 1
--
2.3.2
2.3.5
From e4afa33f1f16062a06ff08730d82e0f77fb831b7 Mon Sep 17 00:00:00 2001
From 99e67b49443c497cfb42ce905145057e6329e0cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 31 Oct 2013 20:42:59 +0100
Subject: [PATCH 13/15] contrib/gcrypt: use git version on iOS
......@@ -135,5 +135,5 @@ index 0000000..df97ffb
+ AM_CFLAGS = $(GPG_ERROR_CFLAGS)
+
--
2.3.2
2.3.5
From 3df686107dd8789e073cecc33f9de9f559c94c54 Mon Sep 17 00:00:00 2001
From 1ef47eb195a8a4cda46340228e95429e89643ab4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Mon, 31 Mar 2014 17:54:01 +0200
Subject: [PATCH 14/15] libvlc: add preliminary code path to modify quartztext
......@@ -275,5 +275,5 @@ index 8de1081..112e952 100644
+ return VLC_SUCCESS;
+}
--
2.3.2
2.3.5
From 47be49f90005cbc224c9769892d42f9fa00e6eab Mon Sep 17 00:00:00 2001
From 1a33d4bc777cbb7828b1845ad38d92bba748839d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 22 Jan 2014 13:37:59 +0100
Subject: [PATCH 15/15] contrib/speex: fix compilation for non-ARMv7 iOS
......@@ -25,5 +25,5 @@ index a5f003c..916b0ea 100644
.speex: speex
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(SPEEX_CONF)
--
2.3.2
2.3.5
......@@ -15,7 +15,7 @@ NONETWORK=no
SKIPLIBVLCCOMPILATION=no
SCARY=yes
TESTEDHASH=22dea4b7368
TESTEDHASH=5c5cd0c3d6a
usage()
{
......
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