mirror of https://code.videolan.org/videolan/vlc
Hugo Beauzée-Luyssen
Alaric Senat
parent
f6bd67bbe7
commit
5c8512dfe1
|
|
@ -0,0 +1,32 @@
|
|||
From 3560d8d3f1a5b7e88b9d6282c09b2caf37beedc8 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
|
||||
Date: Thu, 4 Aug 2022 15:55:55 +0200
|
||||
Subject: [PATCH] ThreadPool: Fix non UCRT builds
|
||||
|
||||
---
|
||||
upnp/src/threadutil/ThreadPool.c | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/upnp/src/threadutil/ThreadPool.c b/upnp/src/threadutil/ThreadPool.c
|
||||
index 49fa8486..e5883d31 100644
|
||||
--- a/upnp/src/threadutil/ThreadPool.c
|
||||
+++ b/upnp/src/threadutil/ThreadPool.c
|
||||
@@ -1297,10 +1297,15 @@ int gettimeofday(struct timeval *tv, struct timezone *tz)
|
||||
_tzset();
|
||||
tzflag++;
|
||||
}
|
||||
+#ifdef _UCRT
|
||||
long itz = 0;
|
||||
_get_timezone(&itz);
|
||||
tz->tz_minuteswest = (int)(itz / 60);
|
||||
_get_daylight(&tz->tz_dsttime);
|
||||
+#else
|
||||
+ tz->tz_minuteswest = _timezone / 60;
|
||||
+ tz->tz_dsttime = _daylight;
|
||||
+#endif
|
||||
}
|
||||
|
||||
return 0;
|
||||
--
|
||||
2.35.1
|
||||
|
||||
|
|
@ -1 +1 @@
|
|||
deb971c6ebaa6a159072cb4153f7ada40400d88faee896366a694d0f15cf1aeea4de1199186122a2968c9e6a92fb7687019601cdbe1f7e08d2962496469a55ea pupnp-release-1.14.11.tar.gz
|
||||
ae6ae72a5e784a0f9508af94c4070627e791660fa37966e9825643fd0f88b171826bda9a2ec872d4961bf3454e5a9cd716127f0bdf6e63c789c4e22aab0b7e71 pupnp-release-1.14.13.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,11 +1,13 @@
|
|||
--- libupnp/upnp/src/inc/upnputil.h 2010-12-23 21:24:06.000000000 +0100
|
||||
+++ libupnp.new/upnp/src/inc/upnputil.h 2011-02-13 08:24:24.000000000 +0100
|
||||
@@ -125,7 +125,7 @@
|
||||
#define strncasecmp strnicmp
|
||||
#define sleep(a) Sleep((a)*1000)
|
||||
#define usleep(a) Sleep((a)/1000)
|
||||
- #define strerror_r(a,b,c) (strerror_s((b),(c),(a)))
|
||||
+ #define strerror_r(a,b,c) strncpy( b, strerror(a), c)
|
||||
diff --git a/upnp/src/inc/upnputil.h b/upnp/src/inc/upnputil.h
|
||||
index 2f18422b..ffc79254 100644
|
||||
--- a/upnp/src/inc/upnputil.h
|
||||
+++ b/upnp/src/inc/upnputil.h
|
||||
@@ -106,7 +106,7 @@ void linecopylen(
|
||||
#endif
|
||||
#define sleep(a) Sleep((a)*1000)
|
||||
#define usleep(a) Sleep((a) / 1000)
|
||||
- #define strerror_r(a, b, c) (strerror_s((b), (c), (a)))
|
||||
+ #define strerror_r(a, b, c) strncpy(b, strerror(a), c)
|
||||
#else
|
||||
#define max(a, b) (((a)>(b))? (a):(b))
|
||||
#define min(a, b) (((a)<(b))? (a):(b))
|
||||
#define max(a, b) (((a) > (b)) ? (a) : (b))
|
||||
#define min(a, b) (((a) < (b)) ? (a) : (b))
|
||||
|
|
|
|||
|
|
@ -1,36 +0,0 @@
|
|||
From 9ec9967c55e51c387f7d517e72adb6ed278d153f Mon Sep 17 00:00:00 2001
|
||||
From: Alaric Senat <dev.asenat@posteo.net>
|
||||
Date: Wed, 10 Mar 2021 15:25:20 +0100
|
||||
Subject: win64
|
||||
|
||||
---
|
||||
upnp/inc/upnp.h | 13 +++++++++++++
|
||||
1 file changed, 13 insertions(+)
|
||||
|
||||
diff --git a/upnp/inc/upnp.h b/upnp/inc/upnp.h
|
||||
index 0a51b34..4711e11 100644
|
||||
--- a/upnp/inc/upnp.h
|
||||
+++ b/upnp/inc/upnp.h
|
||||
@@ -61,6 +61,19 @@
|
||||
/* Other systems ??? */
|
||||
#endif
|
||||
|
||||
+#if defined(__MINGW32__)
|
||||
+ #if !defined(_OFF_T_)
|
||||
+ typedef long long _off_t;
|
||||
+ typedef _off_t off_t;
|
||||
+ #define _OFF_T_
|
||||
+ #else
|
||||
+ #ifdef off_t
|
||||
+ #undef off_t
|
||||
+ #endif
|
||||
+ #define off_t long long
|
||||
+ #endif
|
||||
+#endif
|
||||
+
|
||||
#ifdef UPNP_ENABLE_OPEN_SSL
|
||||
#include <openssl/ssl.h>
|
||||
#endif
|
||||
--
|
||||
2.29.2
|
||||
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
# UPNP
|
||||
UPNP_VERSION := 1.14.11
|
||||
UPNP_VERSION := 1.14.13
|
||||
UPNP_URL := $(GITHUB)/pupnp/pupnp/archive/refs/tags/release-$(UPNP_VERSION).tar.gz
|
||||
|
||||
ifdef BUILD_NETWORK
|
||||
|
|
@ -36,9 +36,8 @@ ifdef HAVE_WIN32
|
|||
$(APPLY) $(SRC)/upnp/libupnp-pthread-force.patch
|
||||
$(APPLY) $(SRC)/upnp/libupnp-win32-exports.patch
|
||||
$(APPLY) $(SRC)/upnp/libupnp-win32.patch
|
||||
$(APPLY) $(SRC)/upnp/libupnp-win64.patch
|
||||
$(APPLY) $(SRC)/upnp/windows-version-inet.patch
|
||||
$(APPLY) $(SRC)/upnp/win32-gettimeofday.patch
|
||||
$(APPLY) $(SRC)/upnp/0001-ThreadPool-Fix-non-UCRT-builds.patch
|
||||
endif
|
||||
ifdef HAVE_LINUX
|
||||
ifndef HAVE_ANDROID
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
--- upnp/upnp/src/threadutil/ThreadPool.h.orig 2022-04-21 15:07:27.194156972 +0300
|
||||
+++ upnp/upnp/src/threadutil/ThreadPool.h 2022-04-21 15:07:31.026076222 +0300
|
||||
@@ -54,8 +54,8 @@
|
||||
int tz_minuteswest; /* minutes W of Greenwich */
|
||||
int tz_dsttime; /* type of dst correction */
|
||||
};
|
||||
- int gettimeofday(struct timeval *tv, struct timezone *tz);
|
||||
#endif
|
||||
+ int gettimeofday(struct timeval *tv, struct timezone *tz);
|
||||
#else /* _WIN32 */
|
||||
#include <sys/param.h>
|
||||
#include <sys/time.h> /* for gettimeofday() */
|
||||
|
|
@ -18,9 +18,9 @@ index f3e08a5..e6233b5 100644
|
|||
|
||||
+#include "autoconfig.h"
|
||||
+
|
||||
#ifdef IPV6_
|
||||
#define INET_IPV6
|
||||
#endif
|
||||
#ifdef IPV6_
|
||||
#define INET_IPV6
|
||||
#endif
|
||||
@@ -13,6 +15,8 @@
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
|
|
|||
Loading…
Reference in New Issue