From 94b06a837e36de27d94c8ce6cc4db4d6b8321aa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= Date: Sun, 26 Nov 2017 11:31:50 +0100 Subject: [PATCH] MVK: update libvlc adding support for HEVC in VT --- ...neon-added-function-macro-to-handle-the-undersco.patch | 4 ++-- ...terlace-merge-use-a-macro-to-fix-compilation-for.patch | 4 ++-- .../patches/0003-arm_neon-work-around-libtool-issue.patch | 4 ++-- .../patches/0004-arm_neon-fix-iOS-linking.patch | 4 ++-- .../patches/0005-disable-neon-volume-plugin.patch | 4 ++-- .../MobileVLCKit/patches/0006-Enable-System-DL.patch | 4 ++-- ...7-deinterlace-merge-arm64-fix-linking-on-appleOS.patch | 4 ++-- .../patches/0008-http-add-vlc_http_cookies_clear.patch | 4 ++-- .../patches/0009-libvlc_media-add-cookie_jar-API.patch | 4 ++-- ...-contrib-gcrypt-work-around-a-libtool-limitation.patch | 4 ++-- .../0011-contrib-gcrypt-fix-tvOS-compilation.patch | 4 ++-- .../patches/0012-contrib-gcrypt-update-patches.patch | 4 ++-- .../0013-Replace-thread-local-with-pthread-TSD.patch | 4 ++-- ...rib-use-live555-version-that-is-compatible-with-.patch | 8 ++++---- buildMobileVLCKit.sh | 2 +- 15 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Resources/MobileVLCKit/patches/0001-arm_neon-added-function-macro-to-handle-the-undersco.patch b/Resources/MobileVLCKit/patches/0001-arm_neon-added-function-macro-to-handle-the-undersco.patch index 80f0eaa4..69dcb87a 100644 --- a/Resources/MobileVLCKit/patches/0001-arm_neon-added-function-macro-to-handle-the-undersco.patch +++ b/Resources/MobileVLCKit/patches/0001-arm_neon-added-function-macro-to-handle-the-undersco.patch @@ -1,4 +1,4 @@ -From 20f03288daaeb9aaccd26df4fa27cc043e00781e Mon Sep 17 00:00:00 2001 +From b263d52c5a75a582b829ac3384e2901ad46c06d7 Mon Sep 17 00:00:00 2001 From: David Geldreich Date: Fri, 20 Apr 2012 16:41:19 +0200 Subject: [PATCH 01/14] arm_neon: added function macro to handle the underscore @@ -65,5 +65,5 @@ index 0000000000..d853255fec +.endm + -- -2.14.2 +2.15.0 diff --git a/Resources/MobileVLCKit/patches/0002-deinterlace-merge-use-a-macro-to-fix-compilation-for.patch b/Resources/MobileVLCKit/patches/0002-deinterlace-merge-use-a-macro-to-fix-compilation-for.patch index 56dcfcb5..91e24eb9 100644 --- a/Resources/MobileVLCKit/patches/0002-deinterlace-merge-use-a-macro-to-fix-compilation-for.patch +++ b/Resources/MobileVLCKit/patches/0002-deinterlace-merge-use-a-macro-to-fix-compilation-for.patch @@ -1,4 +1,4 @@ -From c4dd9c8e35c14e0eaa7693d57d5a10961f704cb4 Mon Sep 17 00:00:00 2001 +From 26f5a2b1ad9aafde480806a88d03d5d10bf7f6e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= Date: Fri, 10 Aug 2012 16:02:07 +0200 Subject: [PATCH 02/14] deinterlace/merge: use a macro to fix compilation for @@ -82,5 +82,5 @@ index dd779029ae..03e5042b28 100644 b 1b +endfunc -- -2.14.2 +2.15.0 diff --git a/Resources/MobileVLCKit/patches/0003-arm_neon-work-around-libtool-issue.patch b/Resources/MobileVLCKit/patches/0003-arm_neon-work-around-libtool-issue.patch index b7a6d9bf..2559e07f 100644 --- a/Resources/MobileVLCKit/patches/0003-arm_neon-work-around-libtool-issue.patch +++ b/Resources/MobileVLCKit/patches/0003-arm_neon-work-around-libtool-issue.patch @@ -1,4 +1,4 @@ -From 23ff0b45f02d9f7d4eab098b20cd34725bb255d3 Mon Sep 17 00:00:00 2001 +From e0aaacfb19be2cbd14d89af273ca54107ed33635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= Date: Thu, 18 Dec 2014 22:14:55 +0100 Subject: [PATCH 03/14] arm_neon: work-around libtool issue @@ -18,5 +18,5 @@ index db81ec0b84..e67e07e61c 100644 libchroma_yuv_neon_plugin_la_SOURCES = \ -- -2.14.2 +2.15.0 diff --git a/Resources/MobileVLCKit/patches/0004-arm_neon-fix-iOS-linking.patch b/Resources/MobileVLCKit/patches/0004-arm_neon-fix-iOS-linking.patch index b9680529..079d8644 100644 --- a/Resources/MobileVLCKit/patches/0004-arm_neon-fix-iOS-linking.patch +++ b/Resources/MobileVLCKit/patches/0004-arm_neon-fix-iOS-linking.patch @@ -1,4 +1,4 @@ -From 51dedcd012f6db2b237aa162cc939bee8bc3ec7f Mon Sep 17 00:00:00 2001 +From 354579cf5140d01f5f944e0de92cb91c4813bdad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= Date: Wed, 10 Dec 2014 22:14:55 +0100 Subject: [PATCH 04/14] arm_neon: fix iOS linking @@ -194,5 +194,5 @@ index a94ae8539f..54b43a79e3 100644 pop {r4,pc} +endfunc -- -2.14.2 +2.15.0 diff --git a/Resources/MobileVLCKit/patches/0005-disable-neon-volume-plugin.patch b/Resources/MobileVLCKit/patches/0005-disable-neon-volume-plugin.patch index a15111d6..6ed17ab5 100644 --- a/Resources/MobileVLCKit/patches/0005-disable-neon-volume-plugin.patch +++ b/Resources/MobileVLCKit/patches/0005-disable-neon-volume-plugin.patch @@ -1,4 +1,4 @@ -From 47404b0be6e9dd1a81a0a5f039680a68a7ef4b8b Mon Sep 17 00:00:00 2001 +From c3f4477dae5a5aff8d54d6c30cf14067c5aae1e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= Date: Wed, 10 Dec 2014 22:14:55 +0100 Subject: [PATCH 05/14] disable neon volume plugin @@ -19,5 +19,5 @@ index e67e07e61c..690975235f 100644 libyuv_rgb_neon_plugin.la endif -- -2.14.2 +2.15.0 diff --git a/Resources/MobileVLCKit/patches/0006-Enable-System-DL.patch b/Resources/MobileVLCKit/patches/0006-Enable-System-DL.patch index b4ef273b..a2c54927 100644 --- a/Resources/MobileVLCKit/patches/0006-Enable-System-DL.patch +++ b/Resources/MobileVLCKit/patches/0006-Enable-System-DL.patch @@ -1,4 +1,4 @@ -From 65934a43e53b3888ed378ee796db04cc223252f3 Mon Sep 17 00:00:00 2001 +From 878cd2e9ab9041f692a21bc38f8b2566dce27cd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= Date: Fri, 22 Jul 2016 11:11:44 +0200 Subject: [PATCH 06/14] Enable System DL @@ -58,5 +58,5 @@ index 41d16a4fb2..3e5f910e99 100644 .ffmpeg: ffmpeg -- -2.14.2 +2.15.0 diff --git a/Resources/MobileVLCKit/patches/0007-deinterlace-merge-arm64-fix-linking-on-appleOS.patch b/Resources/MobileVLCKit/patches/0007-deinterlace-merge-arm64-fix-linking-on-appleOS.patch index d44e2bbc..dae7a26e 100644 --- a/Resources/MobileVLCKit/patches/0007-deinterlace-merge-arm64-fix-linking-on-appleOS.patch +++ b/Resources/MobileVLCKit/patches/0007-deinterlace-merge-arm64-fix-linking-on-appleOS.patch @@ -1,4 +1,4 @@ -From e6c689d3704187b16fa0de013ad782208263b285 Mon Sep 17 00:00:00 2001 +From b08ebe442bbf6c27e53ef176b537cb1d32d78239 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= Date: Mon, 12 Sep 2016 17:04:05 +0200 Subject: [PATCH 07/14] deinterlace-merge-arm64: fix linking on appleOS @@ -107,5 +107,5 @@ index db19e54caf..63c04d3fdd 100644 ret +endfunc -- -2.14.2 +2.15.0 diff --git a/Resources/MobileVLCKit/patches/0008-http-add-vlc_http_cookies_clear.patch b/Resources/MobileVLCKit/patches/0008-http-add-vlc_http_cookies_clear.patch index c7d9b088..c60e8e04 100644 --- a/Resources/MobileVLCKit/patches/0008-http-add-vlc_http_cookies_clear.patch +++ b/Resources/MobileVLCKit/patches/0008-http-add-vlc_http_cookies_clear.patch @@ -1,4 +1,4 @@ -From 71c676ecb8e0fe7b9b55c4236437f937b0255bdf Mon Sep 17 00:00:00 2001 +From d7dc0f73174cd1be9080d561c2ee1b0e3c21815a Mon Sep 17 00:00:00 2001 From: Thomas Guillem Date: Fri, 16 Sep 2016 15:51:10 +0200 Subject: [PATCH 08/14] http: add vlc_http_cookies_clear @@ -61,5 +61,5 @@ index 77ab852b15..f229b85dea 100644 } -- -2.14.2 +2.15.0 diff --git a/Resources/MobileVLCKit/patches/0009-libvlc_media-add-cookie_jar-API.patch b/Resources/MobileVLCKit/patches/0009-libvlc_media-add-cookie_jar-API.patch index f80901d6..4a9264dd 100644 --- a/Resources/MobileVLCKit/patches/0009-libvlc_media-add-cookie_jar-API.patch +++ b/Resources/MobileVLCKit/patches/0009-libvlc_media-add-cookie_jar-API.patch @@ -1,4 +1,4 @@ -From 72eab0c02e1ba0737fbf59407163d7e1a7242f27 Mon Sep 17 00:00:00 2001 +From 7ff53222824c4e61f8db548dd28b50f2b86a9921 Mon Sep 17 00:00:00 2001 From: Thomas Guillem Date: Fri, 16 Sep 2016 15:51:11 +0200 Subject: [PATCH 09/14] libvlc_media: add cookie_jar API @@ -163,5 +163,5 @@ index daef2faedd..4a6cf0cb0e 100644 p_input_thread = input_Create( p_mi, p_mi->p_md->p_input_item, NULL, -- -2.14.2 +2.15.0 diff --git a/Resources/MobileVLCKit/patches/0010-contrib-gcrypt-work-around-a-libtool-limitation.patch b/Resources/MobileVLCKit/patches/0010-contrib-gcrypt-work-around-a-libtool-limitation.patch index 0ca1afdb..8202a106 100644 --- a/Resources/MobileVLCKit/patches/0010-contrib-gcrypt-work-around-a-libtool-limitation.patch +++ b/Resources/MobileVLCKit/patches/0010-contrib-gcrypt-work-around-a-libtool-limitation.patch @@ -1,4 +1,4 @@ -From 81da678c195a38fedcc96b5f65aa1fb64bf71b5a Mon Sep 17 00:00:00 2001 +From 99e5fd5479e463e9fed6e616fcaff8d9e3f1e434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= Date: Sun, 7 Dec 2014 20:02:18 +0100 Subject: [PATCH 10/14] contrib/gcrypt: work-around a libtool limitation @@ -53,5 +53,5 @@ index 0000000000..df97ffb488 + AM_CFLAGS = $(GPG_ERROR_CFLAGS) + -- -2.14.2 +2.15.0 diff --git a/Resources/MobileVLCKit/patches/0011-contrib-gcrypt-fix-tvOS-compilation.patch b/Resources/MobileVLCKit/patches/0011-contrib-gcrypt-fix-tvOS-compilation.patch index f86f43e8..149e7f8f 100644 --- a/Resources/MobileVLCKit/patches/0011-contrib-gcrypt-fix-tvOS-compilation.patch +++ b/Resources/MobileVLCKit/patches/0011-contrib-gcrypt-fix-tvOS-compilation.patch @@ -1,4 +1,4 @@ -From 34e3780d470e77c5d565986a29189be2f82c074e Mon Sep 17 00:00:00 2001 +From 0ea9497b2392046e13fbe9d91992b1c5e246ea77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= Date: Sat, 3 Oct 2015 22:45:14 +0200 Subject: [PATCH 11/14] contrib/gcrypt: fix tvOS compilation @@ -56,5 +56,5 @@ index c2d4b934f4..dbd556be61 100644 GCRYPT_CONF += --disable-aesni-support else -- -2.14.2 +2.15.0 diff --git a/Resources/MobileVLCKit/patches/0012-contrib-gcrypt-update-patches.patch b/Resources/MobileVLCKit/patches/0012-contrib-gcrypt-update-patches.patch index 29ce29e2..2aeacb1f 100644 --- a/Resources/MobileVLCKit/patches/0012-contrib-gcrypt-update-patches.patch +++ b/Resources/MobileVLCKit/patches/0012-contrib-gcrypt-update-patches.patch @@ -1,4 +1,4 @@ -From f1231a5dd27935b6439248f294ca3f82b3aaf8a0 Mon Sep 17 00:00:00 2001 +From 4b2f48db45888f8f388805da5cb2964728405fcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= Date: Mon, 12 Sep 2016 17:03:37 +0200 Subject: [PATCH 12/14] contrib/gcrypt: update patches @@ -363,5 +363,5 @@ index df97ffb488..957f268ad2 100644 # Need to include ../src in addition to top_srcdir because gcrypt.h is -- -2.14.2 +2.15.0 diff --git a/Resources/MobileVLCKit/patches/0013-Replace-thread-local-with-pthread-TSD.patch b/Resources/MobileVLCKit/patches/0013-Replace-thread-local-with-pthread-TSD.patch index c2278a0c..6a200a42 100644 --- a/Resources/MobileVLCKit/patches/0013-Replace-thread-local-with-pthread-TSD.patch +++ b/Resources/MobileVLCKit/patches/0013-Replace-thread-local-with-pthread-TSD.patch @@ -1,4 +1,4 @@ -From d8fc810f8cbf17c8689396392580372dd96f008b Mon Sep 17 00:00:00 2001 +From a26045e6d1d33c23d3227173b34f34ae2527218d Mon Sep 17 00:00:00 2001 From: Thomas Guillem Date: Mon, 17 Jul 2017 17:03:24 +0200 Subject: [PATCH 13/14] Replace thread local with pthread TSD @@ -222,5 +222,5 @@ index 810c8ffc81..3d2d2f1dc8 100644 twalk(priv->var_root, TwalkGetNames); vlc_mutex_unlock(&priv->var_lock); -- -2.14.2 +2.15.0 diff --git a/Resources/MobileVLCKit/patches/0014-contrib-use-live555-version-that-is-compatible-with-.patch b/Resources/MobileVLCKit/patches/0014-contrib-use-live555-version-that-is-compatible-with-.patch index 5c2c0f48..f85d12e2 100644 --- a/Resources/MobileVLCKit/patches/0014-contrib-use-live555-version-that-is-compatible-with-.patch +++ b/Resources/MobileVLCKit/patches/0014-contrib-use-live555-version-that-is-compatible-with-.patch @@ -1,4 +1,4 @@ -From 7ee22ab9ee43d4bac2f8ccd7f00eb91db756d5c0 Mon Sep 17 00:00:00 2001 +From e11038af88732b7774dc3f39393e2018406ea632 Mon Sep 17 00:00:00 2001 From: Carola Nitz Date: Fri, 29 Sep 2017 14:49:02 +0200 Subject: [PATCH 14/14] 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 19d04541d8..8eb4295f42 100644 +index c389f2c33d..7a629bdee4 100644 --- a/contrib/src/live555/rules.mak +++ b/contrib/src/live555/rules.mak @@ -1,14 +1,12 @@ @@ -37,7 +37,7 @@ index 19d04541d8..8eb4295f42 100644 $(TARBALLS)/$(LIVE555_FILE): $(call download_pkg,$(LIVEDOTCOM_URL),live555) -@@ -74,7 +72,6 @@ endif +@@ -76,7 +74,6 @@ endif SUBDIRS=groupsock liveMedia UsageEnvironment BasicUsageEnvironment .live555: live555 @@ -46,5 +46,5 @@ index 19d04541d8..8eb4295f42 100644 echo "PREFIX = $(PREFIX)" >> $$subdir/Makefile.head && \ echo "LIBDIR = $(PREFIX)/lib" >> $$subdir/Makefile.head ; done -- -2.14.2 +2.15.0 diff --git a/buildMobileVLCKit.sh b/buildMobileVLCKit.sh index 7d0941fd..d4e03b90 100755 --- a/buildMobileVLCKit.sh +++ b/buildMobileVLCKit.sh @@ -22,7 +22,7 @@ OSVERSIONMINLDFLAG=ios_version_min ROOT_DIR=empty FARCH="all" -TESTEDHASH=68ebdf18 +TESTEDHASH=50e1f071 if [ -z "$MAKE_JOBS" ]; then CORE_COUNT=`sysctl -n machdep.cpu.core_count` -- GitLab