From 2b76f6ac7b750be5026d5799a0fc5cadada13b83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= Date: Mon, 11 Sep 2017 19:21:44 +0200 Subject: [PATCH] Update libvlc --- ...arm_neon-added-function-macro-to-handle-the-undersco.patch | 2 +- ...deinterlace-merge-use-a-macro-to-fix-compilation-for.patch | 2 +- .../patches/0003-arm_neon-work-around-libtool-issue.patch | 2 +- .../MobileVLCKit/patches/0004-arm_neon-fix-iOS-linking.patch | 2 +- .../patches/0005-disable-neon-volume-plugin.patch | 2 +- .../patches/0006-libvlc-create-VT-zero-copy-variable.patch | 4 ++-- Resources/MobileVLCKit/patches/0007-Enable-System-DL.patch | 2 +- .../0008-deinterlace-merge-arm64-fix-linking-on-appleOS.patch | 2 +- .../patches/0009-http-add-vlc_http_cookies_clear.patch | 2 +- .../patches/0010-libvlc_media-add-cookie_jar-API.patch | 4 ++-- .../0011-Revert-Contribs-update-libpng-to-1.6.29.patch | 2 +- ...0012-contrib-gcrypt-work-around-a-libtool-limitation.patch | 2 +- .../patches/0013-contrib-gcrypt-fix-tvOS-compilation.patch | 2 +- .../patches/0014-contrib-gcrypt-update-patches.patch | 2 +- .../patches/0015-contrib-avcodec-enforce-use-of-FFmpeg.patch | 2 +- .../0016-build-rename-exported-symbols-by-module.patch | 2 +- Resources/MobileVLCKit/patches/0017-Remove-thread-local.patch | 2 +- buildMobileVLCKit.sh | 2 +- 18 files changed, 20 insertions(+), 20 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 6c980fc0..0da734ae 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 e282880ba5f6b2a90f262cc84732ecfe0e326ed4 Mon Sep 17 00:00:00 2001 +From 85f6dfe333478888cf50114d41a6ebd6d32fdd40 Mon Sep 17 00:00:00 2001 From: David Geldreich Date: Fri, 20 Apr 2012 16:41:19 +0200 Subject: [PATCH 01/17] arm_neon: added function macro to handle the underscore 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 711eaeb7..b2bd65e9 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 758f811a86472e75866787993d300523da9b139a Mon Sep 17 00:00:00 2001 +From 2915f208da328eaa70825db3b2654fd20fb9c089 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/17] deinterlace/merge: use a macro to fix compilation for 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 54799be4..dae0dd93 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 cd7ae932c30f1e6e76b4eac89152d92939363dff Mon Sep 17 00:00:00 2001 +From 37b0962e8ba4721a218137b70a5d7c31c1e0bbc3 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/17] arm_neon: work-around libtool issue 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 92aa99b3..26971523 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 3a8849b15f7e4b275e273e328dd339dc924f136d Mon Sep 17 00:00:00 2001 +From 4a52078f846f33f65fe670aecf06e3b97da65510 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/17] arm_neon: fix iOS linking diff --git a/Resources/MobileVLCKit/patches/0005-disable-neon-volume-plugin.patch b/Resources/MobileVLCKit/patches/0005-disable-neon-volume-plugin.patch index e11508ca..a40b87fd 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 e2fce41063ced1c763c2d226ae5734663422c522 Mon Sep 17 00:00:00 2001 +From a7f867ea2f82cc0f7912502a6ad8800686fd136a 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/17] disable neon volume plugin diff --git a/Resources/MobileVLCKit/patches/0006-libvlc-create-VT-zero-copy-variable.patch b/Resources/MobileVLCKit/patches/0006-libvlc-create-VT-zero-copy-variable.patch index b3b4eb56..8d8de96b 100644 --- a/Resources/MobileVLCKit/patches/0006-libvlc-create-VT-zero-copy-variable.patch +++ b/Resources/MobileVLCKit/patches/0006-libvlc-create-VT-zero-copy-variable.patch @@ -1,4 +1,4 @@ -From 12ac703ec9d2bc3b80fca8b7f302821dca655b54 Mon Sep 17 00:00:00 2001 +From 4cd08f868cc3db212715dfdfbdd434900a0c48f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= Date: Wed, 4 May 2016 16:00:40 +0200 Subject: [PATCH 06/17] libvlc: create VT-zero-copy variable @@ -8,7 +8,7 @@ Subject: [PATCH 06/17] libvlc: create VT-zero-copy variable 1 file changed, 1 insertion(+) diff --git a/lib/media_player.c b/lib/media_player.c -index 65632952c2..5cebbd700f 100644 +index f369b96755..ea560b37ac 100644 --- a/lib/media_player.c +++ b/lib/media_player.c @@ -641,6 +641,7 @@ libvlc_media_player_new( libvlc_instance_t *instance ) diff --git a/Resources/MobileVLCKit/patches/0007-Enable-System-DL.patch b/Resources/MobileVLCKit/patches/0007-Enable-System-DL.patch index 53cab9f5..65e60387 100644 --- a/Resources/MobileVLCKit/patches/0007-Enable-System-DL.patch +++ b/Resources/MobileVLCKit/patches/0007-Enable-System-DL.patch @@ -1,4 +1,4 @@ -From d00c17089c76de243a0bca929fc868f0ecf42de3 Mon Sep 17 00:00:00 2001 +From ee069749112e0c27aca5135bf29e70e54ff25607 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 07/17] Enable System DL diff --git a/Resources/MobileVLCKit/patches/0008-deinterlace-merge-arm64-fix-linking-on-appleOS.patch b/Resources/MobileVLCKit/patches/0008-deinterlace-merge-arm64-fix-linking-on-appleOS.patch index b4dac18c..2d2fbe40 100644 --- a/Resources/MobileVLCKit/patches/0008-deinterlace-merge-arm64-fix-linking-on-appleOS.patch +++ b/Resources/MobileVLCKit/patches/0008-deinterlace-merge-arm64-fix-linking-on-appleOS.patch @@ -1,4 +1,4 @@ -From f77413a41b0f7169fd069fa445ff8b7f0aa4ac9a Mon Sep 17 00:00:00 2001 +From ac55b9649946d1c19ff3bad5cb0156bca4f7f5c2 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 08/17] deinterlace-merge-arm64: fix linking on appleOS diff --git a/Resources/MobileVLCKit/patches/0009-http-add-vlc_http_cookies_clear.patch b/Resources/MobileVLCKit/patches/0009-http-add-vlc_http_cookies_clear.patch index cf382653..1197da82 100644 --- a/Resources/MobileVLCKit/patches/0009-http-add-vlc_http_cookies_clear.patch +++ b/Resources/MobileVLCKit/patches/0009-http-add-vlc_http_cookies_clear.patch @@ -1,4 +1,4 @@ -From 50d5e1186c39598937d67d2d6abb38f356b66137 Mon Sep 17 00:00:00 2001 +From 19d6e244128719f0133e3ee4b3f974a13ba6dcc2 Mon Sep 17 00:00:00 2001 From: Thomas Guillem Date: Fri, 16 Sep 2016 15:51:10 +0200 Subject: [PATCH 09/17] http: add vlc_http_cookies_clear diff --git a/Resources/MobileVLCKit/patches/0010-libvlc_media-add-cookie_jar-API.patch b/Resources/MobileVLCKit/patches/0010-libvlc_media-add-cookie_jar-API.patch index e8e0d048..b73b133a 100644 --- a/Resources/MobileVLCKit/patches/0010-libvlc_media-add-cookie_jar-API.patch +++ b/Resources/MobileVLCKit/patches/0010-libvlc_media-add-cookie_jar-API.patch @@ -1,4 +1,4 @@ -From 1a1d040f10239f7f941e8ad718fe6d97153fe6f8 Mon Sep 17 00:00:00 2001 +From eadcdd62fa63b4a07fb0ff05996957de87fbcb65 Mon Sep 17 00:00:00 2001 From: Thomas Guillem Date: Fri, 16 Sep 2016 15:51:11 +0200 Subject: [PATCH 10/17] libvlc_media: add cookie_jar API @@ -138,7 +138,7 @@ index 5a67e9ff60..0f0341e260 100644 /* Media Descriptor */ diff --git a/lib/media_player.c b/lib/media_player.c -index 5cebbd700f..af612c7d74 100644 +index ea560b37ac..5b822329eb 100644 --- a/lib/media_player.c +++ b/lib/media_player.c @@ -620,6 +620,7 @@ libvlc_media_player_new( libvlc_instance_t *instance ) diff --git a/Resources/MobileVLCKit/patches/0011-Revert-Contribs-update-libpng-to-1.6.29.patch b/Resources/MobileVLCKit/patches/0011-Revert-Contribs-update-libpng-to-1.6.29.patch index 6147e40c..9d8a3d7f 100644 --- a/Resources/MobileVLCKit/patches/0011-Revert-Contribs-update-libpng-to-1.6.29.patch +++ b/Resources/MobileVLCKit/patches/0011-Revert-Contribs-update-libpng-to-1.6.29.patch @@ -1,4 +1,4 @@ -From de963414079db9f325b06aaeeafc6da9cbd44559 Mon Sep 17 00:00:00 2001 +From d081f4fa20aef162187771b0634ecd26b56ed8df Mon Sep 17 00:00:00 2001 From: Thomas Guillem Date: Tue, 18 Apr 2017 17:24:03 +0200 Subject: [PATCH 11/17] Revert "Contribs: update libpng to 1.6.29" diff --git a/Resources/MobileVLCKit/patches/0012-contrib-gcrypt-work-around-a-libtool-limitation.patch b/Resources/MobileVLCKit/patches/0012-contrib-gcrypt-work-around-a-libtool-limitation.patch index f6ff10e8..c629d358 100644 --- a/Resources/MobileVLCKit/patches/0012-contrib-gcrypt-work-around-a-libtool-limitation.patch +++ b/Resources/MobileVLCKit/patches/0012-contrib-gcrypt-work-around-a-libtool-limitation.patch @@ -1,4 +1,4 @@ -From 6a88cd6eb408468551fea1f48452dec03d83ec67 Mon Sep 17 00:00:00 2001 +From b07a412ed5eb6659f6ade4035fe634b203fe72b3 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 12/17] contrib/gcrypt: work-around a libtool limitation diff --git a/Resources/MobileVLCKit/patches/0013-contrib-gcrypt-fix-tvOS-compilation.patch b/Resources/MobileVLCKit/patches/0013-contrib-gcrypt-fix-tvOS-compilation.patch index fdf9698b..82c97197 100644 --- a/Resources/MobileVLCKit/patches/0013-contrib-gcrypt-fix-tvOS-compilation.patch +++ b/Resources/MobileVLCKit/patches/0013-contrib-gcrypt-fix-tvOS-compilation.patch @@ -1,4 +1,4 @@ -From d528019b3cd66b378bb14c1c64717d0b8e831bd1 Mon Sep 17 00:00:00 2001 +From 49d75196b713357bf794fdc8ea466e4ea519a72d 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 13/17] contrib/gcrypt: fix tvOS compilation diff --git a/Resources/MobileVLCKit/patches/0014-contrib-gcrypt-update-patches.patch b/Resources/MobileVLCKit/patches/0014-contrib-gcrypt-update-patches.patch index 1345d6b9..bb38c3ca 100644 --- a/Resources/MobileVLCKit/patches/0014-contrib-gcrypt-update-patches.patch +++ b/Resources/MobileVLCKit/patches/0014-contrib-gcrypt-update-patches.patch @@ -1,4 +1,4 @@ -From 10c897b58918c6263aa3fb8af73ba058ee43bad0 Mon Sep 17 00:00:00 2001 +From de6279d972978903bcaced5e80b29ffb2069ec58 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 14/17] contrib/gcrypt: update patches diff --git a/Resources/MobileVLCKit/patches/0015-contrib-avcodec-enforce-use-of-FFmpeg.patch b/Resources/MobileVLCKit/patches/0015-contrib-avcodec-enforce-use-of-FFmpeg.patch index 78888ebc..fccda5ee 100644 --- a/Resources/MobileVLCKit/patches/0015-contrib-avcodec-enforce-use-of-FFmpeg.patch +++ b/Resources/MobileVLCKit/patches/0015-contrib-avcodec-enforce-use-of-FFmpeg.patch @@ -1,4 +1,4 @@ -From 42e8fe864f8753d485bce0bd50c788846635a3d7 Mon Sep 17 00:00:00 2001 +From be6e569de8fdbd4ad89b0ac1df56fa6903cecc56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= Date: Mon, 17 Jul 2017 17:05:51 +0200 Subject: [PATCH 15/17] contrib/avcodec: enforce use of FFmpeg diff --git a/Resources/MobileVLCKit/patches/0016-build-rename-exported-symbols-by-module.patch b/Resources/MobileVLCKit/patches/0016-build-rename-exported-symbols-by-module.patch index d7d4dc69..e7c15d81 100644 --- a/Resources/MobileVLCKit/patches/0016-build-rename-exported-symbols-by-module.patch +++ b/Resources/MobileVLCKit/patches/0016-build-rename-exported-symbols-by-module.patch @@ -1,4 +1,4 @@ -From 9e6c29c3fe7c03d4bdfa24058e749fbcf40c91d8 Mon Sep 17 00:00:00 2001 +From 307236e3336cd0a959537fde826c16f4121a23fa Mon Sep 17 00:00:00 2001 From: Thomas Guillem Date: Tue, 11 Apr 2017 15:15:26 +0200 Subject: [PATCH 16/17] build: rename exported symbols by module diff --git a/Resources/MobileVLCKit/patches/0017-Remove-thread-local.patch b/Resources/MobileVLCKit/patches/0017-Remove-thread-local.patch index 83efd8af..3676c48c 100644 --- a/Resources/MobileVLCKit/patches/0017-Remove-thread-local.patch +++ b/Resources/MobileVLCKit/patches/0017-Remove-thread-local.patch @@ -1,4 +1,4 @@ -From 6aa957635cf237e409ba02c8424960b9154c838c Mon Sep 17 00:00:00 2001 +From 798372a4e6de801e04ec7a8cfdd64359c5321c36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= Date: Mon, 17 Jul 2017 17:03:24 +0200 Subject: [PATCH 17/17] Remove thread local diff --git a/buildMobileVLCKit.sh b/buildMobileVLCKit.sh index 3724638e..ba926e59 100755 --- a/buildMobileVLCKit.sh +++ b/buildMobileVLCKit.sh @@ -22,7 +22,7 @@ OSVERSIONMINLDFLAG=ios_version_min ROOT_DIR=empty FARCH="all" -TESTEDHASH=5cfa5dfb7 +TESTEDHASH=720149c6 CORE_COUNT=`sysctl -n machdep.cpu.core_count` let MAKE_JOBS=$CORE_COUNT+1 -- GitLab