From git at videolan.org Tue Nov 3 10:49:50 2026 From: git at videolan.org (=?UTF-8?Q?Nicolas_Pomepuy?=) Date: Tue, 3 Nov 2026 11:49:50 +0100 (CET) Subject: [Android] =?utf-8?q?buildsystem=3A_Attempt_auto-switching_to_Nod?= =?utf-8?q?e_22_when_building_main_branch?= Message-ID: <20261103104950.0DE9D64F6008@gitlab> vlc-android | branch: master | Nicolas Pomepuy | Fri Oct 30 13:03:13 2026 +0100| [cb5b363b90707f1ab2e02bc7e5e9b5b9160496c9] | committer: Nicolas Pomepuy buildsystem: Attempt auto-switching to Node 22 when building main branch - Attempt to activate Node 22 via NVM, fnm, n, or asdf when building main branch\n- Only display an error and fail if Node 22 remains inactive after the attempt > https://code.videolan.org/videolan/vlc-android/commit/cb5b363b90707f1ab2e02bc7e5e9b5b9160496c9 --- buildsystem/compile-remoteaccess.sh | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/buildsystem/compile-remoteaccess.sh b/buildsystem/compile-remoteaccess.sh index 47763d4071..91ebd3c998 100755 --- a/buildsystem/compile-remoteaccess.sh +++ b/buildsystem/compile-remoteaccess.sh @@ -115,9 +115,34 @@ if [ "$INIT_ONLY" != 1 ]; then cd "$VLC_REMOTE_ACCESS_PATH" if [ "$USE_MAIN" = 1 ]; then + # Check current Node.js major version NODE_VERSION=$(node -v 2>/dev/null | sed -E 's/^v([0-9]+).*/\1/') + + # If Node 22 is not active, attempt to switch automatically using standard version managers if [ "$NODE_VERSION" != "22" ]; then - fail "Node 22 is required to build the remote access main branch (found Node v${NODE_VERSION:-unknown})." + # Attempt to activate Node 22 using NVM if available + if [ -s "${NVM_DIR:-$HOME/.nvm}/nvm.sh" ]; then + . "${NVM_DIR:-$HOME/.nvm}/nvm.sh" 2>/dev/null || true + nvm use 22 >/dev/null 2>&1 || true + # Attempt to activate Node 22 using fnm if available + elif command -v fnm >/dev/null 2>&1; then + eval "$(fnm env 2>/dev/null)" || true + fnm use 22 >/dev/null 2>&1 || true + # Attempt to activate Node 22 using n if available + elif command -v n >/dev/null 2>&1; then + n 22 >/dev/null 2>&1 || true + # Attempt to activate Node 22 using asdf if available + elif command -v asdf >/dev/null 2>&1; then + asdf shell nodejs 22 >/dev/null 2>&1 || true + fi + + # Re-check Node.js major version + NODE_VERSION=$(node -v 2>/dev/null | sed -E 's/^v([0-9]+).*/\1/') + + # Only display an error message and fail if Node 22 is still not available + if [ "$NODE_VERSION" != "22" ]; then + fail "Node 22 is required to build the remote access main branch (found Node v${NODE_VERSION:-unknown}). Please install or switch to Node 22." + fi fi fi From git at videolan.org Tue Nov 3 10:49:50 2026 From: git at videolan.org (=?UTF-8?Q?Nicolas_Pomepuy?=) Date: Tue, 3 Nov 2026 11:49:50 +0100 (CET) Subject: [Android] =?utf-8?q?buildsystem=3A_Require_Node_22_when_building?= =?utf-8?q?_remote_access_main_branch?= Message-ID: <20261103104950.0E28664F600A@gitlab> vlc-android | branch: master | Nicolas Pomepuy | Fri Oct 30 12:56:19 2026 +0100| [8d210caf06e1960f1df485e4b7670128d9f12408] | committer: Nicolas Pomepuy buildsystem: Require Node 22 when building remote access main branch Enforce Node 22 in buildsystem/compile-remoteaccess.sh only when the --main flag is passed. > https://code.videolan.org/videolan/vlc-android/commit/8d210caf06e1960f1df485e4b7670128d9f12408 --- buildsystem/compile-remoteaccess.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/buildsystem/compile-remoteaccess.sh b/buildsystem/compile-remoteaccess.sh index 9016b12ea6..47763d4071 100755 --- a/buildsystem/compile-remoteaccess.sh +++ b/buildsystem/compile-remoteaccess.sh @@ -114,6 +114,13 @@ if [ "$INIT_ONLY" != 1 ]; then diagnostic "Building the Remote Access project" cd "$VLC_REMOTE_ACCESS_PATH" + if [ "$USE_MAIN" = 1 ]; then + NODE_VERSION=$(node -v 2>/dev/null | sed -E 's/^v([0-9]+).*/\1/') + if [ "$NODE_VERSION" != "22" ]; then + fail "Node 22 is required to build the remote access main branch (found Node v${NODE_VERSION:-unknown})." + fi + fi + npm install npm run build-android cd "$CURRENT_DIR" From git at videolan.org Tue Nov 3 10:49:50 2026 From: git at videolan.org (=?UTF-8?Q?Nicolas_Pomepuy?=) Date: Tue, 3 Nov 2026 11:49:50 +0100 (CET) Subject: [Android] =?utf-8?q?buildsystem=3A_Avoid_resetting_remote_access?= =?utf-8?q?_repo_if_already_on_tested_hash?= Message-ID: <20261103104950.133BD64F600C@gitlab> vlc-android | branch: master | Nicolas Pomepuy | Mon Nov 2 13:42:32 2026 +0100| [0e8739e03a215db2ac3ecac203ce48581c815859] | committer: Nicolas Pomepuy buildsystem: Avoid resetting remote access repo if already on tested hash > https://code.videolan.org/videolan/vlc-android/commit/0e8739e03a215db2ac3ecac203ce48581c815859 --- buildsystem/compile-remoteaccess.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/buildsystem/compile-remoteaccess.sh b/buildsystem/compile-remoteaccess.sh index 91ebd3c998..7f467ccf60 100755 --- a/buildsystem/compile-remoteaccess.sh +++ b/buildsystem/compile-remoteaccess.sh @@ -102,10 +102,12 @@ if [ ! -d "$VLC_REMOTE_ACCESS_PATH" ] || [ ! -d "$VLC_REMOTE_ACCESS_PATH/.git" ] else diagnostic "Remote access sources: found in $VLC_REMOTE_ACCESS_PATH" cd "$VLC_REMOTE_ACCESS_PATH" - git fetch origin ${branch}:refs/remotes/origin/${branch} - git checkout -B ${branch} origin/${branch} - if [ "$USE_MAIN" != 1 ]; then - git reset --hard ${REMOTE_ACCESS_TESTED_HASH} || fail "Remote access sources: REMOTE_ACCESS_TESTED_HASH ${REMOTE_ACCESS_TESTED_HASH} not found" + if [ "$USE_MAIN" = 1 ]; then + git fetch origin ${branch}:refs/remotes/origin/${branch} + git checkout -B ${branch} origin/${branch} + elif [ "$(git rev-parse HEAD 2>/dev/null)" != "$REMOTE_ACCESS_TESTED_HASH" ]; then + git fetch origin ${branch}:refs/remotes/origin/${branch} + git checkout -B ${branch} ${REMOTE_ACCESS_TESTED_HASH} || fail "Remote access sources: REMOTE_ACCESS_TESTED_HASH ${REMOTE_ACCESS_TESTED_HASH} not found" fi cd "$CURRENT_DIR" fi From git at videolan.org Tue Nov 3 10:49:50 2026 From: git at videolan.org (=?UTF-8?Q?Nicolas_Pomepuy?=) Date: Tue, 3 Nov 2026 11:49:50 +0100 (CET) Subject: [Android] =?utf-8?q?buildsystem=3A_add_--reset_flag_to_compile-r?= =?utf-8?q?emoteaccess=2Esh_to_force_git_reset?= Message-ID: <20261103104950.234EB64F600F@gitlab> vlc-android | branch: master | Nicolas Pomepuy | Mon Nov 2 14:27:22 2026 +0100| [436160870128792553790133755db82307fe5fd6] | committer: Nicolas Pomepuy buildsystem: add --reset flag to compile-remoteaccess.sh to force git reset > https://code.videolan.org/videolan/vlc-android/commit/436160870128792553790133755db82307fe5fd6 --- buildsystem/compile-remoteaccess.sh | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/buildsystem/compile-remoteaccess.sh b/buildsystem/compile-remoteaccess.sh index 7f467ccf60..0fb2ccc107 100755 --- a/buildsystem/compile-remoteaccess.sh +++ b/buildsystem/compile-remoteaccess.sh @@ -41,12 +41,14 @@ fail() } USE_MAIN=0 +RESET=0 while [ $# -gt 0 ]; do case $1 in help|--help|-h) echo "Use --init to only clone/pull without building" echo "Use --main or -m to build using the main branch" + echo "Use --reset or -r to reset code from git" exit 0 ;; --init) @@ -55,6 +57,9 @@ while [ $# -gt 0 ]; do --main|-m) USE_MAIN=1 ;; + --reset|-r) + RESET=1 + ;; *) diagnostic "$0: Invalid option '$1'." diagnostic "$0: Try --help for more information." @@ -99,17 +104,18 @@ if [ ! -d "$VLC_REMOTE_ACCESS_PATH" ] || [ ! -d "$VLC_REMOTE_ACCESS_PATH/.git" ] git reset --hard ${REMOTE_ACCESS_TESTED_HASH} || fail "Remote access sources: REMOTE_ACCESS_TESTED_HASH ${REMOTE_ACCESS_TESTED_HASH} not found" fi cd "$CURRENT_DIR" -else - diagnostic "Remote access sources: found in $VLC_REMOTE_ACCESS_PATH" +elif [ "$RESET" = 1 ]; then + diagnostic "Remote access sources: resetting $VLC_REMOTE_ACCESS_PATH" cd "$VLC_REMOTE_ACCESS_PATH" + git fetch origin ${branch}:refs/remotes/origin/${branch} if [ "$USE_MAIN" = 1 ]; then - git fetch origin ${branch}:refs/remotes/origin/${branch} git checkout -B ${branch} origin/${branch} - elif [ "$(git rev-parse HEAD 2>/dev/null)" != "$REMOTE_ACCESS_TESTED_HASH" ]; then - git fetch origin ${branch}:refs/remotes/origin/${branch} + else git checkout -B ${branch} ${REMOTE_ACCESS_TESTED_HASH} || fail "Remote access sources: REMOTE_ACCESS_TESTED_HASH ${REMOTE_ACCESS_TESTED_HASH} not found" fi cd "$CURRENT_DIR" +else + diagnostic "Remote access sources: found in $VLC_REMOTE_ACCESS_PATH" fi if [ "$INIT_ONLY" != 1 ]; then From git at videolan.org Tue Nov 3 10:49:49 2026 From: git at videolan.org (=?UTF-8?Q?Nicolas_Pomepuy?=) Date: Tue, 3 Nov 2026 11:49:49 +0100 (CET) Subject: [Android] =?utf-8?q?buildsystem=3A_Allow_building_remote_access_?= =?utf-8?q?main_branch_using_--main_flag?= Message-ID: <20261103104950.0C33364F6006@gitlab> vlc-android | branch: master | Nicolas Pomepuy | Fri Oct 30 08:09:55 2026 +0100| [e8307ea40021e11ba77db97b3ef4ed7277a42626] | committer: Nicolas Pomepuy buildsystem: Allow building remote access main branch using --main flag By default, compile-remoteaccess.sh now targets the 0.x.x branch and resets to REMOTE_ACCESS_TESTED_HASH. Passing --main or -m allows building from the upstream main branch. > https://code.videolan.org/videolan/vlc-android/commit/e8307ea40021e11ba77db97b3ef4ed7277a42626 --- buildsystem/compile-remoteaccess.sh | 51 +++++++++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 10 deletions(-) diff --git a/buildsystem/compile-remoteaccess.sh b/buildsystem/compile-remoteaccess.sh index e3356ec6d4..9016b12ea6 100755 --- a/buildsystem/compile-remoteaccess.sh +++ b/buildsystem/compile-remoteaccess.sh @@ -34,15 +34,27 @@ diagnostic() echo "$@" 1>&2; } +fail() +{ + diagnostic "$1" + exit 1 +} + +USE_MAIN=0 + while [ $# -gt 0 ]; do case $1 in help|--help|-h) - echo "Use -c to build the remote access project" + echo "Use --init to only clone/pull without building" + echo "Use --main or -m to build using the main branch" exit 0 ;; --init) INIT_ONLY=1 ;; + --main|-m) + USE_MAIN=1 + ;; *) diagnostic "$0: Invalid option '$1'." diagnostic "$0: Try --help for more information." @@ -63,20 +75,39 @@ REMOTE_ACCESS_REPOSITORY=https://code.videolan.org/videolan/remoteaccess : ${VLC_REMOTE_ACCESS_PATH:="$(pwd -P)/application/remote-access-client/remoteaccess"} diagnostic "VLC_REMOTE_ACCESS_PATH is $VLC_REMOTE_ACCESS_PATH" -if [ ! -d "$VLC_REMOTE_ACCESS_PATH" ] || [ ! -d "$VLC_REMOTE_ACCESS_PATH/.git" ]; then - diagnostic "Remote access sources: not found, cloning" +if [ "$USE_MAIN" = 1 ]; then branch="main" +else + branch="0.x.x" +fi + +CURRENT_DIR="$(pwd -P)" + +if [ ! -d "$VLC_REMOTE_ACCESS_PATH" ] || [ ! -d "$VLC_REMOTE_ACCESS_PATH/.git" ]; then + diagnostic "Remote access sources: not found, cloning branch $branch" if [ ! -d "$VLC_REMOTE_ACCESS_PATH" ]; then - git clone --single-branch --branch ${branch} "${REMOTE_ACCESS_REPOSITORY}" application/remote-access-client/remoteaccess - cd application/remote-access-client/remoteaccess + git clone --single-branch --branch ${branch} "${REMOTE_ACCESS_REPOSITORY}" "$VLC_REMOTE_ACCESS_PATH" + cd "$VLC_REMOTE_ACCESS_PATH" else # folder exist with only the artifacts - cd application/remote-access-client/remoteaccess + cd "$VLC_REMOTE_ACCESS_PATH" git init git remote add origin "${REMOTE_ACCESS_REPOSITORY}" - git pull origin ${branch} + git fetch origin ${branch}:refs/remotes/origin/${branch} + git checkout -B ${branch} origin/${branch} + fi + if [ "$USE_MAIN" != 1 ]; then + git reset --hard ${REMOTE_ACCESS_TESTED_HASH} || fail "Remote access sources: REMOTE_ACCESS_TESTED_HASH ${REMOTE_ACCESS_TESTED_HASH} not found" + fi + cd "$CURRENT_DIR" +else + diagnostic "Remote access sources: found in $VLC_REMOTE_ACCESS_PATH" + cd "$VLC_REMOTE_ACCESS_PATH" + git fetch origin ${branch}:refs/remotes/origin/${branch} + git checkout -B ${branch} origin/${branch} + if [ "$USE_MAIN" != 1 ]; then + git reset --hard ${REMOTE_ACCESS_TESTED_HASH} || fail "Remote access sources: REMOTE_ACCESS_TESTED_HASH ${REMOTE_ACCESS_TESTED_HASH} not found" fi - git reset --hard ${REMOTE_ACCESS_TESTED_HASH} || fail "Remote access sources: REMOTE_ACCESS_TESTED_HASH ${REMOTE_ACCESS_TESTED_HASH} not found" - cd ../../.. + cd "$CURRENT_DIR" fi if [ "$INIT_ONLY" != 1 ]; then @@ -85,5 +116,5 @@ if [ "$INIT_ONLY" != 1 ]; then npm install npm run build-android - cd .. + cd "$CURRENT_DIR" fi From git at videolan.org Tue Nov 3 10:49:50 2026 From: git at videolan.org (=?UTF-8?Q?Nicolas_Pomepuy?=) Date: Tue, 3 Nov 2026 11:49:50 +0100 (CET) Subject: [Android] =?utf-8?q?Bump_the_remote_access_hash_and_version_to_0?= =?utf-8?b?LjI3LjA=?= Message-ID: <20261103104950.491BE64F6011@gitlab> vlc-android | branch: master | Nicolas Pomepuy | Mon Nov 2 09:57:46 2026 +0100| [57fe6cf2fa308a9a20f8945a71b1a581cfff942d] | committer: Nicolas Pomepuy Bump the remote access hash and version to 0.27.0 > https://code.videolan.org/videolan/vlc-android/commit/57fe6cf2fa308a9a20f8945a71b1a581cfff942d --- build.gradle | 2 +- buildsystem/compile-remoteaccess.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index a22c449a00..e0c951df38 100644 --- a/build.gradle +++ b/build.gradle @@ -64,7 +64,7 @@ ext { versionCode = 3070200 vlcMajorVersion = project.hasProperty('forceVlc4') && project.getProperty('forceVlc4') ? 4 : 3 versionName = vlcMajorVersion == 3 ? '3.7.2' : '4.0.0-preview - ' + versionCode - remoteAccessVersion = '0.26.0' + remoteAccessVersion = '0.27.0' libvlcVersion = vlcMajorVersion == 3 ? '3.7.7' :'4.0.0-eap29' medialibraryVersion = (vlcMajorVersion == 3 ? '0.13.24' : '0.13.22-vlc4') diff --git a/buildsystem/compile-remoteaccess.sh b/buildsystem/compile-remoteaccess.sh index 0fb2ccc107..f60222c99f 100755 --- a/buildsystem/compile-remoteaccess.sh +++ b/buildsystem/compile-remoteaccess.sh @@ -74,7 +74,7 @@ done ############################## diagnostic "Setting up the Remote Access project" -REMOTE_ACCESS_TESTED_HASH=8e4499edf1730dd7ee45200360b53d7c7aed3b61 +REMOTE_ACCESS_TESTED_HASH=b72415d65efc922a2fd2c0539b61aeb0ea17cd66 REMOTE_ACCESS_REPOSITORY=https://code.videolan.org/videolan/remoteaccess : ${VLC_REMOTE_ACCESS_PATH:="$(pwd -P)/application/remote-access-client/remoteaccess"} From git at videolan.org Tue Nov 3 10:57:16 2026 From: git at videolan.org (=?UTF-8?Q?Nicolas_Pomepuy?=) Date: Tue, 3 Nov 2026 11:57:16 +0100 (CET) Subject: [Android] =?utf-8?q?Bump_the_remote_access_hash_and_version_to_0?= =?utf-8?b?LjI3LjA=?= Message-ID: <20261103105716.D562564F6006@gitlab> vlc-android | branch: refs/tags/remoteaccess-0.27.0 | Nicolas Pomepuy | Mon Nov 2 09:57:46 2026 +0100| [57fe6cf2fa308a9a20f8945a71b1a581cfff942d] | committer: Nicolas Pomepuy Bump the remote access hash and version to 0.27.0 > https://code.videolan.org/videolan/vlc-android/commit/57fe6cf2fa308a9a20f8945a71b1a581cfff942d --- build.gradle | 2 +- buildsystem/compile-remoteaccess.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index a22c449a00..e0c951df38 100644 --- a/build.gradle +++ b/build.gradle @@ -64,7 +64,7 @@ ext { versionCode = 3070200 vlcMajorVersion = project.hasProperty('forceVlc4') && project.getProperty('forceVlc4') ? 4 : 3 versionName = vlcMajorVersion == 3 ? '3.7.2' : '4.0.0-preview - ' + versionCode - remoteAccessVersion = '0.26.0' + remoteAccessVersion = '0.27.0' libvlcVersion = vlcMajorVersion == 3 ? '3.7.7' :'4.0.0-eap29' medialibraryVersion = (vlcMajorVersion == 3 ? '0.13.24' : '0.13.22-vlc4') diff --git a/buildsystem/compile-remoteaccess.sh b/buildsystem/compile-remoteaccess.sh index 0fb2ccc107..f60222c99f 100755 --- a/buildsystem/compile-remoteaccess.sh +++ b/buildsystem/compile-remoteaccess.sh @@ -74,7 +74,7 @@ done ############################## diagnostic "Setting up the Remote Access project" -REMOTE_ACCESS_TESTED_HASH=8e4499edf1730dd7ee45200360b53d7c7aed3b61 +REMOTE_ACCESS_TESTED_HASH=b72415d65efc922a2fd2c0539b61aeb0ea17cd66 REMOTE_ACCESS_REPOSITORY=https://code.videolan.org/videolan/remoteaccess : ${VLC_REMOTE_ACCESS_PATH:="$(pwd -P)/application/remote-access-client/remoteaccess"} From bobdoledoesntneedthis at proton.me Mon Nov 9 01:24:19 2026 From: bobdoledoesntneedthis at proton.me (bobdoledoesntneedthis) Date: Mon, 09 Nov 2026 01:24:19 +0000 Subject: [Android] Bug: resuming an MKV HTTP stream from history lands near 0:00 (resume seek runs before video is enabled) Message-ID: Hello, I'd like to report a bug in VLC for Android. I registered on code.videolan.org in October to file it there, but my account is still awaiting approval, so I'm sending it to this list as the README suggests. I'll post it as an issue once the account is approved. I searched the vlc-android and vlc issue trackers (most recently on November 8) and found no existing report. The 3.7.2 changelog doesn't mention it, and the relevant app code is unchanged on master. Three log excerpts are attached (vlc-resume-logs.tar.xz). The stream URL, file name, server address and HTTP auth headers have been redacted. The full logcat captures are available on request. Summary ------- Resuming an MKV network stream from history restarts near 0:00 (fast seek on) or prerolls from 0:00 (fast seek off): the resume seek runs while video is disabled. Description ----------- Resuming an MKV played over HTTP from the Stream history does not resume at the saved position. - With Settings > "Always use fast seek" enabled, playback restarts a few seconds into the file. Sometimes the correct position flashes briefly first. - With fast seek disabled, the player shows the loading cone for a long time (66 s in one run) while it decodes from the start of the file up to the resume point. On a slower or interrupted connection it never gets there: in one run the HTTP connection dropped mid-preroll and playback ended with EOF. The same file downloaded to local storage resumes correctly. Once playback is running, manual seeks on the stream are instant and accurate. Expected: playback resumes at the saved position, as it does for a local file. Actual: the resume seek lands on a keyframe near the beginning of the file. Analysis (from verbose logs and source) --------------------------------------- 1. A history stream is not TYPE_VIDEO, so PlaylistManager.playIndex() starts it in the service without the MEDIA_VIDEO flag, and VLCOptions.setMediaOptions() adds ":no-video". The log shows "video is disabled, not selecting ES" at open. switchToVideo() enables video only about 0.5 s later, after ESAdded. 2. The resume position is applied through ":start-time" during this video-less window. In matroska_segment_c::Seek() (modules/demux/mkv/matroska_segment.cpp), "priority" falls back to the selected tracks when no video track is selected, which here is only the audio track. The file's Cues reference only the video track (the usual mkvmerge layout), and the only audio seekpoints known at that point are the ones already read near the start, so the seek resolves to "fpos 6374, pts 0". 3. When the video player attaches, the app seeks again to the current time. This seek follows "Always use fast seek", which suggests PlaybackService.flush() via setTime(..., fast). Video is still not selected at that instant, so it resolves to an audio seekpoint about 5-6 s in: - Fast seek on: playback starts at about 0:05. - Fast seek off: an accurate seek from about 0:06 decodes and discards about 10 minutes of 1080p over HTTP (about 700 MB) before showing anything. 4. Later user seeks, with video selected, resolve correctly from the Cues. For example, a seek to 442 s resolves to the keyframe at 440.44 s with tracks 1, 2 and 4. Possible fixes: - App: open history network streams that turn out to be video with video enabled, or apply the resume time only after the video track is selected. With libVLC 4 this could use set_time instead of start-time, as the existing TODO in PlaylistManager notes. - mkv demux: when no video track is selected, still use the video tracks' cue points to choose the file position. Steps to reproduce ------------------ 1. Enable "Always use fast seek". 2. Play an MKV (H.264 + E-AC3, Cues on the video track only) from an HTTP server, entered as a network stream. 3. Seek to about 10:00, let it play a few seconds, then exit the player. 4. Reopen the same item from Streams / history. 5. Playback starts at about 0:05 instead of about 10:00. Repeat with fast seek off: the loading cone stays for a long time while the input prerolls from about 0:06. Logs (attached, verbose mode, logcat) ------------------------------------- - report-excerpt-fastseek-on.txt: reopen with fast seek on. "starting at time: 621s" -> "SET_TIME to 621000000" -> "preroll{ track: 2 ... fpos: 6374 }" -> app "SET_TIME to 621398000" -> "preroll{ req: 5184001, start-pts: 5184001 }", i.e. playback starts at 5.2 s. - report-excerpt-fastseek-off-66s.txt: reopen with fast seek off. "SET_TIME to 623817000" -> "preroll{ req: 623817001, start-pts: 5440001 }" -> "Stream buffering done (619935 ms in 66339 ms)". - report-excerpt-fastseek-off.txt: same as above, but the HTTP connection failed during the preroll: "Error while reading SimpleBlock" -> "EOF reached". Key lines from the fast-seek-on run: 21:31:23.853 libvlc input: starting at time: 621s 21:31:23.854 libvlc input: video is disabled, not selecting ES 0x0 21:31:23.872 libvlc demux: SET_TIME to 621000000 21:31:23.873 libvlc demux: seek: preroll{ req: 621000001, start-pts: 1, start-fpos: 6374} 21:31:24.142 Displayed org.videolan.vlc/.gui.video.VideoPlayerActivity 21:31:24.193 libvlc demux: SET_TIME to 621398000 21:31:24.194 libvlc demux: seek: preroll{ req: 5184001, start-pts: 5184001, start-fpos: 3997695} 21:31:24.464 libvlc decoder: using video decoder module "mediacodec" Context ------- App version: 3.7.1 (13070105, F-Droid build), libVLC 3.0.23 Android version: 12 Device: SEI Robotics FRC1-Eastlink (SEI800ESTL), armeabi-v7a, Android TV set-top box App mode: TV Thank you. -------------- next part -------------- A non-text attachment was scrubbed... Name: vlc-resume-logs.tar.xz Type: application/x-xz Size: 12460 bytes Desc: not available URL: From git at videolan.org Mon Nov 9 08:37:15 2026 From: git at videolan.org (=?UTF-8?Q?Nicolas_Pomepuy?=) Date: Mon, 9 Nov 2026 09:37:15 +0100 (CET) Subject: [Android] =?utf-8?q?Bump_the_web_CI_docker_image?= Message-ID: <20261109083715.BE80F82EE12@gitlab> vlc-android | branch: master | Nicolas Pomepuy | Mon Nov 2 11:42:08 2026 +0100| [6cc45524d62128377f5a5c51b57c3293699aa87f] | committer: Nicolas Pomepuy Bump the web CI docker image > https://code.videolan.org/videolan/vlc-android/commit/6cc45524d62128377f5a5c51b57c3293699aa87f --- buildsystem/gitlab/.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildsystem/gitlab/.gitlab-ci.yml b/buildsystem/gitlab/.gitlab-ci.yml index 5a7281e118..79d2dff0e5 100644 --- a/buildsystem/gitlab/.gitlab-ci.yml +++ b/buildsystem/gitlab/.gitlab-ci.yml @@ -8,7 +8,7 @@ cache: variables: VLC_ANDROID_IMAGE_30: registry.videolan.org/vlc-debian-android-3.0:20260701183656 VLC_ANDROID_IMAGE_40: registry.videolan.org/vlc-debian-android:20260610055743 - VLC_WEB_BUILD_IMAGE: registry.videolan.org/videolan-alpine-node:20230523124511 + VLC_WEB_BUILD_IMAGE: registry.videolan.org/videolan-alpine-node:20261030114339 WEBSERVER_DIR: "./application/remote-access-client/remoteaccess" default: From git at videolan.org Mon Nov 9 13:36:42 2026 From: git at videolan.org (=?UTF-8?Q?Nicolas_Pomepuy?=) Date: Mon, 9 Nov 2026 14:36:42 +0100 (CET) Subject: [Android] =?utf-8?q?Feedback=3A_export_the_settings_in_a_file?= Message-ID: <20261109133642.491B182E274@gitlab> vlc-android | branch: master | Nicolas Pomepuy | Wed Nov 4 11:53:52 2026 +0100| [d1cee7a0210125c1840db00a1d54e83af2b8dfac] | committer: Duncan McNamara Feedback: export the settings in a file So that we're sure that the email client doesn't mess up the json > https://code.videolan.org/videolan/vlc-android/commit/d1cee7a0210125c1840db00a1d54e83af2b8dfac --- .../org/videolan/vlc/gui/helpers/FeedbackUtil.kt | 30 ++++++++++++++-------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/application/vlc-android/src/org/videolan/vlc/gui/helpers/FeedbackUtil.kt b/application/vlc-android/src/org/videolan/vlc/gui/helpers/FeedbackUtil.kt index 1871a9ee06..06d8ce630c 100644 --- a/application/vlc-android/src/org/videolan/vlc/gui/helpers/FeedbackUtil.kt +++ b/application/vlc-android/src/org/videolan/vlc/gui/helpers/FeedbackUtil.kt @@ -41,7 +41,6 @@ import org.videolan.resources.VLCOptions import org.videolan.vlc.BuildConfig import org.videolan.vlc.R import org.videolan.vlc.gui.preferences.search.PreferenceParser -import org.videolan.vlc.gui.preferences.search.PreferenceParser.getChangedPrefsJson import org.videolan.vlc.util.FileUtils import org.videolan.vlc.util.Permissions import java.io.BufferedWriter @@ -65,13 +64,26 @@ object FeedbackUtil { val emailIntent = Intent(Intent.ACTION_SEND_MULTIPLE) emailIntent.type = "message/rfc822" - //get medialib db if needed + val externalPath = AppContextProvider.appContext.getExternalFilesDir(null)?.absolutePath val attachments = ArrayList() + + // Attach settings JSON file + if (externalPath != null) { + try { + val settingsJson = PreferenceParser.getChangedPrefsJson(activity) + val settingsFile = File(externalPath, "vlc_settings.json") + settingsFile.writeText(settingsJson) + attachments.add(FileProvider.getUriForFile(activity, activity.applicationContext.packageName + ".provider", settingsFile)) + } catch (e: Exception) { + Log.e("FeedbackUtil", "Failed to export settings file", e) + } + } + + //get medialib db if needed if (includeMedialibrary) { - val externalPath = AppContextProvider.appContext.getExternalFilesDir(null)?.absolutePath - ?: return at withContext null - val dbPath = "$externalPath/${Medialibrary.VLC_MEDIA_DB_NAME}" - val dbZipPath = "$externalPath/db.zip" + val path = externalPath ?: return at withContext null + val dbPath = "$path/${Medialibrary.VLC_MEDIA_DB_NAME}" + val dbZipPath = "$path/db.zip" val db = File(activity.getDir("db", Context.MODE_PRIVATE).toString() + Medialibrary.VLC_MEDIA_DB_NAME) val dbFile = File(dbPath) FileUtils.copyFile(db, dbFile) @@ -82,7 +94,7 @@ object FeedbackUtil { } val appData = generateUsefulInfo(activity).replace("\r\n", "
") + "
" - val body = "

$message

$appData

" + val body = "

$message

$appData

" logcatZipPath?.let { attachments.add(FileProvider.getUriForFile(activity, activity.applicationContext.packageName + ".provider", File(it))) @@ -163,10 +175,6 @@ object FeedbackUtil { append(Log.getStackTraceString(e)) } append("____________________________\r\n") - append("Settings export/import (copy this line in a file to restore those settings)\r\n") - append("____________________________\r\n") - append("${PreferenceParser.getChangedPrefsJson(context)}\r\n") - append("____________________________\r\n") append("vlc options: ${VLCOptions.libOptions.joinToString(" ")}\r\n") append("____________________________\r\n") } From git at videolan.org Mon Nov 9 15:05:06 2026 From: git at videolan.org (=?UTF-8?Q?Nicolas_Pomepuy?=) Date: Mon, 9 Nov 2026 16:05:06 +0100 (CET) Subject: [Android] =?utf-8?q?VideoGridFragment=3A_handle_CTX=5FPLAY=5FALL?= =?utf-8?q?_context_option_for_video_folders?= Message-ID: <20261109150506.C705782E4A5@gitlab> vlc-android | branch: master | Nicolas Pomepuy | Mon Oct 26 14:50:47 2026 +0100| [14a7422459ca809b29cad567c3a59702178cb423] | committer: Duncan McNamara VideoGridFragment: handle CTX_PLAY_ALL context option for video folders > https://code.videolan.org/videolan/vlc-android/commit/14a7422459ca809b29cad567c3a59702178cb423 --- .../vlc-android/src/org/videolan/vlc/gui/video/VideoGridFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/vlc-android/src/org/videolan/vlc/gui/video/VideoGridFragment.kt b/application/vlc-android/src/org/videolan/vlc/gui/video/VideoGridFragment.kt index 9654ef1c0b..eb43b5c73d 100644 --- a/application/vlc-android/src/org/videolan/vlc/gui/video/VideoGridFragment.kt +++ b/application/vlc-android/src/org/videolan/vlc/gui/video/VideoGridFragment.kt @@ -648,7 +648,7 @@ class VideoGridFragment : MediaBrowserFragment(), SwipeRefreshL else -> {} } is Folder -> when (option) { - CTX_PLAY -> viewModel.play(position) + CTX_PLAY_ALL, CTX_PLAY -> viewModel.play(position) CTX_APPEND -> viewModel.append(position) CTX_ADD_TO_PLAYLIST -> viewModel.addItemToPlaylist(requireActivity(), position) CTX_MARK_ALL_AS_PLAYED -> lifecycleScope.launch { viewModel.markAsPlayed(media) } From bobdoledoesntneedthis at proton.me Tue Nov 10 01:55:34 2026 From: bobdoledoesntneedthis at proton.me (bobdoledoesntneedthis) Date: Tue, 10 Nov 2026 01:55:34 +0000 Subject: [Android] Bug: resuming an MKV HTTP stream from history lands near 0:00 (resume seek runs before video is enabled) In-Reply-To: References: Message-ID: This is now filed on GitLab as issue #3386, with the same logs attached: https://code.videolan.org/videolan/vlc-android/-/work_items/3386 Please send any follow-up there. Thank you. On Sunday, 8 November 2026 at 20:24, bobdoledoesntneedthis wrote: > Hello, > > I'd like to report a bug in VLC for Android. I registered on code.videolan.org in October to file it there, but my account is still awaiting approval, so I'm sending it to this list as the README suggests. I'll post it as an issue once the account is approved. > > I searched the vlc-android and vlc issue trackers (most recently on November 8) and found no existing report. The 3.7.2 changelog doesn't mention it, and the relevant app code is unchanged on master. > > Three log excerpts are attached (vlc-resume-logs.tar.xz). The stream URL, file name, server address and HTTP auth headers have been redacted. The full logcat captures are available on request. > > > Summary > ------- > > Resuming an MKV network stream from history restarts near 0:00 (fast seek on) or prerolls from 0:00 (fast seek off): the resume seek runs while video is disabled. > > > Description > ----------- > > Resuming an MKV played over HTTP from the Stream history does not resume at the saved position. > > - With Settings > "Always use fast seek" enabled, playback restarts a few seconds into the file. Sometimes the correct position flashes briefly first. > > - With fast seek disabled, the player shows the loading cone for a long time (66 s in one run) while it decodes from the start of the file up to the resume point. On a slower or interrupted connection it never gets there: in one run the HTTP connection dropped mid-preroll and playback ended with EOF. > > The same file downloaded to local storage resumes correctly. Once playback is running, manual seeks on the stream are instant and accurate. > > Expected: playback resumes at the saved position, as it does for a local file. > > Actual: the resume seek lands on a keyframe near the beginning of the file. > > > Analysis (from verbose logs and source) > --------------------------------------- > > 1. A history stream is not TYPE_VIDEO, so PlaylistManager.playIndex() starts it in the service without the MEDIA_VIDEO flag, and VLCOptions.setMediaOptions() adds ":no-video". The log shows "video is disabled, not selecting ES" at open. switchToVideo() enables video only about 0.5 s later, after ESAdded. > > 2. The resume position is applied through ":start-time" during this video-less window. In matroska_segment_c::Seek() (modules/demux/mkv/matroska_segment.cpp), "priority" falls back to the selected tracks when no video track is selected, which here is only the audio track. The file's Cues reference only the video track (the usual mkvmerge layout), and the only audio seekpoints known at that point are the ones already read near the start, so the seek resolves to "fpos 6374, pts 0". > > 3. When the video player attaches, the app seeks again to the current time. This seek follows "Always use fast seek", which suggests PlaybackService.flush() via setTime(..., fast). Video is still not selected at that instant, so it resolves to an audio seekpoint about 5-6 s in: > - Fast seek on: playback starts at about 0:05. > - Fast seek off: an accurate seek from about 0:06 decodes and discards about 10 minutes of 1080p over HTTP (about 700 MB) before showing anything. > > 4. Later user seeks, with video selected, resolve correctly from the Cues. For example, a seek to 442 s resolves to the keyframe at 440.44 s with tracks 1, 2 and 4. > > Possible fixes: > > - App: open history network streams that turn out to be video with video enabled, or apply the resume time only after the video track is selected. With libVLC 4 this could use set_time instead of start-time, as the existing TODO in PlaylistManager notes. > > - mkv demux: when no video track is selected, still use the video tracks' cue points to choose the file position. > > > Steps to reproduce > ------------------ > > 1. Enable "Always use fast seek". > 2. Play an MKV (H.264 + E-AC3, Cues on the video track only) from an HTTP server, entered as a network stream. > 3. Seek to about 10:00, let it play a few seconds, then exit the player. > 4. Reopen the same item from Streams / history. > 5. Playback starts at about 0:05 instead of about 10:00. Repeat with fast seek off: the loading cone stays for a long time while the input prerolls from about 0:06. > > > Logs (attached, verbose mode, logcat) > ------------------------------------- > > - report-excerpt-fastseek-on.txt: reopen with fast seek on. "starting at time: 621s" -> "SET_TIME to 621000000" -> "preroll{ track: 2 ... fpos: 6374 }" -> app "SET_TIME to 621398000" -> "preroll{ req: 5184001, start-pts: 5184001 }", i.e. playback starts at 5.2 s. > > - report-excerpt-fastseek-off-66s.txt: reopen with fast seek off. "SET_TIME to 623817000" -> "preroll{ req: 623817001, start-pts: 5440001 }" -> "Stream buffering done (619935 ms in 66339 ms)". > > - report-excerpt-fastseek-off.txt: same as above, but the HTTP connection failed during the preroll: "Error while reading SimpleBlock" -> "EOF reached". > > Key lines from the fast-seek-on run: > > 21:31:23.853 libvlc input: starting at time: 621s > 21:31:23.854 libvlc input: video is disabled, not selecting ES 0x0 > 21:31:23.872 libvlc demux: SET_TIME to 621000000 > 21:31:23.873 libvlc demux: seek: preroll{ req: 621000001, start-pts: 1, start-fpos: 6374} > 21:31:24.142 Displayed org.videolan.vlc/.gui.video.VideoPlayerActivity > 21:31:24.193 libvlc demux: SET_TIME to 621398000 > 21:31:24.194 libvlc demux: seek: preroll{ req: 5184001, start-pts: 5184001, start-fpos: 3997695} > 21:31:24.464 libvlc decoder: using video decoder module "mediacodec" > > > Context > ------- > > App version: 3.7.1 (13070105, F-Droid build), libVLC 3.0.23 > Android version: 12 > Device: SEI Robotics FRC1-Eastlink (SEI800ESTL), armeabi-v7a, Android TV set-top box > App mode: TV > > Thank you. From git at videolan.org Thu Nov 19 08:56:15 2026 From: git at videolan.org (=?UTF-8?Q?Fr=C3=A9d=C3=A9ric_Basse?=) Date: Thu, 19 Nov 2026 09:56:15 +0100 (CET) Subject: [Android] =?utf-8?q?PlaylistManager=3A_don=27t_reuse_a_stale_pos?= =?utf-8?q?ition_after_a_media_ends?= Message-ID: <20261119085615.497FF82ED2A@gitlab> vlc-android | branch: master | Fr?d?ric Basse | Fri Oct 2 11:42:23 2026 -0700| [33be31fe5a12bc63a534fea82ef8c5d178a525c3] | committer: Nicolas Pomepuy PlaylistManager: don't reuse a stale position after a media ends When a media whose duration the medialibrary does not know (network media such as SMB, UPnP or streams) reaches its end, the position saved just before the end was not cleared, so already-played videos resumed a few seconds before the end on the next playback. Two problems in saveMediaMeta()/playIndex() caused this: - endReachedFor is set in MediaPlayer.Event.EndReached to stop the immediate next() call from overwriting the end-of-media position with the last known time. It was never reset, so saveMediaMeta() returned early for that URI for the rest of the session and no later progress was ever persisted for it. - saveMediaMeta(true) writes the media length to the medialibrary, but the "mark the file as finished and reset its time" workaround still compared the raw player time (if (time == length)), which is usually already 0 at EndReached. The forced reset was therefore skipped. Clear endReachedFor when a new playback starts. The next() save triggered by EndReached still runs before playIndex(), so the end-of-media position remains protected, while a media that is played again can save its progress normally. Also force the finished state when handling the end of the media (end || time == length). > https://code.videolan.org/videolan/vlc-android/commit/33be31fe5a12bc63a534fea82ef8c5d178a525c3 --- .../vlc-android/src/org/videolan/vlc/media/PlaylistManager.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/application/vlc-android/src/org/videolan/vlc/media/PlaylistManager.kt b/application/vlc-android/src/org/videolan/vlc/media/PlaylistManager.kt index b65ff7fa32..60e677af12 100644 --- a/application/vlc-android/src/org/videolan/vlc/media/PlaylistManager.kt +++ b/application/vlc-android/src/org/videolan/vlc/media/PlaylistManager.kt @@ -494,6 +494,10 @@ class PlaylistManager(val service: PlaybackService) : MediaWrapperList.EventList Log.w(TAG, "Warning: empty media list, nothing to play !") return } + // A new playback starts: the previous "media ended" marker only exists to protect + // the end-of-media position of the media that just ended. It must not keep preventing + // the progress of this media from being saved (e.g. when a shuffle replay selects it again). + endReachedFor = null currentIndex = if (isValidPosition(index)) { index } else { @@ -718,7 +722,10 @@ class PlaylistManager(val service: PlaybackService) : MediaWrapperList.EventList // the Medialibrary sometimes doesn't have the media's length, // and won't know that the file has ended. This forces the ML // to mark the file as finished and reset it's time - if (time == length) { + // When we are handling the end of the media, the value written + // to the ML is `length`, so the raw `time` may already have been + // reset to 0: only compare it when this is a regular save. + if (end || time == length) { medialibrary.setLastTime(media.id, 0) media.seen = 1L media.playCount += 1 From git at videolan.org Thu Nov 19 09:39:53 2026 From: git at videolan.org (=?UTF-8?Q?Nicolas_Pomepuy?=) Date: Thu, 19 Nov 2026 10:39:53 +0100 (CET) Subject: [Android] =?utf-8?q?buildsystem=3A_update_compile-remoteaccess?= =?utf-8?q?=2Esh_for_tag-based_release_pinning_and_dual-branch_support?= Message-ID: <20261119093953.C286882E32E@gitlab> vlc-android | branch: master | Nicolas Pomepuy | Mon Nov 9 07:59:43 2026 +0100| [07e6b1115a02f5af87e6269d9aa5d1ed505fcc6a] | committer: Nicolas Pomepuy buildsystem: update compile-remoteaccess.sh for tag-based release pinning and dual-branch support > https://code.videolan.org/videolan/vlc-android/commit/07e6b1115a02f5af87e6269d9aa5d1ed505fcc6a --- buildsystem/compile-remoteaccess.sh | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/buildsystem/compile-remoteaccess.sh b/buildsystem/compile-remoteaccess.sh index f60222c99f..472fb00635 100755 --- a/buildsystem/compile-remoteaccess.sh +++ b/buildsystem/compile-remoteaccess.sh @@ -74,7 +74,8 @@ done ############################## diagnostic "Setting up the Remote Access project" -REMOTE_ACCESS_TESTED_HASH=b72415d65efc922a2fd2c0539b61aeb0ea17cd66 +REMOTE_ACCESS_TAG_VLC3="0.27.0" +REMOTE_ACCESS_TAG_VLC4="1.0.0-alpha.1" REMOTE_ACCESS_REPOSITORY=https://code.videolan.org/videolan/remoteaccess : ${VLC_REMOTE_ACCESS_PATH:="$(pwd -P)/application/remote-access-client/remoteaccess"} @@ -82,8 +83,10 @@ diagnostic "VLC_REMOTE_ACCESS_PATH is $VLC_REMOTE_ACCESS_PATH" if [ "$USE_MAIN" = 1 ]; then branch="main" + TARGET_TAG="${REMOTE_ACCESS_TAG_VLC4}" else branch="0.x.x" + TARGET_TAG="${REMOTE_ACCESS_TAG_VLC3}" fi CURRENT_DIR="$(pwd -P)" @@ -93,25 +96,32 @@ if [ ! -d "$VLC_REMOTE_ACCESS_PATH" ] || [ ! -d "$VLC_REMOTE_ACCESS_PATH/.git" ] if [ ! -d "$VLC_REMOTE_ACCESS_PATH" ]; then git clone --single-branch --branch ${branch} "${REMOTE_ACCESS_REPOSITORY}" "$VLC_REMOTE_ACCESS_PATH" cd "$VLC_REMOTE_ACCESS_PATH" + git fetch origin --tags else # folder exist with only the artifacts cd "$VLC_REMOTE_ACCESS_PATH" git init git remote add origin "${REMOTE_ACCESS_REPOSITORY}" - git fetch origin ${branch}:refs/remotes/origin/${branch} + git fetch origin ${branch}:refs/remotes/origin/${branch} --tags git checkout -B ${branch} origin/${branch} fi - if [ "$USE_MAIN" != 1 ]; then - git reset --hard ${REMOTE_ACCESS_TESTED_HASH} || fail "Remote access sources: REMOTE_ACCESS_TESTED_HASH ${REMOTE_ACCESS_TESTED_HASH} not found" + if git rev-parse -q --verify "refs/tags/${TARGET_TAG}" >/dev/null || git rev-parse -q --verify "${TARGET_TAG}" >/dev/null; then + diagnostic "Checking out Remote Access tag ${TARGET_TAG}" + git checkout "${TARGET_TAG}" + else + diagnostic "Tag ${TARGET_TAG} not found, falling back to branch ${branch}" + git checkout -B "${branch}" "origin/${branch}" || fail "Remote access sources: branch ${branch} not found" fi cd "$CURRENT_DIR" elif [ "$RESET" = 1 ]; then diagnostic "Remote access sources: resetting $VLC_REMOTE_ACCESS_PATH" cd "$VLC_REMOTE_ACCESS_PATH" - git fetch origin ${branch}:refs/remotes/origin/${branch} - if [ "$USE_MAIN" = 1 ]; then - git checkout -B ${branch} origin/${branch} + git fetch origin ${branch}:refs/remotes/origin/${branch} --tags + if git rev-parse -q --verify "refs/tags/${TARGET_TAG}" >/dev/null || git rev-parse -q --verify "${TARGET_TAG}" >/dev/null; then + diagnostic "Checking out Remote Access tag ${TARGET_TAG}" + git checkout "${TARGET_TAG}" else - git checkout -B ${branch} ${REMOTE_ACCESS_TESTED_HASH} || fail "Remote access sources: REMOTE_ACCESS_TESTED_HASH ${REMOTE_ACCESS_TESTED_HASH} not found" + diagnostic "Tag ${TARGET_TAG} not found, falling back to branch ${branch}" + git checkout -B "${branch}" "origin/${branch}" || fail "Remote access sources: branch ${branch} not found" fi cd "$CURRENT_DIR" else @@ -122,10 +132,9 @@ if [ "$INIT_ONLY" != 1 ]; then diagnostic "Building the Remote Access project" cd "$VLC_REMOTE_ACCESS_PATH" - if [ "$USE_MAIN" = 1 ]; then - # Check current Node.js major version - NODE_VERSION=$(node -v 2>/dev/null | sed -E 's/^v([0-9]+).*/\1/') + NODE_VERSION=$(node -v 2>/dev/null | sed -E 's/^v([0-9]+).*/\1/') + if [ "$USE_MAIN" = 1 ]; then # If Node 22 is not active, attempt to switch automatically using standard version managers if [ "$NODE_VERSION" != "22" ]; then # Attempt to activate Node 22 using NVM if available @@ -152,6 +161,10 @@ if [ "$INIT_ONLY" != 1 ]; then fail "Node 22 is required to build the remote access main branch (found Node v${NODE_VERSION:-unknown}). Please install or switch to Node 22." fi fi + else + if [ -n "$NODE_VERSION" ] && [ "$NODE_VERSION" -lt 20 ]; then + fail "Node 20 or higher is required to build remote access (found Node v${NODE_VERSION:-unknown}). Please install or switch to Node 20+." + fi fi npm install From git at videolan.org Thu Nov 19 09:39:53 2026 From: git at videolan.org (=?UTF-8?Q?Nicolas_Pomepuy?=) Date: Thu, 19 Nov 2026 10:39:53 +0100 (CET) Subject: [Android] =?utf-8?q?remote-access-client=3A_use_git_describe_for?= =?utf-8?q?_revision_and_add_fallback_for_version_resolution?= Message-ID: <20261119093953.CE5FE82E32F@gitlab> vlc-android | branch: master | Nicolas Pomepuy | Mon Nov 9 08:00:01 2026 +0100| [e79a5688d6632060625d304ec63ec9ecc95cbf76] | committer: Nicolas Pomepuy remote-access-client: use git describe for revision and add fallback for version resolution > https://code.videolan.org/videolan/vlc-android/commit/e79a5688d6632060625d304ec63ec9ecc95cbf76 --- application/remote-access-client/build.gradle | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/application/remote-access-client/build.gradle b/application/remote-access-client/build.gradle index be8c1e9f71..3593334af2 100644 --- a/application/remote-access-client/build.gradle +++ b/application/remote-access-client/build.gradle @@ -36,7 +36,7 @@ def remoteclientSourceDir = "$projectDir/remoteaccess" File remoteAccessPackage = file("$remoteclientSourceDir/package.json") def remoteAccessRevision = remoteAccessPackage.exists() ? providers.exec { workingDir(remoteclientSourceDir) - commandLine('git', 'rev-parse', '--short', 'HEAD') + commandLine('git', 'describe', '--tags', '--always') }.standardOutput.asText.get().trim() : 'unknown' android { @@ -87,20 +87,21 @@ android { preBuild.dependsOn(webCopy) def remoteAccessVersion() { - def code = new ByteArrayOutputStream() try { File remoteAccessPackage = file("remoteaccess/package.json") if (remoteAccessPackage.exists()) { - remoteAccessPackage.readLines().each { - if (it.contains('"version"')) { - code = it.split("\"")[3] - return + for (String line : remoteAccessPackage.readLines()) { + if (line.contains('"version"')) { + def version = line.split("\"")[3] + if (version && !version.isEmpty()) { + return version + } } } } - } catch (Exception e) { + } catch (Throwable e) { } - return "unknown" + return rootProject.ext.remoteAccessVersion } From git at videolan.org Thu Nov 19 09:39:53 2026 From: git at videolan.org (=?UTF-8?Q?Nicolas_Pomepuy?=) Date: Thu, 19 Nov 2026 10:39:53 +0100 (CET) Subject: [Android] =?utf-8?q?build=2Egradle=3A_synchronize_remoteAccessVe?= =?utf-8?q?rsion_with_VLC_3_and_VLC_4_RemoteAccess_release_tags?= Message-ID: <20261119093953.CE93F82E343@gitlab> vlc-android | branch: master | Nicolas Pomepuy | Mon Nov 9 08:00:14 2026 +0100| [9ef130c39855e5105b7f31cb1acf89fd479a0a13] | committer: Nicolas Pomepuy build.gradle: synchronize remoteAccessVersion with VLC 3 and VLC 4 RemoteAccess release tags > https://code.videolan.org/videolan/vlc-android/commit/9ef130c39855e5105b7f31cb1acf89fd479a0a13 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e0c951df38..c05ee1683c 100644 --- a/build.gradle +++ b/build.gradle @@ -64,7 +64,7 @@ ext { versionCode = 3070200 vlcMajorVersion = project.hasProperty('forceVlc4') && project.getProperty('forceVlc4') ? 4 : 3 versionName = vlcMajorVersion == 3 ? '3.7.2' : '4.0.0-preview - ' + versionCode - remoteAccessVersion = '0.27.0' + remoteAccessVersion = vlcMajorVersion == 3 ? '0.27.0' : '1.0.0-alpha.1' // Synchronized with RemoteAccess release tag libvlcVersion = vlcMajorVersion == 3 ? '3.7.7' :'4.0.0-eap29' medialibraryVersion = (vlcMajorVersion == 3 ? '0.13.24' : '0.13.22-vlc4') From git at videolan.org Thu Nov 19 09:39:53 2026 From: git at videolan.org (=?UTF-8?Q?Nicolas_Pomepuy?=) Date: Thu, 19 Nov 2026 10:39:53 +0100 (CET) Subject: [Android] =?utf-8?q?buildsystem=3A_fail_when_the_pinned_Remote_A?= =?utf-8?q?ccess_tag_is_missing?= Message-ID: <20261119093953.D36AC82E36C@gitlab> vlc-android | branch: master | Nicolas Pomepuy | Mon Nov 9 13:27:53 2026 +0100| [e2341c2c8a2865a7910a771f7b54adb745709827] | committer: Nicolas Pomepuy buildsystem: fail when the pinned Remote Access tag is missing > https://code.videolan.org/videolan/vlc-android/commit/e2341c2c8a2865a7910a771f7b54adb745709827 --- buildsystem/compile-remoteaccess.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/buildsystem/compile-remoteaccess.sh b/buildsystem/compile-remoteaccess.sh index 472fb00635..d05596f261 100755 --- a/buildsystem/compile-remoteaccess.sh +++ b/buildsystem/compile-remoteaccess.sh @@ -108,8 +108,7 @@ if [ ! -d "$VLC_REMOTE_ACCESS_PATH" ] || [ ! -d "$VLC_REMOTE_ACCESS_PATH/.git" ] diagnostic "Checking out Remote Access tag ${TARGET_TAG}" git checkout "${TARGET_TAG}" else - diagnostic "Tag ${TARGET_TAG} not found, falling back to branch ${branch}" - git checkout -B "${branch}" "origin/${branch}" || fail "Remote access sources: branch ${branch} not found" + fail "Remote access sources: tag ${TARGET_TAG} not found" fi cd "$CURRENT_DIR" elif [ "$RESET" = 1 ]; then @@ -120,8 +119,7 @@ elif [ "$RESET" = 1 ]; then diagnostic "Checking out Remote Access tag ${TARGET_TAG}" git checkout "${TARGET_TAG}" else - diagnostic "Tag ${TARGET_TAG} not found, falling back to branch ${branch}" - git checkout -B "${branch}" "origin/${branch}" || fail "Remote access sources: branch ${branch} not found" + fail "Remote access sources: tag ${TARGET_TAG} not found" fi cd "$CURRENT_DIR" else From git at videolan.org Thu Nov 19 09:39:53 2026 From: git at videolan.org (=?UTF-8?Q?Nicolas_Pomepuy?=) Date: Thu, 19 Nov 2026 10:39:53 +0100 (CET) Subject: [Android] =?utf-8?q?buildsystem=3A_force_checkout_of_the_Remote_?= =?utf-8?q?Access_tag_on_--reset?= Message-ID: <20261119093953.D9FEC82E3D2@gitlab> vlc-android | branch: master | Nicolas Pomepuy | Mon Nov 9 13:30:43 2026 +0100| [ba9b9999301f1b13e45648b6e68faa1aa1204fa5] | committer: Nicolas Pomepuy buildsystem: force checkout of the Remote Access tag on --reset > https://code.videolan.org/videolan/vlc-android/commit/ba9b9999301f1b13e45648b6e68faa1aa1204fa5 --- buildsystem/compile-remoteaccess.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildsystem/compile-remoteaccess.sh b/buildsystem/compile-remoteaccess.sh index d05596f261..b11ce73eee 100755 --- a/buildsystem/compile-remoteaccess.sh +++ b/buildsystem/compile-remoteaccess.sh @@ -117,7 +117,7 @@ elif [ "$RESET" = 1 ]; then git fetch origin ${branch}:refs/remotes/origin/${branch} --tags if git rev-parse -q --verify "refs/tags/${TARGET_TAG}" >/dev/null || git rev-parse -q --verify "${TARGET_TAG}" >/dev/null; then diagnostic "Checking out Remote Access tag ${TARGET_TAG}" - git checkout "${TARGET_TAG}" + git checkout -f "${TARGET_TAG}" else fail "Remote access sources: tag ${TARGET_TAG} not found" fi From git at videolan.org Thu Nov 19 09:39:53 2026 From: git at videolan.org (=?UTF-8?Q?Nicolas_Pomepuy?=) Date: Thu, 19 Nov 2026 10:39:53 +0100 (CET) Subject: [Android] =?utf-8?q?remote-access-client=3A_only_describe_the_re?= =?utf-8?q?vision_from_its_own_git_checkout?= Message-ID: <20261119093953.E82A182E32F@gitlab> vlc-android | branch: master | Nicolas Pomepuy | Mon Nov 9 13:43:17 2026 +0100| [659c4f1865e1abd85734cc24bfc567fd7ed1bae9] | committer: Nicolas Pomepuy remote-access-client: only describe the revision from its own git checkout > https://code.videolan.org/videolan/vlc-android/commit/659c4f1865e1abd85734cc24bfc567fd7ed1bae9 --- application/remote-access-client/build.gradle | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/application/remote-access-client/build.gradle b/application/remote-access-client/build.gradle index 3593334af2..487b623ebc 100644 --- a/application/remote-access-client/build.gradle +++ b/application/remote-access-client/build.gradle @@ -33,11 +33,25 @@ ext { } def remoteclientSourceDir = "$projectDir/remoteaccess" -File remoteAccessPackage = file("$remoteclientSourceDir/package.json") -def remoteAccessRevision = remoteAccessPackage.exists() ? providers.exec { - workingDir(remoteclientSourceDir) - commandLine('git', 'describe', '--tags', '--always') -}.standardOutput.asText.get().trim() : 'unknown' +// Only describe remoteaccess/ when it is its own git checkout: otherwise git walks up +// to the vlc-android repository and would report one of its tags as the revision +def remoteAccessRevision = 'unknown' +if (file("$remoteclientSourceDir/.git").exists()) { + try { + def describe = providers.exec { + workingDir(remoteclientSourceDir) + commandLine('git', 'describe', '--tags', '--always') + ignoreExitValue = true + } + if (describe.result.get().exitValue == 0) { + remoteAccessRevision = describe.standardOutput.asText.get().trim() + } else { + logger.warn("Remote access: git describe failed: ${describe.standardError.asText.get().trim()}") + } + } catch (Exception e) { + logger.warn("Remote access: unable to run git describe: ${e.message}") + } +} android { namespace = 'org.videolan.vlc.remoteaccessclient' From git at videolan.org Thu Nov 19 09:39:54 2026 From: git at videolan.org (=?UTF-8?Q?Nicolas_Pomepuy?=) Date: Thu, 19 Nov 2026 10:39:54 +0100 (CET) Subject: [Android] =?utf-8?q?buildsystem=3A_factor_the_Remote_Access_tag_?= =?utf-8?q?checkout_into_a_function?= Message-ID: <20261119093954.0133082E36C@gitlab> vlc-android | branch: master | Nicolas Pomepuy | Mon Nov 9 13:46:00 2026 +0100| [88733b5e8f3379283323d53143f5549506b7b159] | committer: Nicolas Pomepuy buildsystem: factor the Remote Access tag checkout into a function > https://code.videolan.org/videolan/vlc-android/commit/88733b5e8f3379283323d53143f5549506b7b159 --- buildsystem/compile-remoteaccess.sh | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/buildsystem/compile-remoteaccess.sh b/buildsystem/compile-remoteaccess.sh index 11c8899bb8..f47de29301 100755 --- a/buildsystem/compile-remoteaccess.sh +++ b/buildsystem/compile-remoteaccess.sh @@ -100,6 +100,15 @@ fi CURRENT_DIR="$(pwd -P)" +# Check out the pinned release tag in the current directory, extra arguments are passed to git checkout +checkout_pinned_tag() +{ + git rev-parse -q --verify "refs/tags/${TARGET_TAG}^{commit}" >/dev/null \ + || fail "Remote access sources: tag ${TARGET_TAG} not found" + diagnostic "Checking out Remote Access tag ${TARGET_TAG}" + git checkout "$@" "refs/tags/${TARGET_TAG}" +} + if [ ! -d "$VLC_REMOTE_ACCESS_PATH" ] || [ ! -d "$VLC_REMOTE_ACCESS_PATH/.git" ]; then diagnostic "Remote access sources: not found, cloning branch $branch" if [ ! -d "$VLC_REMOTE_ACCESS_PATH" ]; then @@ -113,23 +122,13 @@ if [ ! -d "$VLC_REMOTE_ACCESS_PATH" ] || [ ! -d "$VLC_REMOTE_ACCESS_PATH/.git" ] git fetch origin ${branch}:refs/remotes/origin/${branch} --tags git checkout -B ${branch} origin/${branch} fi - if git rev-parse -q --verify "refs/tags/${TARGET_TAG}" >/dev/null || git rev-parse -q --verify "${TARGET_TAG}" >/dev/null; then - diagnostic "Checking out Remote Access tag ${TARGET_TAG}" - git checkout "${TARGET_TAG}" - else - fail "Remote access sources: tag ${TARGET_TAG} not found" - fi + checkout_pinned_tag cd "$CURRENT_DIR" elif [ "$RESET" = 1 ]; then diagnostic "Remote access sources: resetting $VLC_REMOTE_ACCESS_PATH" cd "$VLC_REMOTE_ACCESS_PATH" git fetch origin ${branch}:refs/remotes/origin/${branch} --tags - if git rev-parse -q --verify "refs/tags/${TARGET_TAG}" >/dev/null || git rev-parse -q --verify "${TARGET_TAG}" >/dev/null; then - diagnostic "Checking out Remote Access tag ${TARGET_TAG}" - git checkout -f "${TARGET_TAG}" - else - fail "Remote access sources: tag ${TARGET_TAG} not found" - fi + checkout_pinned_tag -f cd "$CURRENT_DIR" else diagnostic "Remote access sources: found in $VLC_REMOTE_ACCESS_PATH" From git at videolan.org Thu Nov 19 09:39:54 2026 From: git at videolan.org (=?UTF-8?Q?Nicolas_Pomepuy?=) Date: Thu, 19 Nov 2026 10:39:54 +0100 (CET) Subject: [Android] =?utf-8?q?buildsystem=3A_only_fetch_the_pinned_Remote_?= =?utf-8?q?Access_tag?= Message-ID: <20261119093954.075F282E32E@gitlab> vlc-android | branch: master | Nicolas Pomepuy | Mon Nov 9 13:49:28 2026 +0100| [0358bfa2e5a13a7d2df9a74d0d2571696c85502e] | committer: Nicolas Pomepuy buildsystem: only fetch the pinned Remote Access tag > https://code.videolan.org/videolan/vlc-android/commit/0358bfa2e5a13a7d2df9a74d0d2571696c85502e --- buildsystem/compile-remoteaccess.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/buildsystem/compile-remoteaccess.sh b/buildsystem/compile-remoteaccess.sh index f47de29301..a2524d55b0 100755 --- a/buildsystem/compile-remoteaccess.sh +++ b/buildsystem/compile-remoteaccess.sh @@ -100,9 +100,12 @@ fi CURRENT_DIR="$(pwd -P)" -# Check out the pinned release tag in the current directory, extra arguments are passed to git checkout +# Fetch and check out the pinned release tag in the current directory, extra arguments are passed to git checkout +# Only this tag is fetched: fetching all tags would also download the other release line's history checkout_pinned_tag() { + git fetch --no-tags origin "+refs/tags/${TARGET_TAG}:refs/tags/${TARGET_TAG}" \ + || fail "Remote access sources: unable to fetch tag ${TARGET_TAG}" git rev-parse -q --verify "refs/tags/${TARGET_TAG}^{commit}" >/dev/null \ || fail "Remote access sources: tag ${TARGET_TAG} not found" diagnostic "Checking out Remote Access tag ${TARGET_TAG}" @@ -114,12 +117,11 @@ if [ ! -d "$VLC_REMOTE_ACCESS_PATH" ] || [ ! -d "$VLC_REMOTE_ACCESS_PATH/.git" ] if [ ! -d "$VLC_REMOTE_ACCESS_PATH" ]; then git clone --single-branch --branch ${branch} "${REMOTE_ACCESS_REPOSITORY}" "$VLC_REMOTE_ACCESS_PATH" cd "$VLC_REMOTE_ACCESS_PATH" - git fetch origin --tags else # folder exist with only the artifacts cd "$VLC_REMOTE_ACCESS_PATH" git init git remote add origin "${REMOTE_ACCESS_REPOSITORY}" - git fetch origin ${branch}:refs/remotes/origin/${branch} --tags + git fetch origin ${branch}:refs/remotes/origin/${branch} git checkout -B ${branch} origin/${branch} fi checkout_pinned_tag @@ -127,7 +129,7 @@ if [ ! -d "$VLC_REMOTE_ACCESS_PATH" ] || [ ! -d "$VLC_REMOTE_ACCESS_PATH/.git" ] elif [ "$RESET" = 1 ]; then diagnostic "Remote access sources: resetting $VLC_REMOTE_ACCESS_PATH" cd "$VLC_REMOTE_ACCESS_PATH" - git fetch origin ${branch}:refs/remotes/origin/${branch} --tags + git fetch origin ${branch}:refs/remotes/origin/${branch} checkout_pinned_tag -f cd "$CURRENT_DIR" else From git at videolan.org Thu Nov 19 09:39:54 2026 From: git at videolan.org (=?UTF-8?Q?Duncan_McNamara?=) Date: Thu, 19 Nov 2026 10:39:54 +0100 (CET) Subject: [Android] =?utf-8?q?buildsystem=3A_download_the_pinned_Remote_Ac?= =?utf-8?q?cess_release?= Message-ID: <20261119093954.0DC3D82E32F@gitlab> vlc-android | branch: master | Duncan McNamara | Mon Nov 16 15:48:10 2026 +0000| [40699173c291a1ab8a3079e89dae0f2bbf376fac] | committer: Nicolas Pomepuy buildsystem: download the pinned Remote Access release RemoteAccess now publishes its releases as tarballs of the built web interface, with a .sha256 file next to each of them. Building it from source requires Node and npm, which CI no longer needs for app builds. Add a --download mode to compile-remoteaccess.sh: it fetches the remoteaccess-android-.tar.gz of the pinned tag, checks it against the SHA-256 pinned next to the tag in remoteaccess.properties and unpacks it in remoteaccess/dist, where webCopy picks it up. The URL can be overridden with REMOTE_ACCESS_RELEASE_URL, e.g. for a mirror. Building from source stays the default, for local builds and F-Droid. The checksums are left empty until the first tarball releases exist. > https://code.videolan.org/videolan/vlc-android/commit/40699173c291a1ab8a3079e89dae0f2bbf376fac --- buildsystem/compile-remoteaccess.sh | 64 +++++++++++++++++++++++++++++++++++++ buildsystem/remoteaccess.properties | 8 +++-- 2 files changed, 70 insertions(+), 2 deletions(-) diff --git a/buildsystem/compile-remoteaccess.sh b/buildsystem/compile-remoteaccess.sh index a2524d55b0..4f865d5134 100755 --- a/buildsystem/compile-remoteaccess.sh +++ b/buildsystem/compile-remoteaccess.sh @@ -42,6 +42,8 @@ fail() USE_MAIN=0 RESET=0 +INIT_ONLY=0 +DOWNLOAD=0 while [ $# -gt 0 ]; do case $1 in @@ -49,11 +51,16 @@ while [ $# -gt 0 ]; do echo "Use --init to only clone/pull without building" echo "Use --main or -m to build using the main branch" echo "Use --reset or -r to reset code from git" + echo "Use --download or -d to download the pinned release tarball instead of building it" + echo " (it doesn't touch the sources: it can't be combined with --init or --reset)" exit 0 ;; --init) INIT_ONLY=1 ;; + --download|-d) + DOWNLOAD=1 + ;; --main|-m) USE_MAIN=1 ;; @@ -69,6 +76,10 @@ while [ $# -gt 0 ]; do shift done +if [ "$DOWNLOAD" = 1 ] && { [ "$INIT_ONLY" = 1 ] || [ "$RESET" = 1 ]; }; then + fail "$0: --download can't be combined with --init or --reset" +fi + ############################## # Retrieve the remote access # ############################## @@ -93,13 +104,66 @@ diagnostic "VLC_REMOTE_ACCESS_PATH is $VLC_REMOTE_ACCESS_PATH" if [ "$USE_MAIN" = 1 ]; then branch="main" TARGET_TAG="${REMOTE_ACCESS_TAG_VLC4}" + TARGET_SHA256_KEY=remoteAccessSha256Vlc4 else branch="0.x.x" TARGET_TAG="${REMOTE_ACCESS_TAG_VLC3}" + TARGET_SHA256_KEY=remoteAccessSha256Vlc3 fi CURRENT_DIR="$(pwd -P)" +sha256_of() +{ + if command -v sha256sum >/dev/null 2>&1; then + sha256sum "$1" | cut -d ' ' -f 1 + else + shasum -a 256 "$1" | cut -d ' ' -f 1 + fi +} + +# Download the release tarball of the pinned tag, check it against its pinned SHA-256 +# and unpack it as the built web interface ($VLC_REMOTE_ACCESS_PATH/dist) +download_release() +{ + TARGET_SHA256="$(read_remote_access_version "$TARGET_SHA256_KEY")" + [ -n "$TARGET_SHA256" ] || fail "Remote access: $TARGET_SHA256_KEY missing in $REMOTE_ACCESS_PROPERTIES" + + tarball="remoteaccess-android-${TARGET_TAG}.tar.gz" + : ${REMOTE_ACCESS_RELEASE_URL:="${REMOTE_ACCESS_REPOSITORY}/-/jobs/artifacts/${TARGET_TAG}/raw/${tarball}?job=webserver-release"} + download_dir="$(mktemp -d)" + trap 'rm -rf "$download_dir"' EXIT + + diagnostic "Downloading Remote Access ${TARGET_TAG} from ${REMOTE_ACCESS_RELEASE_URL}" + if command -v curl >/dev/null 2>&1; then + curl -fsSL -o "$download_dir/$tarball" "$REMOTE_ACCESS_RELEASE_URL" \ + || fail "Remote access: unable to download $tarball" + elif command -v wget >/dev/null 2>&1; then + wget -q -O "$download_dir/$tarball" "$REMOTE_ACCESS_RELEASE_URL" \ + || fail "Remote access: unable to download $tarball" + else + fail "Remote access: curl or wget is required to download $tarball" + fi + + actual_sha256="$(sha256_of "$download_dir/$tarball")" + [ "$actual_sha256" = "$TARGET_SHA256" ] \ + || fail "Remote access: $tarball SHA-256 is $actual_sha256, expected $TARGET_SHA256" + + rm -rf "$VLC_REMOTE_ACCESS_PATH/dist" + mkdir -p "$VLC_REMOTE_ACCESS_PATH/dist" + tar -xzf "$download_dir/$tarball" -C "$VLC_REMOTE_ACCESS_PATH/dist" + diagnostic "Remote Access ${TARGET_TAG} unpacked in $VLC_REMOTE_ACCESS_PATH/dist" + # build.gradle describes a git checkout as the revision, whatever dist/ contains + if [ -d "$VLC_REMOTE_ACCESS_PATH/.git" ]; then + diagnostic "WARNING: $VLC_REMOTE_ACCESS_PATH is a git checkout: the app will report its revision, not the downloaded ${TARGET_TAG}" + fi +} + +if [ "$DOWNLOAD" = 1 ]; then + download_release + exit 0 +fi + # Fetch and check out the pinned release tag in the current directory, extra arguments are passed to git checkout # Only this tag is fetched: fetching all tags would also download the other release line's history checkout_pinned_tag() diff --git a/buildsystem/remoteaccess.properties b/buildsystem/remoteaccess.properties index d851958ff1..a8f7e43e44 100644 --- a/buildsystem/remoteaccess.properties +++ b/buildsystem/remoteaccess.properties @@ -1,6 +1,10 @@ # Remote Access release tags (https://code.videolan.org/videolan/remoteaccess) # Single source of truth, read by: -# - buildsystem/compile-remoteaccess.sh: the tag checked out and built +# - buildsystem/compile-remoteaccess.sh: the tag checked out and built, or downloaded # - build.gradle: remoteAccessVersion (AAR version and Maven coordinate) +# The SHA-256 are the ones of the remoteaccess-android-.tar.gz release tarballs, +# published as remoteaccess-android-.tar.gz.sha256 next to them. remoteAccessVersionVlc3=0.27.0 -remoteAccessVersionVlc4=1.0.0-alpha.1 \ No newline at end of file +remoteAccessSha256Vlc3= +remoteAccessVersionVlc4=1.0.0-alpha.1 +remoteAccessSha256Vlc4= From git at videolan.org Thu Nov 19 09:39:54 2026 From: git at videolan.org (=?UTF-8?Q?Duncan_McNamara?=) Date: Thu, 19 Nov 2026 10:39:54 +0100 (CET) Subject: [Android] =?utf-8?q?remote-access-client=3A_stop_publishing_an_A?= =?utf-8?q?AR?= Message-ID: <20261119093954.14ABA82E32E@gitlab> vlc-android | branch: master | Duncan McNamara | Mon Nov 16 15:48:53 2026 +0000| [08d08060daa0d0966fa50d9fae14e193d3d592d4] | committer: Nicolas Pomepuy remote-access-client: stop publishing an AAR Release builds consumed the Remote Access client as an AAR published to Maven from remoteaccess-* tags, while debug and dev builds used the project directly. vlc-android is the only consumer of that AAR, and the web interface now comes from the RemoteAccess release tarballs. Use the project dependency for every build type, and drop the Maven publication: the maven-publish plugin, the AAR naming, the publish_remote_access_lib CI job with its remoteaccess-* tag rule, and the remote-access artifact in deploy-to-mavencentral.sh. > https://code.videolan.org/videolan/vlc-android/commit/08d08060daa0d0966fa50d9fae14e193d3d592d4 --- application/remote-access-client/build.gradle | 17 ----------------- application/remote-access-server/build.gradle | 5 +---- buildsystem/gitlab/.gitlab-ci.yml | 18 ------------------ buildsystem/maven/deploy-to-mavencentral.sh | 16 +--------------- buildsystem/remoteaccess.properties | 2 +- 5 files changed, 3 insertions(+), 55 deletions(-) diff --git a/application/remote-access-client/build.gradle b/application/remote-access-client/build.gradle index 487b623ebc..0dc07286df 100644 --- a/application/remote-access-client/build.gradle +++ b/application/remote-access-client/build.gradle @@ -25,11 +25,6 @@ plugins { id 'com.android.library' id 'org.jetbrains.kotlin.android' - id 'com.vanniktech.maven.publish' -} - -ext { - library_version = "$rootProject.ext.remoteAccessVersion" } def remoteclientSourceDir = "$projectDir/remoteaccess" @@ -83,16 +78,6 @@ android { assets.srcDirs = ['assets'] } - // Make per-variant version code - libraryVariants.all { variant -> - //Custom APK name - variant.outputs.each { output -> - if (output.outputFileName != null && output.outputFileName.endsWith('.aar')) { - output.outputFileName = "vlc-android-remote-access-${library_version}.aar" - } - } - } - buildFeatures { resValues = true } @@ -125,5 +110,3 @@ dependencies { androidTestImplementation 'androidx.test.ext:junit:1.2.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' } - -apply from: '../../buildsystem/publish.gradle' diff --git a/application/remote-access-server/build.gradle b/application/remote-access-server/build.gradle index caf48b6a62..7c45a4fb13 100644 --- a/application/remote-access-server/build.gradle +++ b/application/remote-access-server/build.gradle @@ -53,10 +53,7 @@ android { dependencies { coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4' - devImplementation project(':application:remote-access-client') - debugImplementation project(':application:remote-access-client') - releaseImplementation "org.videolan.android:remote-access:$rootProject.ext.remoteAccessVersion" - vlcBundleImplementation "org.videolan.android:remote-access:$rootProject.ext.remoteAccessVersion" + implementation project(':application:remote-access-client') implementation project(':application:vlc-android') implementation "io.ktor:ktor:$rootProject.ext.ktorVersion" implementation "io.ktor:ktor-server-netty:$rootProject.ext.ktorVersion" diff --git a/buildsystem/gitlab/.gitlab-ci.yml b/buildsystem/gitlab/.gitlab-ci.yml index e20a877537..079cd7cbb0 100644 --- a/buildsystem/gitlab/.gitlab-ci.yml +++ b/buildsystem/gitlab/.gitlab-ci.yml @@ -39,7 +39,6 @@ stages: - buildsystem/compile-remoteaccess.sh - buildsystem/remoteaccess.properties - if: '$CI_PIPELINE_SOURCE == "schedule"' - - if: '$CI_COMMIT_TAG =~ /^remoteaccess-.*$/' # This is generating the node_modules folder with the required dependencies # If/When we want to make it fully offline: @@ -459,23 +458,6 @@ publish_libs: - $M2_REPO expire_in: 2 weeks -publish_remote_access_lib: - extends: .build-libs-base - rules: - - if: '$CI_COMMIT_TAG =~ /^remoteaccess-.*$/' - stage: package - needs: - - job: "webserver-build" - script: - - mkdir -p $M2_REPO - - ./buildsystem/compile.sh --init -b - - ./gradlew -Dmaven.repo.local=$M2_REPO -p application/remote-access-client publishToMavenLocal - artifacts: - name: "${CI_COMMIT_TAG}" - paths: - - $M2_REPO - expire_in: 2 weeks - publish_libs-v4: extends: .build-libs-base-v4 stage: package diff --git a/buildsystem/maven/deploy-to-mavencentral.sh b/buildsystem/maven/deploy-to-mavencentral.sh index e1b8fa1c4f..a3995e3884 100755 --- a/buildsystem/maven/deploy-to-mavencentral.sh +++ b/buildsystem/maven/deploy-to-mavencentral.sh @@ -6,7 +6,6 @@ set -euo pipefail OUTPUT_DIR="artifacts" MEDIALIB_VERSION="" LIBVLC_VERSION="" -REMOTE_ACCESS_VERSION="" # Utilities function escape_pom() { @@ -73,13 +72,7 @@ else red "Cannot find the libvlc directory" fi -if test -d "$OUTPUT_DIR/aars/repository/org/videolan/android/remote-access"; then - REMOTE_ACCESS_VERSION=$(ls -tUd "$OUTPUT_DIR/aars/repository/org/videolan/android/remote-access/"*/ | xargs basename) -else - red "Cannot find the remote access directory" -fi - -purple "The following versions have been found.\nlibvlc: $LIBVLC_VERSION\nmedialibrary: $MEDIALIB_VERSION\nremote access: $REMOTE_ACCESS_VERSION" +purple "The following versions have been found.\nlibvlc: $LIBVLC_VERSION\nmedialibrary: $MEDIALIB_VERSION" read -sp "Continue: y/N" -n 1 -r echo @@ -163,10 +156,3 @@ else BASE_DIR="$OUTPUT_DIR/aars/repository/org/videolan/android/medialibrary-all/$MEDIALIB_VERSION" deploy_artifact "medialibrary-all" "$MEDIALIB_VERSION" "$BASE_DIR" fi - -if [ -z "$REMOTE_ACCESS_VERSION" ]; then - purple "No version for remote access Skipping" -else - BASE_DIR="$OUTPUT_DIR/aars/repository/org/videolan/android/remote-access/$REMOTE_ACCESS_VERSION" - deploy_artifact "remote-access" "$REMOTE_ACCESS_VERSION" "$BASE_DIR" -fi diff --git a/buildsystem/remoteaccess.properties b/buildsystem/remoteaccess.properties index a8f7e43e44..0e7676b633 100644 --- a/buildsystem/remoteaccess.properties +++ b/buildsystem/remoteaccess.properties @@ -1,7 +1,7 @@ # Remote Access release tags (https://code.videolan.org/videolan/remoteaccess) # Single source of truth, read by: # - buildsystem/compile-remoteaccess.sh: the tag checked out and built, or downloaded -# - build.gradle: remoteAccessVersion (AAR version and Maven coordinate) +# - build.gradle: remoteAccessVersion (version shown in the About dialog) # The SHA-256 are the ones of the remoteaccess-android-.tar.gz release tarballs, # published as remoteaccess-android-.tar.gz.sha256 next to them. remoteAccessVersionVlc3=0.27.0 From git at videolan.org Thu Nov 19 09:39:54 2026 From: git at videolan.org (=?UTF-8?Q?Duncan_McNamara?=) Date: Thu, 19 Nov 2026 10:39:54 +0100 (CET) Subject: [Android] =?utf-8?q?remote-access-client=3A_report_the_pinned_Re?= =?utf-8?q?mote_Access_version?= Message-ID: <20261119093954.1ACED82E32F@gitlab> vlc-android | branch: master | Duncan McNamara | Mon Nov 16 15:49:07 2026 +0000| [bc5279f3fd6b6e5df7047bb5f657416eafb5a63c] | committer: Nicolas Pomepuy remote-access-client: report the pinned Remote Access version remoteAccessVersion() read the version from remoteaccess/package.json, which is not the release version and always said 0.1.0. Downloaded releases have no package.json at all, and their revision fell back to "unknown" as remoteaccess/ is not a git checkout. Report the version pinned in remoteaccess.properties: RemoteAccess release tags are guaranteed to match their package.json version. Use the pinned tag as the revision too, unless remoteaccess/ is a local checkout, which may be on another revision and is still described. > https://code.videolan.org/videolan/vlc-android/commit/bc5279f3fd6b6e5df7047bb5f657416eafb5a63c --- application/remote-access-client/build.gradle | 28 ++++++--------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/application/remote-access-client/build.gradle b/application/remote-access-client/build.gradle index 0dc07286df..25001bd505 100644 --- a/application/remote-access-client/build.gradle +++ b/application/remote-access-client/build.gradle @@ -28,9 +28,11 @@ plugins { } def remoteclientSourceDir = "$projectDir/remoteaccess" -// Only describe remoteaccess/ when it is its own git checkout: otherwise git walks up -// to the vlc-android repository and would report one of its tags as the revision -def remoteAccessRevision = 'unknown' +// The pinned tag identifies the downloaded release. A local checkout is described +// instead, as it may be on another revision. Only describe remoteaccess/ when it is its +// own git checkout: otherwise git walks up to the vlc-android repository and would report +// one of its tags as the revision +def remoteAccessRevision = rootProject.ext.remoteAccessVersion if (file("$remoteclientSourceDir/.git").exists()) { try { def describe = providers.exec { @@ -55,7 +57,7 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" resValue "string", "build_remote_access_revision", remoteAccessRevision - resValue "string", "remote_access_version", remoteAccessVersion() + resValue "string", "remote_access_version", rootProject.ext.remoteAccessVersion } buildTypes { @@ -85,24 +87,6 @@ android { preBuild.dependsOn(webCopy) -def remoteAccessVersion() { - try { - File remoteAccessPackage = file("remoteaccess/package.json") - if (remoteAccessPackage.exists()) { - for (String line : remoteAccessPackage.readLines()) { - if (line.contains('"version"')) { - def version = line.split("\"")[3] - if (version && !version.isEmpty()) { - return version - } - } - } - } - } catch (Throwable e) { - } - return rootProject.ext.remoteAccessVersion -} - dependencies { From git at videolan.org Thu Nov 19 09:39:54 2026 From: git at videolan.org (=?UTF-8?Q?Duncan_McNamara?=) Date: Thu, 19 Nov 2026 10:39:54 +0100 (CET) Subject: [Android] =?utf-8?q?CI=3A_bundle_the_downloaded_Remote_Access_re?= =?utf-8?q?lease_in_app_builds?= Message-ID: <20261119093954.2085B82E343@gitlab> vlc-android | branch: master | Duncan McNamara | Mon Nov 16 15:49:55 2026 +0000| [397a5ed6cb1c9d1e80840b47ad96db5a291ecd64] | committer: Nicolas Pomepuy CI: bundle the downloaded Remote Access release in app builds App builds only got the web interface when webserver-build had built it from source, i.e. on schedules and when the Remote Access pinning changed. VLC 4 jobs also got the VLC 3 web interface, as webserver-build always built the default release line. Replace webserver-build with webserver-fetch and webserver-fetch-v4, which download the pinned release of each line with compile-remoteaccess.sh --download. Merge request, nightly and release builds now always bundle the web interface of their VLC version. The Remote Access sources are still installed and audited by webserver-vulnerabilities, now in the webserver-audit stage. > https://code.videolan.org/videolan/vlc-android/commit/397a5ed6cb1c9d1e80840b47ad96db5a291ecd64 --- buildsystem/gitlab/.gitlab-ci.yml | 80 +++++++++++++++++++++------------------ 1 file changed, 43 insertions(+), 37 deletions(-) diff --git a/buildsystem/gitlab/.gitlab-ci.yml b/buildsystem/gitlab/.gitlab-ci.yml index 079cd7cbb0..8f382d7452 100644 --- a/buildsystem/gitlab/.gitlab-ci.yml +++ b/buildsystem/gitlab/.gitlab-ci.yml @@ -57,28 +57,44 @@ webserver-install-dependencies: when: on_success expire_in: 1h -webserver-build: +webserver-vulnerabilities: extends: .webserver-base - stage: webserver-build + stage: webserver-audit needs: - job: "webserver-install-dependencies" script: - cd "$WEBSERVER_DIR" - - npm run build-android + - npx audit-ci@^6 --skip-dev --config ./audit-ci.jsonc + +# Download the pinned Remote Access release, verified against its pinned SHA-256: +# app builds bundle it instead of building the web interface +# Each line is only fetched by the pipelines that build it, so a missing tarball of one +# line doesn't fail the nightlies and releases of the other +.webserver-fetch-base: + stage: webserver-build + needs: [] artifacts: paths: - - application/remote-access-client/remoteaccess/ + - application/remote-access-client/remoteaccess/dist/ when: on_success expire_in: 1h -webserver-vulnerabilities: - extends: .webserver-base - stage: webserver-build - needs: - - job: "webserver-install-dependencies" +webserver-fetch: + extends: .webserver-fetch-base + rules: + - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' + - if: '$CI_PIPELINE_SOURCE == "schedule" && $VLC4 != "true"' + - if: '$CI_COMMIT_TAG =~ /^(\d+\.)?(\d+\.)?(\*|\d+)/' script: - - cd "$WEBSERVER_DIR" - - npx audit-ci@^6 --skip-dev --config ./audit-ci.jsonc + - ./buildsystem/compile-remoteaccess.sh --download + +webserver-fetch-v4: + extends: .webserver-fetch-base + rules: + - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' + - if: '$CI_PIPELINE_SOURCE == "schedule" && $VLC4 == "true"' + script: + - ./buildsystem/compile-remoteaccess.sh --download --main .build-all-base: stage: build @@ -110,12 +126,6 @@ webserver-vulnerabilities: .build-ml-base: extends: .build-all-base rules: - - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - changes: - - buildsystem/compile-remoteaccess.sh - - buildsystem/remoteaccess.properties - needs: - - job: "webserver-build" - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: - medialibrary/**/* @@ -133,12 +143,8 @@ continuous-app-build: - ./gradlew assembleDebug rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - changes: - - buildsystem/compile-remoteaccess.sh - - buildsystem/remoteaccess.properties - needs: - - job: "webserver-build" - - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' + needs: + - job: "webserver-fetch" continuous-app-build-v4: extends: .build-all-base @@ -147,12 +153,8 @@ continuous-app-build-v4: - ./gradlew assembleDebug -PforceVlc4=true rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - changes: - - buildsystem/compile-remoteaccess.sh - - buildsystem/remoteaccess.properties - needs: - - job: "webserver-build" - - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' + needs: + - job: "webserver-fetch-v4" ################################# @@ -238,7 +240,7 @@ nightly-arm64: rules: - if: '$CI_PIPELINE_SOURCE == "schedule" && $VLC4 != "true"' needs: - - job: "webserver-build" + - job: "webserver-fetch" variables: ARCH: arm64 artifacts: @@ -254,7 +256,7 @@ nightly-armv7: rules: - if: '$CI_PIPELINE_SOURCE == "schedule" && $VLC4 != "true"' needs: - - job: "webserver-build" + - job: "webserver-fetch" variables: ARCH: arm artifacts: @@ -270,7 +272,7 @@ nightly-x86: rules: - if: '$CI_PIPELINE_SOURCE == "schedule" && $VLC4 != "true"' needs: - - job: "webserver-build" + - job: "webserver-fetch" variables: ARCH: x86 artifacts: @@ -284,7 +286,7 @@ nightly-x86_64: rules: - if: '$CI_PIPELINE_SOURCE == "schedule" && $VLC4 != "true"' needs: - - job: "webserver-build" + - job: "webserver-fetch" variables: ARCH: x86_64 artifacts: @@ -299,7 +301,7 @@ nightly-arm64-v4: rules: - if: '$CI_PIPELINE_SOURCE == "schedule" && $VLC4 == "true"' needs: - - job: "webserver-build" + - job: "webserver-fetch-v4" variables: ARCH: arm64 EXTRA_BUILD_PARAM: -vlc4 @@ -314,7 +316,7 @@ nightly-armv7-v4: rules: - if: '$CI_PIPELINE_SOURCE == "schedule" && $VLC4 == "true"' needs: - - job: "webserver-build" + - job: "webserver-fetch-v4" variables: ARCH: arm EXTRA_BUILD_PARAM: -vlc4 @@ -329,7 +331,7 @@ nightly-x86-v4: rules: - if: '$CI_PIPELINE_SOURCE == "schedule" && $VLC4 == "true"' needs: - - job: "webserver-build" + - job: "webserver-fetch-v4" variables: ARCH: x86 EXTRA_BUILD_PARAM: -vlc4 @@ -344,7 +346,7 @@ nightly-x86_64-v4: rules: - if: '$CI_PIPELINE_SOURCE == "schedule" && $VLC4 == "true"' needs: - - job: "webserver-build" + - job: "webserver-fetch-v4" variables: ARCH: x86_64 EXTRA_BUILD_PARAM: -vlc4 @@ -483,7 +485,11 @@ release: stage: build rules: - if: '$CI_COMMIT_TAG =~ /^(\d+\.)?(\d+\.)?(\*|\d+)/' + needs: + - job: "webserver-fetch" script: + # The AAR is gone: never ship a release without the web interface + - 'test -f "$WEBSERVER_DIR/dist/index.html" || { echo "Remote access: dist/index.html missing, refusing to build a release without it"; exit 1; }' - ./buildsystem/compile.sh --init - ./gradlew assembleRelease - ./gradlew bundleVlcBundle From git at videolan.org Thu Nov 19 09:39:54 2026 From: git at videolan.org (=?UTF-8?Q?Duncan_McNamara?=) Date: Thu, 19 Nov 2026 10:39:54 +0100 (CET) Subject: [Android] =?utf-8?q?CI=3A_block_releases_on_the_Remote_Access_vu?= =?utf-8?q?lnerability_check?= Message-ID: <20261119093954.25DFA82E32E@gitlab> vlc-android | branch: master | Duncan McNamara | Mon Nov 16 15:50:09 2026 +0000| [76afd7abbba03747d16fe4de7ed2cd9e985e4262] | committer: Nicolas Pomepuy CI: block releases on the Remote Access vulnerability check New advisories can be published after a Remote Access release was tagged, so a version that was clean when released may not be anymore when vlc-android ships it. Run webserver-install-dependencies and webserver-vulnerabilities on release tags as well: they check out the pinned Remote Access tag and audit its dependencies. The release job needs webserver-vulnerabilities, so a vulnerable Remote Access version blocks the release. A fix then goes through a Remote Access patch release and a bump here. > https://code.videolan.org/videolan/vlc-android/commit/76afd7abbba03747d16fe4de7ed2cd9e985e4262 --- buildsystem/gitlab/.gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/buildsystem/gitlab/.gitlab-ci.yml b/buildsystem/gitlab/.gitlab-ci.yml index 8f382d7452..03455225e8 100644 --- a/buildsystem/gitlab/.gitlab-ci.yml +++ b/buildsystem/gitlab/.gitlab-ci.yml @@ -39,6 +39,8 @@ stages: - buildsystem/compile-remoteaccess.sh - buildsystem/remoteaccess.properties - if: '$CI_PIPELINE_SOURCE == "schedule"' + # Releases must not ship a Remote Access version with known vulnerabilities + - if: '$CI_COMMIT_TAG =~ /^(\d+\.)?(\d+\.)?(\*|\d+)/' # This is generating the node_modules folder with the required dependencies # If/When we want to make it fully offline: @@ -487,6 +489,8 @@ release: - if: '$CI_COMMIT_TAG =~ /^(\d+\.)?(\d+\.)?(\*|\d+)/' needs: - job: "webserver-fetch" + - job: "webserver-vulnerabilities" + artifacts: false script: # The AAR is gone: never ship a release without the web interface - 'test -f "$WEBSERVER_DIR/dist/index.html" || { echo "Remote access: dist/index.html missing, refusing to build a release without it"; exit 1; }' From git at videolan.org Thu Nov 19 09:39:54 2026 From: git at videolan.org (=?UTF-8?Q?Duncan_McNamara?=) Date: Thu, 19 Nov 2026 10:39:54 +0100 (CET) Subject: [Android] =?utf-8?q?buildsystem=3A_warn_when_building_Remote_Acc?= =?utf-8?q?ess_off_its_pinned_tag?= Message-ID: <20261119093954.2B8A282E32F@gitlab> vlc-android | branch: master | Duncan McNamara | Mon Nov 16 15:50:25 2026 +0000| [a0615c462f5b05898de48386ec22aefad5b9fcc4] | committer: Nicolas Pomepuy buildsystem: warn when building Remote Access off its pinned tag compile-remoteaccess.sh builds an existing Remote Access checkout as is, so developers can build local changes or another branch. After a bump of the pinned version, such a checkout silently keeps building the previous one. Warn when the checkout is not at the pinned tag, and point to --reset. > https://code.videolan.org/videolan/vlc-android/commit/a0615c462f5b05898de48386ec22aefad5b9fcc4 --- buildsystem/compile-remoteaccess.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/buildsystem/compile-remoteaccess.sh b/buildsystem/compile-remoteaccess.sh index 4f865d5134..21b8432403 100755 --- a/buildsystem/compile-remoteaccess.sh +++ b/buildsystem/compile-remoteaccess.sh @@ -198,6 +198,11 @@ elif [ "$RESET" = 1 ]; then cd "$CURRENT_DIR" else diagnostic "Remote access sources: found in $VLC_REMOTE_ACCESS_PATH" + # An existing checkout is used as is, so local changes and other branches can be built + if [ "$(git -C "$VLC_REMOTE_ACCESS_PATH" rev-parse -q --verify "HEAD^{commit}")" != \ + "$(git -C "$VLC_REMOTE_ACCESS_PATH" rev-parse -q --verify "refs/tags/${TARGET_TAG}^{commit}")" ]; then + diagnostic "WARNING: Remote access sources are not at the pinned tag ${TARGET_TAG}, building them as is (use --reset to check out the tag)" + fi fi if [ "$INIT_ONLY" != 1 ]; then From git at videolan.org Thu Nov 19 09:39:54 2026 From: git at videolan.org (=?UTF-8?Q?Duncan_McNamara?=) Date: Thu, 19 Nov 2026 10:39:54 +0100 (CET) Subject: [Android] =?utf-8?q?Pin_Remote_Access_to_0=2E28=2E0_and_1=2E0=2E?= =?utf-8?q?0-alpha=2E1?= Message-ID: <20261119093954.32CF982E32E@gitlab> vlc-android | branch: master | Duncan McNamara | Wed Nov 18 15:36:01 2026 +0000| [2066508ddb51b5bec96d72f0ac9c2c80082b3b51] | committer: Nicolas Pomepuy Pin Remote Access to 0.28.0 and 1.0.0-alpha.1 Download the Remote Access 0.28.0 (VLC 3) and 1.0.0-alpha.1 (VLC 4) release tarballs, checked against the SHA-256 published by the Remote Access release CI. > https://code.videolan.org/videolan/vlc-android/commit/2066508ddb51b5bec96d72f0ac9c2c80082b3b51 --- buildsystem/remoteaccess.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/buildsystem/remoteaccess.properties b/buildsystem/remoteaccess.properties index 0e7676b633..ef4f6883e6 100644 --- a/buildsystem/remoteaccess.properties +++ b/buildsystem/remoteaccess.properties @@ -4,7 +4,7 @@ # - build.gradle: remoteAccessVersion (version shown in the About dialog) # The SHA-256 are the ones of the remoteaccess-android-.tar.gz release tarballs, # published as remoteaccess-android-.tar.gz.sha256 next to them. -remoteAccessVersionVlc3=0.27.0 -remoteAccessSha256Vlc3= +remoteAccessVersionVlc3=0.28.0 +remoteAccessSha256Vlc3=1663e33f74236fa47d8dff51c7d4284586b841f04130b046fc1a2bb1f26b5392 remoteAccessVersionVlc4=1.0.0-alpha.1 -remoteAccessSha256Vlc4= +remoteAccessSha256Vlc4=f7cc0cfce4b4573e258d40cc4721fe40ea15b6cad12204a751051a8f86e1aba1 From git at videolan.org Thu Nov 19 09:39:53 2026 From: git at videolan.org (=?UTF-8?Q?Nicolas_Pomepuy?=) Date: Thu, 19 Nov 2026 10:39:53 +0100 (CET) Subject: [Android] =?utf-8?q?buildsystem=3A_share_the_Remote_Access_versi?= =?utf-8?q?ons_in_a_single_file?= Message-ID: <20261119093953.E173F82E32E@gitlab> vlc-android | branch: master | Nicolas Pomepuy | Mon Nov 9 13:35:00 2026 +0100| [6a0b4b38c68d3a0ee7e577e2708ed927ef7d3e0a] | committer: Nicolas Pomepuy buildsystem: share the Remote Access versions in a single file > https://code.videolan.org/videolan/vlc-android/commit/6a0b4b38c68d3a0ee7e577e2708ed927ef7d3e0a --- build.gradle | 6 +++++- buildsystem/compile-remoteaccess.sh | 13 +++++++++++-- buildsystem/gitlab/.gitlab-ci.yml | 4 ++++ buildsystem/remoteaccess.properties | 6 ++++++ 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index c05ee1683c..5acb5ae8a9 100644 --- a/build.gradle +++ b/build.gradle @@ -59,12 +59,16 @@ allprojects { } } +// Remote Access release tags, shared with buildsystem/compile-remoteaccess.sh +def remoteAccessVersions = new Properties() +file('buildsystem/remoteaccess.properties').withInputStream { remoteAccessVersions.load(it) } + ext { appId = "org.videolan.vlc" versionCode = 3070200 vlcMajorVersion = project.hasProperty('forceVlc4') && project.getProperty('forceVlc4') ? 4 : 3 versionName = vlcMajorVersion == 3 ? '3.7.2' : '4.0.0-preview - ' + versionCode - remoteAccessVersion = vlcMajorVersion == 3 ? '0.27.0' : '1.0.0-alpha.1' // Synchronized with RemoteAccess release tag + remoteAccessVersion = remoteAccessVersions.getProperty(vlcMajorVersion == 3 ? 'remoteAccessVersionVlc3' : 'remoteAccessVersionVlc4') libvlcVersion = vlcMajorVersion == 3 ? '3.7.7' :'4.0.0-eap29' medialibraryVersion = (vlcMajorVersion == 3 ? '0.13.24' : '0.13.22-vlc4') diff --git a/buildsystem/compile-remoteaccess.sh b/buildsystem/compile-remoteaccess.sh index b11ce73eee..65596f7798 100755 --- a/buildsystem/compile-remoteaccess.sh +++ b/buildsystem/compile-remoteaccess.sh @@ -74,8 +74,17 @@ done ############################## diagnostic "Setting up the Remote Access project" -REMOTE_ACCESS_TAG_VLC3="0.27.0" -REMOTE_ACCESS_TAG_VLC4="1.0.0-alpha.1" +# Release tags are shared with build.gradle (remoteAccessVersion) +REMOTE_ACCESS_PROPERTIES="$(cd "$(dirname "$0")" && pwd -P)/remoteaccess.properties" +[ -f "$REMOTE_ACCESS_PROPERTIES" ] || fail "Remote access: $REMOTE_ACCESS_PROPERTIES not found" +read_remote_access_version() +{ + sed -n "s/^$1=//p" "$REMOTE_ACCESS_PROPERTIES" | tr -d '[:space:]' +} +REMOTE_ACCESS_TAG_VLC3="$(read_remote_access_version remoteAccessVersionVlc3)" +REMOTE_ACCESS_TAG_VLC4="$(read_remote_access_version remoteAccessVersionVlc4)" +[ -n "$REMOTE_ACCESS_TAG_VLC3" ] || fail "Remote access: remoteAccessVersionVlc3 missing in $REMOTE_ACCESS_PROPERTIES" +[ -n "$REMOTE_ACCESS_TAG_VLC4" ] || fail "Remote access: remoteAccessVersionVlc4 missing in $REMOTE_ACCESS_PROPERTIES" REMOTE_ACCESS_REPOSITORY=https://code.videolan.org/videolan/remoteaccess : ${VLC_REMOTE_ACCESS_PATH:="$(pwd -P)/application/remote-access-client/remoteaccess"} diff --git a/buildsystem/gitlab/.gitlab-ci.yml b/buildsystem/gitlab/.gitlab-ci.yml index 79d2dff0e5..e20a877537 100644 --- a/buildsystem/gitlab/.gitlab-ci.yml +++ b/buildsystem/gitlab/.gitlab-ci.yml @@ -37,6 +37,7 @@ stages: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: - buildsystem/compile-remoteaccess.sh + - buildsystem/remoteaccess.properties - if: '$CI_PIPELINE_SOURCE == "schedule"' - if: '$CI_COMMIT_TAG =~ /^remoteaccess-.*$/' @@ -113,6 +114,7 @@ webserver-vulnerabilities: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: - buildsystem/compile-remoteaccess.sh + - buildsystem/remoteaccess.properties needs: - job: "webserver-build" - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' @@ -134,6 +136,7 @@ continuous-app-build: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: - buildsystem/compile-remoteaccess.sh + - buildsystem/remoteaccess.properties needs: - job: "webserver-build" - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' @@ -147,6 +150,7 @@ continuous-app-build-v4: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: - buildsystem/compile-remoteaccess.sh + - buildsystem/remoteaccess.properties needs: - job: "webserver-build" - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' diff --git a/buildsystem/remoteaccess.properties b/buildsystem/remoteaccess.properties new file mode 100644 index 0000000000..d851958ff1 --- /dev/null +++ b/buildsystem/remoteaccess.properties @@ -0,0 +1,6 @@ +# Remote Access release tags (https://code.videolan.org/videolan/remoteaccess) +# Single source of truth, read by: +# - buildsystem/compile-remoteaccess.sh: the tag checked out and built +# - build.gradle: remoteAccessVersion (AAR version and Maven coordinate) +remoteAccessVersionVlc3=0.27.0 +remoteAccessVersionVlc4=1.0.0-alpha.1 \ No newline at end of file From git at videolan.org Thu Nov 19 09:39:53 2026 From: git at videolan.org (=?UTF-8?Q?Nicolas_Pomepuy?=) Date: Thu, 19 Nov 2026 10:39:53 +0100 (CET) Subject: [Android] =?utf-8?q?buildsystem=3A_fail_the_Node_check_when_node?= =?utf-8?q?_is_missing?= Message-ID: <20261119093953.EECE882E343@gitlab> vlc-android | branch: master | Nicolas Pomepuy | Mon Nov 9 13:44:48 2026 +0100| [72e15ff50d4e118fb8b4b4718500c8ce1456ad52] | committer: Nicolas Pomepuy buildsystem: fail the Node check when node is missing > https://code.videolan.org/videolan/vlc-android/commit/72e15ff50d4e118fb8b4b4718500c8ce1456ad52 --- buildsystem/compile-remoteaccess.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/buildsystem/compile-remoteaccess.sh b/buildsystem/compile-remoteaccess.sh index 65596f7798..11c8899bb8 100755 --- a/buildsystem/compile-remoteaccess.sh +++ b/buildsystem/compile-remoteaccess.sh @@ -169,7 +169,12 @@ if [ "$INIT_ONLY" != 1 ]; then fi fi else - if [ -n "$NODE_VERSION" ] && [ "$NODE_VERSION" -lt 20 ]; then + # Also fails when node is missing or its version can't be parsed + case "$NODE_VERSION" in + ''|*[!0-9]*) NODE_VERSION_OK=0 ;; + *) [ "$NODE_VERSION" -ge 20 ] && NODE_VERSION_OK=1 || NODE_VERSION_OK=0 ;; + esac + if [ "$NODE_VERSION_OK" != 1 ]; then fail "Node 20 or higher is required to build remote access (found Node v${NODE_VERSION:-unknown}). Please install or switch to Node 20+." fi fi