libvlc: update to HEAD

compileAndBuildVLCKit.sh

@@ -25,7 +25,7 @@ OSVERSIONMINLDFLAG=ios
 ROOT_DIR=empty
 FARCH="all"
 
-TESTEDHASH="9db9c1121" # libvlc hash that this version of VLCKit is build on
+TESTEDHASH="0a5330890" # libvlc hash that this version of VLCKit is build on
 
 if [ -z "$MAKE_JOBS" ]; then
     CORE_COUNT=`sysctl -n machdep.cpu.core_count`

libvlc/patches/0001-http-add-vlc_http_cookies_clear.patch

@@ -1,4 +1,4 @@
-From a699e53e42165b2512e8606ef20fb7e3ff496b0e Mon Sep 17 00:00:00 2001
+From f3f288842772f7e5d9626ac624748b0658c553a8 Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Fri, 16 Sep 2016 15:51:10 +0200
 Subject: [PATCH 01/16] http: add vlc_http_cookies_clear
@@ -11,7 +11,7 @@ Clear all cookies without deleting the jar.
  3 files changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/include/vlc_http.h b/include/vlc_http.h
-index 0e649445f6..28085d814e 100644
+index 383a1ed354..33d04eb749 100644
 --- a/include/vlc_http.h
 +++ b/include/vlc_http.h
 @@ -70,6 +70,7 @@ VLC_API char *vlc_http_auth_FormatAuthorizationHeader
@@ -23,10 +23,10 @@ index 0e649445f6..28085d814e 100644
  
  /**
 diff --git a/src/libvlccore.sym b/src/libvlccore.sym
-index 662ad6d3d3..8d9b85ab4c 100644
+index d1a048be98..0e9efa567d 100644
 --- a/src/libvlccore.sym
 +++ b/src/libvlccore.sym
-@@ -129,6 +129,7 @@ vlc_http_auth_ParseAuthenticationInfoHeader
+@@ -131,6 +131,7 @@ vlc_http_auth_ParseAuthenticationInfoHeader
  vlc_http_auth_FormatAuthorizationHeader
  vlc_http_cookies_new
  vlc_http_cookies_destroy
@@ -61,5 +61,5 @@ index f4c9682a9e..0e2898f4f6 100644
  }
  
 -- 
-2.20.1 (Apple Git-117)
+2.21.0 (Apple Git-122.2)
 

libvlc/patches/0002-libvlc_media-add-cookie_jar-API.patch

@@ -1,4 +1,4 @@
-From 39f02f586048c36925748aa04ef6cd5ede275595 Mon Sep 17 00:00:00 2001
+From b070c3f66e46f8cea8ef1ee690397f17719c249f Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Fri, 16 Sep 2016 15:51:11 +0200
 Subject: [PATCH 02/16] libvlc_media: add cookie_jar API
@@ -12,10 +12,10 @@ Subject: [PATCH 02/16] libvlc_media: add cookie_jar API
  5 files changed, 71 insertions(+)
 
 diff --git a/include/vlc/libvlc_media.h b/include/vlc/libvlc_media.h
-index aab025ae28..eaa47c4e7b 100644
+index d60617a3a5..d2eb0fdbcc 100644
 --- a/include/vlc/libvlc_media.h
 +++ b/include/vlc/libvlc_media.h
-@@ -960,6 +960,41 @@ LIBVLC_API
+@@ -967,6 +967,41 @@ LIBVLC_API
  void libvlc_media_slaves_release( libvlc_media_slave_t **pp_slaves,
                                    unsigned int i_count );
  
@@ -58,10 +58,10 @@ index aab025ae28..eaa47c4e7b 100644
  
  # ifdef __cplusplus
 diff --git a/lib/libvlc.sym b/lib/libvlc.sym
-index d1ee941cac..23306395ee 100644
+index d8fb0806bc..e79a65a362 100644
 --- a/lib/libvlc.sym
 +++ b/lib/libvlc.sym
-@@ -188,6 +188,8 @@ libvlc_media_set_user_data
+@@ -189,6 +189,8 @@ libvlc_media_set_user_data
  libvlc_media_subitems
  libvlc_media_tracks_get
  libvlc_media_tracks_release
@@ -71,7 +71,7 @@ index d1ee941cac..23306395ee 100644
  libvlc_playlist_play
  libvlc_release
 diff --git a/lib/media.c b/lib/media.c
-index 06d02bad8d..affa6c63c9 100644
+index f045c729d2..4bbd979986 100644
 --- a/lib/media.c
 +++ b/lib/media.c
 @@ -407,6 +407,7 @@ libvlc_media_t * libvlc_media_new_from_input_item(
@@ -92,7 +92,7 @@ index 06d02bad8d..affa6c63c9 100644
      vlc_cond_destroy( &p_md->parsed_cond );
      vlc_mutex_destroy( &p_md->parsed_lock );
      vlc_mutex_destroy( &p_md->subitems_lock );
-@@ -1350,3 +1354,24 @@ void libvlc_media_slaves_release( libvlc_media_slave_t **pp_slaves,
+@@ -1347,3 +1351,24 @@ void libvlc_media_slaves_release( libvlc_media_slave_t **pp_slaves,
      }
      free( pp_slaves );
  }
@@ -138,7 +138,7 @@ index aefc731c68..e90248c91b 100644
  
  /* Media Descriptor */
 diff --git a/lib/media_player.c b/lib/media_player.c
-index 199d91dbba..e3915e155d 100644
+index cdb6ba0b8c..575632f2cd 100644
 --- a/lib/media_player.c
 +++ b/lib/media_player.c
 @@ -576,6 +576,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
@@ -149,7 +149,7 @@ index 199d91dbba..e3915e155d 100644
  
      /* Video */
      var_Create (mp, "vout", VLC_VAR_STRING|VLC_VAR_DOINHERIT);
-@@ -914,6 +915,12 @@ int libvlc_media_player_play( libvlc_media_player_t *p_mi )
+@@ -913,6 +914,12 @@ int libvlc_media_player_play( libvlc_media_player_t *p_mi )
      vlc_player_t *player = p_mi->player;
      vlc_player_Lock(player);
  
@@ -163,5 +163,5 @@ index 199d91dbba..e3915e155d 100644
      if (ret == VLC_SUCCESS)
      {
 -- 
-2.20.1 (Apple Git-117)
+2.21.0 (Apple Git-122.2)
 

libvlc/patches/0003-arm_neon-work-around-libtool-issue.patch

@@ -1,4 +1,4 @@
-From 8902ca63dad32369ae4ec5c2ead1d7300f906ca1 Mon Sep 17 00:00:00 2001
+From fb10f5b53060f46d90bf4b9fb2910c01f6eff25f 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 03/16] arm_neon: work-around libtool issue
@@ -18,5 +18,5 @@ index 10f5c15d7c..0406ded7eb 100644
  
  libchroma_yuv_neon_plugin_la_SOURCES = \
 -- 
-2.20.1 (Apple Git-117)
+2.21.0 (Apple Git-122.2)
 

libvlc/patches/0004-disable-neon-volume-plugin.patch

@@ -1,4 +1,4 @@
-From 76442688836a4391402873fc85ea0e34dd77ce31 Mon Sep 17 00:00:00 2001
+From 54164a4f6daa22d93f28df691c7ec5a6ba32b5a2 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 04/16] disable neon volume plugin
@@ -20,5 +20,5 @@ index 0406ded7eb..48aa33332b 100644
  endif
  
 -- 
-2.20.1 (Apple Git-117)
+2.21.0 (Apple Git-122.2)
 

libvlc/patches/0005-Enable-System-DL.patch

@@ -1,4 +1,4 @@
-From 424645783f23e5c9cea6d54c49c62ca8ae1fc839 Mon Sep 17 00:00:00 2001
+From 444903483f3cda62d485d57040973effedf8a970 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 05/16] Enable System DL
@@ -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 8179fc3c93..5ed95b76e0 100644
+index 1ba04616e5..136527453b 100644
 --- a/contrib/src/ffmpeg/rules.mak
 +++ b/contrib/src/ffmpeg/rules.mak
 @@ -25,6 +25,9 @@ FFMPEGCONF = \
@@ -49,7 +49,7 @@ index 8179fc3c93..5ed95b76e0 100644
  	--disable-debug \
  	--disable-avdevice \
  	--disable-devices \
