[vlc-devel] [PATCH] CI: add a UWP libvlc target

[Steve Lhomme]

Tested here with the wasapi v2 patch merged:
https://code.videolan.org/robUx4/vlc/pipelines/18698

On 2020-06-11 10:30, Steve Lhomme wrote:
> ---
>   extras/ci/gitlab-ci.yml | 22 ++++++++++++++++++++--
>   1 file changed, 20 insertions(+), 2 deletions(-)
> 
> diff --git a/extras/ci/gitlab-ci.yml b/extras/ci/gitlab-ci.yml
> index 9dd56a64bc67..298303e7e09c 100644
> --- a/extras/ci/gitlab-ci.yml
> +++ b/extras/ci/gitlab-ci.yml
> @@ -15,6 +15,7 @@ variables:
>       VLC_WIN32_IMAGE: registry.videolan.org/vlc-debian-win32:20200602191827
>       VLC_WIN64_IMAGE: registry.videolan.org/vlc-debian-win64:20200602185103
>       VLC_WIN_LLVM_IMAGE: registry.videolan.org/vlc-debian-llvm-mingw:20200603153044
> +    VLC_UWP_LLVM_IMAGE: registry.videolan.org/vlc-debian-llvm-uwp:20200603145315
>       VLC_DEBIAN_IMAGE: registry.videolan.org/vlc-debian-unstable:20200229201904
>       VLC_ANDROID_IMAGE: registry.videolan.org/vlc-debian-android:20190717134531
>       VLC_SNAP_IMAGE: registry.videolan.org/vlc-ubuntu-bionic:20190627090437
> @@ -48,6 +49,11 @@ variables:
>           TRIPLET: $HOST_ARCH-w64-mingw32
>           WINE_SDK_PATH: /usr/include/wine/wine/windows/
>   
> +.variables-uwp64-libvlc-llvm: &variables-uwp64-libvlc-llvm
> +        SHORTARCH: win64
> +        HOST_ARCH: x86_64
> +        TRIPLET: $HOST_ARCH-w64-mingw32
> +
>   .variables-macos: &variables-macos
>           VLC_PATH: /Users/videolanci/sandbox/bin
>           VLC_FORCE_KERNELVERSION: 18
> @@ -111,11 +117,17 @@ variables:
>           if [ "${CI_JOB_NAME:0:8}" = "nightly-" ]; then
>               NIGHTLY_EXTRA_BUILD_FLAGS="-i n -l"
>           fi
> +        if [ -z "${CI_JOB_NAME##*-libvlc-*}" ]; then
> +            LIBVLC_EXTRA_BUILD_FLAGS="-z"
> +        fi
> +        if [ -z "${CI_JOB_NAME##*uwp*-*}" ]; then
> +            UWP_EXTRA_BUILD_FLAGS="-u -w -x"
> +        fi
>           if [ -n "$VLC_PREBUILT_CONTRIBS_URL" ]; then
>               echo "Building using prebuilt contribs at $VLC_PREBUILT_CONTRIBS_URL"
> -            extras/package/win32/build.sh -p -a $HOST_ARCH $NIGHTLY_EXTRA_BUILD_FLAGS
> +            extras/package/win32/build.sh -p -a $HOST_ARCH $NIGHTLY_EXTRA_BUILD_FLAGS $LIBVLC_EXTRA_BUILD_FLAGS $UWP_EXTRA_BUILD_FLAGS
>           else
> -            extras/package/win32/build.sh -c -a $HOST_ARCH $NIGHTLY_EXTRA_BUILD_FLAGS
> +            extras/package/win32/build.sh -c -a $HOST_ARCH $NIGHTLY_EXTRA_BUILD_FLAGS $LIBVLC_EXTRA_BUILD_FLAGS $UWP_EXTRA_BUILD_FLAGS
>           fi
>   
>   win32:
> @@ -136,6 +148,12 @@ win64-llvm:
>           name: $VLC_WIN_LLVM_IMAGE
>       variables: *variables-win64-llvm
>   
> +uwp64-libvlc-llvm:
> +    extends: .win-common
> +    image:
> +        name: $VLC_UWP_LLVM_IMAGE
> +    variables: *variables-uwp64-libvlc-llvm
> +
>   .nightly-win-common:
>       extends: .win-common
>       only:
> -- 
> 2.26.2
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel
>