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

Update patchset

parent f49acc8f
Pipeline #3180 passed with stage
in 30 minutes and 48 seconds
From 0d7c06d4d12751f9ce166740905bb465ac1ff7d1 Mon Sep 17 00:00:00 2001
From 38b4eb3152d24b65f0c2ed1bcc4c76a8478df277 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Tue, 10 Feb 2015 11:58:54 +0100
Subject: [PATCH 01/38] wasapi: Don't fail if the client is already initialized
......@@ -26,5 +26,5 @@ index 9f6d260ccd..fa9eeed116 100644
msg_Err(s, "cannot initialize audio client (error 0x%lx)", hr);
goto error;
--
2.19.1
2.19.2
From 29e659e58681894761143c2211e3c02eaad236d4 Mon Sep 17 00:00:00 2001
From 9725082ad8dbf43f6f7a6b02de0d20941c0e7e33 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/38] gnutls: Set cannot_unload_broken_library for winrt
......@@ -22,5 +22,5 @@ index 1b214358d4..51a8b5c022 100644
add_submodule ()
set_description( N_("GNU TLS server") )
--
2.19.1
2.19.2
From b8b7b4b9f9d79083a3aa3ad25b32c87a9c0cab40 Mon Sep 17 00:00:00 2001
From 4bf69c7342eb175e93d7efa678f15ae74ce3b19a 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/38] Cheat for Windows Store subtitles
......@@ -26,5 +26,5 @@ index acbba3a30f..f4e9e2fba3 100644
free( psz_mrl );
}
--
2.19.1
2.19.2
From aa1f26b375fc3e5623486f2ac1cbe6d886f6f744 Mon Sep 17 00:00:00 2001
From f0d792e30e17d18293107047f831aa767a18025c 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/38] Accept the weird WinRT pathes
......@@ -24,5 +24,5 @@ index 44afaba3fa..8e71855cd7 100644
{ /* Windows UNC paths */
/* \\host\share\path -> file://host/share/path */
--
2.19.1
2.19.2
From f018d49626458eeaf6b438b822aa48f9d1b2ffe2 Mon Sep 17 00:00:00 2001
From 4846ff7467b55535a8e35842c3812b5ef5657f4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Tue, 2 Aug 2016 18:54:28 +0200
Subject: [PATCH 05/38] config: cmdline: Use msg_* instead of fprintf
......@@ -46,5 +46,5 @@ index 535306cc1c..02a88b46d3 100644
}
}
--
2.19.1
2.19.2
From 16e86f74595c539bbe89b1acfe8b343388d0ab65 Mon Sep 17 00:00:00 2001
From 90709ea9d37bb2b7b80a02e559b6ed375decc28d 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/38] plugin cache: Windows doesn't like relative pathes in
......@@ -26,5 +26,5 @@ index 2e67a0d07e..27c5de3924 100644
return;
--
2.19.1
2.19.2
From d906240aa3e54bf707f43979409ee97603ec1c72 Mon Sep 17 00:00:00 2001
From d8e4b65a86fddbd7b6fc4ca89fefa68bf7227ef1 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <slhomme@matroska.org>
Date: Fri, 2 Dec 2016 11:14:40 +0100
Subject: [PATCH 07/38] TEMPORARY: disable cuda/nvenc when building for
......@@ -9,7 +9,7 @@ Subject: [PATCH 07/38] TEMPORARY: disable cuda/nvenc when building for
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index fc68f815a0..92c400d21b 100644
index 2f76ccee15..432996d27a 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -187,7 +187,7 @@ FFMPEGCONF += --enable-w32threads
......@@ -22,5 +22,5 @@ index fc68f815a0..92c400d21b 100644
ifeq ($(ARCH),x86_64)
--
2.19.1
2.19.2
From ccc41eef35ee56fc69c014b6908dca8b2ce6bd78 Mon Sep 17 00:00:00 2001
From 114373bf4c2534f12b276836f437fd678c356b40 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/38] core: avcodec requires 32-bytes memory alignment in
......@@ -29,5 +29,5 @@ index 9a08255e16..c07cdbca56 100644
{
p_pic->i_planes = 0;
--
2.19.1
2.19.2
From 26a2dc3b5b81b0d9fa494f9ec94c64567fcb2c0f Mon Sep 17 00:00:00 2001
From a1247ad1c2d09357fc8fce7df38a9b0455cb3710 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/38] contrib: ffmpeg: use bcrypt instead of the old wincrypt
......@@ -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 92c400d21b..9513d63aaf 100644
index 432996d27a..d21254a2ff 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -241,6 +241,7 @@ endif
@@ -246,6 +246,7 @@ endif
ifdef USE_LIBAV
$(APPLY) $(SRC)/ffmpeg/libav_gsm.patch
endif
......@@ -89,5 +89,5 @@ index 92c400d21b..9513d63aaf 100644
.ffmpeg: ffmpeg
--
2.19.1
2.19.2
From dcfb759a124ca9c06e847895bc516b832045e481 Mon Sep 17 00:00:00 2001
From c131a89fbf0119ac905d6cc8b19eb0f7618357a6 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/38] contrib:avcodec: use a more recent FFmpeg version
......@@ -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 9513d63aaf..667648409f 100644
index d21254a2ff..5f263cf52f 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -5,7 +5,7 @@
......@@ -22,5 +22,5 @@ index 9513d63aaf..667648409f 100644
FFMPEG_GITURL := http://git.videolan.org/git/ffmpeg.git
FFMPEG_LAVC_MIN := 57.37.100
--
2.19.1
2.19.2
From b32392292442290d1928d12a62c7b693a5608bfb Mon Sep 17 00:00:00 2001
From d2e93e70c11ea414a2cc8a952606a5040e00192b 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/38] contrib:mpg123: don't use forbidden APIs on Phone apps
......@@ -39,5 +39,5 @@ index e8f14f6abb..ef0db03a88 100644
$(MOVE)
--
2.19.1
2.19.2
From 1083f0b1288994c6d4d2c7d1a12224197fbe35c0 Mon Sep 17 00:00:00 2001
From 011fa7dd95a40aecfb69ad38c8d84399404588be 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/38] contrib: use live555 version that is compatible with
......@@ -46,5 +46,5 @@ index e4ed5afb07..f99b7968a4 100644
echo "PREFIX = $(PREFIX)" >> $$subdir/Makefile.head && \
echo "LIBDIR = $(PREFIX)/lib" >> $$subdir/Makefile.head ; done
--
2.19.1
2.19.2
From 1deb44bb6be1214a6b71667a7b92dd7629ee4073 Mon Sep 17 00:00:00 2001
From 4562573ce650d9dc76a7f62eac9749eff2b0b6c4 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/38] rand: use bcrypt instead of CryptographicBufferStatics
......@@ -102,5 +102,5 @@ index 1aeb656a8a..723a32b26e 100644
/* acquire default encryption context */
if( CryptAcquireContext(
--
2.19.1
2.19.2
From d5a7f08659e984c58aca22684f6f596f443837b0 Mon Sep 17 00:00:00 2001
From a6c3758ba94e1b448f0446c604c648b4f603e2d5 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/38] keystore: CryptUnprotectData is officially found in
......@@ -23,5 +23,5 @@ index 9a7b3876a6..ebbdcfc99f 100644
typedef BOOL (WINAPI *ProcessFunc)(DATA_BLOB*, LPCWSTR, DATA_BLOB*, PVOID,
CRYPTPROTECT_PROMPTSTRUCT*, DWORD, DATA_BLOB*);
--
2.19.1
2.19.2
From 1709ea70c79853fb6802cf78a225cd7cfd4e51bb Mon Sep 17 00:00:00 2001
From ab7100aab14f7e35bfc64a8af6cf6d61d1010432 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/38] contrib: gnutls: fix Winstore forbidden API calls
......@@ -462,5 +462,5 @@ index 0000000000..d59863d000
+ hCertStore,
+ PCCRL_CONTEXT
--
2.19.1
2.19.2
From 5c443e28373d1921ad66d0d017eb637e4eb14230 Mon Sep 17 00:00:00 2001
From 6967a6ae256bcdd3d2aefc7f778bdbbee99716e1 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/38] sap: use the same declaration signature as the
......@@ -22,5 +22,5 @@ index ee5312eb7d..2b5b0e13a2 100644
static sap_address_t *AddressCreate (vlc_object_t *obj, const char *group)
{
--
2.19.1
2.19.2
From a42147ec973921e8c597747bb4db3ccfbc62f650 Mon Sep 17 00:00:00 2001
From 815b7cc2faaeae8cc69f984ebcc8d80ec0a8c8c7 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/38] contrib: shout: respect the availability of strings.h
everywhere
---
contrib/src/shout/rules.mak | 2 ++
contrib/src/shout/rules.mak | 1 +
contrib/src/shout/shout-strings.patch | 36 +++++++++++++++++++++++++++
2 files changed, 38 insertions(+)
2 files changed, 37 insertions(+)
create mode 100644 contrib/src/shout/shout-strings.patch
diff --git a/contrib/src/shout/rules.mak b/contrib/src/shout/rules.mak
index fedff47b56..c4a1c15fab 100644
index 07f577dce1..c4a1c15fab 100644
--- a/contrib/src/shout/rules.mak
+++ b/contrib/src/shout/rules.mak
@@ -24,6 +24,8 @@ libshout: libshout-$(SHOUT_VERSION).tar.gz .sum-shout
@@ -24,6 +24,7 @@ libshout: libshout-$(SHOUT_VERSION).tar.gz .sum-shout
$(APPLY) $(SRC)/shout/libshout-arpa.patch
$(APPLY) $(SRC)/shout/fix-xiph_openssl.patch
$(APPLY) $(SRC)/shout/no-examples.patch
+ $(APPLY) $(SRC)/shout/shout-strings.patch
+ $(call pkg_static,"shout.pc.in")
$(call pkg_static,"shout.pc.in")
$(UPDATE_AUTOCONFIG)
$(MOVE)
diff --git a/contrib/src/shout/shout-strings.patch b/contrib/src/shout/shout-strings.patch
new file mode 100644
index 0000000000..438a364899
......@@ -66,5 +65,5 @@ index 0000000000..438a364899
+
+ #include <shout/shout.h>
--
2.19.1
2.19.2
From b77231d241e26637e448ec690ca6bdc2c01d8daa Mon Sep 17 00:00:00 2001
From db8c8193756ad2552df54db409a784c3d9345f26 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 29 Mar 2018 15:03:37 +0200
Subject: [PATCH 18/38] contrib: shout: usleep() is not a Windows API
......@@ -42,5 +42,5 @@ index 0000000000..f29926ef1d
+ }
+
--
2.19.1
2.19.2
From 77a50e469e3deaa3a2688331f5ad3fb8a45dd8ee Mon Sep 17 00:00:00 2001
From 92a621ebcf3c1b2514b609c5a0b696d7291d52d0 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 29 Mar 2018 15:06:53 +0200
Subject: [PATCH 19/38] contrib: shout: timeval is defined in winsock2.h on
......@@ -39,5 +39,5 @@ index 0000000000..6d05058446
+ #ifdef TIME_WITH_SYS_TIME
+ # include <sys/time.h>
--
2.19.1
2.19.2
From 4e13ca7990fc3e8a02cc161758d8bfa79ec03cdf Mon Sep 17 00:00:00 2001
From 00dad89925c60a57165b0894c12064566e2a81a8 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 29 Mar 2018 15:13:55 +0200
Subject: [PATCH 20/38] contrib: shout: socklen_t can be found in ws2tcpip.h on
......@@ -42,5 +42,5 @@ index 0000000000..57821bff90
+
+ #include "sock.h"
--
2.19.1
2.19.2
From 9e6afceace5934fcd54cdf216975e86f9ac8d386 Mon Sep 17 00:00:00 2001
From 14bb5cce4d3aae8600b64b869174921c7d347d6c Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 29 Mar 2018 15:46:50 +0200
Subject: [PATCH 21/38] contrib: ffmpeg: don't use libvpx at all in libavcodec
......@@ -9,7 +9,7 @@ We have our own decoder/encoder
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 667648409f..ea288c7284 100644
index 5f263cf52f..b19a43ad59 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -35,6 +35,7 @@ FFMPEGCONF = \
......@@ -35,5 +35,5 @@ index 667648409f..ea288c7284 100644
FFMPEGCONF += --disable-encoders --disable-muxers
endif
--
2.19.1
2.19.2
From 26d0395a323b29bbf1f0c2ef6c82407fc48ce99a Mon Sep 17 00:00:00 2001
From 483653fd7f5a02a4d4d155ac60b6de709dcb3b03 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 5 Apr 2018 13:29:40 +0200
Subject: [PATCH 22/38] contrib: gcrypt: use bcrypt rather than wincrypt
......@@ -316,5 +316,5 @@ index fdceb26fea..6c02a407ce 100644
addedFixedItems = 1;
}
--
2.19.1
2.19.2
From bf81fd0f7d6ae952976547840073c7bcf9ee9a5d Mon Sep 17 00:00:00 2001
From 81bd30ad82d17786f67c3030de352c3324e71015 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 5 Apr 2018 14:49:26 +0200
Subject: [PATCH 23/38] contrib: libarchive: use bcrypt rather than wincrypt
......@@ -90,5 +90,5 @@ index aced4db253..befacd4279 100644
endif
$(APPLY) $(SRC)/libarchive/fix-types.patch
--
2.19.1
2.19.2
From 4f956ba28a5c0ddc0d47647f87b5d275d487b5c0 Mon Sep 17 00:00:00 2001
From 2fa9dbf9a2e322e86887368483eb84968c546df2 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Wed, 4 Apr 2018 12:10:17 +0200
Subject: [PATCH 24/38] transcode: do not include the decoder padding in the
......@@ -26,5 +26,5 @@ index b6fabead48..7849e379b2 100644
}
else
--
2.19.1
2.19.2
From 4080a898c2d19cb587dec0d001153dca23bedfb1 Mon Sep 17 00:00:00 2001
From d987dff8bee5ae574435fc04b463e0a131618a69 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@videolabs.io>
Date: Thu, 14 Dec 2017 14:20:25 +0100
Subject: [PATCH 25/38] transcode: the visible dimensions are unlikely to be 0
......@@ -24,5 +24,5 @@ index 7849e379b2..c0a0b26275 100644
--
2.19.1
2.19.2
From 77177dcbd99487abb0f002d769e959af818b9ac6 Mon Sep 17 00:00:00 2001
From 5bf73a3cf67b5d8644b0e5ffcffd10118cf1566e Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@videolabs.io>
Date: Mon, 4 Sep 2017 13:59:25 +0200
Subject: [PATCH 26/38] codec: add a set of functions to use a plain FIFO
......@@ -141,5 +141,5 @@ index 0000000000..49a99b454f
+
+#endif /* VLC_FIFO_HELPER_H */
--
2.19.1
2.19.2
From 924a83e43dd7e80eb6fc8259b473e7121856843d Mon Sep 17 00:00:00 2001
From b05e835839da57d7f49db328ebe4d652602f79b3 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@videolabs.io>
Date: Thu, 31 Aug 2017 18:02:31 +0200
Subject: [PATCH 27/38] qsv: CUMULATIVE PATCH to encode from CPU planes
......@@ -738,5 +738,5 @@ index 93752e792e..0f865dd4ab 100644
return block;
}
--
2.19.1
2.19.2
From 6058a06875053c9f4512c48abd62dda5e2db7b0b Mon Sep 17 00:00:00 2001
From 98bf7149be8f43bf97bdbc5bd4a22863ab3a3b06 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 5 Apr 2018 09:49:44 +0200
Subject: [PATCH 28/38] chromecast: try to encode with QSV if possible
......@@ -67,5 +67,5 @@ index 53227c258b..2210d1d46c 100644
{ .fcc = VLC_CODEC_VP8, .get_opt = GetVencVPXOption },
{ .fcc = VLC_CODEC_H264, .get_opt = NULL },
--
2.19.1
2.19.2
From 6ff33bedd7a31b74f5aed97bfdda9552a79e5835 Mon Sep 17 00:00:00 2001
From 69e691dda343954170de692ce98dc64e41ce351e Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Sun, 8 Apr 2018 15:29:38 +0200
Subject: [PATCH 29/38] contrib: libarchive: fix building with bcrypt.h on UNIX
......@@ -41,5 +41,5 @@ index befacd4279..91515920f1 100644
$(APPLY) $(SRC)/libarchive/no-windows-files.patch
$(APPLY) $(SRC)/libarchive/libarchive-win32-bcrypt.patch
--
2.19.1
2.19.2
From 3f3e35e0cef6022c25d003a920eeafea23fee7d8 Mon Sep 17 00:00:00 2001
From ac96166b98b88e85f8e2ab3e420ea62449c433fd Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Mon, 9 Apr 2018 09:59:27 +0200
Subject: [PATCH 30/38] contrib: libarchive: Fix winrt build
......@@ -60,5 +60,5 @@ index 50258dfe91..6dbc3c86d2 100644
+ DebugBreak();
+ #endif
--
2.19.1
2.19.2
From 0a75cbe32afce5a568c30433b9d2d50a515c0fbc Mon Sep 17 00:00:00 2001
From f62f3869dc970f3d79728a21f875c406b44c7c0c 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 31/38] contribs: Fix ffmpeg build with gcrypt.h
......@@ -28,5 +28,5 @@ index 456557716d..ff5ad0f9a4 100644
+ #elif HAVE_WINCRYPT
+ #include <windows.h>
--
2.19.1
2.19.2
From d43f311d6d1e45aa2650ae5c1e79125474dd6823 Mon Sep 17 00:00:00 2001
From 9977bcac6d6f6713fecc8e4ec502d345c863991c 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 32/38] contribs: Fix gnutls UWP build with mingw-w64
......@@ -36,5 +36,5 @@ index d59863d000..68e4b3c609 100644
+
+ #include <winapifamily.h>
--
2.19.1
2.19.2
From 635130b149aaa8e4233ee3d6122c208b479b467d Mon Sep 17 00:00:00 2001
From e21ec7974be559f6cb929c12a26837541a35450a Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Mon, 9 Apr 2018 18:46:34 +0200
Subject: [PATCH 33/38] win32: fix crash on closesocket() when a poll() is
......@@ -30,5 +30,5 @@ index 8d56cc859a..bb1ad12985 100644
}
--
2.19.1
2.19.2
From 02558b57d16eb1730342c92c2be79787fa4b7970 Mon Sep 17 00:00:00 2001
From eec294e7548861243bc2b081ce4cc6a740faf26c 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 34/38] contrib: ffmpeg: Don't check for wincrypt anymore
......@@ -43,10 +43,10 @@ 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 ea288c7284..c61b0d6969 100644
index b19a43ad59..c939b4f244 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -240,6 +240,8 @@ ifdef USE_LIBAV
@@ -245,6 +245,8 @@ ifdef USE_LIBAV
$(APPLY) $(SRC)/ffmpeg/libav_gsm.patch
endif
$(APPLY) $(SRC)/ffmpeg/ffmpeg-win32-bcrypt.patch
......@@ -56,5 +56,5 @@ index ea288c7284..c61b0d6969 100644
.ffmpeg: ffmpeg
--
2.19.1
2.19.2
From ca27fc0ffe649cf83cca139bd1cbe6be61022946 Mon Sep 17 00:00:00 2001
From 23a2d4e854324f6933154d369010c607e051fc20 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 35/38] contrib: gnutls: Use winstorecompat overload when
......@@ -35,5 +35,5 @@ index 68e4b3c609..6d7210b154 100644
+
+ #include "gnutls_int.h"
--
2.19.1
2.19.2
From 3316248b96d6fd9980daa260c533dca60e23e226 Mon Sep 17 00:00:00 2001
From d8266b9b752ef36403309c34cb91662a1ef71b0a 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 36/38] contrib: mpg123: Simplify unicode checks
......@@ -62,5 +62,5 @@ index 416faeaba9..3171e1c5fc 100644
+ fi
+ else
--
2.19.1
2.19.2
From e52a2a08384c525627b67e4bfefe5ff16c15de14 Mon Sep 17 00:00:00 2001
From 26e661304b769b1d193c208ae129dc9773e73d22 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Wed, 18 Apr 2018 14:19:56 +0200
Subject: [PATCH 37/38] direct3d11: get the feature level from the external
......@@ -9,10 +9,10 @@ Subject: [PATCH 37/38] direct3d11: get the feature level from the external
1 file changed, 1 insertion(+)
diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c
index 4b29daab41..3f401ed1a4 100644
index 32d06caa00..d1026fd17c 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -210,6 +210,7 @@ static int OpenCoreW(vout_display_t *vd)
@@ -212,6 +212,7 @@ static int OpenCoreW(vout_display_t *vd)
sys->dxgiswapChain = dxgiswapChain;
sys->d3d_dev.d3ddevice = d3ddevice;
sys->d3d_dev.d3dcontext = d3dcontext;
......@@ -21,5 +21,5 @@ index 4b29daab41..3f401ed1a4 100644
ID3D11Device_AddRef (sys->d3d_dev.d3ddevice);
ID3D11DeviceContext_AddRef(sys->d3d_dev.d3dcontext);
--
2.19.1
2.19.2
From c970419f597106898aa8d31f91d1202b4dff6cf2 Mon Sep 17 00:00:00 2001
From 6f41c26a95160f3acfcbfb09473ab16a99e0331d Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 24 May 2018 15:17:02 +0200
Subject: [PATCH 38/38] contrib: harfbuzz: don't build tests on winstore builds
......@@ -47,5 +47,5 @@ index c8695afdae..446a926566 100644
DEPS_harfbuzz = freetype2 $(DEPS_freetype2)
--
2.19.1
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