Merge pull request #18 from huynhsontung/llvm11

Revert back to llvm11 image for CI build registry.videolan.org/vlc-debian-llvm-uwp:20220713124227

.github/workflows/ci.yml

@@ -15,21 +15,18 @@ jobs:
   libvlc:
     runs-on: ubuntu-latest
     container:
-      image: huynhsontung/vlc-debian-llvm-ucrt:llvm17
+      image: registry.videolan.org/vlc-debian-llvm-uwp:20220713124227
       options: -u root
     strategy:
       matrix:
-        arch: [x86, x64, arm, arm64]
+        arch: [x86, x64, arm64]
         include:
           - arch: x86
             short-arch: win32
             host-arch: i686
           - arch: x64
             short-arch: win64
             host-arch: x86_64
-          - arch: arm
-            short-arch: winarm
-            host-arch: armv7
           - arch: arm64
             short-arch: winarm64
             host-arch: aarch64
@@ -39,7 +36,7 @@ jobs:
       TRIPLET: ${{ matrix.host-arch }}-w64-mingw32
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
       - name: Apply patches
@@ -56,7 +53,7 @@ jobs:
       - name: Build
         run: vlc/extras/package/win32/build.sh -c -a ${{ matrix.host-arch }} $UWP_LIBVLC_BUILD_FLAGS
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: libvlc-${{ matrix.arch }}
           path: ${{ matrix.short-arch }}-uwp/vlc-${{ env.VLC_VERSION }}-*.7z
@@ -65,7 +62,7 @@ jobs:
   UWP_access_v3:
     strategy:
       matrix:
-        arch: [x64, x86, arm, arm64]
+        arch: [x64, x86, arm64]
     runs-on: windows-2019
     steps:
       - name: Checkout libvlc uwp access module code
@@ -81,8 +78,8 @@ jobs:
           7z x vlc-3.0.x.zip -ovlc
           mv vlc/vlc-3.0.x/include vlc-winrt/libvlc/Universal/vlc-${{ matrix.arch }}/Release
       - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v1.3
-      - name: MSBuild x64/ARM/ARM64
+        uses: microsoft/setup-msbuild@v2
+      - name: MSBuild x64/ARM64
         if: matrix.arch != 'x86'
         working-directory: vlc-winrt/modules/libaccess_winrt_plugin.UWP
         run: msbuild libaccess_winrt_plugin.UWP.vcxproj /p:Configuration=Release /p:Platform=${{ matrix.arch }}
@@ -91,7 +88,7 @@ jobs:
         working-directory: vlc-winrt/modules/libaccess_winrt_plugin.UWP
         run: msbuild libaccess_winrt_plugin.UWP.vcxproj /p:Configuration=Release /p:Platform=Win32
       - name: Upload build
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: libvlc-uwp-access-build-${{ matrix.arch }}
           path: vlc-winrt/modules/libaccess_winrt_plugin.UWP/Release/libaccess_winrt_plugin.UWP
@@ -103,15 +100,14 @@ jobs:
       - UWP_access_v3
       - libvlc
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/download-artifact@v3
-      - uses: NuGet/setup-nuget@v1.2.0
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
+      - uses: NuGet/setup-nuget@v2
         with:
           nuget-version: '5.x'
       - name: Create NuGet folders
         shell: bash
         run: |
-          mkdir -p build/win10-arm/native
           mkdir -p build/win10-arm64/native
           mkdir -p build/win10-x64/native
           mkdir -p build/win10-x86/native
@@ -120,19 +116,10 @@ jobs:
         run: |
           7z x libvlc-arm64/vlc-$VLC_VERSION-win32.7z -oarm64/vlc/winarm64-uwp -y  
 
-          7z x libvlc-arm/vlc-$VLC_VERSION-win32.7z -oarm/vlc/winarm-uwp -y
-
           7z x libvlc-x86/vlc-$VLC_VERSION-win32.7z -ox86/vlc/win32-uwp -y
 
           7z x libvlc-x64/vlc-$VLC_VERSION-win64.7z -ox64/vlc/win64-uwp -y
 
-          mv arm/vlc/winarm-uwp/vlc-$VLC_VERSION/lua build/win10-arm/native
-          mv arm/vlc/winarm-uwp/vlc-$VLC_VERSION/plugins build/win10-arm/native
-          mv libvlc-uwp-access-build-arm/libaccess_winrt_plugin.dll build/win10-arm/native/plugins/access
-          mv arm/vlc/winarm-uwp/vlc-$VLC_VERSION/sdk build/win10-arm/native
-          mv arm/vlc/winarm-uwp/vlc-$VLC_VERSION/libvlc.dll build/win10-arm/native
-          mv arm/vlc/winarm-uwp/vlc-$VLC_VERSION/libvlccore.dll build/win10-arm/native
-
           mv arm64/vlc/winarm64-uwp/vlc-$VLC_VERSION/lua build/win10-arm64/native
           mv arm64/vlc/winarm64-uwp/vlc-$VLC_VERSION/plugins build/win10-arm64/native
           mv libvlc-uwp-access-build-arm64/libaccess_winrt_plugin.dll build/win10-arm64/native/plugins/access
