Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
VideoLAN
VLCKit
Commits
f4df6b61
Commit
f4df6b61
authored
Aug 13, 2016
by
Felix Paul Kühne
Browse files
MVK: update libvlc
parent
bfdcee6c
Changes
17
Hide whitespace changes
Inline
Side-by-side
MobileVLCKit/patches/0001-arm_neon-added-function-macro-to-handle-the-undersco.patch
View file @
f4df6b61
From
9f1c93d482b072ab00831a44c083f397abe01bc4
Mon Sep 17 00:00:00 2001
From
0491fbb26ab9b226e7e14417848d20b64bc02649
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/1
6
] arm_neon: added function macro to handle the underscore
Subject: [PATCH 01/1
5
] arm_neon: added function macro to handle the underscore
prefix for the iOS ARM ABI
---
...
...
MobileVLCKit/patches/0002-deinterlace-merge-use-a-macro-to-fix-compilation-for.patch
View file @
f4df6b61
From 7
b16e8997a869053668ecf8f6d258323caff751b
Mon Sep 17 00:00:00 2001
From 7
abc597649a709b44603aee0ee8fd77383bbbe18
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/1
6
] deinterlace/merge: use a macro to fix compilation for
Subject: [PATCH 02/1
5
] deinterlace/merge: use a macro to fix compilation for
iOS
---
...
...
MobileVLCKit/patches/0003-lib-media-player-inherit-deinterlace-variable-to-ach.patch
View file @
f4df6b61
From
21e2160501c87211fd83eb8492d4258aa58699e9
Mon Sep 17 00:00:00 2001
From
3c2b29d19debd81e04f952bab42934090078448f
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 03/1
6
] lib/media player: inherit deinterlace variable to
Subject: [PATCH 03/1
5
] lib/media player: inherit deinterlace variable to
achieve correct value on first use
---
...
...
MobileVLCKit/patches/0004-arm_neon-work-around-libtool-issue.patch
View file @
f4df6b61
From
ab864288c7725ae82ae34a71e941f073936fe802
Mon Sep 17 00:00:00 2001
From
944c7868046ff1832c5e9da10cbc0d2ac178afcb
Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 18 Dec 2014 22:14:55 +0100
Subject: [PATCH 04/1
6
] arm_neon: work-around libtool issue
Subject: [PATCH 04/1
5
] arm_neon: work-around libtool issue
---
modules/arm_neon/Makefile.am | 2 ++
...
...
MobileVLCKit/patches/0005-arm_neon-fix-iOS-linking.patch
View file @
f4df6b61
From
63c816f3753b1a7902e719b2c1165ebecf55ae2
5 Mon Sep 17 00:00:00 2001
From
d96257d82cc8f2b8a6d62cbcc7bc2e077ab5057
5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 10 Dec 2014 22:14:55 +0100
Subject: [PATCH 05/1
6
] arm_neon: fix iOS linking
Subject: [PATCH 05/1
5
] arm_neon: fix iOS linking
---
modules/arm_neon/amplify.S | 7 ++---
...
...
MobileVLCKit/patches/0006-disable-neon-volume-plugin.patch
View file @
f4df6b61
From
77987213df1f95e47d2f59c4743d69873e6ad7ba
Mon Sep 17 00:00:00 2001
From
89458ba3a249ec99c45263d42704baa6406306ae
Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 10 Dec 2014 22:14:55 +0100
Subject: [PATCH 06/1
6
] disable neon volume plugin
Subject: [PATCH 06/1
5
] disable neon volume plugin
---
modules/arm_neon/Makefile.am | 1 -
...
...
MobileVLCKit/patches/0007-src-misc-fix-compilation-for-OS-without-fork.patch
View file @
f4df6b61
From
effd90f2b5082f5139d875415756d04288c2ded5
Mon Sep 17 00:00:00 2001
From
46f4712e1571d03440ef88e7d628c6ad70de4de9
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 07/1
6
] src/misc: fix compilation for OS without fork()
Subject: [PATCH 07/1
5
] src/misc: fix compilation for OS without fork()
---
src/misc/cpu.c | 2 +-
...
...
MobileVLCKit/patches/0008-libvlc-hack-to-disable-daemon-mode.patch
View file @
f4df6b61
From
3e6dab2ff7e8b459e065330a4de4c9c25d2f5d91
Mon Sep 17 00:00:00 2001
From
ff576edef9302c50788512d3e52b91bb5fc54287
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 08/1
6
] libvlc: hack to disable daemon mode
Subject: [PATCH 08/1
5
] libvlc: hack to disable daemon mode
---
src/libvlc.c | 4 ++++
...
...
MobileVLCKit/patches/0009-contrib-harfbuzz-fix-iOS-compilation-when-CoreText-i.patch
deleted
100644 → 0
View file @
bfdcee6c
From 5ba1602915d653efa94e16617e9bf0cc75e8a17c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Mon, 23 Nov 2015 16:46:27 +0100
Subject: [PATCH 09/16] contrib/harfbuzz: fix iOS compilation when CoreText is
enabled
---
contrib/src/harfbuzz/harfbuzz-coretext.patch | 32 ++++++++++++++++++++++++++++
contrib/src/harfbuzz/rules.mak | 1 +
2 files changed, 33 insertions(+)
create mode 100644 contrib/src/harfbuzz/harfbuzz-coretext.patch
diff --git a/contrib/src/harfbuzz/harfbuzz-coretext.patch b/contrib/src/harfbuzz/harfbuzz-coretext.patch
new file mode 100644
index 0000000..555e851
--- /dev/null
+++ b/contrib/src/harfbuzz/harfbuzz-coretext.patch
@@ -0,0 +1,32 @@
+diff -ru harfbuzz/configure.ac harfbuzz/configure.ac
+--- harfbuzz/configure.ac 2015-11-23 15:00:52.000000000 +0100
++++ harfbuzz-fixed/configure.ac 2015-11-23 14:59:43.000000000 +0100
+@@ -354,22 +354,21 @@
+ [with_coretext=no])
+ have_coretext=false
+ if test "x$with_coretext" = "xyes" -o "x$with_coretext" = "xauto"; then
+- AC_CHECK_TYPE(CTFontRef, have_coretext=true,, [#include <ApplicationServices/ApplicationServices.h>])
++ if test "x$have_coretext" != "xtrue"; then
++ AC_CHECK_TYPE(CTFontRef, have_coretext=true,, [#include <CoreText/CoreText.h>])
++ fi
+
+ if $have_coretext; then
+ CORETEXT_CFLAGS=
+- CORETEXT_LIBS="-framework ApplicationServices"
++ CORETEXT_LIBS="-framework CoreText -framework CoreGraphics -framework CoreFoundation"
+ AC_SUBST(CORETEXT_CFLAGS)
+ AC_SUBST(CORETEXT_LIBS)
+ else
+- # On iOS CoreText and CoreGraphics are stand-alone frameworks
+- if test "x$have_coretext" != "xtrue"; then
+- AC_CHECK_TYPE(CTFontRef, have_coretext=true,, [#include <CoreText/CoreText.h>])
+- fi
++ AC_CHECK_TYPE(CTFontRef, have_coretext=true,, [#include <ApplicationServices/ApplicationServices.h>])
+
+ if $have_coretext; then
+ CORETEXT_CFLAGS=
+- CORETEXT_LIBS="-framework CoreText -framework CoreGraphics"
++ CORETEXT_LIBS="-framework ApplicationServices"
+ AC_SUBST(CORETEXT_CFLAGS)
+ AC_SUBST(CORETEXT_LIBS)
+ fi
diff --git a/contrib/src/harfbuzz/rules.mak b/contrib/src/harfbuzz/rules.mak
index 36bcb31..4c9bcf2 100644
--- a/contrib/src/harfbuzz/rules.mak
+++ b/contrib/src/harfbuzz/rules.mak
@@ -23,6 +23,7 @@
harfbuzz: harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 .sum-harfbuzz
$(UPDATE_AUTOCONFIG)
$(APPLY) $(SRC)/harfbuzz/harfbuzz-aarch64.patch
$(APPLY) $(SRC)/harfbuzz/harfbuzz-clang.patch
+ $(APPLY) $(SRC)/harfbuzz/harfbuzz-coretext.patch
$(MOVE)
DEPS_harfbuzz = freetype2 $(DEPS_freetype2)
--
2.9.2
MobileVLCKit/patches/00
1
0-libvlc-expose-a-base-set-of-freetype-options-to-over.patch
→
MobileVLCKit/patches/000
9
-libvlc-expose-a-base-set-of-freetype-options-to-over.patch
View file @
f4df6b61
From
f57c7ab8c891c1ca696bab79607f3e3354bf9d2b
Mon Sep 17 00:00:00 2001
From
93c0fb563e992ad16b05f3977ea41327126e0cb3
Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Mon, 23 Nov 2015 16:09:24 +0100
Subject: [PATCH
1
0/1
6
] libvlc: expose a base set of freetype options to
Subject: [PATCH 0
9
/1
5
] libvlc: expose a base set of freetype options to
overwrite the default font
---
...
...
MobileVLCKit/patches/001
2
-libvlc-create-VT-zero-copy-variable.patch
→
MobileVLCKit/patches/001
0
-libvlc-create-VT-zero-copy-variable.patch
View file @
f4df6b61
From
08e946c93351e1b609b51a606919c4cf54780f40
Mon Sep 17 00:00:00 2001
From
537c9ef4b91ca034e6917548d3d0abd876495053
Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 4 May 2016 16:00:40 +0200
Subject: [PATCH 1
2
/1
6
] libvlc: create VT-zero-copy variable
Subject: [PATCH 1
0
/1
5
] libvlc: create VT-zero-copy variable
---
lib/media_player.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/media_player.c b/lib/media_player.c
index
d047874..ac30787
100644
index
8d54c93..143e240
100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -622,6 +622,7 @@
libvlc_media_player_new( libvlc_instance_t *instance )
...
...
MobileVLCKit/patches/001
3
-contrib-gcrypt-work-around-a-libtool-limitation.patch
→
MobileVLCKit/patches/001
1
-contrib-gcrypt-work-around-a-libtool-limitation.patch
View file @
f4df6b61
From
71b925425dc7823a2c87b922960c95beecd858a2
Mon Sep 17 00:00:00 2001
From
f3e5f5fd75f3143bb8804a0ca132c8fd29ec1ae8
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 1
3
/1
6
] contrib/gcrypt: work-around a libtool limitation
Subject: [PATCH 1
1
/1
5
] contrib/gcrypt: work-around a libtool limitation
---
contrib/src/gcrypt/rules.mak | 1 +
...
...
MobileVLCKit/patches/001
4
-contrib-gcrypt-fix-tvOS-compilation.patch
→
MobileVLCKit/patches/001
2
-contrib-gcrypt-fix-tvOS-compilation.patch
View file @
f4df6b61
From
258b60750029a56e0010edc3e1141b3ad592f108
Mon Sep 17 00:00:00 2001
From
62d65b6bf70142f89786c3ed61c2c987405ea907
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 1
4
/1
6
] contrib/gcrypt: fix tvOS compilation
Subject: [PATCH 1
2
/1
5
] contrib/gcrypt: fix tvOS compilation
---
contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch | 16 ++++++++++++++++
...
...
MobileVLCKit/patches/001
5
-contrib-avcodec-enforce-use-of-FFmpeg.patch
→
MobileVLCKit/patches/001
3
-contrib-avcodec-enforce-use-of-FFmpeg.patch
View file @
f4df6b61
From
437a03183ab96ed5dab9e6a0fc306e0318c07bc2
Mon Sep 17 00:00:00 2001
From
7d549584baf9d3ed050643a98d688efa2a42d735
Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Tue, 12 Jul 2016 13:50:54 +0200
Subject: [PATCH 1
5
/1
6
] contrib/avcodec: enforce use of FFmpeg
Subject: [PATCH 1
3
/1
5
] contrib/avcodec: enforce use of FFmpeg
---
contrib/src/ffmpeg/rules.mak | 4 ++--
...
...
MobileVLCKit/patches/001
6
-Enable-System-DL.patch
→
MobileVLCKit/patches/001
4
-Enable-System-DL.patch
View file @
f4df6b61
From
f8cbab0be1de3da62b6dad089a10bda30433e60
5 Mon Sep 17 00:00:00 2001
From
d8b67cebea5c3f5953c5231f06ebc0c606e34f1
5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 22 Jul 2016 11:11:44 +0200
Subject: [PATCH 1
6
/1
6
] Enable System DL
Subject: [PATCH 1
4
/1
5
] Enable System DL
---
contrib/src/ffmpeg/patch-as-patch-can.patch | 20 ++++++++++++++++++++
...
...
MobileVLCKit/patches/001
1
-Add-AC-3-pass-through.patch
→
MobileVLCKit/patches/001
5
-Add-AC-3-pass-through.patch
View file @
f4df6b61
From
f153e11077a517389cfa364e87e2de94e11df490
Mon Sep 17 00:00:00 2001
From
e8dac1564e09125dfb73862f71f26a69944c4881
Mon Sep 17 00:00:00 2001
From: Aman Gupta <aman@tmm1.net>
Date: Tue, 1 Mar 2016 16:31:13 +0100
Subject: [PATCH 1
1
/1
6
] Add AC-3 pass-through
Subject: [PATCH 1
5
/1
5
] Add AC-3 pass-through
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
---
extras/package/ios/build.sh |
1
-
extras/package/ios/build.sh |
2
-
-
include/vlc/libvlc_media_player.h | 10 +++++++++
lib/audio.c | 16 +++++++++++++++
lib/media_player.c | 1 +
modules/audio_output/audiounit_ios.m | 39 +++++++++++++++++++++++++++---------
modules/codec/a52.c | 2 +-
6 files changed, 57 insertions(+), 12 deletions(-)
5 files changed, 56 insertions(+), 12 deletions(-)
diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
index
6c264bc..b0901ae
100755
index
8ea32c4..af7933a
100755
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@ -46
0,7
+46
0
,6 @@
speex_resampler
@@ -46
1,8
+46
1
,6 @@
speex_resampler
remoteosd
magnify
gradient
-tospdif
dtstofloat32
-
dtstofloat32
logger
visual
fb
diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
index 3a37d3b..90a27af 100644
--- a/include/vlc/libvlc_media_player.h
...
...
@@ -77,10 +77,10 @@ index 7901c64..3877311 100644
*****************************************************************************/
int64_t libvlc_audio_get_delay( libvlc_media_player_t *p_mi )
diff --git a/lib/media_player.c b/lib/media_player.c
index
8d54c93..d04
787
4
100644
index
143e240..ac30
787 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -64
0
,6 +64
0
,7 @@
libvlc_media_player_new( libvlc_instance_t *instance )
@@ -64
1
,6 +64
1
,7 @@
libvlc_media_player_new( libvlc_instance_t *instance )
var_Create (mp, "zoom", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT);
var_Create (mp, "aspect-ratio", VLC_VAR_STRING);
var_Create (mp, "crop", VLC_VAR_STRING);
...
...
@@ -149,19 +149,6 @@ index cee8eab..0aa9dee 100644
/* Set audio session to mediaplayback */
NSError *error = nil;
diff --git a/modules/codec/a52.c b/modules/codec/a52.c
index 044905b..355f14f 100644
--- a/modules/codec/a52.c
+++ b/modules/codec/a52.c
@@ -152,7 +152,7 @@
static int OpenCommon( vlc_object_t *p_this, bool b_packetizer )
static int OpenDecoder( vlc_object_t *p_this )
{
/* HACK: Don't use this codec if we don't have an a52 audio filter */
- if( !module_exists( "a52tofloat32" ) )
+ if( !module_exists( "a52tofloat32" ) && !(module_exists("a52tospdif") && var_InheritBool(p_this, "spdif")) )
return VLC_EGENERIC;
return OpenCommon( p_this, false );
}
--
2.9.2
buildMobileVLCKit.sh
View file @
f4df6b61
...
...
@@ -17,7 +17,7 @@ SCARY=yes
TVOS
=
no
BITCODE
=
no
TESTEDHASH
=
e54bc05e
TESTEDHASH
=
c8ee8ea5
usage
()
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment