Commit 44563a2c authored by Felix Paul Kühne's avatar Felix Paul Kühne

MVK: rebase libvlc

parent c2653285
From 3ffbb4b323977540db0af3e22182d824df8fb993 Mon Sep 17 00:00:00 2001
From c3e5ec62269961f01cdbc975bc922020c2dadb90 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
......
From aeb583dd74d924e43b4bc4ca2edad2b205b262f1 Mon Sep 17 00:00:00 2001
From a83850b196d346b22b17a41e99a068577b6ee138 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
......
From 59cd7645d66887ceaf28ea625f5e1a39b08437cb Mon Sep 17 00:00:00 2001
From 2f8c305e1b89171bd4859835e5638869c42d11a7 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/13] lib/media player: inherit deinterlace variable to
......@@ -9,7 +9,7 @@ Subject: [PATCH 03/13] lib/media player: inherit deinterlace variable to
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/media_player.c b/lib/media_player.c
index 2a8eb5f..f1da39b 100644
index 4761fee..24d0c71 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -609,7 +609,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
......
From b5f5ead2b6515d5f8cd17fbe30585ef5f710be05 Mon Sep 17 00:00:00 2001
From fa1c5b2b06676ee69edb03f25061ba7a26c3cf55 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/13] arm_neon: work-around libtool issue
......
From 453d6f7698626f9078436c16c96e6dab778c1fdf Mon Sep 17 00:00:00 2001
From f324c5455e5f56afd08ce607a6918d1175b6a83a 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/13] arm_neon: fix iOS linking
Subject: [PATCH 05/13] arm_neon: fix iOS linking
---
modules/arm_neon/amplify.S | 7 ++---
......
From 258b8b777f2511de518b8cab43caca680be65d53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 19 Dec 2014 22:14:55 +0100
Subject: [PATCH 05/13] libvlc/media: re-parse if flags changed
---
lib/media.c | 6 ++++++
lib/media_internal.h | 1 +
2 files changed, 7 insertions(+)
diff --git a/lib/media.c b/lib/media.c
index 49f5132..6b5504b 100644
--- a/lib/media.c
+++ b/lib/media.c
@@ -719,6 +719,12 @@ static int media_parse(libvlc_media_t *media, bool b_async,
vlc_mutex_lock(&media->parsed_lock);
needed = !media->has_asked_preparse;
media->has_asked_preparse = true;
+ if (!needed)
+ {
+ if (media->parse_flag != parse_flag)
+ needed = true;
+ }
+ media->parse_flag = parse_flag;
vlc_mutex_unlock(&media->parsed_lock);
if (needed)
diff --git a/lib/media_internal.h b/lib/media_internal.h
index 35f06a4..d28297e 100644
--- a/lib/media_internal.h
+++ b/lib/media_internal.h
@@ -47,6 +47,7 @@ struct libvlc_media_t
bool is_parsed;
bool has_asked_preparse;
+ libvlc_media_parse_flag_t parse_flag;
};
/* Media Descriptor */
--
2.8.1
From c3bf5a9003115176e1510ff37fc550884f4fe2f1 Mon Sep 17 00:00:00 2001
From 5f4fe3e4381f2d46f8c233c1749354a964f2b0f2 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 07/13] disable neon volume plugin
Subject: [PATCH 06/13] disable neon volume plugin
---
modules/arm_neon/Makefile.am | 1 -
......
From 3e924c7dd19821d6b727c1938065063d4cb9c030 Mon Sep 17 00:00:00 2001
From c426b35f9ee23bf114b480d58a62fa12dfea1ee5 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 08/13] contrib/gcrypt: work-around a libtool limitation
Subject: [PATCH 07/13] contrib/gcrypt: work-around a libtool limitation
---
contrib/src/gcrypt/rules.mak | 1 +
......
From 3cd668de58e4d7a77db03aa4a03ad3c067ed1712 Mon Sep 17 00:00:00 2001
From f5e55af7030fc36492a79056ea46de0763df469b 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 09/13] src/misc: fix compilation for OS without fork()
Subject: [PATCH 08/13] src/misc: fix compilation for OS without fork()
---
src/misc/cpu.c | 2 +-
......
From 03f0b86c12a6c31f26ac3a259edb5d15678d3f90 Mon Sep 17 00:00:00 2001
From 89d32303c85b2a25b95591c30c4f1826e84dfa19 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 10/13] libvlc: hack to disable daemon mode
Subject: [PATCH 09/13] libvlc: hack to disable daemon mode
---
src/libvlc.c | 4 ++++
......
From 8e363ed73820efb5cf35512184a97630909b16fe Mon Sep 17 00:00:00 2001
From 964d8736dd288f82a04070bd76b26a8af977180b 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 11/13] contrib/gcrypt: fix tvOS compilation
Subject: [PATCH 10/13] contrib/gcrypt: fix tvOS compilation
---
contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch | 16 ++++++++++++++++
......
From a8b72facb9e7aec4fac8eff326dd777dcd707597 Mon Sep 17 00:00:00 2001
From e294e691d785f6e02c3b105262d1ae611e58d1ad 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 12/13] contrib/harfbuzz: fix iOS compilation when CoreText is
Subject: [PATCH 11/13] contrib/harfbuzz: fix iOS compilation when CoreText is
enabled
---
......
From 99a39c97fd6607a8ed1f5431a267554d9ac0910b Mon Sep 17 00:00:00 2001
From 54f50cdaea744f515c8c75abb1e935f1336deb73 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 13/13] libvlc: expose a base set of freetype options to
Subject: [PATCH 12/13] libvlc: expose a base set of freetype options to
overwrite the default font
---
......@@ -51,10 +51,10 @@ index 73562b8..17b0450 100644
/** \defgroup libvlc_audio LibVLC audio controls
diff --git a/lib/libvlc.sym b/lib/libvlc.sym
index 03e9a5e..ec2ca4a 100644
index c134fef..b74c313 100644
--- a/lib/libvlc.sym
+++ b/lib/libvlc.sym
@@ -237,6 +237,9 @@ libvlc_video_get_spu_count
@@ -238,6 +238,9 @@ libvlc_video_get_spu_count
libvlc_video_get_spu_delay
libvlc_video_get_spu_description
libvlc_video_get_teletext
......@@ -64,7 +64,7 @@ index 03e9a5e..ec2ca4a 100644
libvlc_video_get_title_description
libvlc_video_get_track
libvlc_video_get_track_count
@@ -261,6 +264,9 @@ libvlc_video_set_spu
@@ -262,6 +265,9 @@ libvlc_video_set_spu
libvlc_video_set_spu_delay
libvlc_video_set_subtitle_file
libvlc_video_set_teletext
......@@ -75,7 +75,7 @@ index 03e9a5e..ec2ca4a 100644
libvlc_video_take_snapshot
libvlc_vlm_add_broadcast
diff --git a/lib/media_player.c b/lib/media_player.c
index f1da39b..29623db 100644
index 24d0c71..b10bee1 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -639,6 +639,12 @@ libvlc_media_player_new( libvlc_instance_t *instance )
......
From f7a362b9e3e3940c0e25378f24e0bbf82ae61aea Mon Sep 17 00:00:00 2001
From fb3f59d1e533f04e5f9d48dee53c7c61c4eeefda Mon Sep 17 00:00:00 2001
From: Aman Gupta <aman@tmm1.net>
Date: Tue, 1 Mar 2016 16:31:13 +0100
Subject: [PATCH 16/17] Add AC-3 pass-through
Subject: [PATCH 13/13] Add AC-3 pass-through
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
......@@ -17,10 +17,10 @@ Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
6 files changed, 57 insertions(+), 12 deletions(-)
diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
index c480171..85d73dd 100755
index 6c264bc..b0901ae 100755
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@ -458,7 +458,6 @@ speex_resampler
@@ -460,7 +460,6 @@ speex_resampler
remoteosd
magnify
gradient
......@@ -77,7 +77,7 @@ 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 29623db..ef66391 100644
index b10bee1..b4c23a4 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -609,6 +609,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
......
From 01651bd7e3da37cb4391b7a95a498c59701cd52f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Tue, 5 Apr 2016 17:14:50 +0200
Subject: [PATCH 17/17] contrib/gsm: fix compilation with Xcode 7.3
---
contrib/src/gsm/gsm-xcode73.patch | 11 +++++++++++
contrib/src/gsm/rules.mak | 1 +
2 files changed, 12 insertions(+)
create mode 100644 contrib/src/gsm/gsm-xcode73.patch
diff --git a/contrib/src/gsm/gsm-xcode73.patch b/contrib/src/gsm/gsm-xcode73.patch
new file mode 100644
index 0000000..677d7b4
--- /dev/null
+++ b/contrib/src/gsm/gsm-xcode73.patch
@@ -0,0 +1,11 @@
+diff -ru gsm-broken/src/code.c gsm/src/code.c
+--- gsm-broken/src/code.c 2006-04-26 21:16:50.000000000 +0200
++++ gsm/src/code.c 2016-04-05 17:13:19.000000000 +0200
+@@ -19,6 +19,7 @@
+ #include "private.h"
+ #include "gsm.h"
+ #include "proto.h"
++#include <string.h>
+
+ /*
+ * 4.2 FIXED POINT IMPLEMENTATION OF THE RPE-LTP CODER
diff --git a/contrib/src/gsm/rules.mak b/contrib/src/gsm/rules.mak
index 38553d3..3cecb30 100644
--- a/contrib/src/gsm/rules.mak
+++ b/contrib/src/gsm/rules.mak
@@ -11,6 +11,7 @@ gsm: libgsm_$(GSM_VERSION).tar.gz .sum-gsm
$(UNPACK)
mv gsm-1.0-* libgsm_$(GSM_VERSION)
$(APPLY) $(SRC)/gsm/gsm-cross.patch
+ $(APPLY) $(SRC)/gsm/gsm-xcode73.patch
sed -e 's/^CFLAGS.*=/CFLAGS+=/' -i.orig libgsm_$(GSM_VERSION)/Makefile
$(MOVE)
--
2.8.1
......@@ -17,7 +17,7 @@ SCARY=yes
TVOS=no
BITCODE=no
TESTEDHASH=fe425c44
TESTEDHASH=09d306f0
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