-@@ -251,6 +254,7 @@ endif
+@@ -248,6 +251,7 @@ endif
  ifdef USE_LIBAV
  	$(APPLY) $(SRC)/ffmpeg/libav_gsm.patch
  endif
@@ -58,5 +58,5 @@ index 8179fc3c93..5ed95b76e0 100644
  
  .ffmpeg: ffmpeg
 -- 
-2.20.1 (Apple Git-117)
+2.21.0 (Apple Git-122.2)
 

libvlc/patches/0006-contrib-use-live555-version-that-is-compatible-with-.patch

@@ -1,4 +1,4 @@
-From d552e8d399fa1de9e8a959a8aa73da6bf23332cd Mon Sep 17 00:00:00 2001
+From 476f4c07e43f8dba7689eba73a40d7210d84a79b 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 06/16] contrib: use live555 version that is compatible with
@@ -46,5 +46,5 @@ index 4f9b70d452..976154312d 100644
  		echo "PREFIX = $(PREFIX)" >> $$subdir/Makefile.head && \
  		echo "LIBDIR = $(PREFIX)/lib" >> $$subdir/Makefile.head ; done
 -- 
-2.20.1 (Apple Git-117)
+2.21.0 (Apple Git-122.2)
 

libvlc/patches/0007-modules-common-Use-the-full-module-name-as-MODULE_NA.patch

@@ -1,4 +1,4 @@
-From 0b8c28749d95ce86916cbcec2411fc3abf05acc5 Mon Sep 17 00:00:00 2001
+From bee9ee12afee95900bb68ec68f8ac1d5e93b2cad 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 07/16] modules:common: Use the full module name as MODULE_NAME
@@ -28,5 +28,5 @@ index b991f6ce2f..d327b23871 100644
  AM_CFLAGS =
  AM_CXXFLAGS =
 -- 
-2.20.1 (Apple Git-117)
+2.21.0 (Apple Git-122.2)
 

libvlc/patches/0008-http-access-retain-auth-struct-for-the-runtime-of-th.patch

@@ -1,4 +1,4 @@
-From 01677160c9d1273e2e497dd63804278b2f5bbba2 Mon Sep 17 00:00:00 2001
+From a59c26e4dfaf9587dbf553c648b19795403396e1 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 08/16] http access: retain auth struct for the runtime of the
@@ -11,7 +11,7 @@ Previously, it was retained for a given connection only, so all information need
  2 files changed, 23 insertions(+), 3 deletions(-)
 
 diff --git a/modules/access/http.c b/modules/access/http.c
-index a1d0593e0f..138b262643 100644
+index 4384e2b0a3..1a112b9ec1 100644
 --- a/modules/access/http.c
 +++ b/modules/access/http.c
 @@ -271,6 +271,8 @@ static int Open( vlc_object_t *p_this )
@@ -52,7 +52,7 @@ index a1d0593e0f..138b262643 100644
      p_sys->psz_mime = NULL;
      p_sys->i_icy_meta = 0;
 diff --git a/src/network/http_auth.c b/src/network/http_auth.c
