From 23b1b34ee27e7d987c7e1793365f691b482d642c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= Date: Sun, 24 Sep 2017 15:08:09 +0200 Subject: [PATCH] Update libvlc with vout improvements --- ...m_neon-added-function-macro-to-handle-the-undersco.patch | 2 +- ...interlace-merge-use-a-macro-to-fix-compilation-for.patch | 2 +- .../patches/0003-arm_neon-work-around-libtool-issue.patch | 2 +- .../patches/0004-arm_neon-fix-iOS-linking.patch | 2 +- .../patches/0005-disable-neon-volume-plugin.patch | 2 +- Resources/MobileVLCKit/patches/0006-Enable-System-DL.patch | 2 +- ...007-deinterlace-merge-arm64-fix-linking-on-appleOS.patch | 2 +- .../patches/0008-http-add-vlc_http_cookies_clear.patch | 6 +++--- .../patches/0009-libvlc_media-add-cookie_jar-API.patch | 4 ++-- ...10-contrib-gcrypt-work-around-a-libtool-limitation.patch | 2 +- .../patches/0011-contrib-gcrypt-fix-tvOS-compilation.patch | 2 +- .../patches/0012-contrib-gcrypt-update-patches.patch | 2 +- .../0013-build-rename-exported-symbols-by-module.patch | 2 +- .../0014-Replace-thread-local-with-pthread-TSD.patch | 2 +- buildMobileVLCKit.sh | 2 +- 15 files changed, 18 insertions(+), 18 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 dd2fd52f..be4005ec 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 a2747128e9e682640bfe3bfb313dc935cf1a0264 Mon Sep 17 00:00:00 2001 +From bfa34e1b7df1d80c08a115dbb3b44d1476b78a96 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 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 a2476a51..1932e072 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 e48dc19bfa4fdf61a27981603e2355dc1549dfbd Mon Sep 17 00:00:00 2001 +From 705363bb70efd67a6e6af4fa501c12cd31f043e7 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 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 6849deca..1e7845f5 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 c3b57ed59a7bf53782990dafecf69b043b170893 Mon Sep 17 00:00:00 2001 +From af01161e7a035b6b5355dfb4cd6059288c57faaa 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 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 7ba8f7ce..22c73e29 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 f7f6a5875d8c7907fb7af5fc69259d370588abbb Mon Sep 17 00:00:00 2001 +From 56e92e9c436cfa07998285ffc134958181a2a7c0 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 diff --git a/Resources/MobileVLCKit/patches/0005-disable-neon-volume-plugin.patch b/Resources/MobileVLCKit/patches/0005-disable-neon-volume-plugin.patch index bda59047..6bc99cf9 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 c70dccebb53fa81ea95402ede8aabf058e0f1b75 Mon Sep 17 00:00:00 2001 +From eb0d3b6becaa92768d62c873fa9dcdc9f6eab246 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 diff --git a/Resources/MobileVLCKit/patches/0006-Enable-System-DL.patch b/Resources/MobileVLCKit/patches/0006-Enable-System-DL.patch index 593202ea..e786a21d 100644 --- a/Resources/MobileVLCKit/patches/0006-Enable-System-DL.patch +++ b/Resources/MobileVLCKit/patches/0006-Enable-System-DL.patch @@ -1,4 +1,4 @@ -From 277e071c76896ef63e202c50fce511aa17bff871 Mon Sep 17 00:00:00 2001 +From cf74a8c7973a1632dabdbf29717d01efbdd77d98 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 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 ef3c55d8..a08064f5 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 5cb4cb24f59df343e5a7db2334b4eccc75c3b815 Mon Sep 17 00:00:00 2001 +From 74f0dadd51c8fcd96044a3660665867c61a4702f 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 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 48240db0..355e9afe 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 ab7f0035a4eb7f74c6af0a81d752df201a498d57 Mon Sep 17 00:00:00 2001 +From 544391ca227ed3fd2d952a1793ae07e8aae8fd95 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 @@ -23,10 +23,10 @@ index ed7e1613da..da1fe4ef1a 100644 /** diff --git a/src/libvlccore.sym b/src/libvlccore.sym -index 4f0bf20dbc..0e24d0aeac 100644 +index 5b1a8bfee8..39e8b59cc7 100644 --- a/src/libvlccore.sym +++ b/src/libvlccore.sym -@@ -131,6 +131,7 @@ vlc_http_auth_ParseAuthenticationInfoHeader +@@ -128,6 +128,7 @@ vlc_http_auth_ParseAuthenticationInfoHeader vlc_http_auth_FormatAuthorizationHeader vlc_http_cookies_new vlc_http_cookies_destroy 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 6f2b75b9..e340b799 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 b64b07ccaac8c66f1358b1b711fb33cf94725627 Mon Sep 17 00:00:00 2001 +From 33b5c11f4bd689e6f4637fe5642403581cf7afcf 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 @@ -138,7 +138,7 @@ index 5a67e9ff60..0f0341e260 100644 /* Media Descriptor */ diff --git a/lib/media_player.c b/lib/media_player.c -index b5677ae7ec..14d1c6a1a4 100644 +index 7da1bf25a8..94c9e8064d 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/0010-contrib-gcrypt-work-around-a-libtool-limitation.patch b/Resources/MobileVLCKit/patches/0010-contrib-gcrypt-work-around-a-libtool-limitation.patch index 4baf32b1..0d9898f4 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 ad09210ef4be3f2d241e90e9ca2147615c1f5cba Mon Sep 17 00:00:00 2001 +From 6f41c200ccc274a255cd727cbcbcbfb581c574ac 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 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 acd20cf1..b979b814 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 e44f2cf66ec764a5360eedd3ac9fea558f29dd6d Mon Sep 17 00:00:00 2001 +From 6a38ccb497cf1b0b36dfb2899b6cff6108b1644b 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 diff --git a/Resources/MobileVLCKit/patches/0012-contrib-gcrypt-update-patches.patch b/Resources/MobileVLCKit/patches/0012-contrib-gcrypt-update-patches.patch index 2d06f230..a037ce57 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 02ba5f23ab54ff0a842f1276286381209429eb75 Mon Sep 17 00:00:00 2001 +From e47d63e4a7331d95fe30e71b7dbf215f53c55e51 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 diff --git a/Resources/MobileVLCKit/patches/0013-build-rename-exported-symbols-by-module.patch b/Resources/MobileVLCKit/patches/0013-build-rename-exported-symbols-by-module.patch index 7bda6a7e..a9e4a4ce 100644 --- a/Resources/MobileVLCKit/patches/0013-build-rename-exported-symbols-by-module.patch +++ b/Resources/MobileVLCKit/patches/0013-build-rename-exported-symbols-by-module.patch @@ -1,4 +1,4 @@ -From 498e6e260d05ddee45e934b91b7e5b26aa503fd9 Mon Sep 17 00:00:00 2001 +From 13e9a60f4e52df7012ca26ce54fef82ebca1ac7c Mon Sep 17 00:00:00 2001 From: Thomas Guillem Date: Tue, 11 Apr 2017 15:15:26 +0200 Subject: [PATCH 13/14] build: rename exported symbols by module diff --git a/Resources/MobileVLCKit/patches/0014-Replace-thread-local-with-pthread-TSD.patch b/Resources/MobileVLCKit/patches/0014-Replace-thread-local-with-pthread-TSD.patch index e25d76f8..a958c75e 100644 --- a/Resources/MobileVLCKit/patches/0014-Replace-thread-local-with-pthread-TSD.patch +++ b/Resources/MobileVLCKit/patches/0014-Replace-thread-local-with-pthread-TSD.patch @@ -1,4 +1,4 @@ -From 9f5842c37d2f63025a8c44ff82bdbab562d923ac Mon Sep 17 00:00:00 2001 +From bbe96651ce201e069d28c6113d0729baf7f554b1 Mon Sep 17 00:00:00 2001 From: Thomas Guillem Date: Mon, 17 Jul 2017 17:03:24 +0200 Subject: [PATCH 14/14] Replace thread local with pthread TSD diff --git a/buildMobileVLCKit.sh b/buildMobileVLCKit.sh index 43fe95bf..a8f30336 100755 --- a/buildMobileVLCKit.sh +++ b/buildMobileVLCKit.sh @@ -22,7 +22,7 @@ OSVERSIONMINLDFLAG=ios_version_min ROOT_DIR=empty FARCH="all" -TESTEDHASH=ba3c32e03 +TESTEDHASH=bb7e8b5a if [ -z "$MAKE_JOBS" ]; then CORE_COUNT=`sysctl -n machdep.cpu.core_count` -- GitLab