[vlc-commits] [Git][videolan/vlc][master] 2 commits: upnp: include iphlpapi.h to use local structures

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
eacf1bd2 by Steve Lhomme at 2025-02-21T07:08:15+00:00
upnp: include iphlpapi.h to use local structures

They used to be included by pupnp. They don't use/need it anymore, but we do.

- - - - -
77611ed7 by Steve Lhomme at 2025-02-21T07:08:15+00:00
contrib: upnp: update to 1.4.20

And remove the merged android patch.

- - - - -


4 changed files:

- − contrib/src/upnp/0001-disable-fseeko-usage-on-32-bit-Android-older-than-AP.patch
- contrib/src/upnp/SHA512SUMS
- contrib/src/upnp/rules.mak
- modules/services_discovery/upnp-wrapper.hpp


Changes:

=====================================
contrib/src/upnp/0001-disable-fseeko-usage-on-32-bit-Android-older-than-AP.patch deleted
=====================================
@@ -1,31 +0,0 @@
-From 270dd4063694c6138a893bfaebdddde4987c69d1 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at ycbcr.xyz>
-Date: Mon, 22 Apr 2024 13:17:15 +0200
-Subject: [PATCH] disable fseeko usage on 32-bit Android older than API 24
-
-feesko is not supported on 32-bit Android older than API 24 [1].
-Older SDKs would allow the call but the 64-bit off_t was not accurate.
-With the NDK26 the call is hidden in that case and calling fseeko() results in a compilation error.
-
-[1] https://android.googlesource.com/platform/bionic/+/main/docs/32-bit-abi.md
----
- upnp/src/genlib/net/http/httpreadwrite.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/upnp/src/genlib/net/http/httpreadwrite.c b/upnp/src/genlib/net/http/httpreadwrite.c
-index 27e9c3a5..045e5d51 100644
---- a/upnp/src/genlib/net/http/httpreadwrite.c
-+++ b/upnp/src/genlib/net/http/httpreadwrite.c
-@@ -73,6 +73,9 @@
- 	#include <sys/types.h>
- 	#include <sys/utsname.h>
- 	#include <sys/wait.h>
-+	#if defined(__ANDROID__) && (!defined(__USE_FILE_OFFSET64) || __ANDROID_API__ < 24)
-+		#define fseeko fseek
-+	#endif
- #endif /* _WIN32 */
- 
- /*
--- 
-2.37.3.windows.1
-


=====================================
contrib/src/upnp/SHA512SUMS
=====================================
@@ -1 +1 @@
-68973e0e5a8f9e64b2311246b7924b0837fd2c7ef30483d3d93ebfeee62bc2293760209d8a5213c0456ce5c37f9f32a6038c9e5d8b461670ba6073db8c2f1394  pupnp-release-1.14.18.tar.gz
+8aabd054d3c311abab762d15c739e5e10801e9a6caf09540560be9497cb632fdfc2c86a61522ab0b24e9baf20020ab0dab2a6e8e253c9cc1a1047efc701ba563  pupnp-release-1.14.20.tar.gz


=====================================
contrib/src/upnp/rules.mak
=====================================
@@ -1,5 +1,5 @@
 # UPNP
-UPNP_VERSION := 1.14.18
+UPNP_VERSION := 1.14.20
 UPNP_URL := $(GITHUB)/pupnp/pupnp/archive/refs/tags/release-$(UPNP_VERSION).tar.gz
 
 ifdef BUILD_NETWORK
@@ -42,7 +42,6 @@ endif
 ifdef HAVE_IOS
 	$(APPLY) $(SRC)/upnp/fix-reuseaddr-option.patch
 endif
-	$(APPLY) $(SRC)/upnp/0001-disable-fseeko-usage-on-32-bit-Android-older-than-AP.patch
 	$(MOVE)
 
 .upnp: upnp toolchain.cmake


=====================================
modules/services_discovery/upnp-wrapper.hpp
=====================================
@@ -115,6 +115,8 @@ inline const char* xml_getChildElementValue( IXML_Element* p_parent,
 
 #ifdef _WIN32
 
+#include <iphlpapi.h> // IP_ADAPTER_ADDRESSES, IP_ADAPTER_MULTICAST_ADDRESS, etc
+
 inline IP_ADAPTER_MULTICAST_ADDRESS* getMulticastAddress(IP_ADAPTER_ADDRESSES* p_adapter)
 {
     const unsigned long i_broadcast_ip = inet_addr("239.255.255.250");



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/a61e338c6ef16ba58d8aebdd8709c66256e8a098...77611ed7018e582b5bf1a014d5c0bfdbf6644169

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


VideoLAN code repository instance