-index 0ad9d92042..fe1ead8bca 100644
+index ff1796c25d..939e493b76 100644
 --- a/src/network/http_auth.c
 +++ b/src/network/http_auth.c
 @@ -242,7 +242,10 @@ void vlc_http_auth_ParseWwwAuthenticateHeader(
@@ -93,5 +93,5 @@ index 0ad9d92042..fe1ead8bca 100644
          p_auth->i_nonce = 0;
  
 -- 
-2.20.1 (Apple Git-117)
+2.21.0 (Apple Git-122.2)
 

libvlc/patches/0009-access_output-file-Add-error-dialog-for-write-open.patch

@@ -1,4 +1,4 @@
-From bf0f2eaa2be864409c66b9c1c2ba952016cfd994 Mon Sep 17 00:00:00 2001
+From a779e265ee9b4af54540f74c611ed99ad5bea5fa Mon Sep 17 00:00:00 2001
 From: Soomin Lee <bubu@mikan.io>
 Date: Mon, 1 Oct 2018 15:37:57 +0200
 Subject: [PATCH 09/16] access_output: file: Add error dialog for write/open
@@ -36,5 +36,5 @@ index c983e3a8f0..8a690fc41f 100644
                  break;
              flags &= ~O_EXCL;
 -- 
-2.20.1 (Apple Git-117)
+2.21.0 (Apple Git-122.2)
 

libvlc/patches/0010-Replace-thread-local-with-pthread-TSD.patch

@@ -1,4 +1,4 @@
-From a4d4646f35d755ab9a300bed4725eac4ea3c7dee Mon Sep 17 00:00:00 2001
+From a0ffc3168589f0d3627a4c6ede0045e3dfc5e434 Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Mon, 17 Jul 2017 17:03:24 +0200
 Subject: [PATCH 10/16] Replace thread local with pthread TSD
@@ -192,10 +192,10 @@ index fc62eb7fff..a96fb0104c 100644
      int (*compar)(const void *, const void *, void *);
      void *arg;
 diff --git a/src/misc/variables.c b/src/misc/variables.c
-index a39fd4143f..30ce120fce 100644
+index ed284cf4f4..15f6dfe096 100644
 --- a/src/misc/variables.c
 +++ b/src/misc/variables.c
-@@ -1134,7 +1134,17 @@ error:
+@@ -1135,7 +1135,17 @@ error:
      return VLC_EGENERIC;
  }
  
@@ -213,7 +213,7 @@ index a39fd4143f..30ce120fce 100644
  
  static void TwalkGetNames(const void *data, const VISIT which, const int depth)
  {
-@@ -1143,7 +1153,11 @@ static void TwalkGetNames(const void *data, const VISIT which, const int depth)
+@@ -1144,7 +1154,11 @@ static void TwalkGetNames(const void *data, const VISIT which, const int depth)
      (void) depth;
  
      const variable_t *var = *(const variable_t **)data;
@@ -225,7 +225,7 @@ index a39fd4143f..30ce120fce 100644
      char *dup = strdup(var->psz_name);
      if (dup != NULL)
          ARRAY_APPEND(*names, dup);
-@@ -1156,7 +1170,12 @@ char **var_GetAllNames(vlc_object_t *obj)
+@@ -1157,7 +1171,12 @@ char **var_GetAllNames(vlc_object_t *obj)
      DECL_ARRAY(char *) names;
      ARRAY_INIT(names);
  
@@ -239,5 +239,5 @@ index a39fd4143f..30ce120fce 100644
      twalk(priv->var_root, TwalkGetNames);
      vlc_mutex_unlock(&priv->var_lock);
 -- 
-2.20.1 (Apple Git-117)
+2.21.0 (Apple Git-122.2)
 

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

@@ -1,7 +1,7 @@
-From f7029fdee76892c213beab6c93ce59a0914ef8c7 Mon Sep 17 00:00:00 2001
+From 3397b6c35dd97ef8a6e77d5c4118d420da50d7a9 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 12/16] libvlc: add a basic API to change freetype's color,
+Subject: [PATCH 11/16] libvlc: add a basic API to change freetype's color,
  bold, font and size variables on-the-fly
 
 ---
@@ -13,10 +13,10 @@ Subject: [PATCH 12/16] libvlc: add a basic API to change freetype's color,
  5 files changed, 148 insertions(+), 5 deletions(-)
 
 diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
-index 1ab92f5bc3..99ed1fcccb 100644
+index 7c72c9774b..d4597e3353 100644
 --- a/include/vlc/libvlc_media_player.h
 +++ b/include/vlc/libvlc_media_player.h
-@@ -1950,6 +1950,32 @@ LIBVLC_API float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
+@@ -1956,6 +1956,32 @@ LIBVLC_API float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
  LIBVLC_API void libvlc_video_set_adjust_float( libvlc_media_player_t *p_mi,
                                                     unsigned option, float value );
  
