[vlc-commits] [Git][videolan/vlc][master] 4 commits: CI: build an iOS variant with shared library modules

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
9e6f30fc by Steve Lhomme at 2025-10-30T06:43:02+00:00
CI: build an iOS variant with shared library modules

We should verify it builds before finding out in other CIs.

- - - - -
a79a654a by Steve Lhomme at 2025-10-30T06:43:02+00:00
package/apple: don't pretend to disable growl

That contrib doesn't exist anymore in VLC 4.

- - - - -
0b05a420 by Steve Lhomme at 2025-10-30T06:43:02+00:00
package/apple: don't pretend to disable gpg-error

It is built because it's pulled as a dependency of gcrypt.
gcrypt cannot be built without gpg-error.

- - - - -
effa17a3 by Steve Lhomme at 2025-10-30T06:43:02+00:00
package/apple: force building custom cmake

Until there's a release with this patch: https://gitlab.kitware.com/cmake/cmake/-/merge_requests/11333

If CMake 4.0 is installed it's OK to use it.

- - - - -


3 changed files:

- extras/ci/gitlab-ci.yml
- extras/package/apple/build.conf
- extras/package/apple/build.sh


Changes:

=====================================
extras/ci/gitlab-ci.yml
=====================================
@@ -570,7 +570,7 @@ nightly-macos-arm64:
         if [ "${CI_COMMIT_BRANCH}" = "${CI_DEFAULT_BRANCH}" -a "${CI_PROJECT_PATH}" = "videolan/vlc" ]; then
           EXTRA_BUILD_FLAGS="${EXTRA_BUILD_FLAGS} --package-contribs"
         fi
-        ../extras/package/apple/build.sh --sdk=$SDKNAME --arch=$HOST_ARCH $EXTRA_BUILD_FLAGS
+        ../extras/package/apple/build.sh --sdk=$SDKNAME --arch=$HOST_ARCH $EXTRA_BUILD_FLAGS $EXTRA_TARGET_FLAGS
 
 ios-arm64:
     extends: .apple-os-common
@@ -594,7 +594,9 @@ tvos-arm64:
     extends: .apple-os-common
     tags:
         - macos-xcode15
-    variables: *variables-tvos-arm64
+    variables:
+        <<: *variables-tvos-arm64
+        EXTRA_TARGET_FLAGS: --enable-shared
 
 watchos-arm64_32:
     extends: .apple-os-common


=====================================
extras/package/apple/build.conf
=====================================
@@ -58,7 +58,6 @@ export VLC_CONTRIB_OPTIONS_BASE=(
     --enable-freetype2
     --enable-ass
     --disable-fontconfig
-    --disable-gpg-error
     --disable-vncclient
     --disable-gnutls
     --disable-lua
@@ -69,7 +68,6 @@ export VLC_CONTRIB_OPTIONS_BASE=(
     --enable-libdsm
     --enable-libplacebo
     --disable-sparkle
-    --disable-growl
     --disable-breakpad
     --disable-ncurses
     --disable-asdcplib


=====================================
extras/package/apple/build.sh
=====================================
@@ -625,6 +625,10 @@ TOOLS_BOOTSTRAP=
 if [ "$VLC_HOST_OS" = "xros" ]; then
     TOOLS_BOOTSTRAP="$TOOLS_BOOTSTRAP --min-cmake=3.28.0"
 fi
+# force local build until implicit C++ is properly supported, cmake 4.x is OK
+if [ "$VLC_HOST_OS" = "ios" ] || [ "$VLC_HOST_OS" = "tvos" ] || [ "$VLC_HOST_OS" = "watchos" ] || [ "$VLC_HOST_OS" = "xros" ]; then
+    TOOLS_BOOTSTRAP="$TOOLS_BOOTSTRAP --min-cmake=3.31.10"
+fi
 
 cd "$VLC_SRC_DIR/extras/tools" || abort_err "Failed cd to tools dir"
 ./bootstrap $TOOLS_BOOTSTRAP || abort_err "Bootstrapping tools failed"



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/51169c3c33c829925371fb1880a157026d8e9390...effa17a30e868dcdee5c97bd5baead2aa105429d

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/51169c3c33c829925371fb1880a157026d8e9390...effa17a30e868dcdee5c97bd5baead2aa105429d
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance