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

MVK: update libvlc

parent 68d295c4
......@@ -651,7 +651,6 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_BITCODE = NO;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
......@@ -696,7 +695,6 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_BITCODE = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
......
From 511e1f215608bedf9f72adcf87f5ce73c92ee375 Mon Sep 17 00:00:00 2001
From 443e46780fd75f27b77fe543ab86b7825951fffa 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
Subject: [PATCH 01/15] arm_neon: added function macro to handle the underscore
prefix for the iOS ARM ABI
---
......
From fab89c00905a120d23d875056869241a091b9089 Mon Sep 17 00:00:00 2001
From 2f028284356f4356af2d3b2379790ba743dc6820 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 02/13] deinterlace/merge: use a macro to fix compilation for
Subject: [PATCH 02/15] deinterlace/merge: use a macro to fix compilation for
iOS
---
......
From 837dc0740a82c2c7cf734213ffc5e2b714a5775f Mon Sep 17 00:00:00 2001
From 22361aabcf781fc3c1fd3dcae666ffc46624c492 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 03/13] libass: fix text rendering on iOS by providing a font
Subject: [PATCH 03/15] libass: fix text rendering on iOS by providing a font
lookup mechanism for the font shipped with Aspen
---
......
From ceba5188773cc8faeb3c8b95f451436becf8c7f6 Mon Sep 17 00:00:00 2001
From 20c1756e1540b3adbd37fee06847744c8e947133 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 04/13] freetype: added a fake font lookup mechanism for iOS to
Subject: [PATCH 04/15] freetype: added a fake font lookup mechanism for iOS to
use the packaged demo fonts
---
......
From db872f03d5ddd2f86778de022846149d7dde93a1 Mon Sep 17 00:00:00 2001
From fff28568b0c8fdf3109498df16cb3a7aa5c3f3b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Tue, 9 Dec 2014 22:14:55 +0100
Subject: [PATCH 05/13] lib/media player: inherit deinterlace variable to
Subject: [PATCH 05/15] lib/media player: inherit deinterlace variable to
achieve correct value on first use
---
......
From e2967d6ac21dfc8b737ee815b00e7108b9d738c0 Mon Sep 17 00:00:00 2001
From 22895aabc53ff871ff9162ed7ae5f92fbd147fdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 18 Feb 2015 21:35:16 +0100
Subject: [PATCH 06/13] arm_neon: work-around libtool issue
Subject: [PATCH 06/15] arm_neon: work-around libtool issue
---
modules/arm_neon/Makefile.am | 2 ++
......
From 6c281b6c77325bd1d4a123eed7fd79f2fb7f4935 Mon Sep 17 00:00:00 2001
From 9b6692ef5b02ce9a3b01e8e69b8f67faf22e18c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 19 Jun 2015 15:26:06 +0200
Subject: [PATCH 07/13] libvlc/media: re-parse if flags changed
Subject: [PATCH 07/15] libvlc/media: re-parse if flags changed
---
lib/media.c | 6 ++++++
......
From 642d87c7a95a3192b272ffba4c6c5e69caac3503 Mon Sep 17 00:00:00 2001
From 5f3f20000ed18d6be01f298c287cbe73dac9eece 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 08/13] libvlc: add preliminary code path to modify quartztext
Subject: [PATCH 08/15] libvlc: add preliminary code path to modify quartztext
variables on-the-fly
---
......@@ -45,10 +45,10 @@ index 0c7351b..b0b4208 100644
/** \defgroup libvlc_audio LibVLC audio controls
diff --git a/lib/libvlc.sym b/lib/libvlc.sym
index a7e814b..97b153b 100644
index e7527bd..2f18a00 100644
--- a/lib/libvlc.sym
+++ b/lib/libvlc.sym
@@ -227,6 +227,8 @@ libvlc_video_get_spu_count
@@ -228,6 +228,8 @@ libvlc_video_get_spu_count
libvlc_video_get_spu_delay
libvlc_video_get_spu_description
libvlc_video_get_teletext
......@@ -57,7 +57,7 @@ index a7e814b..97b153b 100644
libvlc_video_get_title_description
libvlc_video_get_track
libvlc_video_get_track_count
@@ -251,6 +253,8 @@ libvlc_video_set_spu
@@ -252,6 +254,8 @@ libvlc_video_set_spu
libvlc_video_set_spu_delay
libvlc_video_set_subtitle_file
libvlc_video_set_teletext
......
From c428a0b86fa8df8df9bf431ad4f504b03ef4b1d7 Mon Sep 17 00:00:00 2001
From 5f74d6cc2035652c9cd76b45d89339a34d667609 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 10 Sep 2015 14:04:52 +0200
Subject: [PATCH 09/13] arm_neon: fix iOS linking
Subject: [PATCH 09/15] arm_neon: fix iOS linking
---
modules/arm_neon/amplify.S | 7 ++---
......
From f03186abd2d5483bdcf91afa139302435fbf79e5 Mon Sep 17 00:00:00 2001
From 3ea9a8cea0e0cfed075b85e7a9d5cec187cdfdc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 10 Jul 2015 19:57:18 +0200
Subject: [PATCH 10/13] disable neon volume plugin
Subject: [PATCH 10/15] disable neon volume plugin
---
modules/arm_neon/Makefile.am | 1 -
......
From d2f5bfff8e390590f9acd2f7a7714b844e16f394 Mon Sep 17 00:00:00 2001
From 0e7acc766d4128549291691ad33446a0dba41ca5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Sun, 7 Dec 2014 20:02:18 +0100
Subject: [PATCH 11/13] contrib/gcrypt: work-around a libtool limitation
Subject: [PATCH 11/15] contrib/gcrypt: work-around a libtool limitation
---
contrib/src/gcrypt/rules.mak | 1 +
......@@ -10,7 +10,7 @@ Subject: [PATCH 11/13] contrib/gcrypt: work-around a libtool limitation
create mode 100644 contrib/src/gcrypt/work-around-libtool-limitation.patch
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index 55c9f4c..be97991 100644
index d817a13..5000488 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -15,6 +15,7 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
......
From 9684fd3703bd1e3d5bb08d0352c3a6188f98ae6b Mon Sep 17 00:00:00 2001
From 40a2ff454d77db45b9ea8ecb09cf49fd95a96b1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 10 Sep 2015 19:58:40 +0200
Subject: [PATCH 12/13] src/misc: fix compilation for OS without fork()
Subject: [PATCH 12/15] src/misc: fix compilation for OS without fork()
---
src/misc/cpu.c | 2 +-
......
From 968ff57dd5830d9962d429e5757737274305e12f Mon Sep 17 00:00:00 2001
From 2510feb5f1c792ad5f00d067437e170ef1102f08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 11 Sep 2015 18:34:26 +0200
Subject: [PATCH 13/13] libvlc: hack to disable daemon mode
Subject: [PATCH 13/15] libvlc: hack to disable daemon mode
---
src/libvlc.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/libvlc.c b/src/libvlc.c
index 34824da..3bb0ec1 100644
index 34824da..6bad336 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -199,6 +199,10 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
......
From 953b373cbf149cdd28618cdabbdf97317517df14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Tue, 15 Sep 2015 15:51:14 +0200
Subject: [PATCH 14/15] Revert "decoder: restart module if fmt_in is changed by
the packetizer"
This reverts commit 6e89372e4bfb3e2b0d5c55c3f31caddf42da1043.
---
src/input/decoder.c | 46 ++++++++++++++++++++--------------------------
1 file changed, 20 insertions(+), 26 deletions(-)
diff --git a/src/input/decoder.c b/src/input/decoder.c
index 4d9809e..38b025c 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -1031,20 +1031,24 @@ static void DecoderProcessVideo( decoder_t *p_dec, block_t *p_block, bool b_flus
while( (p_packetized_block =
p_packetizer->pf_packetize( p_packetizer, p_block ? &p_block : NULL )) )
{
- if( !es_format_IsSimilar( &p_dec->fmt_in, &p_packetizer->fmt_out ) )
+ if( p_packetizer->fmt_out.i_extra && !p_dec->fmt_in.i_extra )
{
- msg_Dbg( p_dec, "restarting module due to input format change");
-
- /* Drain the decoder module */
- DecoderDecodeVideo( p_dec, NULL );
- /* Restart the decoder module */
- UnloadDecoder( p_dec );
- if( LoadDecoder( p_dec, false, &p_packetizer->fmt_out ) )
- {
- p_dec->b_error = true;
- block_ChainRelease( p_packetized_block );
- return;
- }
+ es_format_Clean( &p_dec->fmt_in );
+ es_format_Copy( &p_dec->fmt_in, &p_packetizer->fmt_out );
+ }
+
+ /* If the packetizer provides aspect ratio information, pass it
+ * to the decoder as a hint if the decoder itself can't provide
+ * it. Copy it regardless of the current value of the decoder input
+ * format aspect ratio, to properly propagate changes in aspect
+ * ratio. */
+ if( p_packetizer->fmt_out.video.i_sar_num > 0 &&
+ p_packetizer->fmt_out.video.i_sar_den > 0)
+ {
+ p_dec->fmt_in.video.i_sar_num =
+ p_packetizer->fmt_out.video.i_sar_num;
+ p_dec->fmt_in.video.i_sar_den=
+ p_packetizer->fmt_out.video.i_sar_den;
}
if( p_packetizer->pf_get_cc )
@@ -1207,20 +1211,10 @@ static void DecoderProcessAudio( decoder_t *p_dec, block_t *p_block, bool b_flus
while( (p_packetized_block =
p_packetizer->pf_packetize( p_packetizer, p_block ? &p_block : NULL )) )
{
- if( !es_format_IsSimilar( &p_dec->fmt_in, &p_packetizer->fmt_out ) )
+ if( p_packetizer->fmt_out.i_extra && !p_dec->fmt_in.i_extra )
{
- msg_Dbg( p_dec, "restarting module due to input format change");
-
- /* Drain the decoder module */
- DecoderDecodeAudio( p_dec, NULL );
- /* Restart the decoder module */
- UnloadDecoder( p_dec );
- if( LoadDecoder( p_dec, false, &p_packetizer->fmt_out ) )
- {
- p_dec->b_error = true;
- block_ChainRelease( p_packetized_block );
- return;
- }
+ es_format_Clean( &p_dec->fmt_in );
+ es_format_Copy( &p_dec->fmt_in, &p_packetizer->fmt_out );
}
while( p_packetized_block )
--
2.5.1
From 3d785cf7aa3cf6e6f9d43fdf584997829907b8fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Sat, 3 Oct 2015 22:45:14 +0200
Subject: [PATCH 15/15] contrib/gcrypt: fix tvOS compilation
---
contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch | 16 ++++++++++++++++
contrib/src/gcrypt/rules.mak | 6 ++++++
2 files changed, 22 insertions(+)
create mode 100644 contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch
diff --git a/contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch b/contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch
new file mode 100644
index 0000000..f1d3ccc
--- /dev/null
+++ b/contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch
@@ -0,0 +1,16 @@
+diff -ru libgcrypt/cipher/sha1-ssse3-amd64.S libgcrypt/cipher/sha1-ssse3-amd64.S
+--- libgcrypt/cipher/sha1-ssse3-amd64.S 2014-08-21 14:50:39.000000000 +0200
++++ libgcrypt/cipher/sha1-ssse3-amd64.S 2015-10-03 22:40:21.000000000 +0200
+@@ -217,10 +217,9 @@
+ * _gcry_sha1_transform_amd64_ssse3 (void *ctx, const unsigned char *data)
+ */
+ .text
+-.globl _gcry_sha1_transform_amd64_ssse3
+-.type _gcry_sha1_transform_amd64_ssse3,@function
++.globl __gcry_sha1_transform_amd64_ssse3
+ .align 16
+-_gcry_sha1_transform_amd64_ssse3:
++__gcry_sha1_transform_amd64_ssse3:
+ /* input:
+ * %rdi: ctx, CTX
+ * %rsi: data (64 bytes)
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index 5000488..6de232b 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -16,6 +16,7 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
$(APPLY) $(SRC)/gcrypt/disable-doc-compilation.patch
$(APPLY) $(SRC)/gcrypt/disable-tests-compilation.patch
$(APPLY) $(SRC)/gcrypt/work-around-libtool-limitation.patch
+ $(APPLY) $(SRC)/gcrypt/fix-sha1-ssse3-for-clang.patch
$(MOVE)
DEPS_gcrypt = gpg-error
@@ -32,6 +33,11 @@ GCRYPT_EXTRA_CFLAGS = -fheinous-gnu-extensions
else
GCRYPT_EXTRA_CFLAGS =
endif
+ifdef HAVE_TVOS
+ifeq ($(ARCH), x86_64)
+GCRYPT_CONF += --disable-asm --enable-ciphers=des,rfc2268,arcfour --enable-digests=md5,sha1,rmd160
+endif
+endif
ifdef HAVE_MACOSX
GCRYPT_CONF += --disable-aesni-support
else
--
2.5.1
......@@ -16,7 +16,7 @@ SKIPLIBVLCCOMPILATION=no
SCARY=yes
TVOS=no
TESTEDHASH=a6305ff5
TESTEDHASH=7ce48b0d
usage()
{
......@@ -180,8 +180,6 @@ spopd
buildMobileKit() {
PLATFORM="$1"
info "Building for $PLATFORM"
spushd MobileVLCKit/ImportedSources
if [ "$SKIPLIBVLCCOMPILATION" != "yes" ]; then
......@@ -217,8 +215,6 @@ buildMobileKit() {
fi
spopd # MobileVLCKit/ImportedSources
info "Build for $PLATFORM completed"
}
if [ "$BUILD_DEVICE" != "no" ]; then
......
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