libvlc: revert recent patch to fix compilation for macOS

This also rebases the existing patches to the latest libvlc hash.

Resources/MobileVLCKit/patches/0001-arm_neon-work-around-libtool-issue.patch

-From fd027ac29f38ffdb57469a2fa18327980f1c5764 Mon Sep 17 00:00:00 2001
+From 6c5311556c8aca0b9c6a38cd6b89fb726d4faee5 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/27] arm_neon: work-around libtool issue
+Subject: [PATCH 01/29] arm_neon: work-around libtool issue
 
 ---
  modules/arm_neon/Makefile.am | 2 ++
@@ -18,5 +18,5 @@ index 10f5c15d7c..0406ded7eb 100644
  
  libchroma_yuv_neon_plugin_la_SOURCES = \
 -- 
-2.25.0
+2.21.1 (Apple Git-122.3)
 

Resources/MobileVLCKit/patches/0002-disable-neon-volume-plugin.patch

-From 745239733e62effbdc0664097e2d9a732fed8246 Mon Sep 17 00:00:00 2001
+From d21d5378df6f7f16ce3b77a9cd92cf25357ce7f6 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/27] disable neon volume plugin
+Subject: [PATCH 02/29] disable neon volume plugin
 
 ---
  modules/arm_neon/Makefile.am | 1 -
@@ -20,5 +20,5 @@ index 0406ded7eb..48aa33332b 100644
  endif
  
 -- 
-2.25.0
+2.21.1 (Apple Git-122.3)
 

Resources/MobileVLCKit/patches/0003-Enable-System-DL.patch

-From 551ed9bac27af09c563ea86fdf27a5176dfe9c12 Mon Sep 17 00:00:00 2001
+From 101f0cad7807c9ef1e7be7943ea8a87acec27459 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/27] Enable System DL
+Subject: [PATCH 03/29] 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 82fcc9955f..8ef4b8593a 100644
+index 4db97585ea..3c4a52fadf 100644
 --- a/contrib/src/ffmpeg/rules.mak
 +++ b/contrib/src/ffmpeg/rules.mak
 @@ -27,6 +27,9 @@ FFMPEGCONF = \
@@ -58,5 +58,5 @@ index 82fcc9955f..8ef4b8593a 100644
  
  .ffmpeg: ffmpeg
 -- 
-2.25.0
+2.21.1 (Apple Git-122.3)
 

Resources/MobileVLCKit/patches/0004-http-add-vlc_http_cookies_clear.patch

-From 22b7a23e9861d94018ec08a57b72e39b263a174c Mon Sep 17 00:00:00 2001
+From 94c8eef477e19ca23763bf66bc460c4b5597db9e 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/27] http: add vlc_http_cookies_clear
+Subject: [PATCH 04/29] http: add vlc_http_cookies_clear
 
 Clear all cookies without deleting the jar.
 ---
@@ -61,5 +61,5 @@ index 77ab852b15..f229b85dea 100644
  }
  
 -- 
-2.25.0
+2.21.1 (Apple Git-122.3)
 

Resources/MobileVLCKit/patches/0005-libvlc_media-add-cookie_jar-API.patch

-From 9b32764f70bfe4b465dbb80027c571023813168a Mon Sep 17 00:00:00 2001
+From fbc3ff52db9362d6cda81e6ca69e804f66a28094 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/27] libvlc_media: add cookie_jar API
+Subject: [PATCH 05/29] libvlc_media: add cookie_jar API
 
 ---
  include/vlc/libvlc_media.h | 35 +++++++++++++++++++++++++++++++++++
@@ -163,5 +163,5 @@ index a9a22fee15..fde008aaeb 100644
  
      p_input_thread = input_Create( p_mi, p_mi->p_md->p_input_item, NULL,
 -- 
-2.25.0
+2.21.1 (Apple Git-122.3)
 

Resources/MobileVLCKit/patches/0006-contrib-gcrypt-work-around-a-libtool-limitation.patch

-From be96f603cc7b7d3e347c2484763286b2d90464b2 Mon Sep 17 00:00:00 2001
+From 000fffed43829b1c6dafbf6486d557bd2f98afb6 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/27] contrib/gcrypt: work-around a libtool limitation
+Subject: [PATCH 06/29] contrib/gcrypt: work-around a libtool limitation
 
 ---
  contrib/src/gcrypt/rules.mak                  |  1 +