@@ -50,10 +50,10 @@ index 1ab92f5bc3..99ed1fcccb 100644
  
  /** \defgroup libvlc_audio LibVLC audio controls
 diff --git a/lib/libvlc.sym b/lib/libvlc.sym
-index 23306395ee..88fc0056d4 100644
+index e79a65a362..72946add0d 100644
 --- a/lib/libvlc.sym
 +++ b/lib/libvlc.sym
-@@ -226,6 +226,9 @@ libvlc_video_get_spu_count
+@@ -227,6 +227,9 @@ libvlc_video_get_spu_count
  libvlc_video_get_spu_delay
  libvlc_video_get_spu_description
  libvlc_video_get_teletext
@@ -63,7 +63,7 @@ index 23306395ee..88fc0056d4 100644
  libvlc_video_get_track
  libvlc_video_get_track_count
  libvlc_video_get_track_description
-@@ -251,6 +254,9 @@ libvlc_video_set_scale
+@@ -252,6 +255,9 @@ libvlc_video_set_scale
  libvlc_video_set_spu
  libvlc_video_set_spu_delay
  libvlc_video_set_teletext
@@ -74,10 +74,10 @@ index 23306395ee..88fc0056d4 100644
  libvlc_video_take_snapshot
  libvlc_video_new_viewpoint
 diff --git a/lib/media_player.c b/lib/media_player.c
-index e3915e155d..90fa54d1d2 100644
+index 575632f2cd..ec56b4bc6a 100644
 --- a/lib/media_player.c
 +++ b/lib/media_player.c
-@@ -661,6 +661,12 @@ libvlc_media_player_new( libvlc_instance_t *instance )
+@@ -660,6 +660,12 @@ libvlc_media_player_new( libvlc_instance_t *instance )
      var_Create (mp, "saturation", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT);
      var_Create (mp, "gamma", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT);
  
@@ -248,5 +248,5 @@ index 65c2386553..e84c902691 100644
  
  static void FillDefaultStyles( filter_t *p_filter )
 -- 
-2.20.1 (Apple Git-117)
+2.21.0 (Apple Git-122.2)
 

libvlc/patches/0013-core-expose-config_AutoSaveConfigFile.patch

@@ -1,7 +1,7 @@
-From 67124257866654878786383e0aa26e0c2f91f63f Mon Sep 17 00:00:00 2001
+From c96126cd6c8c6964a731a34a678f76e18748a264 Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Wed, 17 Jan 2018 10:06:13 +0200
-Subject: [PATCH 13/16] core: expose config_AutoSaveConfigFile
+Subject: [PATCH 12/16] core: expose config_AutoSaveConfigFile
 
 ---
  include/vlc_configuration.h | 2 ++
@@ -11,7 +11,7 @@ Subject: [PATCH 13/16] core: expose config_AutoSaveConfigFile
  4 files changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/include/vlc_configuration.h b/include/vlc_configuration.h
-index f1467c9a0c..7ecc1ea174 100644
+index d4b8fc2473..155081b37b 100644
 --- a/include/vlc_configuration.h
 +++ b/include/vlc_configuration.h
 @@ -243,6 +243,8 @@ VLC_API ssize_t config_GetPszChoices(const char *,
@@ -48,7 +48,7 @@ index e6b10e5c02..4275a7ad00 100644
  {
      int ret = 0;
 diff --git a/src/libvlccore.sym b/src/libvlccore.sym
-index 8d9b85ab4c..794c923db0 100644
+index 0e9efa567d..17fcbdfcbc 100644
 --- a/src/libvlccore.sym
 +++ b/src/libvlccore.sym
 @@ -48,6 +48,7 @@ block_Realloc
@@ -60,5 +60,5 @@ index 8d9b85ab4c..794c923db0 100644
  config_ChainDestroy
  config_ChainDuplicate
 -- 
-2.20.1 (Apple Git-117)
+2.21.0 (Apple Git-122.2)
 

libvlc/patches/0015-libvlc-media_player-Add-record-method.patch

@@ -1,7 +1,7 @@
-From b35c48d3a181265d438ff91390d74b0809ee39ce Mon Sep 17 00:00:00 2001
+From ef5e61d24238f31caa193b54ac262a52134a7cc8 Mon Sep 17 00:00:00 2001
 From: Soomin Lee <bubu@mikan.io>
 Date: Wed, 31 Oct 2018 10:08:55 +0100
-Subject: [PATCH 15/16] libvlc: media_player: Add record method
+Subject: [PATCH 13/16] libvlc: media_player: Add record method
 
 ---
  include/vlc/libvlc_media_player.h | 13 +++++++++++++
@@ -9,10 +9,10 @@ Subject: [PATCH 15/16] libvlc: media_player: Add record method
  2 files changed, 33 insertions(+)
 
 diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
-index 99ed1fcccb..cd42a8b60b 100644
+index d4597e3353..fcb7e23ce6 100644
 --- a/include/vlc/libvlc_media_player.h
 +++ b/include/vlc/libvlc_media_player.h
-@@ -2489,6 +2489,19 @@ LIBVLC_API int libvlc_media_player_get_role(libvlc_media_player_t *p_mi);
+@@ -2480,6 +2480,19 @@ LIBVLC_API int libvlc_media_player_get_role(libvlc_media_player_t *p_mi);
   */
  LIBVLC_API int libvlc_media_player_set_role(libvlc_media_player_t *p_mi,
                                              unsigned role);
