From 55d657d1ff907ac09e64c59623029767ac2c62cc Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Fri, 22 Dec 2023 16:08:13 -0500 Subject: [PATCH] Remove upstreamed patch --- ...gstdtlscertificate-define-WINSOCKAPI.patch | 43 ------------------- gvsbuild/projects/gstreamer.py | 1 - 2 files changed, 44 deletions(-) delete mode 100644 gvsbuild/patches/gst-plugins-bad/gstdtlscertificate-define-WINSOCKAPI.patch diff --git a/gvsbuild/patches/gst-plugins-bad/gstdtlscertificate-define-WINSOCKAPI.patch b/gvsbuild/patches/gst-plugins-bad/gstdtlscertificate-define-WINSOCKAPI.patch deleted file mode 100644 index 103c49c95..000000000 --- a/gvsbuild/patches/gst-plugins-bad/gstdtlscertificate-define-WINSOCKAPI.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 363773a80b5c13b09f247a2819acfa0acb8321ae Mon Sep 17 00:00:00 2001 -From: Alessandro Bono -Date: Wed, 6 Dec 2023 12:01:36 +0100 -Subject: [PATCH] gstdtlscertificate: Define _WINSOCKAPI_ before including - windows.h - -This avoid a build failure when compiling against OpenSSL 3.2.0. The -problem is when windows.h is included before WinSock2.h. Because -windows.h includes winsock.h[1]. Defining _WINSOCKAPI_ stops windows.h -including winsock.h. - -Error: -``` -[748/1041] Compiling C object ext/dtls/gstdtls.dll.p/gstdtlscertificate.c.obj -FAILED: ext/dtls/gstdtls.dll.p/gstdtlscertificate.c.obj -[...] -C:\Program Files (x86)\Windows Kits\10\include\10.0.17763.0\shared\ws2def.h(235): error C2011: 'sockaddr': 'struct' type redefinition -C:\Program Files (x86)\Windows Kits\10\include\10.0.17763.0\um\winsock.h(482): note: see declaration of 'sockaddr' - -``` - -[1] https://stackoverflow.com/a/1372836 - -Closes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3167 ---- - ext/dtls/gstdtlscertificate.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/ext/dtls/gstdtlscertificate.c b/ext/dtls/gstdtlscertificate.c -index 9b31464b297..dc16a0137e8 100644 ---- a/ext/dtls/gstdtlscertificate.c -+++ b/ext/dtls/gstdtlscertificate.c -@@ -39,6 +39,7 @@ - #endif - - #ifdef G_OS_WIN32 -+#define _WINSOCKAPI_ - #include - #ifdef X509_NAME - #undef X509_NAME --- -GitLab - diff --git a/gvsbuild/projects/gstreamer.py b/gvsbuild/projects/gstreamer.py index 56d153fa3..cfed1302b 100644 --- a/gvsbuild/projects/gstreamer.py +++ b/gvsbuild/projects/gstreamer.py @@ -162,7 +162,6 @@ def __init__(self): patches=[ "wasapisink-reduce-buffer-latency.patch", "wasapi2-Add-option-to-monitor-loopback-device-s-mute.patch", - "gstdtlscertificate-define-WINSOCKAPI.patch", ], ) self.add_param("-Dcurl=disabled")