@@ -53,5 +53,5 @@ index 0000000000..df97ffb488
 + AM_CFLAGS = $(GPG_ERROR_CFLAGS)
 + 
 -- 
-2.25.0
+2.21.1 (Apple Git-122.3)
 

Resources/MobileVLCKit/patches/0007-contrib-gcrypt-fix-tvOS-compilation.patch

-From 32b75f61e9e04408bb1c6dbb0aeb0189ea620b6f Mon Sep 17 00:00:00 2001
+From 5ead59ef594a483b69be71b9c22ccc93ffc2f509 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/27] contrib/gcrypt: fix tvOS compilation
+Subject: [PATCH 07/29] contrib/gcrypt: fix tvOS compilation
 
 ---
  .../src/gcrypt/fix-sha1-ssse3-for-clang.patch    | 16 ++++++++++++++++
@@ -56,5 +56,5 @@ index 97a5e0481b..5067a6dd3c 100644
  GCRYPT_CONF += --disable-aesni-support
  else
 -- 
-2.25.0
+2.21.1 (Apple Git-122.3)
 

Resources/MobileVLCKit/patches/0008-contrib-gcrypt-update-patches.patch

-From a7f22e05ffd35421c63525c3dc876355d0bc1760 Mon Sep 17 00:00:00 2001
+From 0bf2f071f4f04903e5a38fd4df641e13af591405 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/27] contrib/gcrypt: update patches
+Subject: [PATCH 08/29] contrib/gcrypt: update patches
 
 ---
  .../src/gcrypt/fix-sha1-ssse3-for-clang.patch | 308 +++++++++++++++++-
@@ -363,5 +363,5 @@ index df97ffb488..957f268ad2 100644
   
   # Need to include ../src in addition to top_srcdir because gcrypt.h is
 -- 
-2.25.0
+2.21.1 (Apple Git-122.3)
 

Resources/MobileVLCKit/patches/0009-Replace-thread-local-with-pthread-TSD.patch

-From edcee42598db7d7aa63b3a953449f1b0e505d7b1 Mon Sep 17 00:00:00 2001
+From 75e3eb6eac8844c27b97b8d5ba52e5fdd21b4215 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/27] Replace thread local with pthread TSD
+Subject: [PATCH 09/29] Replace thread local with pthread TSD
 
 ---
  src/misc/interrupt.c | 59 ++++++++++++++++++++++++++++++++++++++++++++
@@ -222,5 +222,5 @@ index 810c8ffc81..3d2d2f1dc8 100644
      twalk(priv->var_root, TwalkGetNames);
      vlc_mutex_unlock(&priv->var_lock);
 -- 
-2.25.0
+2.21.1 (Apple Git-122.3)
 

Resources/MobileVLCKit/patches/0010-contrib-use-live555-version-that-is-compatible-with-.patch

-From 16ec3ae5daa9257aa57c03b29275446f512ad388 Mon Sep 17 00:00:00 2001
+From cb785242909e8223a2eaa53d7e35745ba3177b81 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/27] contrib: use live555 version that is compatible with
+Subject: [PATCH 10/29] contrib: use live555 version that is compatible with
  LGPL2
 
 ---
@@ -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 3bb8e78b3d..4e7281bc56 100644
+index f5984577dc..0fc15bc9f4 100644
 --- a/contrib/src/live555/rules.mak
 +++ b/contrib/src/live555/rules.mak
 @@ -1,14 +1,12 @@
@@ -37,7 +37,7 @@ index 3bb8e78b3d..4e7281bc56 100644
  
  ifeq ($(call need_pkg,"live555"),)
  PKGS_FOUND += live555
-@@ -93,7 +91,6 @@ endif
+@@ -95,7 +93,6 @@ endif
  SUBDIRS=groupsock liveMedia UsageEnvironment BasicUsageEnvironment
  
  .live555: live555
@@ -46,5 +46,5 @@ index 3bb8e78b3d..4e7281bc56 100644
  		echo "PREFIX = $(PREFIX)" >> $$subdir/Makefile.head && \
  		echo "LIBDIR = $(PREFIX)/lib" >> $$subdir/Makefile.head ; done
 -- 
-2.25.0
+2.21.1 (Apple Git-122.3)
 

Resources/MobileVLCKit/patches/0011-libvlc-add-a-basic-API-to-change-freetype-s-color-bo.patch