@@ -33,7 +33,7 @@ index 99ed1fcccb..cd42a8b60b 100644
  /** @} audio */
  
 diff --git a/lib/media_player.c b/lib/media_player.c
-index 6244d1b2c5..5b1f8ab22e 100644
+index ec56b4bc6a..58eec27ae9 100644
 --- a/lib/media_player.c
 +++ b/lib/media_player.c
 @@ -576,6 +576,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
@@ -44,7 +44,7 @@ index 6244d1b2c5..5b1f8ab22e 100644
      var_Create (mp, "http-cookies", VLC_VAR_ADDRESS);
  
      /* Video */
-@@ -1908,6 +1909,25 @@ int libvlc_media_player_get_role(libvlc_media_player_t *mp)
+@@ -1907,6 +1908,25 @@ int libvlc_media_player_get_role(libvlc_media_player_t *mp)
      return ret;
  }
  
@@ -71,5 +71,5 @@ index 6244d1b2c5..5b1f8ab22e 100644
  
  /* make sure surface structures from libvlc can be passed as such to vlc
 -- 
-2.20.1 (Apple Git-117)
+2.21.0 (Apple Git-122.2)
 

libvlc/patches/0016-libvlc-events-Add-callbacks-for-record.patch

@@ -1,7 +1,7 @@
-From 59d8c11ae6ba5218ba89e7484878f8c63562c742 Mon Sep 17 00:00:00 2001
+From 911267d8b6bfa0a4f1ba05e26ce74eecec79c3d6 Mon Sep 17 00:00:00 2001
 From: Soomin Lee <bubu@mikan.io>
 Date: Thu, 27 Sep 2018 18:40:39 +0200
-Subject: [PATCH 16/16] libvlc: events: Add callbacks for record
+Subject: [PATCH 14/16] libvlc: events: Add callbacks for record
 
 ---
  include/vlc/libvlc_events.h |  9 +++++++++
@@ -43,7 +43,7 @@ index 62a81104da..22730b35e1 100644
          {
              libvlc_renderer_item_t *item;
 diff --git a/lib/media_player.c b/lib/media_player.c
-index 5b1f8ab22e..3ae31ddf61 100644
+index 58eec27ae9..4b41ce5e13 100644
 --- a/lib/media_player.c
 +++ b/lib/media_player.c
 @@ -127,6 +127,28 @@ on_state_changed(vlc_player_t *player, enum vlc_player_state new_state,
@@ -84,5 +84,5 @@ index 5b1f8ab22e..3ae31ddf61 100644
  
  static const struct vlc_player_aout_cbs vlc_player_aout_cbs = {
 -- 
-2.20.1 (Apple Git-117)
+2.21.0 (Apple Git-122.2)
 

libvlc/patches/0011-Work-around-lack-of-__thread-storage-qualifier-on-ol.patch

@@ -1,82 +1,21 @@
-From b1cde0aa486420bb1dd1d5f872088a7f159aeb60 Mon Sep 17 00:00:00 2001
+From 834faef414b913e0a909945295779509dff44d55 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 11/16] Work around lack of __thread storage qualifier on old
+Subject: [PATCH 15/16] Work around lack of __thread storage qualifier on old
  macOS
 
 ---
- configure.ac                      |  4 +-
- include/vlc_fixups.h              |  6 ++-
- po/POTFILES.in                    |  1 +
- src/Makefile.am                   |  1 +
- {compat => src/extras}/tdestroy.c | 67 ++++++++++++++++++-------------
+ compat/tdestroy.c    | 67 ++++++++++++++++++++++++++------------------
+ configure.ac         |  4 +--
+ include/vlc_fixups.h |  6 ++--
+ po/POTFILES.in       |  1 +
+ src/Makefile.am      |  1 +
  5 files changed, 47 insertions(+), 32 deletions(-)
- rename {compat => src/extras}/tdestroy.c (59%)
 
-diff --git a/configure.ac b/configure.ac
-index 38446812ca..81f64c7657 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -633,8 +633,8 @@ dnl Check for system libs needed
- need_libc=false
- 
- dnl Check for usual libc functions
--AC_CHECK_FUNCS([accept4 daemon fcntl flock fstatvfs fork getenv getpwuid_r isatty memalign mkostemp mmap open_memstream newlocale openat pipe2 pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp strptime uselocale])
--AC_REPLACE_FUNCS([aligned_alloc atof atoll dirfd fdopendir 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 memalign mkostemp mmap 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 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 1518b84362..ffd64f382a 100644
---- a/include/vlc_fixups.h
-+++ b/include/vlc_fixups.h
-@@ -500,9 +500,11 @@ void *lfind( const void *key, const void *base, size_t *nmemb,
-          lfind((a),(b), &(unsigned){ (*(c) > UINT_MAX) ? UINT_MAX : *(c) }, (d),(e))
- #endif /* _WIN64 */
- 
--#ifndef HAVE_TDESTROY
- void tdestroy( void *root, void (*free_node)(void *nodep) );
--#endif
-+# ifndef HAVE_TDESTROY
-+void vlc_tdestroy( void *, void (*)(void *) );
-+#  define tdestroy vlc_tdestroy
-+# endif
- 
- /* Random numbers */
- #ifndef HAVE_NRAND48
-diff --git a/po/POTFILES.in b/po/POTFILES.in
-index 1c2a5298a8..4f385589e8 100644
---- a/po/POTFILES.in
-+++ b/po/POTFILES.in
-@@ -66,6 +66,7 @@ src/config/help.c
- src/config/intf.c
- src/darwin/error.c
- src/extras/libc.c
-+src/extras/tdestroy.c
- src/input/access.c
- src/input/decoder.c
- src/input/decoder.h
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 8c56c0e165..80cb5fdbc5 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -210,6 +210,7 @@ libvlccore_la_SOURCES = \
- 	config/getopt.c \
- 	config/vlc_getopt.h \
- 	extras/libc.c \
-+	extras/tdestroy.c \
- 	media_source/media_source.c \
- 	media_source/media_source.h \
- 	media_source/media_tree.c \
-diff --git a/compat/tdestroy.c b/src/extras/tdestroy.c
-similarity index 59%
-rename from compat/tdestroy.c
-rename to src/extras/tdestroy.c
+diff --git a/compat/tdestroy.c b/compat/tdestroy.c
 index 6bb3480957..5c54881553 100644
 --- a/compat/tdestroy.c
