buildsystem/build-libvlc.sh

@@ -258,28 +258,9 @@ avlc_build()
 ###########################
 
 VLC_CONTRIB_ARGS="\
-    --disable-aribb24 \
-    --disable-aribb25 \
-    --disable-caca \
-    --disable-chromaprint \
-    --disable-dca \
-    --disable-a52 \
-    --disable-faad2 \
-    --disable-fontconfig \
     --disable-goom \
-    --disable-kate \
-    --disable-libmpeg2 \
-    --disable-mad \
     --disable-medialibrary \
-    --disable-mpcdec \
-    --disable-rav1e \
-    --disable-samplerate \
-    --disable-schroedinger \
-    --disable-sidplay2 \
-    --disable-srt \
-    --disable-vnc \
     --disable-vncclient \
-    --disable-x265 \
     --enable-ad-clauses \
     --enable-dvdnav \
     --enable-dvdread \

buildsystem/get-vlc.sh

@@ -69,7 +69,7 @@ done
 # Fetch VLC source #
 ####################
 
-VLC_TESTED_HASH=8c9891d4bb7f7c146abb17606e7528f6d0209ea3
+VLC_TESTED_HASH=bf03bd51bad3faa19b8e1ab4abfc8fc7fcc2b430
 VLC_REPOSITORY=https://code.videolan.org/videolan/vlc.git
 VLC_BRANCH=master
 if [ ! -d "vlc" ]; then

buildsystem/gitlab/.gitlab-ci.yml

@@ -21,7 +21,7 @@ stages:
     script: |
         rm -rf vlc
         ./buildsystem/get-vlc.sh
-        export VLC_CONTRIB_SHA="$(cd vlc && extras/ci/get-contrib-sha.sh android-${ARCH})"
+        export VLC_CONTRIB_SHA="12345"
         export VLC_PREBUILT_CONTRIBS_URL="https://artifacts.videolan.org/vlc/android-${ARCH}/vlc-contrib-${TRIPLET}-${VLC_CONTRIB_SHA}.tar.bz2"
         if vlc/extras/ci/check-url.sh "$VLC_PREBUILT_CONTRIBS_URL"; then CONTRIB_FLAGS="--with-prebuilt-contribs"; fi
         ./buildsystem/compile-libvlc.sh -a ${ARCH} $CONTRIB_FLAGS

libvlc/patches/0006-input-display-discoverer-preparsers-logs.patch

@@ -14,14 +14,14 @@ diff --git a/src/input/input.c b/src/input/input.c
 index 21e019a6e72..d12de7bf367 100644
 --- a/src/input/input.c
 +++ b/src/input/input.c
-@@ -297,7 +297,6 @@ input_thread_t *input_Create( vlc_object_t *p_parent,
-     if( priv->type == INPUT_TYPE_PREPARSING
-      || priv->type == INPUT_TYPE_THUMBNAILING )
+@@ -301,7 +301,6 @@ input_thread_t * input_Create( vlc_object_t *p_parent, input_item_t *p_item,
+ 
+     if( priv->type != INPUT_TYPE_PLAYBACK )
      {
 -        p_input->obj.logger = NULL;
          p_input->obj.no_interact = true;
      }
-     else
+ 
 -- 
 2.35.1