-From 19edc123807887b868e9fed25ad4262150d4c44b Mon Sep 17 00:00:00 2001
+From f63486c136369d280764e4a94ca5a4e32588664f 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/27] libvlc: add a basic API to change freetype's color,
+Subject: [PATCH 11/29] libvlc: add a basic API to change freetype's color,
  bold, font and size variables on-the-fly
 
 ---
@@ -227,5 +227,5 @@ index c5d3ff8036..35b3a0cd08 100644
  
  static void FillDefaultStyles( filter_t *p_filter )
 -- 
-2.25.0
+2.21.1 (Apple Git-122.3)
 

Resources/MobileVLCKit/patches/0012-Work-around-lack-of-__thread-storage-qualifier-on-ol.patch

-From 7be42ab7e77448d2c527e855c527d76a4aa274f7 Mon Sep 17 00:00:00 2001
+From 0eeef16883a6d002ec83249c4126704ef23bf3dc 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/27] Work around lack of __thread storage qualifier on old
+Subject: [PATCH 12/29] Work around lack of __thread storage qualifier on old
  macOS
 
 ---
@@ -14,10 +14,10 @@ Subject: [PATCH 12/27] 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 1836f41b7f..0d4f8c03c5 100644
+index a38e385dba..d82b1494fc 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -601,8 +601,8 @@ dnl Check for system libs needed
+@@ -605,8 +605,8 @@ dnl Check for system libs needed
  need_libc=false
  
  dnl Check for usual libc functions
@@ -48,7 +48,7 @@ index 239cad4d77..e1a1d13e1e 100644
  
  /* Random numbers */
 diff --git a/po/POTFILES.in b/po/POTFILES.in
-index 3041c2b52e..8af94cb361 100644
+index 63022d2afd..b30c6cdfd7 100644
 --- a/po/POTFILES.in
 +++ b/po/POTFILES.in
 @@ -68,6 +68,7 @@ src/config/help.c
@@ -204,5 +204,5 @@ index 6bb3480957..5c54881553 100644
 +
 +#endif
 -- 
-2.25.0
+2.21.1 (Apple Git-122.3)
 

Resources/MobileVLCKit/patches/0013-modules-common-Use-the-full-module-name-as-MODULE_NA.patch

-From 1a1fb792549476d8a4b0111f051cce083fcc272e Mon Sep 17 00:00:00 2001
+From b4a8fa7369eeb85aa2ba6cb6982dc45d59d4e1dc 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/27] modules:common: Use the full module name as MODULE_NAME
+Subject: [PATCH 13/29] modules:common: Use the full module name as MODULE_NAME
 
 This avoid conflicts when linking modules staticly on platforms that don't
 have objdump
@@ -29,5 +29,5 @@ index 1b9117c98d..fc67a39bca 100644
  AM_CFLAGS =
  AM_CXXFLAGS =
 -- 
-2.25.0
+2.21.1 (Apple Git-122.3)
 

Resources/MobileVLCKit/patches/0014-add-auto-deinterlacer-mode-which-is-also-valid.patch

-From 0fd881557433d1deb8ca5e2826a58600f0f18acb Mon Sep 17 00:00:00 2001
+From bf04b33d6a4c620646f89e38e2a08e0821ed2af6 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/27] add auto deinterlacer-mode which is also valid
+Subject: [PATCH 14/29] add auto deinterlacer-mode which is also valid
 
 ---
  lib/video.c | 3 ++-
@@ -22,5 +22,5 @@ index 035cc0ebf1..a3e5b248e9 100644
  
      if (*psz_mode)
 -- 
-2.25.0
+2.21.1 (Apple Git-122.3)
 

Resources/MobileVLCKit/patches/0015-Users-will-be-able-to-change-the-deinterlace-mode-wi.patch

-From 314b7658832bfa5bf7aa860073bb1c478899e5ee Mon Sep 17 00:00:00 2001
+From 231cd5d76e41bc366d176a932e8abd825c473794 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/27] Users will be able to change the deinterlace mode
+Subject: [PATCH 15/29] Users will be able to change the deinterlace mode
  without forcing it.
 
 ---
@@ -87,5 +87,5 @@ index a3e5b248e9..9bc0f634f5 100644
      }
      free (pp_vouts);
 -- 
-2.25.0
+2.21.1 (Apple Git-122.3)
 

Resources/MobileVLCKit/patches/0016-contrib-ffmpeg-enable-videotoolbox-encoder.patch