@@ -160,7 +147,7 @@ jobs:
         shell: bash
         run: nuget pack VideoLAN.LibVLC.UWP.nuspec -Version $VLC_VERSION-${{ steps.get-tag.outputs.tag }}+$(printf '%.10s' $GITHUB_SHA)
       - name: Upload NuGet package
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: libvlc-uwp
           path: '*.nupkg'

VideoLAN.LibVLC.UWP.nuspec

@@ -19,7 +19,6 @@
     <file src="build\LibVLC.UWP.targets" target="build"/>
     <file src="build\win10-x86\native\**" target="build\win10-x86"/>
     <file src="build\win10-x64\native\**" target="build\win10-x64"/>
-    <file src="build\win10-arm\native\**" target="build\win10-arm"/>
     <file src="build\win10-arm64\native\**" target="build\win10-arm64"/>
     <file src="icon.png" target="" />
   </files>

build/LibVLC.UWP.targets

@@ -3,17 +3,9 @@
   <ItemGroup>
     <VlcUWPX64IncludeFilesFullPath Include="$(MSBuildThisFileDirectory)win10-x64\**" />
     <VlcUWPX86IncludeFilesFullPath Include="$(MSBuildThisFileDirectory)win10-x86\**" />
-    <VlcUWPARMIncludeFilesFullPath Include="$(MSBuildThisFileDirectory)win10-arm\**" />
     <VlcUWPARM64IncludeFilesFullPath Include="$(MSBuildThisFileDirectory)win10-arm64\**" />
   </ItemGroup>
 
-  <ItemGroup>
-    <SDKReference Include="Microsoft.VCLibs, Version=14.0">
-      <Name>Microsoft.VCLibs</Name>
-      <Version>14.0.0.0</Version>
-    </SDKReference>
-  </ItemGroup>
-
   <ItemGroup>
     <None Condition="'$(Platform)' == 'x64'" Include="@(VlcUWPX64IncludeFilesFullPath)">
       <Link>$([MSBuild]::MakeRelative($(MSBuildThisFileDirectory)win10-x64\, %(FullPath)))</Link>
@@ -23,10 +15,6 @@
       <Link>$([MSBuild]::MakeRelative($(MSBuildThisFileDirectory)win10-x86\, %(FullPath)))</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Condition="'$(Platform)' == 'ARM'" Include="@(VlcUWPARMIncludeFilesFullPath)">
-      <Link>$([MSBuild]::MakeRelative($(MSBuildThisFileDirectory)win10-arm\, %(FullPath)))</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Condition="'$(Platform)' == 'ARM64'" Include="@(VlcUWPARM64IncludeFilesFullPath)">
       <Link>$([MSBuild]::MakeRelative($(MSBuildThisFileDirectory)win10-arm64\, %(FullPath)))</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

patches/0001-replace-vcruntime140_app-with-ucrtapp-runtime-for-UW.patch

@@ -0,0 +1,27 @@
+From 9c6f90dae5ed797e3ad901a018da35f0aad0b283 Mon Sep 17 00:00:00 2001
+From: Tung Huynh <tung75605@gmail.com>
+Date: Mon, 1 Apr 2024 23:37:45 -0700
+Subject: [PATCH] replace vcruntime140_app with ucrtapp runtime for UWP
+
+Added in Mingw-w64 v8
+https://sourceforge.net/p/mingw-w64/mailman/message/37111166/
+---
+ extras/package/win32/build.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/extras/package/win32/build.sh b/extras/package/win32/build.sh
+index c0339d86a3..ea383aefdc 100755
+--- a/extras/package/win32/build.sh
++++ b/extras/package/win32/build.sh
+@@ -211,7 +211,7 @@ if [ ! -z "$BUILD_UCRT" ]; then
+         CFLAGS="$CFLAGS -Wl,-lwindowsapp,-lwindowsappcompat"
+         CXXFLAGS="$CXXFLAGS -Wl,-lwindowsapp,-lwindowsappcompat"
+         CPPFLAGS="$CPPFLAGS -DWINSTORECOMPAT"
+-        EXTRA_CRUNTIME="vcruntime140_app"
++        EXTRA_CRUNTIME="ucrtapp"
+     else
+         SHORTARCH="$SHORTARCH-ucrt"
+         # The current minimum for VLC is Windows 7
+-- 
+2.42.0.windows.2
+