[vlc-commits] [Git][videolan/vlc][master] 3 commits: contrib: caca: fix htons/htonl used without declaration

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
0a06eea9 by Steve Lhomme at 2024-06-19T06:26:48+00:00
contrib: caca: fix htons/htonl used without declaration

- - - - -
03730063 by Steve Lhomme at 2024-06-19T06:26:48+00:00
contrib: libarchive: fix usage of GetVolumePathNameW in UWP before 20H1

- - - - -
b16adfe7 by Steve Lhomme at 2024-06-19T06:26:48+00:00
CI: update windows images with LLVM15

To fix ARM nightlies with PDB.

- - - - -


5 changed files:

- + contrib/src/caca/0006-stubs-include-winsock2.h-to-get-htons-htonl-declarat.patch
- contrib/src/caca/rules.mak
- + contrib/src/libarchive/0001-Fix-usage-of-GetVolumePathNameW-in-UWP-before-20H1.patch
- contrib/src/libarchive/rules.mak
- extras/ci/gitlab-ci.yml


Changes:

=====================================
contrib/src/caca/0006-stubs-include-winsock2.h-to-get-htons-htonl-declarat.patch
=====================================
@@ -0,0 +1,25 @@
+From 82ebd7474b72bb3743fb6e08972056c3e6843753 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4 at ycbcr.xyz>
+Date: Tue, 18 Jun 2024 07:04:41 +0200
+Subject: [PATCH 6/6] stubs: include winsock2.h to get htons/htonl declaration
+
+---
+ caca/caca_stubs.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/caca/caca_stubs.h b/caca/caca_stubs.h
+index bba3298..2cf0a59 100644
+--- a/caca/caca_stubs.h
++++ b/caca/caca_stubs.h
+@@ -34,6 +34,8 @@ static inline int geterrno(void) { return errno; }
+ #       include <arpa/inet.h>
+ #   elif defined HAVE_NETINET_IN_H
+ #       include <netinet/in.h>
++#   elif defined HAVE_WINSOCK2_H
++#       include <winsock2.h>
+ #   endif
+ #   define hton16 htons
+ #   define hton32 htonl
+-- 
+2.45.0.windows.1
+


=====================================
contrib/src/caca/rules.mak
=====================================
@@ -26,6 +26,7 @@ caca: libcaca-$(CACA_VERSION).tar.gz .sum-caca
 	$(APPLY) $(SRC)/caca/0003-win32-use-ANSI-calls-explicitly.patch
 	$(APPLY) $(SRC)/caca/0004-win32-use-CreateFile2-when-compiling-for-Win8.patch
 	$(APPLY) $(SRC)/caca/0005-canvas-use-GetCurrentProcessId-on-Windows.patch
+	$(APPLY) $(SRC)/caca/0006-stubs-include-winsock2.h-to-get-htons-htonl-declarat.patch
 	$(call pkg_static,"caca/caca.pc.in")
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)


=====================================
contrib/src/libarchive/0001-Fix-usage-of-GetVolumePathNameW-in-UWP-before-20H1.patch
=====================================
@@ -0,0 +1,29 @@
+From f06054ea7a576d031a5bbfea1dbd6a9a6432761e Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4 at ycbcr.xyz>
+Date: Tue, 18 Jun 2024 07:26:22 +0200
+Subject: [PATCH] Fix usage of GetVolumePathNameW in UWP before 20H1
+
+It started being allowed in UWP in 20H1.
+---
+ libarchive/archive_windows.h | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/libarchive/archive_windows.h b/libarchive/archive_windows.h
+index 47b7cb8e..8187dd66 100644
+--- a/libarchive/archive_windows.h
++++ b/libarchive/archive_windows.h
+@@ -294,7 +294,10 @@ typedef int mbstate_t;
+ size_t wcrtomb(char *, wchar_t, mbstate_t *);
+ #endif
+ 
+-#if defined(_MSC_VER) && _MSC_VER < 1300
++#if !WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) && NTDDI_VERSION < NTDDI_WIN10_VB
++// not supported in UWP SDK before 20H1
++#define GetVolumePathNameW(f, v, c)   (0)
++#elif defined(_MSC_VER) && _MSC_VER < 1300
+ WINBASEAPI BOOL WINAPI GetVolumePathNameW(
+        LPCWSTR lpszFileName,
+        LPWSTR lpszVolumePathName,
+-- 
+2.45.0.windows.1
+


=====================================
contrib/src/libarchive/rules.mak
=====================================
@@ -36,6 +36,7 @@ $(TARBALLS)/libarchive-$(LIBARCHIVE_VERSION).tar.gz:
 
 libarchive: libarchive-$(LIBARCHIVE_VERSION).tar.gz .sum-libarchive
 	$(UNPACK)
+	$(APPLY) $(SRC)/libarchive/0001-Fix-usage-of-GetVolumePathNameW-in-UWP-before-20H1.patch
 	$(call pkg_static,"build/pkgconfig/libarchive.pc.in")
 	$(MOVE)
 


=====================================
extras/ci/gitlab-ci.yml
=====================================
@@ -21,8 +21,8 @@ default:
 variables:
     VLC_TEST_TIMEOUT: 60
     VLC_WIN64_IMAGE: registry.videolan.org/vlc-debian-win64-posix:20240612181044
-    VLC_WIN_LLVM_MSVCRT_IMAGE: registry.videolan.org/vlc-debian-llvm-msvcrt:20240612181044
-    VLC_WIN_LLVM_UCRT_IMAGE: registry.videolan.org/vlc-debian-llvm-ucrt:20240612181044
+    VLC_WIN_LLVM_MSVCRT_IMAGE: registry.videolan.org/vlc-debian-llvm-msvcrt:20240617101054
+    VLC_WIN_LLVM_UCRT_IMAGE: registry.videolan.org/vlc-debian-llvm-ucrt:20240617101054
     VLC_DEBIAN_IMAGE: registry.videolan.org/vlc-debian-unstable:20240402131352
     VLC_ANDROID_IMAGE: registry.videolan.org/vlc-debian-android:20240522152555
     VLC_SNAP_IMAGE: registry.videolan.org/vlc-ubuntu-focal:20231013031754



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/54c32fc9eae608309d86c663eea8799deab1fde6...b16adfe7764fa36709a4dc1de932c61a61bd9f76

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/54c32fc9eae608309d86c663eea8799deab1fde6...b16adfe7764fa36709a4dc1de932c61a61bd9f76
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance