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

MVK: rebase libvlc

parent 2c88df26
From db2a46c562d31156c289ea8b5bbb58158dccd75d Mon Sep 17 00:00:00 2001
From 9f1c93d482b072ab00831a44c083f397abe01bc4 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
Subject: [PATCH 01/16] arm_neon: added function macro to handle the underscore
prefix for the iOS ARM ABI
---
......@@ -65,5 +65,5 @@ index 0000000..d853255
+.endm
+
--
2.8.4
2.9.2
From e97fe6b2ce384203fe1249b6eaafb18651a53fb4 Mon Sep 17 00:00:00 2001
From 7b16e8997a869053668ecf8f6d258323caff751b 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/15] deinterlace/merge: use a macro to fix compilation for
Subject: [PATCH 02/16] deinterlace/merge: use a macro to fix compilation for
iOS
---
......@@ -82,5 +82,5 @@ index dd77902..03e5042 100644
b 1b
+endfunc
--
2.8.4
2.9.2
From 0ffba5efff4fef769b7485f398fefd9a15e07686 Mon Sep 17 00:00:00 2001
From 21e2160501c87211fd83eb8492d4258aa58699e9 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/15] lib/media player: inherit deinterlace variable to
Subject: [PATCH 03/16] lib/media player: inherit deinterlace variable to
achieve correct value on first use
---
......@@ -22,5 +22,5 @@ index 69d3523..f2e9d03 100644
var_Create (mp, "vbi-page", VLC_VAR_INTEGER);
--
2.8.4
2.9.2
From a6734ef0c86841f477e383f7ca488e48966390af Mon Sep 17 00:00:00 2001
From ab864288c7725ae82ae34a71e941f073936fe802 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/15] arm_neon: work-around libtool issue
Subject: [PATCH 04/16] arm_neon: work-around libtool issue
---
modules/arm_neon/Makefile.am | 2 ++
......@@ -18,5 +18,5 @@ index db81ec0..e67e07e 100644
libchroma_yuv_neon_plugin_la_SOURCES = \
--
2.8.4
2.9.2
From 734e0b98e72750625515a8eeddf16104f37c76cd Mon Sep 17 00:00:00 2001
From 63c816f3753b1a7902e719b2c1165ebecf55ae25 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/15] arm_neon: fix iOS linking
Subject: [PATCH 05/16] arm_neon: fix iOS linking
---
modules/arm_neon/amplify.S | 7 ++---
......@@ -194,5 +194,5 @@ index a94ae85..54b43a7 100644
pop {r4,pc}
+endfunc
--
2.8.4
2.9.2
From f8839ba46636c0be50730e17d6ae7cf2379fcfa7 Mon Sep 17 00:00:00 2001
From 77987213df1f95e47d2f59c4743d69873e6ad7ba 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/15] disable neon volume plugin
Subject: [PATCH 06/16] disable neon volume plugin
---
modules/arm_neon/Makefile.am | 1 -
......@@ -19,5 +19,5 @@ index e67e07e..6909752 100644
libyuv_rgb_neon_plugin.la
endif
--
2.8.4
2.9.2
From 70c94b4a91320134115736fd06c0bd52e250eac3 Mon Sep 17 00:00:00 2001
From effd90f2b5082f5139d875415756d04288c2ded5 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/15] src/misc: fix compilation for OS without fork()
Subject: [PATCH 07/16] src/misc: fix compilation for OS without fork()
---
src/misc/cpu.c | 2 +-
......@@ -21,5 +21,5 @@ index 28f127a..bacf842 100644
{
pid_t pid = fork();
--
2.8.4
2.9.2
From 48880393d3d1a306fa4eb71b45dd4753231e52f6 Mon Sep 17 00:00:00 2001
From 3e6dab2ff7e8b459e065330a4de4c9c25d2f5d91 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/15] libvlc: hack to disable daemon mode
Subject: [PATCH 08/16] libvlc: hack to disable daemon mode
---
src/libvlc.c | 4 ++++
......@@ -23,5 +23,5 @@ index 48c2b8c..3c9f879 100644
/* Check for daemon mode */
if( var_InheritBool( p_libvlc, "daemon" ) )
--
2.8.4
2.9.2
From afb0a5378ab0097b54062789f63771a283bf0c82 Mon Sep 17 00:00:00 2001
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/15] contrib/harfbuzz: fix iOS compilation when CoreText is
Subject: [PATCH 09/16] contrib/harfbuzz: fix iOS compilation when CoreText is
enabled
---
......@@ -61,5 +61,5 @@ index 36bcb31..4c9bcf2 100644
DEPS_harfbuzz = freetype2 $(DEPS_freetype2)
--
2.8.4
2.9.2
From 1074cace5e1951650e2f61b0753c9fdcbaeac34a Mon Sep 17 00:00:00 2001
From f57c7ab8c891c1ca696bab79607f3e3354bf9d2b 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 10/15] libvlc: expose a base set of freetype options to
Subject: [PATCH 10/16] libvlc: expose a base set of freetype options to
overwrite the default font
---
......@@ -14,7 +14,7 @@ Subject: [PATCH 10/15] libvlc: expose a base set of freetype options to
6 files changed, 163 insertions(+), 4 deletions(-)
diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
index 2323b4d..5a54cb7 100644
index 79a0b1f..3a37d3b 100644
--- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h
@@ -1496,6 +1496,32 @@ LIBVLC_API float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
......@@ -314,5 +314,5 @@ index 44b2731..7f1abec 100644
/**
--
2.8.4
2.9.2
From da6125df0221b4c5b6fe69ddbc7ebdc04372b8be Mon Sep 17 00:00:00 2001
From f153e11077a517389cfa364e87e2de94e11df490 Mon Sep 17 00:00:00 2001
From: Aman Gupta <aman@tmm1.net>
Date: Tue, 1 Mar 2016 16:31:13 +0100
Subject: [PATCH 11/15] Add AC-3 pass-through
Subject: [PATCH 11/16] Add AC-3 pass-through
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
......@@ -29,7 +29,7 @@ index 6c264bc..b0901ae 100755
logger
visual
diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
index 5a54cb7..303e716 100644
index 3a37d3b..90a27af 100644
--- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h
@@ -1831,6 +1831,16 @@ LIBVLC_API int64_t libvlc_audio_get_delay( libvlc_media_player_t *p_mi );
......@@ -163,5 +163,5 @@ index 044905b..355f14f 100644
return OpenCommon( p_this, false );
}
--
2.8.4
2.9.2
From 24627e3110d29253f7fcacb6520091014218e65a Mon Sep 17 00:00:00 2001
From 08e946c93351e1b609b51a606919c4cf54780f40 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 12/15] libvlc: create VT-zero-copy variable
Subject: [PATCH 12/16] libvlc: create VT-zero-copy variable
---
lib/media_player.c | 1 +
......@@ -20,5 +20,5 @@ index d047874..ac30787 100644
#ifdef __ANDROID__
var_Create (mp, "drawable-androidwindow", VLC_VAR_ADDRESS);
--
2.8.4
2.9.2
From ad632dc2465db62daffdfcd10471703842e0ad46 Mon Sep 17 00:00:00 2001
From 71b925425dc7823a2c87b922960c95beecd858a2 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 13/15] contrib/gcrypt: work-around a libtool limitation
Subject: [PATCH 13/16] contrib/gcrypt: work-around a libtool limitation
---
contrib/src/gcrypt/rules.mak | 1 +
......@@ -53,5 +53,5 @@ index 0000000..df97ffb
+ AM_CFLAGS = $(GPG_ERROR_CFLAGS)
+
--
2.8.4
2.9.2
From e575f15e911c3c4d8a266b34610b9e9baa73ae55 Mon Sep 17 00:00:00 2001
From 258b60750029a56e0010edc3e1141b3ad592f108 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 14/15] contrib/gcrypt: fix tvOS compilation
Subject: [PATCH 14/16] contrib/gcrypt: fix tvOS compilation
---
contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch | 16 ++++++++++++++++
......@@ -56,5 +56,5 @@ index 4d2604c..ee4c969 100644
GCRYPT_CONF += --disable-aesni-support
else
--
2.8.4
2.9.2
From a6631bce58a861446355b9e411845d072ea0e5ef Mon Sep 17 00:00:00 2001
From 437a03183ab96ed5dab9e6a0fc306e0318c07bc2 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 15/15] contrib/avcodec: enforce use of FFmpeg
Subject: [PATCH 15/16] contrib/avcodec: enforce use of FFmpeg
---
contrib/src/ffmpeg/rules.mak | 4 ++--
......@@ -25,5 +25,5 @@ index 6604a76..607b781 100644
FFMPEG_GITURL := git://git.videolan.org/ffmpeg.git
else
--
2.8.4
2.9.2
From f8cbab0be1de3da62b6dad089a10bda30433e605 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 16/16] Enable System DL
---
contrib/src/ffmpeg/patch-as-patch-can.patch | 20 ++++++++++++++++++++
contrib/src/ffmpeg/rules.mak | 4 ++++
2 files changed, 24 insertions(+)
create mode 100644 contrib/src/ffmpeg/patch-as-patch-can.patch
diff --git a/contrib/src/ffmpeg/patch-as-patch-can.patch b/contrib/src/ffmpeg/patch-as-patch-can.patch
new file mode 100644
index 0000000..2d60cf7
--- /dev/null
+++ b/contrib/src/ffmpeg/patch-as-patch-can.patch
@@ -0,0 +1,20 @@
+Only in ffmpeg: .DS_Store
+diff -ru ffmpeg/libavcodec/audiotoolboxdec.c ffmpeg-fix/libavcodec/audiotoolboxdec.c
+--- ffmpeg/libavcodec/audiotoolboxdec.c 2016-05-09 11:44:29.000000000 +0200
++++ ffmpeg-fix/libavcodec/audiotoolboxdec.c 2016-05-09 14:01:04.000000000 +0200
+@@ -345,7 +345,6 @@
+ avctx->bit_rate = bit_rate;
+ in_format.mSampleRate = avctx->sample_rate;
+ #endif
+-#if CONFIG_AC3_AT_DECODER || CONFIG_EAC3_AT_DECODER
+ } else if (pkt && pkt->size >= 7 &&
+ (avctx->codec_id == AV_CODEC_ID_AC3 ||
+ avctx->codec_id == AV_CODEC_ID_EAC3)) {
+@@ -358,7 +357,6 @@
+ in_format.mChannelsPerFrame = hdr.channels;
+ avctx->frame_size = hdr.num_blocks * 256;
+ avctx->bit_rate = hdr.bit_rate;
+-#endif
+ } else {
+ in_format.mSampleRate = avctx->sample_rate ? avctx->sample_rate : 44100;
+ in_format.mChannelsPerFrame = avctx->channels ? avctx->channels : 1;
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 607b781..52cd07e 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -22,6 +22,9 @@ FFMPEGCONF = \
--disable-decoder=opus \
--enable-libgsm \
--enable-libopenjpeg \
+ --disable-decoder=ac3,ac3_fixed,eac3,mlp \
+ --disable-demuxer=mlp \
+ --disable-parser=mlp \
--disable-debug \
--disable-avdevice \
--disable-devices \
@@ -200,6 +203,7 @@ ffmpeg: ffmpeg-$(FFMPEG_HASH).tar.xz .sum-ffmpeg
rm -Rf $@ $@-$(FFMPEG_HASH)
mkdir -p $@-$(FFMPEG_HASH)
$(XZCAT) "$<" | (cd $@-$(FFMPEG_HASH) && tar xv --strip-components=1)
+ $(APPLY) $(SRC)/ffmpeg/patch-as-patch-can.patch
$(MOVE)
.ffmpeg: ffmpeg
--
2.9.2
......@@ -17,7 +17,7 @@ SCARY=yes
TVOS=no
BITCODE=no
TESTEDHASH=a09dbdef
TESTEDHASH=7f9fac4e
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