Commit 039df2eb authored by Felix Paul Kühne's avatar Felix Paul Kühne

libvlc: rebase patches notably 0012 and update libvlc

parent 70d730cb
From a2103b8070ad060de61baab046c7424ddb5d9681 Mon Sep 17 00:00:00 2001
From f722ec6e0a507d9d6ac8d07b64d397e0005f7d36 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 01/21] arm_neon: work-around libtool issue
......
From aaa325c49ddf4ccd523000f82bca4a087437acb5 Mon Sep 17 00:00:00 2001
From ec0833dc5c0de67ccb70aaad13b5cca1b53b2b63 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 02/21] disable neon volume plugin
......
From f447969ddec739eb266da9502046342723b43540 Mon Sep 17 00:00:00 2001
From e212978e2104a3b1b63c26a7844039d04ee2a3d1 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 03/21] Enable System DL
......
From e6e9e49c9465f443364a3fdee400da6a252f2067 Mon Sep 17 00:00:00 2001
From a6aab77007bd9037311dd318e7d0f6731a2d072c Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Fri, 16 Sep 2016 15:51:10 +0200
Subject: [PATCH 04/21] http: add vlc_http_cookies_clear
......
From 2e0450098a219c94ecb50e770672c1a17682d24c Mon Sep 17 00:00:00 2001
From 7ea0717450762464b257e5ee36624871a96b1d74 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Fri, 16 Sep 2016 15:51:11 +0200
Subject: [PATCH 05/21] libvlc_media: add cookie_jar API
......
From 6863609c964e4be15fac86179964e9078722ebe9 Mon Sep 17 00:00:00 2001
From 20fc6522b5fdc3b2e9cd43c20365e0449bf7370e 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 06/21] contrib/gcrypt: work-around a libtool limitation
......
From 48fc3a3ed9c0a5ad5fb032218d6d9f7ddd9973db Mon Sep 17 00:00:00 2001
From 56de0725dec3e6bbb1e7c50bbdd27e6f71c9c1fe 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 07/21] contrib/gcrypt: fix tvOS compilation
......
From 85cd4dcac702493f4eb4c7e09dbf6914e2bfdb51 Mon Sep 17 00:00:00 2001
From 7eb426d0b581e6ca258c61185b9b58b75b59069a 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 08/21] contrib/gcrypt: update patches
......
From c9bf588975906b7092ea82de8f5d47b15a90574c Mon Sep 17 00:00:00 2001
From 3cd38bd0a11400577995f94b10a94ac0d601ddd0 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Mon, 17 Jul 2017 17:03:24 +0200
Subject: [PATCH 09/21] Replace thread local with pthread TSD
......
From b68d83237a50beb6da2a9520011029e527f45be4 Mon Sep 17 00:00:00 2001
From a69b13b0a86f1f74be3b765484e75e6080547fea Mon Sep 17 00:00:00 2001
From: Carola Nitz <nitz.carola@googlemail.com>
Date: Fri, 29 Sep 2017 14:49:02 +0200
Subject: [PATCH 10/21] contrib: use live555 version that is compatible with
......@@ -18,7 +18,7 @@ index f459fb9d16..02b2a69734 100644
+10846fd6d5482bbea131ae805137077997e9dec242665e3c01d699d5584154c65049e8c520ea855599e554154a148e61fea77b592d97c814a4a98c773658d8f5 live.2016.10.21.tar.gz
\ No newline at end of file
diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index b77d96ce73..3a2526a497 100644
index 9b275ec33b..30ee48eece 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -1,14 +1,12 @@
......@@ -37,7 +37,7 @@ index b77d96ce73..3a2526a497 100644
ifeq ($(call need_pkg,"live555"),)
PKGS_FOUND += live555
@@ -82,7 +80,6 @@ endif
@@ -90,7 +88,6 @@ endif
SUBDIRS=groupsock liveMedia UsageEnvironment BasicUsageEnvironment
.live555: live555
......
From 0fcb64856d14c35c14a0a435b090a2e79fd1de90 Mon Sep 17 00:00:00 2001
From fa00abf30e86d629dec8c39049267671ffa93494 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <felix@feepk.net>
Date: Sun, 17 Dec 2017 18:05:40 +0100
Subject: [PATCH 11/21] libvlc: add a basic API to change freetype's color,
......
From 3240c00e03620d1b3ef2ff2ded86147b6162222a Mon Sep 17 00:00:00 2001
From f48e06d158c35e5546e76e0bfde719f40b540553 Mon Sep 17 00:00:00 2001
From: Carola Nitz <nitz.carola@googlemail.com>
Date: Fri, 23 Feb 2018 13:16:41 +0100
Subject: [PATCH 12/21] Work around lack of __thread storage qualifier on old
......@@ -14,7 +14,7 @@ Subject: [PATCH 12/21] Work around lack of __thread storage qualifier on old
rename {compat => src/extras}/tdestroy.c (59%)
diff --git a/configure.ac b/configure.ac
index 54c270df37..8225d996b5 100644
index cfdae650b3..603b260a73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -590,8 +590,8 @@ dnl Check for system libs needed
......@@ -22,20 +22,20 @@ index 54c270df37..8225d996b5 100644
dnl Check for usual libc functions
-AC_CHECK_FUNCS([accept4 daemon fcntl flock fstatvfs fork getenv getpwuid_r isatty lstat memalign mkostemp mmap newlocale open_memstream openat pipe2 pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp strptime uselocale])
-AC_REPLACE_FUNCS([aligned_alloc atof atoll dirfd fdopendir ffsll flockfile fsync getdelim getpid lldiv memrchr nrand48 poll recvmsg rewind sendmsg setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strnstr strsep strtof strtok_r strtoll swab tdestroy tfind timegm timespec_get strverscmp pathconf])
-AC_REPLACE_FUNCS([aligned_alloc atof atoll dirfd fdopendir ffsll flockfile fsync getdelim getpid lfind lldiv memrchr nrand48 poll recvmsg rewind sendmsg setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strnstr strsep strtof strtok_r strtoll swab tdestroy tfind timegm timespec_get strverscmp pathconf])
+AC_CHECK_FUNCS([accept4 daemon fcntl flock fstatvfs fork getenv getpwuid_r isatty lstat memalign mkostemp mmap open_memstream openat pipe2 pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp strptime tdestroy uselocale])
+AC_REPLACE_FUNCS([aligned_alloc atof atoll dirfd fdopendir ffsll flockfile fsync getdelim getpid lldiv memrchr nrand48 poll recvmsg rewind sendmsg setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strnstr strsep strtof strtok_r strtoll swab tfind timegm timespec_get strverscmp pathconf])
+AC_REPLACE_FUNCS([aligned_alloc atof atoll dirfd fdopendir ffsll flockfile fsync getdelim getpid lfind lldiv memrchr nrand48 poll recvmsg rewind sendmsg setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strnstr strsep strtof strtok_r strtoll swab tfind timegm timespec_get strverscmp pathconf])
AC_REPLACE_FUNCS([gettimeofday])
AC_CHECK_FUNC(fdatasync,,
[AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index 3003a154f6..ba4f6447be 100644
index 6c0de2854b..8e8e406028 100644
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -486,9 +486,12 @@ void *tsearch( const void *key, void **rootp, int(*cmp)(const void *, const void
void *tfind( const void *key, const void **rootp, int(*cmp)(const void *, const void *) );
void *tdelete( const void *key, void **rootp, int(*cmp)(const void *, const void *) );
@@ -490,9 +490,12 @@ void *tdelete( const void *key, void **rootp, int(*cmp)(const void *, const void
void twalk( const void *root, void(*action)(const void *nodep, VISIT which, int depth) );
void *lfind( const void *key, const void *base, size_t *nmemb,
size_t size, int(*cmp)(const void *, const void *) );
-#endif /* HAVE_SEARCH_H */
-#ifndef HAVE_TDESTROY
void tdestroy( void *root, void (*free_node)(void *nodep) );
......
From 3cf768f74c8ee4050b7cb0646a7441a817e590ae Mon Sep 17 00:00:00 2001
From 800d701b0339f6f10f58f0f71fb828c93fe1d4a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Mon, 26 Mar 2018 16:44:44 +0200
Subject: [PATCH 13/21] modules:common: Use the full module name as MODULE_NAME
......
From f7f6a1736714a969e7ed2bdfd213d59bc98dd7df Mon Sep 17 00:00:00 2001
From bde8deaef81276f53e6c0680747ed1f25b564139 Mon Sep 17 00:00:00 2001
From: Luis Fernandes <zipleen@gmail.com>
Date: Mon, 30 Apr 2018 14:33:08 +0100
Subject: [PATCH 14/21] add auto deinterlacer-mode which is also valid
......
From 2d8fecb9dfe4c5bc0e4bfb360cd722da77a46014 Mon Sep 17 00:00:00 2001
From d787329479948bbb4e08ccb6ea9fb1363ead5808 Mon Sep 17 00:00:00 2001
From: Luis Fernandes <zipleen@gmail.com>
Date: Wed, 9 May 2018 10:44:43 +0100
Subject: [PATCH 15/21] Users will be able to change the deinterlace mode
......
From 62b27ae90ab2661d1a84016b648218ebf9db4de1 Mon Sep 17 00:00:00 2001
From 939e1151740e3abb060a0afeac620a22a0cd70ef Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Tue, 27 Mar 2018 16:49:34 +0200
Subject: [PATCH 16/21] contrib: ffmpeg: enable videotoolbox encoder
......
From 68ae48e1e806bcbc68d795d68b56ee2fdcd466be Mon Sep 17 00:00:00 2001
From a42d5d27f29f6239ee6a874b9a07e675e98fbfa8 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Tue, 27 Mar 2018 16:52:35 +0200
Subject: [PATCH 17/21] chromecast: use vt encoder from avcodec
......
From d251faa6fec291d85ea078806a82e3f88a6cc1ea Mon Sep 17 00:00:00 2001
From b7ac55bfbc294676bd6ae343a80269f104b4b8d0 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Mon, 18 Jun 2018 12:31:13 +0200
Subject: [PATCH 18/21] ffmpeg: backport vtenc patches
......
From ef572bd0e55241ee419c2c3267f277583cc4a0c6 Mon Sep 17 00:00:00 2001
From e9af8d3cf8a7d8dc142f09b0b6b500ca36b126d4 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Wed, 17 Jan 2018 10:06:13 +0200
Subject: [PATCH 19/21] core: expose config_AutoSaveConfigFile
......
From 15e22494dd962578969bfa6b73362f201d051c4f Mon Sep 17 00:00:00 2001
From 70c8cec5bd26150631b662131ffb65ca6d395a21 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Wed, 17 Jan 2018 10:06:13 +0200
Subject: [PATCH 20/21] lib: save configuration after playback/parse
......
From 1e4ab39e4d1cbb678fea8c0cd2f3ce3dcc499039 Mon Sep 17 00:00:00 2001
From b0ef8f7ad8ec99498fcde33989c2765ea2de9069 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <felix@feepk.net>
Date: Mon, 10 Sep 2018 20:55:11 +0200
Subject: [PATCH 21/21] http access: retain auth struct for the runtime of the
......
......@@ -25,7 +25,7 @@ OSVERSIONMINLDFLAG=ios_version_min
ROOT_DIR=empty
FARCH="all"
TESTEDHASH="79ed7f520" # libvlc hash that this version of VLCKit is build on
TESTEDHASH="177a4a2a5" # libvlc hash that this version of VLCKit is build on
if [ -z "$MAKE_JOBS" ]; then
CORE_COUNT=`sysctl -n machdep.cpu.core_count`
......
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