From 08f4149916e655bb479db8d2ef73b63c8d793814 Mon Sep 17 00:00:00 2001 From: Tung Huynh Date: Mon, 1 Apr 2024 23:35:43 -0700 Subject: [PATCH 1/6] remove newer winrt api patch --- patches/0008-fix-winrt-api-usage.patch | 128 ------------------------- 1 file changed, 128 deletions(-) delete mode 100644 patches/0008-fix-winrt-api-usage.patch diff --git a/patches/0008-fix-winrt-api-usage.patch b/patches/0008-fix-winrt-api-usage.patch deleted file mode 100644 index f376ba1..0000000 --- a/patches/0008-fix-winrt-api-usage.patch +++ /dev/null @@ -1,128 +0,0 @@ -From fbbaa8953f0c6877210d9e7abebdf8e34fb222fc Mon Sep 17 00:00:00 2001 -From: Tung Huynh -Date: Thu, 14 Dec 2023 21:57:06 -0800 -Subject: [PATCH 8/9] fix winrt api usage - ---- - modules/audio_output/winstore.c | 4 ++-- - src/win32/dirs.c | 34 ++++++++++++++++++++------------- - 2 files changed, 23 insertions(+), 15 deletions(-) - -diff --git a/modules/audio_output/winstore.c b/modules/audio_output/winstore.c -index 8366200344..66795a2e78 100644 ---- a/modules/audio_output/winstore.c -+++ b/modules/audio_output/winstore.c -@@ -104,8 +104,8 @@ static STDMETHODIMP MMDeviceLocator_QueryInterface(IActivateAudioInterfaceComple - } - - /* MMDeviceLocator IActivateAudioInterfaceCompletionHandler methods */ --static HRESULT MMDeviceLocator_ActivateCompleted(IActivateAudioInterfaceCompletionHandler *This, -- IActivateAudioInterfaceAsyncOperation *operation) -+static STDMETHODIMP_(HRESULT) MMDeviceLocator_ActivateCompleted(IActivateAudioInterfaceCompletionHandler *This, -+ IActivateAudioInterfaceAsyncOperation *operation) - { - (void)operation; - aout_sys_t *sys = container_of(This, aout_sys_t, client_locator); -diff --git a/src/win32/dirs.c b/src/win32/dirs.c -index 8a8876a1a2..081925226f 100644 ---- a/src/win32/dirs.c -+++ b/src/win32/dirs.c -@@ -51,6 +51,14 @@ - #include - #include - #include -+typedef __x_ABI_CWindows_CStorage_CIStorageFolder IStorageFolder; -+typedef __x_ABI_CWindows_CStorage_CIApplicationDataStatics IApplicationDataStatics; -+typedef __x_ABI_CWindows_CStorage_CIApplicationData IApplicationData; -+typedef __x_ABI_CWindows_CStorage_CIStorageItem IStorageItem; -+typedef __x_ABI_CWindows_CStorage_CIKnownFoldersStatics IKnownFoldersStatics; -+#define IID_IApplicationDataStatics IID___x_ABI_CWindows_CStorage_CIApplicationDataStatics -+#define IID_IKnownFoldersStatics IID___x_ABI_CWindows_CStorage_CIKnownFoldersStatics -+#define IID_IStorageItem IID___x_ABI_CWindows_CStorage_CIStorageItem - - #ifndef CSIDL_LOCAL_APPDATA - # define CSIDL_LOCAL_APPDATA 0x001C -@@ -92,7 +100,7 @@ static HRESULT WinRTSHGetFolderPath(HWND hwnd, int csidl, HANDLE hToken, DWORD d - goto end_appdata; - } - -- hr = IApplicationDataStatics_get_Current(appDataStatics, &appData); -+ hr = appDataStatics->lpVtbl->get_Current(appDataStatics, &appData); - - if (FAILED(hr)) - goto end_appdata; -@@ -102,14 +110,14 @@ static HRESULT WinRTSHGetFolderPath(HWND hwnd, int csidl, HANDLE hToken, DWORD d - goto end_appdata; - } - -- hr = IApplicationData_get_LocalFolder(appData, &folder); -+ hr = appData->lpVtbl->get_LocalFolder(appData, &folder); - - end_appdata: - WindowsDeleteString(hClassName); - if (appDataStatics) -- IApplicationDataStatics_Release(appDataStatics); -+ appDataStatics->lpVtbl->Release(appDataStatics); - if (appData) -- IApplicationData_Release(appData); -+ appData->lpVtbl->Release(appData); - } - else - { -@@ -135,16 +143,16 @@ end_appdata: - - switch (csidl) { - case CSIDL_PERSONAL: -- hr = IKnownFoldersStatics_get_DocumentsLibrary(knownFoldersStatics, &folder); -+ hr = knownFoldersStatics->lpVtbl->get_DocumentsLibrary(knownFoldersStatics, &folder); - break; - case CSIDL_MYMUSIC: -- hr = IKnownFoldersStatics_get_MusicLibrary(knownFoldersStatics, &folder); -+ hr = knownFoldersStatics->lpVtbl->get_MusicLibrary(knownFoldersStatics, &folder); - break; - case CSIDL_MYPICTURES: -- hr = IKnownFoldersStatics_get_PicturesLibrary(knownFoldersStatics, &folder); -+ hr = knownFoldersStatics->lpVtbl->get_PicturesLibrary(knownFoldersStatics, &folder); - break; - case CSIDL_MYVIDEO: -- hr = IKnownFoldersStatics_get_VideosLibrary(knownFoldersStatics, &folder); -+ hr = knownFoldersStatics->lpVtbl->get_VideosLibrary(knownFoldersStatics, &folder); - break; - default: - hr = E_NOTIMPL; -@@ -153,7 +161,7 @@ end_appdata: - end_other: - WindowsDeleteString(hClassName); - if (knownFoldersStatics) -- IKnownFoldersStatics_Release(knownFoldersStatics); -+ knownFoldersStatics->lpVtbl->Release(knownFoldersStatics); - } - - if( SUCCEEDED(hr) && folder != NULL ) -@@ -161,19 +169,19 @@ end_other: - HSTRING path = NULL; - IStorageItem *item = NULL; - PCWSTR pszPathTemp; -- hr = IStorageFolder_QueryInterface(folder, &IID_IStorageItem, (void**)&item); -+ hr = folder->lpVtbl->QueryInterface(folder, &IID_IStorageItem, (void**)&item); - if (FAILED(hr)) - goto end_folder; -- hr = IStorageItem_get_Path(item, &path); -+ hr = item->lpVtbl->get_Path(item, &path); - if (FAILED(hr)) - goto end_folder; - pszPathTemp = WindowsGetStringRawBuffer(path, NULL); - wcscpy(pszPath, pszPathTemp); - end_folder: - WindowsDeleteString(path); -- IStorageFolder_Release(folder); -+ folder->lpVtbl->Release(folder); - if (item) -- IStorageItem_Release(item); -+ item->lpVtbl->Release(item); - } - - return hr; --- -2.42.0.windows.2 - From 8191c4b9fefee280407bff588b7dbb05e2120ed7 Mon Sep 17 00:00:00 2001 From: Tung Huynh Date: Mon, 1 Apr 2024 23:39:35 -0700 Subject: [PATCH 2/6] add ucrtapp patch --- ...e140_app-with-ucrtapp-runtime-for-UW.patch | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 patches/0001-replace-vcruntime140_app-with-ucrtapp-runtime-for-UW.patch diff --git a/patches/0001-replace-vcruntime140_app-with-ucrtapp-runtime-for-UW.patch b/patches/0001-replace-vcruntime140_app-with-ucrtapp-runtime-for-UW.patch new file mode 100644 index 0000000..7290eea --- /dev/null +++ b/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 +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 + From ce12e9aa981b85e7bd2a63f3a38fe59f26acc410 Mon Sep 17 00:00:00 2001 From: Tung Huynh Date: Mon, 1 Apr 2024 23:41:33 -0700 Subject: [PATCH 3/6] remove ARM32 support --- .github/workflows/ci.yml | 21 ++++----------------- VideoLAN.LibVLC.UWP.nuspec | 1 - build/LibVLC.UWP.targets | 5 ----- 3 files changed, 4 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index df6c7e7..166e901 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,11 +15,11 @@ 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 @@ -27,9 +27,6 @@ jobs: - 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 @@ -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 @@ -82,7 +79,7 @@ jobs: 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 + - 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 }} @@ -111,7 +108,6 @@ jobs: - 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 diff --git a/VideoLAN.LibVLC.UWP.nuspec b/VideoLAN.LibVLC.UWP.nuspec index 8c2c964..b11bb46 100644 --- a/VideoLAN.LibVLC.UWP.nuspec +++ b/VideoLAN.LibVLC.UWP.nuspec @@ -19,7 +19,6 @@ - diff --git a/build/LibVLC.UWP.targets b/build/LibVLC.UWP.targets index 8af8d11..1a9af0d 100644 --- a/build/LibVLC.UWP.targets +++ b/build/LibVLC.UWP.targets @@ -3,7 +3,6 @@ - @@ -23,10 +22,6 @@ $([MSBuild]::MakeRelative($(MSBuildThisFileDirectory)win10-x86\, %(FullPath))) PreserveNewest - - $([MSBuild]::MakeRelative($(MSBuildThisFileDirectory)win10-arm\, %(FullPath))) - PreserveNewest - $([MSBuild]::MakeRelative($(MSBuildThisFileDirectory)win10-arm64\, %(FullPath))) PreserveNewest From 9f132b2c95fd24859738d75034262f2a83c6c697 Mon Sep 17 00:00:00 2001 From: Tung Huynh Date: Tue, 2 Apr 2024 00:49:42 -0700 Subject: [PATCH 4/6] remove more custom patches --- ...-ffmpeg-dont-error-on-int-conversion.patch | 25 -------- ...r-on-incompatible-function-pointer-t.patch | 35 ------------ patches/0003-gnutls-fix-clang-errors.patch | 33 ----------- .../0004-libarchive-fix-clang-errors.patch | 33 ----------- patches/0005-musepack-fix-clang-errors.patch | 34 ----------- patches/0006-libdsm-fix-clang-errors.patch | 57 ------------------- ...7-fix-clang-error-for-main-configure.patch | 33 ----------- ...0009-gnutls-dont-apply-UNICODE-patch.patch | 26 --------- 8 files changed, 276 deletions(-) delete mode 100644 patches/0001-ffmpeg-dont-error-on-int-conversion.patch delete mode 100644 patches/0002-gcrypt-dont-error-on-incompatible-function-pointer-t.patch delete mode 100644 patches/0003-gnutls-fix-clang-errors.patch delete mode 100644 patches/0004-libarchive-fix-clang-errors.patch delete mode 100644 patches/0005-musepack-fix-clang-errors.patch delete mode 100644 patches/0006-libdsm-fix-clang-errors.patch delete mode 100644 patches/0007-fix-clang-error-for-main-configure.patch delete mode 100644 patches/0009-gnutls-dont-apply-UNICODE-patch.patch diff --git a/patches/0001-ffmpeg-dont-error-on-int-conversion.patch b/patches/0001-ffmpeg-dont-error-on-int-conversion.patch deleted file mode 100644 index f537d03..0000000 --- a/patches/0001-ffmpeg-dont-error-on-int-conversion.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f6cecd95af59748a4a05968d2f0dad7d1e5efb7b Mon Sep 17 00:00:00 2001 -From: Tung Huynh -Date: Sun, 10 Dec 2023 22:29:16 -0800 -Subject: [PATCH 1/9] ffmpeg: dont error on int conversion - ---- - contrib/src/ffmpeg/rules.mak | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak -index 9baf9b140d..121721a9bc 100644 ---- a/contrib/src/ffmpeg/rules.mak -+++ b/contrib/src/ffmpeg/rules.mak -@@ -262,7 +262,7 @@ endif - $(MOVE) - - .ffmpeg: ffmpeg -- cd $< && $(HOSTVARS) ./configure \ -+ cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -Wno-error=int-conversion" ./configure \ - --extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) \ - --prefix="$(PREFIX)" --enable-static --disable-shared - cd $< && $(MAKE) install-libs install-headers --- -2.42.0.windows.2 - diff --git a/patches/0002-gcrypt-dont-error-on-incompatible-function-pointer-t.patch b/patches/0002-gcrypt-dont-error-on-incompatible-function-pointer-t.patch deleted file mode 100644 index 10d0532..0000000 --- a/patches/0002-gcrypt-dont-error-on-incompatible-function-pointer-t.patch +++ /dev/null @@ -1,35 +0,0 @@ -From b1f601ad759389e9cf910c987b7c7ef638b8232f Mon Sep 17 00:00:00 2001 -From: Tung Huynh -Date: Sun, 10 Dec 2023 23:04:49 -0800 -Subject: [PATCH 2/9] gcrypt: dont error on incompatible function pointer types - ---- - contrib/src/gcrypt/rules.mak | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak -index 7319fc046c..7dbd0bc022 100644 ---- a/contrib/src/gcrypt/rules.mak -+++ b/contrib/src/gcrypt/rules.mak -@@ -39,15 +39,15 @@ GCRYPT_CONF = \ - --enable-pubkey-ciphers=dsa,rsa,ecc \ - --disable-docs - -+GCRYPT_EXTRA_CFLAGS = -Wno-error=incompatible-function-pointer-types -+ - ifdef HAVE_WIN32 - ifeq ($(ARCH),x86_64) - GCRYPT_CONF += --disable-asm --disable-padlock-support - endif - endif - ifdef HAVE_IOS --GCRYPT_EXTRA_CFLAGS = -fheinous-gnu-extensions --else --GCRYPT_EXTRA_CFLAGS = -+GCRYPT_EXTRA_CFLAGS += -fheinous-gnu-extensions - endif - ifdef HAVE_MACOSX - GCRYPT_CONF += --disable-aesni-support --- -2.42.0.windows.2 - diff --git a/patches/0003-gnutls-fix-clang-errors.patch b/patches/0003-gnutls-fix-clang-errors.patch deleted file mode 100644 index 1c119f2..0000000 --- a/patches/0003-gnutls-fix-clang-errors.patch +++ /dev/null @@ -1,33 +0,0 @@ -From e2d4a2504d850d54b3db9a6ab753f3cdaaf4055f Mon Sep 17 00:00:00 2001 -From: Tung Huynh -Date: Mon, 11 Dec 2023 03:04:04 -0800 -Subject: [PATCH 3/9] gnutls: fix clang errors - ---- - contrib/src/gnutls/rules.mak | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak -index c6eeeccbd4..2ac81dc5e1 100644 ---- a/contrib/src/gnutls/rules.mak -+++ b/contrib/src/gnutls/rules.mak -@@ -70,6 +70,7 @@ GNUTLS_CONF := \ - $(HOSTCONF) - - GNUTLS_ENV := $(HOSTVARS) -+GNUTLS_EXTRA_CFLAGS = -Wno-error=implicit-function-declaration -Wno-error=int-conversion - - DEPS_gnutls = nettle $(DEPS_nettle) - -@@ -90,7 +91,7 @@ endif - endif - - .gnutls: gnutls -- cd $< && $(GNUTLS_ENV) ./configure $(GNUTLS_CONF) -+ cd $< && $(GNUTLS_ENV) CFLAGS="$(CFLAGS) $(GNUTLS_EXTRA_CFLAGS)" ./configure $(GNUTLS_CONF) - cd $< && $(MAKE) -C gl install - cd $< && $(MAKE) -C lib install - touch $@ --- -2.42.0.windows.2 - diff --git a/patches/0004-libarchive-fix-clang-errors.patch b/patches/0004-libarchive-fix-clang-errors.patch deleted file mode 100644 index 170bcc7..0000000 --- a/patches/0004-libarchive-fix-clang-errors.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6d2a14fdb545adf54ae7f0516415b56a7567a9a1 Mon Sep 17 00:00:00 2001 -From: Tung Huynh -Date: Mon, 11 Dec 2023 10:32:32 -0800 -Subject: [PATCH 4/9] libarchive: fix clang errors - ---- - contrib/src/libarchive/rules.mak | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/contrib/src/libarchive/rules.mak b/contrib/src/libarchive/rules.mak -index 9e094257da..343f290e2f 100644 ---- a/contrib/src/libarchive/rules.mak -+++ b/contrib/src/libarchive/rules.mak -@@ -8,6 +8,7 @@ PKGS_FOUND += libarchive - endif - - DEPS_libarchive = zlib -+LIBARCHIVE_EXTRA_CFLAGS := -Wno-error=implicit-function-declaration - - $(TARBALLS)/libarchive-$(LIBARCHIVE_VERSION).tar.gz: - $(call download_pkg,$(LIBARCHIVE_URL),libarchive) -@@ -27,7 +28,7 @@ endif - - .libarchive: libarchive - $(RECONF) -- cd $< && $(HOSTVARS) ./configure $(HOSTCONF) \ -+ cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) $(LIBARCHIVE_EXTRA_CFLAGS)" ./configure $(HOSTCONF) \ - --disable-bsdcpio --disable-bsdtar --disable-bsdcat \ - --without-nettle --without-cng \ - --without-xml2 --without-lzma --without-iconv --without-expat --- -2.42.0.windows.2 - diff --git a/patches/0005-musepack-fix-clang-errors.patch b/patches/0005-musepack-fix-clang-errors.patch deleted file mode 100644 index bb40bfb..0000000 --- a/patches/0005-musepack-fix-clang-errors.patch +++ /dev/null @@ -1,34 +0,0 @@ -From fe96aebd89a18cd99c50f05677b574c40b70b0b0 Mon Sep 17 00:00:00 2001 -From: Tung Huynh -Date: Mon, 11 Dec 2023 19:18:58 -0800 -Subject: [PATCH 5/9] musepack: fix clang errors - ---- - contrib/src/mpcdec/rules.mak | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/contrib/src/mpcdec/rules.mak b/contrib/src/mpcdec/rules.mak -index cf513dc47e..d8d323953d 100644 ---- a/contrib/src/mpcdec/rules.mak -+++ b/contrib/src/mpcdec/rules.mak -@@ -20,6 +20,8 @@ $(TARBALLS)/musepack_src_r$(MUSE_REV).tar.gz: - # $(SVN) export $(MUSE_SVN) -r $(MUSE_REV) musepack_src_r$(MUSE_REV) - # tar czv musepack_src_r$(MUSE_REV) > $@ - -+MUSE_EXTRA_CFLAGS = -Wno-error=incompatible-function-pointer-types -+ - .sum-mpcdec: musepack_src_r$(MUSE_REV).tar.gz - # $(warning $@ not implemented) - # touch $@ -@@ -43,7 +45,7 @@ endif - touch $@ - - .mpcdec: musepack toolchain.cmake -- cd $< && $(HOSTVARS_PIC) $(CMAKE) -DSHARED=OFF . -+ cd $< && $(HOSTVARS_PIC) CFLAGS="$(CFLAGS) $(MUSE_EXTRA_CFLAGS)" $(CMAKE) -DSHARED=OFF . - cd $< && $(CMAKEBUILD) . --target install - mkdir -p -- "$(PREFIX)/lib" - # Use globbing to work around cmake's change of destination file --- -2.42.0.windows.2 - diff --git a/patches/0006-libdsm-fix-clang-errors.patch b/patches/0006-libdsm-fix-clang-errors.patch deleted file mode 100644 index 6b939e6..0000000 --- a/patches/0006-libdsm-fix-clang-errors.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 71388dcb28289f8a69a18740b2d62a7f9e3aa007 Mon Sep 17 00:00:00 2001 -From: Tung Huynh -Date: Mon, 11 Dec 2023 19:19:13 -0800 -Subject: [PATCH 6/9] libdsm: fix clang errors - ---- - ...nal-flags-to-avoid-clang-build-error.patch | 25 +++++++++++++++++++ - contrib/src/libdsm/rules.mak | 1 + - 2 files changed, 26 insertions(+) - create mode 100644 contrib/src/libdsm/0001-add-optional-flags-to-avoid-clang-build-error.patch - -diff --git a/contrib/src/libdsm/0001-add-optional-flags-to-avoid-clang-build-error.patch b/contrib/src/libdsm/0001-add-optional-flags-to-avoid-clang-build-error.patch -new file mode 100644 -index 0000000000..ca99400961 ---- /dev/null -+++ b/contrib/src/libdsm/0001-add-optional-flags-to-avoid-clang-build-error.patch -@@ -0,0 +1,25 @@ -+From 775ab81dc48050323d7822d91bc3dc66804142f8 Mon Sep 17 00:00:00 2001 -+From: Tung Huynh -+Date: Mon, 11 Dec 2023 19:15:47 -0800 -+Subject: [PATCH] add optional flags to avoid clang build error -+ -+--- -+ meson.build | 2 ++ -+ 1 file changed, 2 insertions(+) -+ -+diff --git a/meson.build b/meson.build -+index 4a32ddd..a8681db 100644 -+--- a/meson.build -++++ b/meson.build -+@@ -39,6 +39,8 @@ optional_arguments = [ -+ '-Wall', -+ '-Wsign-compare', -+ '-Wextra', -++ '-Wno-error=implicit-function-declaration', -++ '-Wno-error=incompatible-function-pointer-types', -+ '-Wstrict-aliasing', -+ '-Wstrict-overflow' ] -+ -+-- -+2.42.0.windows.2 -+ -diff --git a/contrib/src/libdsm/rules.mak b/contrib/src/libdsm/rules.mak -index d37251b730..f9589cea01 100644 ---- a/contrib/src/libdsm/rules.mak -+++ b/contrib/src/libdsm/rules.mak -@@ -19,6 +19,7 @@ endif - - libdsm: libdsm-$(LIBDSM_VERSION).tar.xz .sum-libdsm - $(UNPACK) -+ $(APPLY) $(SRC)/libdsm/0001-add-optional-flags-to-avoid-clang-build-error.patch - $(MOVE) - - DEPS_libdsm = libtasn1 iconv --- -2.42.0.windows.2 - diff --git a/patches/0007-fix-clang-error-for-main-configure.patch b/patches/0007-fix-clang-error-for-main-configure.patch deleted file mode 100644 index bed7c92..0000000 --- a/patches/0007-fix-clang-error-for-main-configure.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0c788c765b4016e2b4fdfa197130dbbd61f90202 Mon Sep 17 00:00:00 2001 -From: Tung Huynh -Date: Mon, 11 Dec 2023 20:37:12 -0800 -Subject: [PATCH 7/9] fix clang error for main configure - ---- - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 69beb77ac0..4d611bec42 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -957,7 +957,7 @@ AX_APPEND_COMPILE_FLAGS([-Wall -Wextra -Wsign-compare -Wundef -Wpointer-arith -W - AX_APPEND_COMPILE_FLAGS([-Wall -Wextra -Wsign-compare -Wundef -Wpointer-arith -Wvolatile-register-var -Wformat -Wformat-security], [CXXFLAGS]) - - dnl -Werror-implicit-function-declaration is used for the if_nametoindex detection with winstore --AX_APPEND_COMPILE_FLAGS([-Wbad-function-cast -Wwrite-strings -Wmissing-prototypes -Werror-implicit-function-declaration -Winit-self -Wlogical-op -Wshadow=local], [CFLAGS]) -+AX_APPEND_COMPILE_FLAGS([-Wbad-function-cast -Wwrite-strings -Wmissing-prototypes -Wno-error=implicit-function-declaration -Wno-error=implicit-function-declaration -Winit-self -Wlogical-op -Wshadow=local], [CFLAGS]) - AX_APPEND_COMPILE_FLAGS([-pipe], [CFLAGS]) - - dnl Checks for socket stuff -@@ -980,7 +980,6 @@ AC_SEARCH_LIBS([inet_pton], [nsl], [ - ],, [${SOCKET_LIBS}]) - - LIBS="${LIBS} ${SOCKET_LIBS}" --CFLAGS="${CFLAGS} -Werror-implicit-function-declaration" - AC_LINK_IFELSE([ - AC_LANG_PROGRAM([#ifdef _WIN32 - #include --- -2.42.0.windows.2 - diff --git a/patches/0009-gnutls-dont-apply-UNICODE-patch.patch b/patches/0009-gnutls-dont-apply-UNICODE-patch.patch deleted file mode 100644 index fd34934..0000000 --- a/patches/0009-gnutls-dont-apply-UNICODE-patch.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 85c7a0b1047056ca4a14429476a365ec1574f6a8 Mon Sep 17 00:00:00 2001 -From: Tung Huynh -Date: Fri, 15 Dec 2023 15:38:43 -0800 -Subject: [PATCH 9/9] gnutls: dont apply UNICODE patch - -for some reason this patch breaks win32 compilation in new mingw-llvm versions ---- - contrib/src/gnutls/rules.mak | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak -index 2ac81dc5e1..4450e7d8f7 100644 ---- a/contrib/src/gnutls/rules.mak -+++ b/contrib/src/gnutls/rules.mak -@@ -22,7 +22,7 @@ gnutls: gnutls-$(GNUTLS_VERSION).tar.xz .sum-gnutls - $(APPLY) $(SRC)/gnutls/gnutls-fix-mangling.patch - - # backport gnulib patch -- $(APPLY) $(SRC)/gnutls/0001-Don-t-assume-that-UNICODE-is-not-defined.patch -+ # $(APPLY) $(SRC)/gnutls/0001-Don-t-assume-that-UNICODE-is-not-defined.patch - - # fix forbidden UWP call which can't be upstreamed as they won't - # differentiate for winstore, only _WIN32_WINNT --- -2.42.0.windows.2 - From a180b20e800d27a1fc8984ba6359c71544f313b5 Mon Sep 17 00:00:00 2001 From: Tung Huynh Date: Tue, 2 Apr 2024 00:50:00 -0700 Subject: [PATCH 5/6] no need to include reference to VCLibs --- build/LibVLC.UWP.targets | 7 ------- 1 file changed, 7 deletions(-) diff --git a/build/LibVLC.UWP.targets b/build/LibVLC.UWP.targets index 1a9af0d..2f43a7d 100644 --- a/build/LibVLC.UWP.targets +++ b/build/LibVLC.UWP.targets @@ -6,13 +6,6 @@ - - - Microsoft.VCLibs - 14.0.0.0 - - - $([MSBuild]::MakeRelative($(MSBuildThisFileDirectory)win10-x64\, %(FullPath))) From ff0ace3970c5e5bbe475dbee7c05a6a6a451aa62 Mon Sep 17 00:00:00 2001 From: Tung Huynh Date: Tue, 2 Apr 2024 00:51:56 -0700 Subject: [PATCH 6/6] resolve deprecated nodejs version in ci --- .github/workflows/ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 166e901..68f5a41 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,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 @@ -53,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 @@ -78,7 +78,7 @@ 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 + uses: microsoft/setup-msbuild@v2 - name: MSBuild x64/ARM64 if: matrix.arch != 'x86' working-directory: vlc-winrt/modules/libaccess_winrt_plugin.UWP @@ -88,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 @@ -100,9 +100,9 @@ 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 @@ -147,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'