Commit 42c0ae22 authored by Felix Paul Kühne's avatar Felix Paul Kühne

MVK: update libvlc hash and the patch set

parent d0e7b32b
From e11b759bdbf8982471f1115d3eee744ffcf6d063 Mon Sep 17 00:00:00 2001
From ef776041a5ad68d9819ad3f359a58b14de7af700 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/21] arm_neon: added function macro to handle the underscore
Subject: [PATCH 01/23] arm_neon: added function macro to handle the underscore
prefix for the iOS ARM ABI
---
......
From 55fca182c6cfccac1282ddfa6e721134444348e3 Mon Sep 17 00:00:00 2001
From 7c8852f65771838642d881c287bcc9d7d16daafa 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/21] arm_neon: use a macro to fix compilation for iOS
Subject: [PATCH 02/23] arm_neon: use a macro to fix compilation for iOS
---
modules/arm_neon/amplify.S | 9 +++---
......
From 639ab64fde139782bfa80435705f481b406cc169 Mon Sep 17 00:00:00 2001
From 7cd23164a4a6edd46a44cc791f016d9b9ea90242 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/21] deinterlace/merge: use a macro to fix compilation for
Subject: [PATCH 03/23] deinterlace/merge: use a macro to fix compilation for
iOS
---
......
From 812de71234533be42899b0d5aad10859d7387b63 Mon Sep 17 00:00:00 2001
From f2806506856ea318eeb34da382624979019163c1 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 04/21] contrib/ebml+mkv: compile with hidden symbols on iOS
Subject: [PATCH 04/23] contrib/ebml+mkv: compile with hidden symbols on iOS
---
contrib/src/ebml/rules.mak | 7 +++++--
......
From e9163e34e5077975369eace94b5434bc36638172 Mon Sep 17 00:00:00 2001
From 254074a4594fdbaf040b1c8a30a4fde6540adb4a 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 05/21] posix/thread: add a hack to work-around crashes when
Subject: [PATCH 05/23] posix/thread: add a hack to work-around crashes when
using the buggy iOS 6 runtime
---
......
From 5e846820550c44fd0b71170cf21de469e5d87b63 Mon Sep 17 00:00:00 2001
From b68a05f395c859ff8c25d2ccf6d9d55086ea556f 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 06/21] freetype: added a fake font lookup mechanism for iOS to
Subject: [PATCH 06/23] freetype: added a fake font lookup mechanism for iOS to
use the packaged demo fonts
---
......@@ -9,10 +9,10 @@ Subject: [PATCH 06/21] freetype: added a fake font lookup mechanism for iOS to
1 file changed, 42 insertions(+)
diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype.c
index 05fa2a2..9a00739 100644
index c27ec45..93beba8 100644
--- a/modules/text_renderer/freetype.c
+++ b/modules/text_renderer/freetype.c
@@ -106,6 +106,9 @@
@@ -107,6 +107,9 @@
#include <TargetConditionals.h>
#if !TARGET_OS_IPHONE
#include <Carbon/Carbon.h>
......@@ -22,7 +22,7 @@ index 05fa2a2..9a00739 100644
#endif
#include <sys/param.h> /* for MAXPATHLEN */
#undef HAVE_FONTCONFIG
@@ -807,6 +810,40 @@ static char* MacLegacy_Select( filter_t *p_filter, const char* psz_fontname,
@@ -808,6 +811,40 @@ static char* MacLegacy_Select( filter_t *p_filter, const char* psz_fontname,
return psz_path;
}
......@@ -63,7 +63,7 @@ index 05fa2a2..9a00739 100644
#endif
#endif
@@ -1988,6 +2025,8 @@ static FT_Face LoadFace( filter_t *p_filter,
@@ -1989,6 +2026,8 @@ static FT_Face LoadFace( filter_t *p_filter,
#elif defined( __APPLE__ )
#if !TARGET_OS_IPHONE
psz_fontfile = MacLegacy_Select( p_filter, p_style->psz_fontname, false, false, -1, &i_idx );
......@@ -72,7 +72,7 @@ index 05fa2a2..9a00739 100644
#endif
#elif defined( _WIN32 )
psz_fontfile = Win32_Select( p_filter,
@@ -2890,6 +2929,9 @@ static int Create( vlc_object_t *p_this )
@@ -2895,6 +2934,9 @@ static int Create( vlc_object_t *p_this )
#elif defined(__APPLE__)
#if !TARGET_OS_IPHONE
psz_fontfile = MacLegacy_Select( p_filter, psz_fontfamily, false, false, 0, &fontindex );
......
From 6202d66eb5c2afeaca11eaf5b686b9c9ee93e3c3 Mon Sep 17 00:00:00 2001
From c9feb6cf01b6470f6f3be7972d3839f34c5d21aa 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 07/21] libass: fix text rendering on iOS by providing a font
Subject: [PATCH 07/23] libass: fix text rendering on iOS by providing a font
lookup mechanism for the font shipped with Aspen
---
......
From 206c4c192f5bd59180faab5f7ed9b2bd95e57d09 Mon Sep 17 00:00:00 2001
From 4ddaf9d4298756544f02587b8db2a190d44b5388 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 08/21] freetype: fix corner-case crash
Subject: [PATCH 08/23] freetype: fix corner-case crash
---
modules/text_renderer/freetype.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype.c
index 9a00739..c7f3c1f 100644
index 93beba8..4bac64d 100644
--- a/modules/text_renderer/freetype.c
+++ b/modules/text_renderer/freetype.c
@@ -825,6 +825,8 @@ static char *iOSFake_Select( filter_t *p_filter, bool b_monospace, bool b_bold,
@@ -826,6 +826,8 @@ static char *iOSFake_Select( filter_t *p_filter, bool b_monospace, bool b_bold,
CFSTR("OpenSans-Regular.ttf") : CFSTR("SourceCodePro-Regular.ttf"),
NULL,
NULL);
......
From 146735192b832b773625ae9d86d5a8787fbc6249 Mon Sep 17 00:00:00 2001
From ff1c0f6eea58903a6e89023f8d148f29d058f7ce Mon Sep 17 00:00:00 2001
From: Gleb Pinigin <gpinigin@gmail.com>
Date: Sun, 28 Jul 2013 18:32:51 +0700
Subject: [PATCH 09/21] io: implement network timeout(default 60s)
Subject: [PATCH 09/23] io: implement network timeout(default 60s)
---
src/network/io.c | 15 ++++++++++++++-
......
From 7cb0df42e76298434ddb2ce1805f3b483a24abf4 Mon Sep 17 00:00:00 2001
From d07fd68c1f19f71fb4a37e9ec5c4e827b4a43f5b 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 10/21] deinterlace: added a hack to work-around a libtool bug
Subject: [PATCH 10/23] deinterlace: added a hack to work-around a libtool bug
---
modules/video_filter/Modules.am | 4 ++++
......
From 94efd45db195bd0a370141a75463b92ab030f762 Mon Sep 17 00:00:00 2001
From 7f0a2cc704998de73f892a2304a313b2c7220823 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 11/21] contrib/png: fix ARM assembly for iOS
Subject: [PATCH 11/23] contrib/png: fix ARM assembly for iOS
---
contrib/src/png/ios.patch | 66 +++++++++++++++++++++++++++++++++++++++++++++++
......
From 003d852f4014fcfcc771c333342f1b54b69fd47b Mon Sep 17 00:00:00 2001
From 5015458b755e7ab7d50c683a01da194c71eb8479 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/23] contrib: add arch option for platforms where the arch
......
From 6a2aade44a61699d9eccc84a21e299d803c11f86 Mon Sep 17 00:00:00 2001
From 3cb5e1a73d8aef941efb09f3f49f1ce72e8e269a 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 13/21] extras: deploy arch option for iOS
Subject: [PATCH 13/23] 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 da0f3bd..26d1957 100755
index 1766cf9..dc3fb94 100755
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@ -181,7 +181,7 @@ else
@@ -183,7 +183,7 @@ else
export ASCPP="xcrun as"
fi
......
From 63f4f78d9880b9b5e88e11ce46356af8be997340 Mon Sep 17 00:00:00 2001
From d9a5a3394c366a8af0d80c1e6e2e1b9931a6e6ba 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 14/21] contrib/png: fix compilation for arm64 which is unknown
Subject: [PATCH 14/23] contrib/png: fix compilation for arm64 which is unknown
to the libpng developers
---
......
From 4c9f0cd545cb9924adde27f15a45836a5a5aba15 Mon Sep 17 00:00:00 2001
From 5a36158793a16d02ced092dd96d3c56269c1754a 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 15/21] contrib/speex: fix compilation for arm64
Subject: [PATCH 15/23] contrib/speex: fix compilation for arm64
---
contrib/src/speex/rules.mak | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/contrib/src/speex/rules.mak b/contrib/src/speex/rules.mak
index 974eac2..8bbbfa7 100644
index b13133f..3cc7500 100644
--- a/contrib/src/speex/rules.mak
+++ b/contrib/src/speex/rules.mak
@@ -36,6 +36,11 @@ ifeq ($(ARCH),arm)
@@ -38,6 +38,11 @@ ifeq ($(ARCH),arm)
SPEEX_CONF += --enable-arm5e-asm
endif
endif
......
From 2336e7415e3309bcafefabf45ae6ebdf07e2bd8f Mon Sep 17 00:00:00 2001
From 76b1dc709f57a206c54212d33298d2a5156da114 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Mon, 7 Oct 2013 17:05:21 +0200
Subject: [PATCH 16/21] contrib/flac: fix compilation with clang 5.0
Subject: [PATCH 16/23] contrib/flac: fix compilation with clang 5.0
---
contrib/src/flac/libFLAC-clang-5.0.patch | 19 +++++++++++++++++++
......
From 06386c3c1fe9cd4d2683cda1404f35125ceb587f Mon Sep 17 00:00:00 2001
From 5397b09b17580f1d10d855f91a4bb8c51de4a570 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 17/21] contrib/gcrypt: use git version on iOS
Subject: [PATCH 17/23] contrib/gcrypt: use git version on iOS
---
contrib/src/gcrypt/disable-doc-compilation.patch | 43 ++++++++++++++++++++++
......@@ -61,12 +61,12 @@ index 0000000..e63224e
+1.8.3.4 (Apple Git-47)
+
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index 38c96b5..332d2ad 100644
index ae55695..44dfcab 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -1,6 +1,7 @@
# GCRYPT
GCRYPT_VERSION := 1.5.3
GCRYPT_VERSION := 1.6.0
GCRYPT_URL := ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2
+GCRYPT_GITURL := git://git.gnupg.org/libgcrypt.git
......
From b6af33445628d16241d6925da46ce59539a35824 Mon Sep 17 00:00:00 2001
From b0aa8fa78522327ab095b1cfb04ab2d50922ed65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Tue, 19 Nov 2013 00:09:34 +0100
Subject: [PATCH 18/21] gnutls: HACK to enable https playback on iOS
Subject: [PATCH 18/23] gnutls: HACK to enable https playback on iOS
Note that certificates presented by a server won't verified at all so we cannot trust the stream
---
......
From dd45893ffd2b3561aeefece1b1dcbd42f88d1f98 Mon Sep 17 00:00:00 2001
From af7cf133c158afe651f279ad73dcffda2edccddd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Tue, 19 Nov 2013 16:56:24 +0100
Subject: [PATCH 19/21] contrib/gnutls: don't reconf on iOS so we don't have to
Subject: [PATCH 19/23] contrib/gnutls: don't reconf on iOS so we don't have to
compile gettext
---
......@@ -9,7 +9,7 @@ Subject: [PATCH 19/21] contrib/gnutls: don't reconf on iOS so we don't have to
1 file changed, 2 insertions(+)
diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index b587686..7d997d8 100644
index b7f1bed..f2d5c7a 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -48,7 +48,9 @@ GNUTLS_CONF := \
......
From 46d3855907924bf9138ba9c9a868076fb825c323 Mon Sep 17 00:00:00 2001
From dc8026e7bbd228a2ded2c43ffea8c070d9c500a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 21 Nov 2013 01:35:43 +0100
Subject: [PATCH 20/22] Revert "gnutls: require version 3.0.20 or later"
Subject: [PATCH 20/23] Revert "gnutls: require version 3.0.20 or later"
This reverts commit 55f8f754788a0ad228f53ea40706710b517e5f2a.
---
......@@ -10,7 +10,7 @@ This reverts commit 55f8f754788a0ad228f53ea40706710b517e5f2a.
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 02fb8aa..98ba0c4 100644
index 92e6916..e697a3e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3969,7 +3969,7 @@ dnl
......
From 7ae76fb68493f0cf11dccd2fec1460b8d27364a3 Mon Sep 17 00:00:00 2001
From 68fbb7b754620327f2c577f253513e42e89c120b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 21 Nov 2013 02:36:43 +0100
Subject: [PATCH 21/23] contrib/gnutls: use version 2.12.23 instead of 3.1.16 which
still depends on gcrypt instead of nettle
Subject: [PATCH 21/23] contrib/gnutls: use version 2.12.23 instead of 3.1.16
which still depends on gcrypt instead of nettle
---
contrib/src/gnutls/SHA512SUMS | 2 +-
......
From 022968d85e0ed54e18962e72244dd3742a5b4f9b Mon Sep 17 00:00:00 2001
From e3229e765c0a748c690a4d34573d01e6a487fda9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 21 Nov 2013 02:40:27 +0100
Subject: [PATCH 22/22] contrib/gcrypt: patch the external API so old gnutls
Subject: [PATCH 22/23] contrib/gcrypt: patch the external API so old gnutls
versions can still access what they need
---
......@@ -52,7 +52,7 @@ index 0000000..2f5fa63
+ #define GCRY_THREAD_OPTION_PTH_IMPL \
+
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index 332d2ad..305e5c8 100644
index 44dfcab..7e2cc30 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -22,6 +22,7 @@ libgcrypt: libgcrypt-git.tar.xz .sum-gcrypt
......
From 9a996dfec6000dce657b582a4d86e99beb5b7aef Mon Sep 17 00:00:00 2001
From 372ba9d5696c00400e87eeaa07124c3e194b4312 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] lib/media_player: inherit deinterlace and vbi variables to
fix correct variables values on first use
Subject: [PATCH 23/23] lib/media_player: inherit deinterlace and vbi variables
to fix correct variables values on first use
---
lib/media_player.c | 4 ++--
......
......@@ -12,7 +12,7 @@ CONFIGURATION="Release"
NONETWORK=no
SKIPLIBVLCCOMPILATION=no
TESTEDHASH=413db2a84
TESTEDHASH=37fa883c2
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