Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gst-plugins-bad: Apply upstream patch #1164

Merged
merged 1 commit into from
Dec 7, 2023
Merged

gst-plugins-bad: Apply upstream patch #1164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions gvsbuild/patches/gst-plugins-bad/gstdtlscertificate-define-WINSOCKAPI.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
From 363773a80b5c13b09f247a2819acfa0acb8321ae Mon Sep 17 00:00:00 2001
From: Alessandro Bono <[email protected]>
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
---
subprojects/gst-plugins-bad/ext/dtls/gstdtlscertificate.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/subprojects/gst-plugins-bad/ext/dtls/gstdtlscertificate.c b/subprojects/gst-plugins-bad/ext/dtls/gstdtlscertificate.c
index 9b31464b297..dc16a0137e8 100644
--- a/subprojects/gst-plugins-bad/ext/dtls/gstdtlscertificate.c
+++ b/subprojects/gst-plugins-bad/ext/dtls/gstdtlscertificate.c
@@ -39,6 +39,7 @@
#endif

#ifdef G_OS_WIN32
+#define _WINSOCKAPI_
#include <windows.h>
#ifdef X509_NAME
#undef X509_NAME
--
GitLab

1 change: 1 addition & 0 deletions gvsbuild/projects/gstreamer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ 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")
Expand Down