-From cf0c7459a176fc4358918c2f59050688168d6a06 Mon Sep 17 00:00:00 2001
+From 28ed98c2f8c5bf4dec16c74529d0ab17fd46d61d 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/27] contrib: ffmpeg: enable videotoolbox encoder
+Subject: [PATCH 16/29] contrib: ffmpeg: enable videotoolbox encoder
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -15,7 +15,7 @@ Signed-off-by: Felix Paul Kühne <felix@feepk.net>
  1 file changed, 1 deletion(-)
 
 diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
-index 8ef4b8593a..3e3b260622 100644
+index 3c4a52fadf..f8052e76fc 100644
 --- a/contrib/src/ffmpeg/rules.mak
 +++ b/contrib/src/ffmpeg/rules.mak
 @@ -51,7 +51,6 @@ FFMPEGCONF += \
@@ -27,5 +27,5 @@ index 8ef4b8593a..3e3b260622 100644
  endif
  endif
 -- 
-2.25.0
+2.21.1 (Apple Git-122.3)
 

Resources/MobileVLCKit/patches/0017-chromecast-use-vt-encoder-from-avcodec.patch

-From 7a37d61de2099c9b8e474a1e787c6feff6c1ea57 Mon Sep 17 00:00:00 2001
+From 1a1d58ec631dc3f7dab282c4264120a1169a1f04 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/27] chromecast: use vt encoder from avcodec
+Subject: [PATCH 17/29] chromecast: use vt encoder from avcodec
 
 ---
  modules/stream_out/chromecast/cast.cpp | 13 +++++++++++++
@@ -38,5 +38,5 @@ index f3840cf4c4..486745ccee 100644
      { .fcc = VLC_CODEC_VP8,  .get_opt = GetVencVPXOption },
      { .fcc = VLC_CODEC_H264, .get_opt = NULL },
 -- 
-2.25.0
+2.21.1 (Apple Git-122.3)
 

Resources/MobileVLCKit/patches/0018-ffmpeg-backport-vtenc-patches.patch

-From aaace06f94583e1b4405e816f985e93e12609292 Mon Sep 17 00:00:00 2001
+From 1a03b5120ed1e67cc61ab7cf947089add816f355 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/27] ffmpeg: backport vtenc patches
+Subject: [PATCH 18/29] ffmpeg: backport vtenc patches
 
 ---
  ...lboxenc-fix-mutex-cond-leak-in-error.patch |  35 ++++++
@@ -340,7 +340,7 @@ index 0000000000..42f4cce1e6
 +2.18.0
 +
 diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
-index 3e3b260622..c531fe5bb4 100644
+index f8052e76fc..0226af35eb 100644
 --- a/contrib/src/ffmpeg/rules.mak
 +++ b/contrib/src/ffmpeg/rules.mak
 @@ -247,6 +247,10 @@ ifdef USE_FFMPEG
@@ -355,5 +355,5 @@ index 3e3b260622..c531fe5bb4 100644
  ifdef USE_LIBAV
  	$(APPLY) $(SRC)/ffmpeg/libav_gsm.patch
 -- 
-2.25.0
+2.21.1 (Apple Git-122.3)
 

Resources/MobileVLCKit/patches/0019-core-expose-config_AutoSaveConfigFile.patch

-From b3a2381c424bb652d0b6e6d1ba3e20f7636b45e1 Mon Sep 17 00:00:00 2001
+From 595b39659f59e67646c65c1765efc67caedcb9dc 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/27] core: expose config_AutoSaveConfigFile
+Subject: [PATCH 19/29] core: expose config_AutoSaveConfigFile
 
 ---
  include/vlc_configuration.h | 2 ++
@@ -60,5 +60,5 @@ index db7f4030b9..4ad59b1fc0 100644
  config_ChainDestroy
  config_ChainDuplicate
 -- 
-2.25.0
+2.21.1 (Apple Git-122.3)
 

Resources/MobileVLCKit/patches/0020-lib-save-configuration-after-playback-parse.patch

-From c3cf8c204d9de90e23f6f0986749bf44179167f8 Mon Sep 17 00:00:00 2001
+From 40aa3f3ec0ca1e4d99ed55391c11aea2be5debaf 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/27] lib: save configuration after playback/parse
+Subject: [PATCH 20/29] lib: save configuration after playback/parse
 
 The configuration is also saved when the libvlc instance is terminated but this
 doesn't happen often. Indeed, apps using libvlc will generally hold the libvlc
@@ -38,5 +38,5 @@ index 7b4050164f..29285065f0 100644
  
  /*
 -- 
-2.25.0
+2.21.1 (Apple Git-122.3)