Commit d0bc696c authored by Thomas Guillem's avatar Thomas Guillem

MVK: update patches, revert libpng to 1.6.19, remove taglib hack

libpng: there is a zlib issue with 1.6.29

taglib: this patch slowed down distant media opening and could cause issues on
servers that don't accept more than one concurent connection.
parent 2f111f60
From fa421881b056403144329e7f7f423dcda0a8a308 Mon Sep 17 00:00:00 2001
From 83892278f64356185e76d3cd2669dbfc5c79790c 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
---
......
From 7d27c294e5084db778143e6745840065601e4755 Mon Sep 17 00:00:00 2001
From 45cd9f190877a26154a1400de79e8886e55bfa43 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
---
......
From 29e2573375b9b57edf23e6b6be8d412aa339af5e Mon Sep 17 00:00:00 2001
From 3c7a9552361d2fba0ce65482575f076f2bded204 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 03/15] arm_neon: work-around libtool issue
Subject: [PATCH 03/16] arm_neon: work-around libtool issue
---
modules/arm_neon/Makefile.am | 2 ++
......
From 55a2810ff4e91031a765fdf0a9ebabe5072f6033 Mon Sep 17 00:00:00 2001
From 0d13b51af91847bae2ab074e74d1396ae0af117d 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 04/15] arm_neon: fix iOS linking
Subject: [PATCH 04/16] arm_neon: fix iOS linking
---
modules/arm_neon/amplify.S | 7 ++---
......
From 2a4fa81246e3e3d5ec118802533f6760578c983f Mon Sep 17 00:00:00 2001
From 92161246ca1767be31d2942f246f49b8f9f7e77b 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] disable neon volume plugin
Subject: [PATCH 05/16] disable neon volume plugin
---
modules/arm_neon/Makefile.am | 1 -
......
From 3a9e051faebf8da66bf33eac8e384057c96156fa Mon Sep 17 00:00:00 2001
From 28192fe25bea1cce99d947bf8e82d3be0955a1d6 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 06/15] libvlc: create VT-zero-copy variable
Subject: [PATCH 06/16] libvlc: create VT-zero-copy variable
---
lib/media_player.c | 1 +
......
From af1a5192ffb663d13d8ea2127a2865918e0ab1e3 Mon Sep 17 00:00:00 2001
From 44a1b08c0d8cad4df6dca685d271211a9e62b6d6 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 07/15] contrib/gcrypt: work-around a libtool limitation
Subject: [PATCH 07/16] contrib/gcrypt: work-around a libtool limitation
---
contrib/src/gcrypt/rules.mak | 1 +
......@@ -10,7 +10,7 @@ Subject: [PATCH 07/15] 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 291f0fc1b5..1484e7ab82 100644
index 141b32d6b4..f9ead8e357 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -12,6 +12,7 @@ $(TARBALLS)/libgcrypt-$(GCRYPT_VERSION).tar.bz2:
......
From af89b95b7a7144801f39b86be35504d7c62d319e Mon Sep 17 00:00:00 2001
From 3fbe401079ef24a8f91456655508be81069c9a0b 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 08/15] contrib/gcrypt: fix tvOS compilation
Subject: [PATCH 08/16] contrib/gcrypt: fix tvOS compilation
---
contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch | 16 ++++++++++++++++
......@@ -32,7 +32,7 @@ index 0000000000..f1d3ccc71f
+ * %rdi: ctx, CTX
+ * %rsi: data (64 bytes)
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index 1484e7ab82..200a98e828 100644
index f9ead8e357..d1c421a8b8 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -13,6 +13,7 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
......
From 1fa30ef90c3f6992c6b6b26cd3e5bba7c03f5062 Mon Sep 17 00:00:00 2001
From 2032d63f799351c0a1607f767563daa9c8c2950d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=83=C2=BChne?= <fkuehne@videolan.org>
Date: Tue, 12 Jul 2016 13:50:54 +0200
Subject: [PATCH 09/15] contrib/avcodec: enforce use of FFmpeg
Subject: [PATCH 09/16] contrib/avcodec: enforce use of FFmpeg
---
contrib/src/ffmpeg/rules.mak | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 2b4778c826..842a61b9d7 100644
index 5725e8f11e..5ee8a6896a 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -2,10 +2,10 @@
......
From fdb7a3f58b0d9919cfc3607c765b8af09af32f4f Mon Sep 17 00:00:00 2001
From 24755de58771622a4937109d6dc59e61ecd714c6 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 10/15] Enable System DL
Subject: [PATCH 10/16] Enable System DL
---
contrib/src/ffmpeg/patch-as-patch-can.patch | 20 ++++++++++++++++++++
......@@ -36,7 +36,7 @@ index 0000000000..2d60cf7140
+ 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 842a61b9d7..b950b027dd 100644
index 5ee8a6896a..e99e3ef68f 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -24,6 +24,9 @@ FFMPEGCONF = \
......
From 865aed65f9088f5495fecba4d9d7a8dd74c7aa44 Mon Sep 17 00:00:00 2001
From 33e2f5b6665254cc7e54af04bc87c122039202c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Mon, 12 Sep 2016 17:03:37 +0200
Subject: [PATCH 12/15] contrib/gcrypt: update patches
Subject: [PATCH 11/16] contrib/gcrypt: update patches
---
contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch | 308 ++++++++++++++++++++-
......
From 8ba8849bc5d510be22f2dc8a52b64594d36e7805 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Fri, 22 Jul 2016 11:20:24 +0200
Subject: [PATCH 11/15] taglib: DO NOT PUSH: works with networks accesses
---
modules/meta_engine/taglib.cpp | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
index 6d051ba1ea..afc81312e6 100644
--- a/modules/meta_engine/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
@@ -174,7 +174,7 @@ public:
FileName name() const
{
- return m_stream->psz_location;
+ return m_stream->psz_url;
}
ByteVector readBlock(ulong length)
@@ -835,16 +835,8 @@ static int ReadMeta( vlc_object_t* p_this)
if( unlikely(psz_uri == NULL) )
return VLC_ENOMEM;
- char *psz_path = vlc_uri2path( psz_uri );
-#if VLC_WINSTORE_APP && TAGLIB_VERSION >= TAGLIB_VERSION_1_11
- if( psz_path == NULL )
- {
- free( psz_uri );
- return VLC_EGENERIC;
- }
- free( psz_path );
-
- stream_t *p_stream = vlc_access_NewMRL( p_this, psz_uri );
+#if TAGLIB_VERSION >= TAGLIB_VERSION_1_11
+ stream_t *p_stream = vlc_stream_NewURL( p_this, psz_uri );
free( psz_uri );
if( p_stream == NULL )
return VLC_EGENERIC;
@@ -852,6 +844,7 @@ static int ReadMeta( vlc_object_t* p_this)
VlcIostream s( p_stream );
f = FileRef( &s );
#else /* VLC_WINSTORE_APP */
+ char *psz_path = vlc_uri2path( psz_uri );
free( psz_uri );
if( psz_path == NULL )
return VLC_EGENERIC;
--
2.11.0
From 038c89300806762f8dfa052f88dfa6fe5dce4cb3 Mon Sep 17 00:00:00 2001
From 44e2867581a44e2274af9c85b81489d702492d9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Mon, 12 Sep 2016 17:04:05 +0200
Subject: [PATCH 13/15] deinterlace-merge-arm64: fix linking on appleOS
Subject: [PATCH 12/16] deinterlace-merge-arm64: fix linking on appleOS
---
modules/arm_neon/asm64.S | 46 ++++++++++++++++++++++++++
......
From e47a1f507b01c9178527ab3318d8bd5612519ca9 Mon Sep 17 00:00:00 2001
From 2a12dcbf6eddd127044f1f2fb8143bc7537b2785 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Fri, 16 Sep 2016 15:51:10 +0200
Subject: [PATCH 14/15] http: add vlc_http_cookies_clear
Subject: [PATCH 13/16] http: add vlc_http_cookies_clear
Clear all cookies without deleting the jar.
---
......
From 47f3f623506fe1695773ef326c7e2f02ffe34100 Mon Sep 17 00:00:00 2001
From 1c2d8162df070df6395d66b3c23c833e4f2d6879 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Fri, 16 Sep 2016 15:51:11 +0200
Subject: [PATCH 15/15] libvlc_media: add cookie_jar API
Subject: [PATCH 14/16] libvlc_media: add cookie_jar API
---
include/vlc/libvlc_media.h | 35 +++++++++++++++++++++++++++++++++++
......@@ -12,7 +12,7 @@ Subject: [PATCH 15/15] libvlc_media: add cookie_jar API
5 files changed, 72 insertions(+)
diff --git a/include/vlc/libvlc_media.h b/include/vlc/libvlc_media.h
index 01e571c..5ca39f5 100644
index 01e571c519..5ca39f51a3 100644
--- a/include/vlc/libvlc_media.h
+++ b/include/vlc/libvlc_media.h
@@ -876,6 +876,41 @@ LIBVLC_API
......@@ -58,7 +58,7 @@ index 01e571c..5ca39f5 100644
# ifdef __cplusplus
diff --git a/lib/libvlc.sym b/lib/libvlc.sym
index caa5598..c0d5754 100644
index caa55981bf..c0d5754abf 100644
--- a/lib/libvlc.sym
+++ b/lib/libvlc.sym
@@ -216,6 +216,8 @@ libvlc_media_set_user_data
......@@ -71,7 +71,7 @@ index caa5598..c0d5754 100644
libvlc_playlist_play
libvlc_release
diff --git a/lib/media.c b/lib/media.c
index 4c95c94..86a42cd 100644
index 4c95c94c8e..86a42cdf88 100644
--- a/lib/media.c
+++ b/lib/media.c
@@ -396,6 +396,8 @@ libvlc_media_t * libvlc_media_new_from_input_item(
......@@ -119,7 +119,7 @@ index 4c95c94..86a42cd 100644
+ vlc_http_cookies_clear( p_md->p_cookie_jar );
+}
diff --git a/lib/media_internal.h b/lib/media_internal.h
index f063ddb..17bbd84 100644
index f063ddb5fa..17bbd84fac 100644
--- a/lib/media_internal.h
+++ b/lib/media_internal.h
@@ -30,6 +30,7 @@
......@@ -139,7 +139,7 @@ index f063ddb..17bbd84 100644
/* Media Descriptor */
diff --git a/lib/media_player.c b/lib/media_player.c
index f5ec04a..9326fb8 100644
index adf450d99e..e0cf0ee20e 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -620,6 +620,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
......@@ -150,7 +150,7 @@ index f5ec04a..9326fb8 100644
/* Video */
var_Create (mp, "vout", VLC_VAR_STRING|VLC_VAR_DOINHERIT);
@@ -970,6 +971,12 @@ int libvlc_media_player_play( libvlc_media_player_t *p_mi )
@@ -971,6 +972,12 @@ int libvlc_media_player_play( libvlc_media_player_t *p_mi )
for( size_t i = 0; i < ARRAY_SIZE( p_mi->selected_es ); ++i )
p_mi->selected_es[i] = ES_INIT;
......@@ -164,5 +164,5 @@ index f5ec04a..9326fb8 100644
p_input_thread = input_Create( p_mi, p_mi->p_md->p_input_item, NULL,
--
2.10.1
2.11.0
From a001708c77b5719d2688ef646517f46d0a2487b1 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Tue, 18 Apr 2017 17:24:03 +0200
Subject: [PATCH 15/16] Revert "Contribs: update libpng to 1.6.29"
This reverts commit 8891af2d84de3caa5c4f2a51acbb2b47647ed62d.
---
contrib/src/png/SHA512SUMS | 2 +-
contrib/src/png/bins.patch | 15 ++++++---------
contrib/src/png/rules.mak | 2 +-
3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/contrib/src/png/SHA512SUMS b/contrib/src/png/SHA512SUMS
index b07b35b341..83d7d029b9 100644
--- a/contrib/src/png/SHA512SUMS
+++ b/contrib/src/png/SHA512SUMS
@@ -1 +1 @@
-070393423ec11f19e3264a0200959ae09238aa005615571586987253028b4ffb7e6b7c734a132f65180252b0259f79add03896d79fdc7dcfd8773b82c82a5ffc libpng-1.6.29.tar.xz
+166377ce4f8abfcae0e76bafbdbe94aebef60b9a12c1820eda392e63a8ba7a9e8d7ef4840d8d4853cd487418edd2c4515a889cd9f830d4223a13315e1db4c3b8 libpng-1.6.19.tar.xz
diff --git a/contrib/src/png/bins.patch b/contrib/src/png/bins.patch
index 660437c71b..317f9c85ea 100644
--- a/contrib/src/png/bins.patch
+++ b/contrib/src/png/bins.patch
@@ -1,18 +1,15 @@
---- libpng-1.6.29/Makefile.am.orig 2017-04-08 12:12:49.688261183 +0200
-+++ libpng-1.6.29/Makefile.am 2017-04-08 12:13:27.148259514 +0200
-@@ -12,13 +12,13 @@
+--- libpng-1.6.10/Makefile.am.orig 2014-05-24 18:11:01.881964331 +0200
++++ libpng-1.6.10/Makefile.am 2014-05-24 18:12:02.839819773 +0200
+@@ -7,10 +7,10 @@
ACLOCAL_AMFLAGS = -I scripts
# test programs - run on make check, make distcheck
--check_PROGRAMS= pngtest pngunknown pngstest pngvalid pngimage pngcp
-+check_PROGRAMS=
- if HAVE_CLOCK_GETTIME
- check_PROGRAMS += timepng
- endif
+-check_PROGRAMS= pngtest pngunknown pngstest pngvalid pngimage
++check_PROGRAMS=
# Utilities - installed
-bin_PROGRAMS= pngfix png-fix-itxt
-+bin_PROGRAMS=
++bin_PROGRAMS=
# This ensures that pnglibconf.h gets built at the start of 'make all' or
# 'make check', but it does not add dependencies to the individual programs,
diff --git a/contrib/src/png/rules.mak b/contrib/src/png/rules.mak
index 9a05170afc..c18cfdf214 100644
--- a/contrib/src/png/rules.mak
+++ b/contrib/src/png/rules.mak
@@ -1,5 +1,5 @@
# PNG
-PNG_VERSION := 1.6.29
+PNG_VERSION := 1.6.19
PNG_URL := $(SF)/libpng/libpng16/$(PNG_VERSION)/libpng-$(PNG_VERSION).tar.xz
PKGS += png
--
2.11.0
From a0e311ff1087e214c49368973ab8af104270e9c5 Mon Sep 17 00:00:00 2001
From f652d5bdff7152bdad58a37b36e1f9460a03fac4 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Tue, 11 Apr 2017 15:15:26 +0200
Subject: [PATCH 17/17] build: rename exported symbols by module
Subject: [PATCH 16/16] build: rename exported symbols by module
This is quite ugly and temporary. Ideally we should rename symbols in binaries
like the Android script do.
......@@ -89,7 +89,7 @@ index 5105dd1efd..7c97fc842a 100644
#define MUX_TEXT N_("Avformat mux")
#define MUX_LONGTEXT N_("Force use of a specific avformat muxer.")
diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
index 4824215c02..8b50528624 100644
index 453e7247fd..e4d804a74e 100644
--- a/modules/demux/avformat/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -152,7 +152,7 @@ static void get_rotation(es_format_t *fmt, AVStream *s)
......@@ -147,7 +147,7 @@ index 4824215c02..8b50528624 100644
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys = p_demux->p_sys;
diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c
index 9072c2f8e1..3045a35e32 100644
index 821860dcf0..504d491f54 100644
--- a/modules/demux/avformat/mux.c
+++ b/modules/demux/avformat/mux.c
@@ -84,7 +84,7 @@ static int IOWriteTyped(void *opaque, uint8_t *buf, int buf_size,
......@@ -159,7 +159,7 @@ index 9072c2f8e1..3045a35e32 100644
{
AVOutputFormat *file_oformat;
sout_mux_t *p_mux = (sout_mux_t*)p_this;
@@ -161,7 +161,7 @@ int OpenMux( vlc_object_t *p_this )
@@ -163,7 +163,7 @@ int OpenMux( vlc_object_t *p_this )
/*****************************************************************************
* Close
*****************************************************************************/
......
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