Commit b032f7da authored by Steve Lhomme's avatar Steve Lhomme

update patchset

fix gnutls building from mingw
parent cff49670
From 21d52aa1f7660f8033d8e9f12aff20c0092526fc Mon Sep 17 00:00:00 2001
From f24d37eb06407f1fba4fcad4c83a58edfba3084a Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@videolabs.io>
Date: Mon, 23 May 2016 09:18:17 +0200
Subject: [PATCH 15/22] contrib: gnutls: fix Winstore forbidden API calls
---
contrib/src/gnutls/rules.mak | 3 +
contrib/src/gnutls/winstore.patch | 421 ++++++++++++++++++++++++++++++++++++++
2 files changed, 424 insertions(+)
contrib/src/gnutls/winstore.patch | 432 ++++++++++++++++++++++++++++++++++++++
2 files changed, 435 insertions(+)
create mode 100644 contrib/src/gnutls/winstore.patch
diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
......@@ -25,10 +25,10 @@ index 9cd29be..b04b3c0 100644
$(MOVE)
diff --git a/contrib/src/gnutls/winstore.patch b/contrib/src/gnutls/winstore.patch
new file mode 100644
index 0000000..30861c7
index 0000000..9d61069
--- /dev/null
+++ b/contrib/src/gnutls/winstore.patch
@@ -0,0 +1,421 @@
@@ -0,0 +1,432 @@
+--- gnutls/lib/nettle/sysrng-windows.c.winstore 2016-11-05 19:12:02.000000000 +0100
++++ gnutls/lib/nettle/sysrng-windows.c 2018-03-28 14:31:43.044698600 +0200
+@@ -29,6 +29,34 @@
......@@ -406,16 +406,17 @@ index 0000000..30861c7
+
+ #define DYN_NCRYPT
+
+--- gnutls/lib/system.c.winstore 2018-03-28 14:33:51.324022200 +0200
++++ gnutls/lib/system.c 2018-03-28 11:56:50.586164500 +0200
+@@ -21,6 +21,25 @@
+--- gnutls/lib/system.c.winstore 2018-03-30 11:34:26.354394100 +0200
++++ gnutls/lib/system.c 2018-03-30 11:27:07.794862100 +0200
+@@ -21,6 +21,26 @@
+ *
+ */
+
++#ifdef _WIN32
++# include <windows.h>
++# include <wincrypt.h>
++# if defined(NEED_CERT_ENUM_CRLS)
++# if defined(__MINGW32__) && !defined(__MINGW64__) && __MINGW32_MAJOR_VERSION <= 3 && __MINGW32_MINOR_VERSION <= 20
++# define NEED_CERT_ENUM_CRLS
++CertEnumCRLsInStoreFunc pCertEnumCRLsInStore;
++static HMODULE Crypt32_dll;
++# endif
......@@ -434,7 +435,7 @@ index 0000000..30861c7
+ #include <config.h>
+ #include <system.h>
+ #include "gnutls_int.h"
+@@ -32,15 +51,6 @@
+@@ -32,15 +52,6 @@
+ #include <sys/types.h>
+ #include <time.h>
+
......@@ -450,6 +451,16 @@ index 0000000..30861c7
+ /* System specific function wrappers for certificate stores.
+ */
+ gnutls_time_func gnutls_time;
+--- gnutls/lib/system.h.winstore 2018-03-30 11:33:41.074982000 +0200
++++ gnutls/lib/system.h 2018-03-30 11:26:50.778890200 +0200
+@@ -30,7 +30,6 @@
+
+ #ifdef _WIN32
+ # if defined(__MINGW32__) && !defined(__MINGW64__) && __MINGW32_MAJOR_VERSION <= 3 && __MINGW32_MINOR_VERSION <= 20
+-# define NEED_CERT_ENUM_CRLS
+ typedef PCCRL_CONTEXT WINAPI(*CertEnumCRLsInStoreFunc) (HCERTSTORE
+ hCertStore,
+ PCCRL_CONTEXT
--
2.10.1.windows.1
From b5ba278849cb6d1d9b3adce95436a7c655b05798 Mon Sep 17 00:00:00 2001
From 3e419035921f82b4ff3e7530cc83913c3f953523 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 29 Mar 2018 09:05:06 +0200
Subject: [PATCH 16/22] contrib: gnutls: update to current stable 3.5.18
......
From b54a77a1af53656e89163328c068fe89c9e5d7af Mon Sep 17 00:00:00 2001
From 078914be6f32c5b151b1c02b836cbca5e5eef07e Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 29 Mar 2018 13:09:59 +0200
Subject: [PATCH 17/22] sap: use the same declaration signature as the
......
From 6e9033e8f3b61d5a63c10f61cf96edc4c1af6235 Mon Sep 17 00:00:00 2001
From f791703c3e44561a148502c5c51789d6e274614b Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 29 Mar 2018 15:00:53 +0200
Subject: [PATCH 18/22] contrib: shout: respect the availability of strings.h
......
From fa422e17ea13c492f2d633460a6cac80479d495e Mon Sep 17 00:00:00 2001
From 381c321f53cab9d547a9305cba5ab10df40b748a Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 29 Mar 2018 15:03:37 +0200
Subject: [PATCH 19/22] contrib: shout: usleep() is not a Windows API
......
From 87605e79603eb762de678474cbc6ba39959a231d Mon Sep 17 00:00:00 2001
From f0582ce4ad1a91d36a7c768e18ffb39bcbc53b04 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 29 Mar 2018 15:06:53 +0200
Subject: [PATCH 20/22] contrib: shout: timeval is defined in winsock2.h on
......
From ab426c24c23d473596583576b1809d418ebf6258 Mon Sep 17 00:00:00 2001
From e51432e6e9079453968de586471a3a9675bb1969 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 29 Mar 2018 15:13:55 +0200
Subject: [PATCH 21/22] contrib: shout: socklen_t can be found in ws2tcpip.h on
......
From 388289b746587ff8e010ab375d6bc8a2949cd7ee Mon Sep 17 00:00:00 2001
From 42c4617e5589464f441f5729068b648cd34ebe55 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 29 Mar 2018 15:46:50 +0200
Subject: [PATCH 22/22] contrib: ffmpeg: don't use libvpx at all in libavcodec
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment