Commit 8c25592a authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

Rebase patchset

parent cf234d4d
From 9a16ca5cccf436c34a78dc05befa3f6a977f5a2c Mon Sep 17 00:00:00 2001
From 59d8085f8f7a6165b9a1702562fc0a018dcbd2c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Wed, 11 May 2016 17:37:47 +0200
Subject: [PATCH 02/37] gnutls: Set cannot_unload_broken_library for winrt
Subject: [PATCH 01/30] gnutls: Set cannot_unload_broken_library for winrt
---
modules/misc/gnutls.c | 3 +++
......
From b31ad99f070e83f844f583a7f8b7526c18d8b578 Mon Sep 17 00:00:00 2001
From 19d110303ce2492b8fe1a61da7039e8d3dcfc176 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Wed, 16 Apr 2014 16:09:53 +0200
Subject: [PATCH 03/37] Cheat for Windows Store subtitles
Subject: [PATCH 02/30] Cheat for Windows Store subtitles
---
lib/video.c | 5 +++++
......
From 8c3512658f11970b15a60ccb1cdded95964935cf Mon Sep 17 00:00:00 2001
From 60a4088c2b68736c18bfe1a156b2c95e75c72f1b Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Wed, 12 Mar 2014 00:11:26 +0100
Subject: [PATCH 04/37] Accept the weird WinRT pathes
Subject: [PATCH 03/30] Accept the weird WinRT pathes
---
src/text/url.c | 5 +++++
......
From c971cae19f70f37979eb6581d9a2a0c2968e5840 Mon Sep 17 00:00:00 2001
From 2a0698914e4e973187e2837a094968af75d12ef1 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@videolabs.io>
Date: Fri, 30 Sep 2016 09:49:19 +0200
Subject: [PATCH 06/37] plugin cache: Windows doesn't like relative pathes in
Subject: [PATCH 04/30] plugin cache: Windows doesn't like relative pathes in
LoadLibraryEx()
Fixes "vlc-cache-gen ../modules" on Windows and general VLC_PLUGIN_PATH usage.
......
From a8228f4879806daa1d6cacc1442084f498405114 Mon Sep 17 00:00:00 2001
From 1945d7e8b77624591cafe21d0eba066478de82c9 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@videolabs.io>
Date: Wed, 25 Jan 2017 10:49:37 +0100
Subject: [PATCH 08/37] core: avcodec requires 32-bytes memory alignment in
Subject: [PATCH 05/30] core: avcodec requires 32-bytes memory alignment in
many cases
For example a IA0L texture on Windows is not 32 bytes aligned and avcodec
......
From 11a27f5d36073f1f7dbaafb83ab66bbb6e330afd Mon Sep 17 00:00:00 2001
From e52c265e8fb34198cf94f796a712354ce3f1bf62 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 29 Mar 2018 15:46:11 +0200
Subject: [PATCH 09/37] contrib: ffmpeg: use bcrypt instead of the old wincrypt
Subject: [PATCH 06/30] contrib: ffmpeg: use bcrypt instead of the old wincrypt
API
When targeting Windows Vista and above
......@@ -77,10 +77,10 @@ index 0000000000..456557716d
+ if (CryptAcquireContext(&provider, NULL, NULL, PROV_RSA_FULL,
+ CRYPT_VERIFYCONTEXT | CRYPT_SILENT)) {
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 432996d27a..d21254a2ff 100644
index 0980142a16..0f4d19cc66 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -246,6 +246,7 @@ endif
@@ -244,6 +244,7 @@ endif
ifdef USE_LIBAV
$(APPLY) $(SRC)/ffmpeg/libav_gsm.patch
endif
......
From d04423479e7f4955583a2583bbae306fce73e127 Mon Sep 17 00:00:00 2001
From f49b1674f8d63760dfbec581be628e79ee89e9b1 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@videolabs.io>
Date: Tue, 19 Dec 2017 12:39:06 +0100
Subject: [PATCH 10/37] contrib:avcodec: use a more recent FFmpeg version
Subject: [PATCH 07/30] contrib:avcodec: use a more recent FFmpeg version
So that it doesn't use bogus atomics based code
---
......@@ -9,7 +9,7 @@ So that it doesn't use bogus atomics based code
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index d21254a2ff..5f263cf52f 100644
index 0f4d19cc66..68746815b5 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -5,7 +5,7 @@
......
From a2bcc0d6b97c50af06d6cd2b96d7cce036fa6ced Mon Sep 17 00:00:00 2001
From 95668ec3494334ff6f85df69d16fe432a8447669 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Tue, 20 Feb 2018 11:24:43 +0100
Subject: [PATCH 11/37] contrib:mpg123: don't use forbidden APIs on Phone apps
Subject: [PATCH 08/30] contrib:mpg123: don't use forbidden APIs on Phone apps
---
contrib/src/mpg123/mpg123-winstore.patch | 11 +++++++++++
......
From 1ad1331e69dd42c58d1f2daa237f324796122949 Mon Sep 17 00:00:00 2001
From 99ec044ecf6996e04aad6048278ce9e8276a197f Mon Sep 17 00:00:00 2001
From: Carola Nitz <nitz.carola@googlemail.com>
Date: Fri, 29 Sep 2017 14:49:02 +0200
Subject: [PATCH 12/37] contrib: use live555 version that is compatible with
Subject: [PATCH 09/30] contrib: use live555 version that is compatible with
LGPL2
---
......
From fd34e2ec2dd477a839e5d5ca38cbd4491d486e80 Mon Sep 17 00:00:00 2001
From 88252da2b950cdcdc4f532f9086e9524a3066fb0 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Tue, 27 Mar 2018 18:57:41 +0200
Subject: [PATCH 13/37] rand: use bcrypt instead of CryptographicBufferStatics
Subject: [PATCH 10/30] rand: use bcrypt instead of CryptographicBufferStatics
for Winstore builds
It's available to winstore apps and on desktop since Vista.
......
From 122be61e1ea02b51ff0da321741be5d165011243 Mon Sep 17 00:00:00 2001
From d083e31b634fa83807c55404108ab64f993451c8 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/37] contrib: gnutls: fix Winstore forbidden API calls
Subject: [PATCH 11/30] contrib: gnutls: fix Winstore forbidden API calls
---
contrib/src/gnutls/rules.mak | 3 +
......
From f91da9229b0d6d2c5548a4183e1852377f8c587d Mon Sep 17 00:00:00 2001
From ffbda2a074e63714dcbf095296bb1ccc172d15a8 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 29 Mar 2018 15:00:53 +0200
Subject: [PATCH 17/37] contrib: shout: respect the availability of strings.h
Subject: [PATCH 12/30] contrib: shout: respect the availability of strings.h
everywhere
---
......
From a366f35a4b567ff10ed63dee7bd00db1a4b1ebc0 Mon Sep 17 00:00:00 2001
From cd4613d5b0bca33d46398b00b078c5cdca5f48cf Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 29 Mar 2018 15:06:53 +0200
Subject: [PATCH 18/37] contrib: shout: timeval is defined in winsock2.h on
Subject: [PATCH 13/30] contrib: shout: timeval is defined in winsock2.h on
Windows
---
......
From 23a20fd567b2e6acb8f5b3597c5f96c6cab89f27 Mon Sep 17 00:00:00 2001
From 42ecf6325f87bbb012980c56e01aeae6d9b73c07 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 29 Mar 2018 15:13:55 +0200
Subject: [PATCH 19/37] contrib: shout: socklen_t can be found in ws2tcpip.h on
Subject: [PATCH 14/30] contrib: shout: socklen_t can be found in ws2tcpip.h on
Windows
and make sure it's found on Windows Store builds as well
......
From 75a3319bd21b8da815eef13a666f8277560a4dfe Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Wed, 28 Mar 2018 09:10:39 +0200
Subject: [PATCH 14/37] keystore: CryptUnprotectData is officially found in
dpapi.h
In MS SDKs and in mingw64
---
modules/keystore/file_crypt_win32.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/keystore/file_crypt_win32.c b/modules/keystore/file_crypt_win32.c
index 9a7b3876a6..ebbdcfc99f 100644
--- a/modules/keystore/file_crypt_win32.c
+++ b/modules/keystore/file_crypt_win32.c
@@ -26,7 +26,7 @@
#include "file_crypt.h"
#include <windows.h>
-#include <wincrypt.h>
+#include <dpapi.h>
typedef BOOL (WINAPI *ProcessFunc)(DATA_BLOB*, LPCWSTR, DATA_BLOB*, PVOID,
CRYPTPROTECT_PROMPTSTRUCT*, DWORD, DATA_BLOB*);
--
2.19.2
From 8a13e6c99f0ac573bc3a787cc17b12c3471dffe4 Mon Sep 17 00:00:00 2001
From 2d5ef3b44faed9b2e1f6214d0f4de97e07e30324 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 5 Apr 2018 13:29:40 +0200
Subject: [PATCH 21/37] contrib: gcrypt: use bcrypt rather than wincrypt
Subject: [PATCH 15/30] contrib: gcrypt: use bcrypt rather than wincrypt
---
contrib/src/gcrypt/winrt.patch | 177 +++++++++++++++++++++++----------
......
From 5c0b9ebaf73bac26096a188a09e488ece5b8522b Mon Sep 17 00:00:00 2001
From 463ea284f1991e0a8d3401d88cf5ab472e7d101f Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 5 Apr 2018 14:49:26 +0200
Subject: [PATCH 22/37] contrib: libarchive: use bcrypt rather than wincrypt
Subject: [PATCH 16/30] contrib: libarchive: use bcrypt rather than wincrypt
---
.../libarchive/libarchive-win32-bcrypt.patch | 62 +++++++++++++++++++
......
From c785102c768661117fc250703bc3f9dbd20965c6 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 29 Mar 2018 13:09:59 +0200
Subject: [PATCH 16/37] sap: use the same declaration signature as the
definition
---
src/stream_output/sap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/stream_output/sap.c b/src/stream_output/sap.c
index ee5312eb7d..2b5b0e13a2 100644
--- a/src/stream_output/sap.c
+++ b/src/stream_output/sap.c
@@ -79,7 +79,7 @@ static vlc_mutex_t sap_mutex = VLC_STATIC_MUTEX;
#define MIN_INTERVAL 2
#define MAX_INTERVAL 300
-static void *RunThread (void *);
+noreturn static void *RunThread (void *);
static sap_address_t *AddressCreate (vlc_object_t *obj, const char *group)
{
--
2.19.2
From d8b38fde9fd1b0df085421ab6ed90625d7f94ca5 Mon Sep 17 00:00:00 2001
From 2f486f6457962920d215424365f7cd8d52c75039 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Wed, 4 Apr 2018 12:10:17 +0200
Subject: [PATCH 23/37] transcode: do not include the decoder padding in the
Subject: [PATCH 17/30] transcode: do not include the decoder padding in the
output SAR
---
......
From 9d2a4387b9976a29f59d26552ec5919fb9134d9a Mon Sep 17 00:00:00 2001
From 6699aefc010c00e1c342d5ad46edcb9f1313f1ad Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@videolabs.io>
Date: Thu, 14 Dec 2017 14:20:25 +0100
Subject: [PATCH 24/37] transcode: the visible dimensions are unlikely to be 0
Subject: [PATCH 18/30] transcode: the visible dimensions are unlikely to be 0
---
modules/stream_out/transcode/video.c | 4 ++--
......
From 6c42f79999345cb8d2af325284745bc312352958 Mon Sep 17 00:00:00 2001
From 09d2b5284a068b7df0992c1b69d0f30cb379e02d Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@videolabs.io>
Date: Mon, 4 Sep 2017 13:59:25 +0200
Subject: [PATCH 25/37] codec: add a set of functions to use a plain FIFO
Subject: [PATCH 19/30] codec: add a set of functions to use a plain FIFO
It's similar to the block FIFO but with no locking.
---
......
From e1d4475c2b662f187bfe78e64661c1c6304e283f Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 29 Mar 2018 15:46:50 +0200
Subject: [PATCH 20/37] contrib: ffmpeg: don't use libvpx at all in libavcodec
We have our own decoder/encoder
---
contrib/src/ffmpeg/rules.mak | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 5f263cf52f..b19a43ad59 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -35,6 +35,7 @@ FFMPEGCONF = \
--disable-protocol=concat \
--disable-bsfs \
--disable-bzlib \
+ --disable-libvpx \
--disable-avresample \
--enable-bsf=vp9_superframe
@@ -65,11 +66,8 @@ ifndef BUILD_NETWORK
FFMPEGCONF += --disable-network
endif
ifdef BUILD_ENCODERS
-FFMPEGCONF += --enable-libmp3lame --enable-libvpx --disable-decoder=libvpx_vp8 --disable-decoder=libvpx_vp9
-ifndef USE_FFMPEG
-FFMPEGCONF += --disable-decoder=libvpx
-endif
-DEPS_ffmpeg += lame $(DEPS_lame) vpx $(DEPS_vpx)
+FFMPEGCONF += --enable-libmp3lame
+DEPS_ffmpeg += lame $(DEPS_lame)
else
FFMPEGCONF += --disable-encoders --disable-muxers
endif
--
2.19.2
From 0e10d7592f4f77b3b38744bd0397f17796407200 Mon Sep 17 00:00:00 2001
From d35c393558901cd43305c91b2c9710795e816cbf Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@videolabs.io>
Date: Thu, 31 Aug 2017 18:02:31 +0200
Subject: [PATCH 26/37] qsv: CUMULATIVE PATCH to encode from CPU planes
Subject: [PATCH 20/30] qsv: CUMULATIVE PATCH to encode from CPU planes
properly
---
......
From 7ec4482a22e6011c989dfac17e4406c5a83106ba Mon Sep 17 00:00:00 2001
From 5e672b221673f79330fc87b529ec442c1762f392 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 5 Apr 2018 09:49:44 +0200
Subject: [PATCH 27/37] chromecast: try to encode with QSV if possible
Subject: [PATCH 21/30] chromecast: try to encode with QSV if possible
It will be handled by the GPU so use less resource.
---
......
From a6d9627eb49d268e9a9dca4e83082341a4cb4256 Mon Sep 17 00:00:00 2001
From 6ef6b1e4289d29d8b3584182f1c94e40320a8598 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Sun, 8 Apr 2018 15:29:38 +0200
Subject: [PATCH 28/37] contrib: libarchive: fix building with bcrypt.h on UNIX
Subject: [PATCH 22/30] contrib: libarchive: fix building with bcrypt.h on UNIX
systems
mingw64 provides the header in lowercase
......
From 2632d5b9b8c5d3a2d76d1d1ed6b9a4fb174a250a Mon Sep 17 00:00:00 2001
From 0ac8913a21380d344e90e52772f58fe6e8ec3660 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Mon, 9 Apr 2018 09:59:27 +0200
Subject: [PATCH 29/37] contrib: libarchive: Fix winrt build
Subject: [PATCH 23/30] contrib: libarchive: Fix winrt build
don't force compilation for Windows XP
don't call DebugBreak() (in debug builds)
......
From fd9f573a9ef5a1c9c051120929fc8b6a74f35176 Mon Sep 17 00:00:00 2001
From a90ff3439553ed62058e8fff415758f87b81ff58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Mon, 9 Apr 2018 13:04:02 +0200
Subject: [PATCH 30/37] contribs: Fix ffmpeg build with gcrypt.h
Subject: [PATCH 24/30] contribs: Fix ffmpeg build with gcrypt.h
---
contrib/src/ffmpeg/ffmpeg-win32-bcrypt.patch | 12 ++++++++++++
......
From 5c913e68e59bfebfdb00f4d7ab97a9b28603849f Mon Sep 17 00:00:00 2001
From e12882272bda334ba77be242dd721835253cab4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Mon, 9 Apr 2018 13:25:00 +0200
Subject: [PATCH 31/37] contribs: Fix gnutls UWP build with mingw-w64
Subject: [PATCH 25/30] contribs: Fix gnutls UWP build with mingw-w64
---
contrib/src/gnutls/winstore.patch | 20 ++++++++++++++++++++
......
From 68b56836dcc3bf4a9fb2399b6eb4a442b3e0c3f0 Mon Sep 17 00:00:00 2001
From bbe4d49917ea47f5c66c232ea7a6da13dd6b24a9 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Mon, 9 Apr 2018 18:46:34 +0200
Subject: [PATCH 32/37] win32: fix crash on closesocket() when a poll() is
Subject: [PATCH 26/30] win32: fix crash on closesocket() when a poll() is
pending
Only for winstore builds for now
......
From d4b46ecac570f6de13a0a88176bc4c2753c8c6e4 Mon Sep 17 00:00:00 2001
From 544ff2a5e7069a0475b7c3606d538a5798ff3eef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Tue, 10 Apr 2018 15:14:25 +0200
Subject: [PATCH 33/37] contrib: ffmpeg: Don't check for wincrypt anymore
Subject: [PATCH 27/30] contrib: ffmpeg: Don't check for wincrypt anymore
---
.../src/ffmpeg/ffmpeg-winrt-wincrypt.patch | 27 +++++++++++++++++++
......@@ -43,7 +43,7 @@ index 0000000000..081c64d703
+ check_cpp_condition windows.h "_WIN32_WINNT >= 0x0600" && check_lib bcrypt "windows.h bcrypt.h" BCryptGenRandom -lbcrypt
+
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index b19a43ad59..c939b4f244 100644
index 68746815b5..5c44f183ad 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -245,6 +245,8 @@ ifdef USE_LIBAV
......
From 2aa24db71e85612c9b890255770d1b5d959bdd55 Mon Sep 17 00:00:00 2001
From fbf753341b927aa0b172acd2920dbf75dd0fd688 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Tue, 10 Apr 2018 15:58:44 +0200
Subject: [PATCH 34/37] contrib: gnutls: Use winstorecompat overload when
Subject: [PATCH 28/30] contrib: gnutls: Use winstorecompat overload when
available
---
......
From 05643749e954821e3c2740a5b3f0ad49ab52be4a Mon Sep 17 00:00:00 2001
From aea156501b97cafe723c0b53ddaad2faff77f713 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Tue, 10 Apr 2018 17:14:15 +0200
Subject: [PATCH 35/37] contrib: mpg123: Simplify unicode checks
Subject: [PATCH 29/30] contrib: mpg123: Simplify unicode checks
---
contrib/src/mpg123/winstore.patch | 46 +++++++++++++++++++++++++++++++
......
From 41916ffa4d3fa0c3758c90011d13d1789760324d Mon Sep 17 00:00:00 2001
From: Martin Finkel <martin@videolabs.io>
Date: Mon, 15 Jan 2018 12:00:05 +0100
Subject: [PATCH 30/30] revert gnutls to previous version for now
---
...nutls-update-to-current-stable-3.5.1.patch | 68 +++++++++++++++++++
1 file changed, 68 insertions(+)
create mode 100644 libvlc/patches/0013-Revert-contrib-gnutls-update-to-current-stable-3.5.1.patch
diff --git a/libvlc/patches/0013-Revert-contrib-gnutls-update-to-current-stable-3.5.1.patch b/libvlc/patches/0013-Revert-contrib-gnutls-update-to-current-stable-3.5.1.patch
new file mode 100644
index 0000000000..806ca3b4a5
--- /dev/null
+++ b/libvlc/patches/0013-Revert-contrib-gnutls-update-to-current-stable-3.5.1.patch
@@ -0,0 +1,68 @@
+From 0e773ed899d01b708aeaaafcad291a3893da2ba1 Mon Sep 17 00:00:00 2001
+From: Martin Finkel <martin@videolabs.io>
+Date: Mon, 15 Jan 2018 11:41:31 +0100
+Subject: [PATCH] Revert "contrib: gnutls: update to current stable 3.5.16
+ (fixes #19350)"
+
+This reverts commit 496d5f426d7fde1bb60c90a0009d222a52fd582d.
+
+# Conflicts:
+# contrib/src/gnutls/rules.mak
+---
+ contrib/src/gnutls/SHA512SUMS | 2 +-
+ contrib/src/gnutls/gnutls-pkgconfig-static.patch | 9 ++++-----
+ contrib/src/gnutls/rules.mak | 5 ++---
+ 3 files changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/contrib/src/gnutls/SHA512SUMS b/contrib/src/gnutls/SHA512SUMS
+index e5e3af8db4..7292832e42 100644
+--- a/contrib/src/gnutls/SHA512SUMS
++++ b/contrib/src/gnutls/SHA512SUMS
+@@ -1 +1 @@
+-451d3167be599ed8e0333dd7c9f8501fcb47b7aa871aeb461c368381c0b7ecd7e2026ec35dbbb2aa685cb2c3a22e9296e0a0699409e3744b731c1bb7e7e69f07 gnutls-3.5.16.tar.xz
++d75f6b4dea2dc742cd7f60ee0ee540d41b69991aaa937ca0138cfdf4a1e0dfaaa3863464303bfa5799e14ee02de252f71c59a7a9e57b96ff8af653e419edfd4e gnutls-3.4.14.tar.xz
+diff --git a/contrib/src/gnutls/gnutls-pkgconfig-static.patch b/contrib/src/gnutls/gnutls-pkgconfig-static.patch
+index 0a5ecfcef0..361d65104b 100644
+--- a/contrib/src/gnutls/gnutls-pkgconfig-static.patch
++++ b/contrib/src/gnutls/gnutls-pkgconfig-static.patch
+@@ -1,11 +1,10 @@
+-diff -ru gnutls-3.5.16/lib/gnutls.pc.in gnutls-3.5.16.patched/lib/gnutls.pc.in
+---- gnutls-3.5.16/lib/gnutls.pc.in 2017-03-28 20:20:50.000000000 +0300
+-+++ gnutls-3.5.16.patched/lib/gnutls.pc.in 2017-12-26 16:47:54.502835713 +0200
++--- gnutls/lib/gnutls.pc.in 2015-11-03 21:47:28.000000000 +0000
+++++ gnutls.patched/lib/gnutls.pc.in 2016-11-02 22:53:04.272156182 +0000
+ @@ -19,6 +19,6 @@
+ URL: http://www.gnutls.org/
+ Version: @VERSION@
+ Libs: -L${libdir} -lgnutls
+--Libs.private: @LIBZ_PC@ @LIBINTL@ @LIBSOCKET@ @LIBNSL@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@
+-+Libs.private: @LIBZ@ @LIBINTL@ @LIBSOCKET@ @LIBNSL@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@ @LIBIDN_LIBS@ @HOGWEED_LIBS@ @NETTLE_LIBS@
++-Libs.private: @LIBZ@ @LIBINTL@ @LIBSOCKET@ @LIBPTHREAD@ @LIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@
+++Libs.private: @LIBZ@ @LIBINTL@ @LIBSOCKET@ @LIBPTHREAD@ @LIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @NETTLE_LIBS@ @LIBIDN_LIBS@ @HOGWEED_LIBS@
+ @GNUTLS_REQUIRES_PRIVATE@
+ Cflags: -I${includedir}
+diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
+index 9cd29beead..66a3b00d64 100644
+--- a/contrib/src/gnutls/rules.mak
++++ b/contrib/src/gnutls/rules.mak
+@@ -1,7 +1,7 @@
+ # GnuTLS
+
+-GNUTLS_VERSION := 3.5.16
+-GNUTLS_URL := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-$(GNUTLS_VERSION).tar.xz
++GNUTLS_VERSION := 3.4.14
++GNUTLS_URL := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-$(GNUTLS_VERSION).tar.xz
+
+ ifdef BUILD_NETWORK
+ ifndef HAVE_DARWIN_OS
+@@ -57,7 +57,6 @@ GNUTLS_CONF := \
+ --disable-doc \
+ --disable-tests \
+ --with-included-libtasn1 \
+- --with-included-unistring \
+ $(HOSTCONF)
+
+ GNUTLS_ENV := $(HOSTVARS)
+--
+2.15.1.windows.2
+
--
2.19.2
From 0765254beae3a1dcb8d1f8649254ab0a4d213260 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Wed, 18 Apr 2018 14:19:56 +0200
Subject: [PATCH 36/37] direct3d11: get the feature level from the external
D3D11 device on winstore builds
---
modules/video_output/win32/direct3d11.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c
index 32d06caa00..d1026fd17c 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -212,6 +212,7 @@ static int OpenCoreW(vout_display_t *vd)
sys->dxgiswapChain = dxgiswapChain;
sys->d3d_dev.d3ddevice = d3ddevice;
sys->d3d_dev.d3dcontext = d3dcontext;
+ sys->d3d_dev.feature_level = ID3D11Device_GetFeatureLevel(sys->d3d_dev.d3ddevice );
IDXGISwapChain_AddRef (sys->dxgiswapChain);
ID3D11Device_AddRef (sys->d3d_dev.d3ddevice);
ID3D11DeviceContext_AddRef(sys->d3d_dev.d3dcontext);
--
2.19.2
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