-+++ b/src/extras/tdestroy.c
++++ b/compat/tdestroy.c
 @@ -3,7 +3,7 @@
   * @brief replacement for GNU tdestroy()
   */
@@ -202,6 +141,63 @@ index 6bb3480957..5c54881553 100644
 -#endif /* HAVE_TFIND */
 +
 +#endif
+diff --git a/configure.ac b/configure.ac
+index 1201826d2f..3ad0ccf81d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -639,8 +639,8 @@ dnl Check for system libs needed
+ need_libc=false
+ 
+ dnl Check for usual libc functions
+-AC_CHECK_FUNCS([accept4 daemon fcntl flock fstatat fstatvfs fork getmntent_r getenv getpwuid_r isatty memalign mkostemp mmap open_memstream newlocale pipe2 pread posix_fadvise posix_madvise setlocale stricmp strnicmp strptime uselocale])
+-AC_REPLACE_FUNCS([aligned_alloc atof atoll dirfd fdopendir flockfile fsync getdelim getpid lfind lldiv memrchr nrand48 poll posix_memalign 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 fstatat fstatvfs fork getmntent_r getenv getpwuid_r isatty memalign mkostemp mmap open_memstream pipe2 pread posix_fadvise posix_madvise setlocale stricmp strnicmp strptime uselocale])
++AC_REPLACE_FUNCS([aligned_alloc atof atoll dirfd fdopendir flockfile fsync getdelim getpid lfind lldiv memrchr nrand48 poll posix_memalign 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 8fd01da0ce..16282aae9e 100644
+--- a/include/vlc_fixups.h
++++ b/include/vlc_fixups.h
+@@ -505,9 +505,11 @@ void *lfind( const void *key, const void *base, size_t *nmemb,
+          lfind((a),(b), &(unsigned){ (*(c) > UINT_MAX) ? UINT_MAX : *(c) }, (d),(e))
+ #endif /* _WIN64 */
+ 
+-#ifndef HAVE_TDESTROY
+ void tdestroy( void *root, void (*free_node)(void *nodep) );
+-#endif
++# ifndef HAVE_TDESTROY
++void vlc_tdestroy( void *, void (*)(void *) );
++#  define tdestroy vlc_tdestroy
++# endif
+ 
+ /* Random numbers */
+ #ifndef HAVE_NRAND48
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index d2771b57ec..62b3645c30 100644
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -66,6 +66,7 @@ src/config/help.c
+ src/config/intf.c
+ src/darwin/error.c
+ src/extras/libc.c
++src/extras/tdestroy.c
+ src/input/access.c
+ src/input/decoder.c
+ src/input/decoder.h
+diff --git a/src/Makefile.am b/src/Makefile.am
+index b6c5996837..978a0674b1 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -210,6 +210,7 @@ libvlccore_la_SOURCES = \
+ 	config/getopt.c \
+ 	config/vlc_getopt.h \
+ 	extras/libc.c \
++	extras/tdestroy.c \
+ 	media_source/media_source.c \
+ 	media_source/media_source.h \
+ 	media_source/media_tree.c \
 -- 
-2.20.1 (Apple Git-117)
+2.21.0 (Apple Git-122.2)
 

libvlc/patches/0014-lib-save-configuration-after-playback-parse.patch

@@ -1,7 +1,7 @@
-From b82413980d38b3ce336931177697fc99696acf9d Mon Sep 17 00:00:00 2001
+From 7e15e3ca16d78b470e621d84ed9d1bfc914131de Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Wed, 17 Jan 2018 10:06:13 +0200
-Subject: [PATCH 14/16] lib: save configuration after playback/parse
+Subject: [PATCH 16/16] 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 instance during all its lifetime and won't be able to clean it up in a lot of case (app killed by OS to free up memory, crashes, reboot, force close...).
 ---
@@ -10,7 +10,7 @@ The configuration is also saved when the libvlc instance is terminated but this
  2 files changed, 4 insertions(+)
 
 diff --git a/lib/media.c b/lib/media.c
-index affa6c63c9..fa34e8ef40 100644
+index 4bbd979986..f125552fca 100644
 --- a/lib/media.c
 +++ b/lib/media.c
 @@ -579,6 +579,8 @@ void libvlc_media_release( libvlc_media_t *p_md )
@@ -23,18 +23,18 @@ index affa6c63c9..fa34e8ef40 100644
      free( p_md );
  }
 diff --git a/lib/media_player.c b/lib/media_player.c
-index 90fa54d1d2..6244d1b2c5 100644
+index 4b41ce5e13..9eedaf4af0 100644
 --- a/lib/media_player.c
 +++ b/lib/media_player.c
-@@ -996,6 +996,8 @@ void libvlc_media_player_stop_async( libvlc_media_player_t *p_mi )
-     vlc_player_Stop(player);
+@@ -992,6 +992,8 @@ void libvlc_media_player_pause( libvlc_media_player_t *p_mi )
+     vlc_player_TogglePause(player);
  
      vlc_player_Unlock(player);
 +
 +    config_AutoSaveConfigFile( p_mi );
  }
  
- int libvlc_media_player_set_renderer( libvlc_media_player_t *p_mi,
+ /**************************************************************************
 -- 
-2.20.1 (Apple Git-117)
+2.21.0 (Apple Git-122.2)