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

Update patchset

parent 6d62a0c2
Pipeline #6748 passed with stage
in 33 minutes and 48 seconds
From 59d8085f8f7a6165b9a1702562fc0a018dcbd2c1 Mon Sep 17 00:00:00 2001
From 5ea34e2b4a1f9fb2f42bbf987c57b6f28f503fbc 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 01/30] gnutls: Set cannot_unload_broken_library for winrt
Subject: [PATCH 01/28] gnutls: Set cannot_unload_broken_library for winrt
---
modules/misc/gnutls.c | 3 +++
......@@ -22,5 +22,5 @@ index 1b214358d4..51a8b5c022 100644
add_submodule ()
set_description( N_("GNU TLS server") )
--
2.19.2
2.20.1
From 19d110303ce2492b8fe1a61da7039e8d3dcfc176 Mon Sep 17 00:00:00 2001
From b069e8f439caf81b7256c876cb5f5598dc2ea9d7 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 02/30] Cheat for Windows Store subtitles
Subject: [PATCH 02/28] Cheat for Windows Store subtitles
---
lib/video.c | 5 +++++
......@@ -26,5 +26,5 @@ index acbba3a30f..f4e9e2fba3 100644
free( psz_mrl );
}
--
2.19.2
2.20.1
From 60a4088c2b68736c18bfe1a156b2c95e75c72f1b Mon Sep 17 00:00:00 2001
From e8b8373667fa6a010434e5f3b2c318b83a1df35e 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 03/30] Accept the weird WinRT pathes
Subject: [PATCH 03/28] Accept the weird WinRT pathes
---
src/text/url.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/text/url.c b/src/text/url.c
index 44afaba3fa..8e71855cd7 100644
index 83bba30e09..e3c257f9e3 100644
--- a/src/text/url.c
+++ b/src/text/url.c
@@ -176,6 +176,11 @@ char *vlc_path2uri (const char *path, const char *scheme)
......@@ -24,5 +24,5 @@ index 44afaba3fa..8e71855cd7 100644
{ /* Windows UNC paths */
/* \\host\share\path -> file://host/share/path */
--
2.19.2
2.20.1
From 2a0698914e4e973187e2837a094968af75d12ef1 Mon Sep 17 00:00:00 2001
From 4a363ae9ff6c9f88e8ffa02d93d55d959496a77d Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@videolabs.io>
Date: Fri, 30 Sep 2016 09:49:19 +0200
Subject: [PATCH 04/30] plugin cache: Windows doesn't like relative pathes in
Subject: [PATCH 04/28] plugin cache: Windows doesn't like relative pathes in
LoadLibraryEx()
Fixes "vlc-cache-gen ../modules" on Windows and general VLC_PLUGIN_PATH usage.
......@@ -26,5 +26,5 @@ index 2e67a0d07e..27c5de3924 100644
return;
--
2.19.2
2.20.1
From e52c265e8fb34198cf94f796a712354ce3f1bf62 Mon Sep 17 00:00:00 2001
From 9b98d9f56eefaa0185ef3ebfb93abf7bccd78270 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 29 Mar 2018 15:46:11 +0200
Subject: [PATCH 06/30] contrib: ffmpeg: use bcrypt instead of the old wincrypt
Subject: [PATCH 05/28] contrib: ffmpeg: use bcrypt instead of the old wincrypt
API
When targeting Windows Vista and above
......@@ -77,7 +77,7 @@ 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 0980142a16..0f4d19cc66 100644
index 74ea2a5be6..ea8eba7b22 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -244,6 +244,7 @@ endif
......@@ -89,5 +89,5 @@ index 0980142a16..0f4d19cc66 100644
.ffmpeg: ffmpeg
--
2.19.2
2.20.1
From f49b1674f8d63760dfbec581be628e79ee89e9b1 Mon Sep 17 00:00:00 2001
From 2c7607156700ee961b9dbbda57ba723419bb6d4b Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@videolabs.io>
Date: Tue, 19 Dec 2017 12:39:06 +0100
Subject: [PATCH 07/30] contrib:avcodec: use a more recent FFmpeg version
Subject: [PATCH 06/28] 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 0f4d19cc66..68746815b5 100644
index ea8eba7b22..2c0f4267a9 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -5,7 +5,7 @@
......@@ -22,5 +22,5 @@ index 0f4d19cc66..68746815b5 100644
FFMPEG_GITURL := http://git.videolan.org/git/ffmpeg.git
FFMPEG_LAVC_MIN := 57.37.100
--
2.19.2
2.20.1
From 95668ec3494334ff6f85df69d16fe432a8447669 Mon Sep 17 00:00:00 2001
From 931a0d25b041aad919e3eefb2b12a2d95a9d3e45 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Tue, 20 Feb 2018 11:24:43 +0100
Subject: [PATCH 08/30] contrib:mpg123: don't use forbidden APIs on Phone apps
Subject: [PATCH 07/28] contrib:mpg123: don't use forbidden APIs on Phone apps
---
contrib/src/mpg123/mpg123-winstore.patch | 11 +++++++++++
......@@ -39,5 +39,5 @@ index e8f14f6abb..ef0db03a88 100644
$(MOVE)
--
2.19.2
2.20.1
From 99ec044ecf6996e04aad6048278ce9e8276a197f Mon Sep 17 00:00:00 2001
From 38c58e92956d30b088cedd04f30d771adb59d344 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 09/30] contrib: use live555 version that is compatible with
Subject: [PATCH 08/28] contrib: use live555 version that is compatible with
LGPL2
---
......@@ -18,7 +18,7 @@ index f459fb9d16..02b2a69734 100644
+10846fd6d5482bbea131ae805137077997e9dec242665e3c01d699d5584154c65049e8c520ea855599e554154a148e61fea77b592d97c814a4a98c773658d8f5 live.2016.10.21.tar.gz
\ No newline at end of file
diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index e4ed5afb07..f99b7968a4 100644
index bb1d5655c7..41fc1c6179 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -1,14 +1,12 @@
......@@ -46,5 +46,5 @@ index e4ed5afb07..f99b7968a4 100644
echo "PREFIX = $(PREFIX)" >> $$subdir/Makefile.head && \
echo "LIBDIR = $(PREFIX)/lib" >> $$subdir/Makefile.head ; done
--
2.19.2
2.20.1
From 88252da2b950cdcdc4f532f9086e9524a3066fb0 Mon Sep 17 00:00:00 2001
From e50b151d6e1e86361489afaf6b5b8554672150a6 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Tue, 27 Mar 2018 18:57:41 +0200
Subject: [PATCH 10/30] rand: use bcrypt instead of CryptographicBufferStatics
Subject: [PATCH 09/28] rand: use bcrypt instead of CryptographicBufferStatics
for Winstore builds
It's available to winstore apps and on desktop since Vista.
......@@ -12,7 +12,7 @@ The old API is deprecated.
2 files changed, 15 insertions(+), 40 deletions(-)
diff --git a/configure.ac b/configure.ac
index a6ff64595e..c3fab3a304 100644
index 49b1166742..198496cf5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1138,7 +1138,10 @@ AH_BOTTOM([
......@@ -102,5 +102,5 @@ index 1aeb656a8a..723a32b26e 100644
/* acquire default encryption context */
if( CryptAcquireContext(
--
2.19.2
2.20.1
From d083e31b634fa83807c55404108ab64f993451c8 Mon Sep 17 00:00:00 2001
From 20d6c0fee9af110ae4930066560ad521f3cc1959 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@videolabs.io>
Date: Mon, 23 May 2016 09:18:17 +0200
Subject: [PATCH 11/30] contrib: gnutls: fix Winstore forbidden API calls
Subject: [PATCH 10/28] contrib: gnutls: fix Winstore forbidden API calls
---
contrib/src/gnutls/rules.mak | 3 +
......@@ -10,13 +10,13 @@ Subject: [PATCH 11/30] contrib: gnutls: fix Winstore forbidden API calls
create mode 100644 contrib/src/gnutls/winstore.patch
diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index 546561fe6a..a721840cd2 100644
index 98bfd33acf..4281419a05 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -37,6 +37,9 @@ ifdef HAVE_MACOSX
$(APPLY) $(SRC)/gnutls/gnutls-disable-connectx-macos.patch
@@ -38,6 +38,9 @@ ifdef HAVE_MACOSX
endif
$(APPLY) $(SRC)/gnutls/gnutls-libidn.patch
$(APPLY) $(SRC)/gnutls/vasnprintf-android-no-percent-n.patch
+ifdef HAVE_WINSTORE
+ $(APPLY) $(SRC)/gnutls/winstore.patch
+endif
......@@ -462,5 +462,5 @@ index 0000000000..d59863d000
+ hCertStore,
+ PCCRL_CONTEXT
--
2.19.2
2.20.1
From ffbda2a074e63714dcbf095296bb1ccc172d15a8 Mon Sep 17 00:00:00 2001
From 950e6a10098938d3df64222ae90aa73d7a0540a4 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 29 Mar 2018 15:00:53 +0200
Subject: [PATCH 12/30] contrib: shout: respect the availability of strings.h
Subject: [PATCH 11/28] contrib: shout: respect the availability of strings.h
everywhere
---
......@@ -65,5 +65,5 @@ index 0000000000..438a364899
+
+ #include <shout/shout.h>
--
2.19.2
2.20.1
From cd4613d5b0bca33d46398b00b078c5cdca5f48cf Mon Sep 17 00:00:00 2001
From 4e604f5289e361c3fc8208157afc14bb2231dc50 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 29 Mar 2018 15:06:53 +0200
Subject: [PATCH 13/30] contrib: shout: timeval is defined in winsock2.h on
Subject: [PATCH 12/28] contrib: shout: timeval is defined in winsock2.h on
Windows
---
......@@ -39,5 +39,5 @@ index 0000000000..6d05058446
+ #ifdef TIME_WITH_SYS_TIME
+ # include <sys/time.h>
--
2.19.2
2.20.1
From 42ecf6325f87bbb012980c56e01aeae6d9b73c07 Mon Sep 17 00:00:00 2001
From 4926a3e12c40f29d0af2d98ecc60d524cdf72913 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 29 Mar 2018 15:13:55 +0200
Subject: [PATCH 14/30] contrib: shout: socklen_t can be found in ws2tcpip.h on
Subject: [PATCH 13/28] contrib: shout: socklen_t can be found in ws2tcpip.h on
Windows
and make sure it's found on Windows Store builds as well
......@@ -42,5 +42,5 @@ index 0000000000..57821bff90
+
+ #include "sock.h"
--
2.19.2
2.20.1
From 2d5ef3b44faed9b2e1f6214d0f4de97e07e30324 Mon Sep 17 00:00:00 2001
From 9634a7409dbb1c372c48a46f22b9f4d5245ce8d1 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 5 Apr 2018 13:29:40 +0200
Subject: [PATCH 15/30] contrib: gcrypt: use bcrypt rather than wincrypt
Subject: [PATCH 14/28] contrib: gcrypt: use bcrypt rather than wincrypt
---
contrib/src/gcrypt/winrt.patch | 177 +++++++++++++++++++++++----------
......@@ -316,5 +316,5 @@ index fdceb26fea..6c02a407ce 100644
addedFixedItems = 1;
}
--
2.19.2
2.20.1
From 463ea284f1991e0a8d3401d88cf5ab472e7d101f Mon Sep 17 00:00:00 2001
From f2c6d7f571293ff26f91de1abf325c4afc7309cb Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 5 Apr 2018 14:49:26 +0200
Subject: [PATCH 16/30] contrib: libarchive: use bcrypt rather than wincrypt
Subject: [PATCH 15/28] contrib: libarchive: use bcrypt rather than wincrypt
---
.../libarchive/libarchive-win32-bcrypt.patch | 62 +++++++++++++++++++
......@@ -90,5 +90,5 @@ index aced4db253..befacd4279 100644
endif
$(APPLY) $(SRC)/libarchive/fix-types.patch
--
2.19.2
2.20.1
From 2f486f6457962920d215424365f7cd8d52c75039 Mon Sep 17 00:00:00 2001
From c99a4971ba56773980ea8c953db71555d3ca171e Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Wed, 4 Apr 2018 12:10:17 +0200
Subject: [PATCH 17/30] transcode: do not include the decoder padding in the
Subject: [PATCH 16/28] transcode: do not include the decoder padding in the
output SAR
---
......@@ -26,5 +26,5 @@ index b6fabead48..7849e379b2 100644
}
else
--
2.19.2
2.20.1
From 6699aefc010c00e1c342d5ad46edcb9f1313f1ad Mon Sep 17 00:00:00 2001
From 53c178c84d6db54ebcb4a606e1e6642f5900f9ef Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@videolabs.io>
Date: Thu, 14 Dec 2017 14:20:25 +0100
Subject: [PATCH 18/30] transcode: the visible dimensions are unlikely to be 0
Subject: [PATCH 17/28] transcode: the visible dimensions are unlikely to be 0
---
modules/stream_out/transcode/video.c | 4 ++--
......@@ -24,5 +24,5 @@ index 7849e379b2..c0a0b26275 100644
--
2.19.2
2.20.1
From 09d2b5284a068b7df0992c1b69d0f30cb379e02d Mon Sep 17 00:00:00 2001
From a8f40a0ae2c06e29fa54271f03056e79cc1d1c51 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@videolabs.io>
Date: Mon, 4 Sep 2017 13:59:25 +0200
Subject: [PATCH 19/30] codec: add a set of functions to use a plain FIFO
Subject: [PATCH 18/28] codec: add a set of functions to use a plain FIFO
It's similar to the block FIFO but with no locking.
---
......@@ -141,5 +141,5 @@ index 0000000000..49a99b454f
+
+#endif /* VLC_FIFO_HELPER_H */
--
2.19.2
2.20.1
From d35c393558901cd43305c91b2c9710795e816cbf Mon Sep 17 00:00:00 2001
From ac33e27f79c5c3f68404a46b7b893a43baee8ce1 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@videolabs.io>
Date: Thu, 31 Aug 2017 18:02:31 +0200
Subject: [PATCH 20/30] qsv: CUMULATIVE PATCH to encode from CPU planes
Subject: [PATCH 19/28] qsv: CUMULATIVE PATCH to encode from CPU planes
properly
---
......@@ -10,10 +10,10 @@ Subject: [PATCH 20/30] qsv: CUMULATIVE PATCH to encode from CPU planes
2 files changed, 294 insertions(+), 163 deletions(-)
diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
index 9bbc5f2877..2d2dbe2b64 100644
index 3dadf11191..2915784e0b 100644
--- a/modules/codec/Makefile.am
+++ b/modules/codec/Makefile.am
@@ -598,7 +598,7 @@ libcrystalhd_plugin_la_LIBADD = $(LIBS_crystalhd)
@@ -606,7 +606,7 @@ libcrystalhd_plugin_la_LIBADD = $(LIBS_crystalhd)
EXTRA_LTLIBRARIES += libcrystalhd_plugin.la
codec_LTLIBRARIES += $(LTLIBcrystalhd)
......@@ -738,5 +738,5 @@ index 93752e792e..0f865dd4ab 100644
return block;
}
--
2.19.2
2.20.1
From 5e672b221673f79330fc87b529ec442c1762f392 Mon Sep 17 00:00:00 2001
From 3e6f963401f1a8afb59205a4d0594465f6256370 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 5 Apr 2018 09:49:44 +0200
Subject: [PATCH 21/30] chromecast: try to encode with QSV if possible
Subject: [PATCH 20/28] chromecast: try to encode with QSV if possible
It will be handled by the GPU so use less resource.
---
......@@ -9,10 +9,10 @@ It will be handled by the GPU so use less resource.
1 file changed, 40 insertions(+)
diff --git a/modules/stream_out/chromecast/cast.cpp b/modules/stream_out/chromecast/cast.cpp
index 53227c258b..2210d1d46c 100644
index 5d2aefc139..01250190f2 100644
--- a/modules/stream_out/chromecast/cast.cpp
+++ b/modules/stream_out/chromecast/cast.cpp
@@ -914,6 +914,45 @@ static std::string GetVencVPXOption( sout_stream_t * /* p_stream */,
@@ -910,6 +910,45 @@ static std::string GetVencVPXOption( sout_stream_t * /* p_stream */,
return "venc=vpx{quality-mode=1}";
}
......@@ -58,7 +58,7 @@ index 53227c258b..2210d1d46c 100644
static std::string GetVencX264Option( sout_stream_t * /* p_stream */,
const video_format_t *p_vid,
int i_quality )
@@ -960,6 +999,7 @@ static struct
@@ -956,6 +995,7 @@ static struct
vlc_fourcc_t fcc;
std::string (*get_opt)( sout_stream_t *, const video_format_t *, int);
} venc_opt_list[] = {
......@@ -67,5 +67,5 @@ index 53227c258b..2210d1d46c 100644
{ .fcc = VLC_CODEC_VP8, .get_opt = GetVencVPXOption },
{ .fcc = VLC_CODEC_H264, .get_opt = NULL },
--
2.19.2
2.20.1
From 6ef6b1e4289d29d8b3584182f1c94e40320a8598 Mon Sep 17 00:00:00 2001
From 65a920677b6bd6f93e3c41d10aac371fd004897c Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Sun, 8 Apr 2018 15:29:38 +0200
Subject: [PATCH 22/30] contrib: libarchive: fix building with bcrypt.h on UNIX
Subject: [PATCH 21/28] contrib: libarchive: fix building with bcrypt.h on UNIX
systems
mingw64 provides the header in lowercase
......@@ -41,5 +41,5 @@ index befacd4279..91515920f1 100644
$(APPLY) $(SRC)/libarchive/no-windows-files.patch
$(APPLY) $(SRC)/libarchive/libarchive-win32-bcrypt.patch
--
2.19.2
2.20.1
From 0ac8913a21380d344e90e52772f58fe6e8ec3660 Mon Sep 17 00:00:00 2001
From f954560b46a373f67ecc3d4af44a85ad9022c03f Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Mon, 9 Apr 2018 09:59:27 +0200
Subject: [PATCH 23/30] contrib: libarchive: Fix winrt build
Subject: [PATCH 22/28] contrib: libarchive: Fix winrt build
don't force compilation for Windows XP
don't call DebugBreak() (in debug builds)
......@@ -60,5 +60,5 @@ index 50258dfe91..6dbc3c86d2 100644
+ DebugBreak();
+ #endif
--
2.19.2
2.20.1
From a90ff3439553ed62058e8fff415758f87b81ff58 Mon Sep 17 00:00:00 2001
From a48ea0af978822859cc5eda9d0601bcb12d13de9 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 24/30] contribs: Fix ffmpeg build with gcrypt.h
Subject: [PATCH 23/28] contribs: Fix ffmpeg build with gcrypt.h
---
contrib/src/ffmpeg/ffmpeg-win32-bcrypt.patch | 12 ++++++++++++
......@@ -28,5 +28,5 @@ index 456557716d..ff5ad0f9a4 100644
+ #elif HAVE_WINCRYPT
+ #include <windows.h>
--
2.19.2
2.20.1
From e12882272bda334ba77be242dd721835253cab4b Mon Sep 17 00:00:00 2001
From 895bd903c7cb2168912c4cc947e206528fa7ee54 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 25/30] contribs: Fix gnutls UWP build with mingw-w64
Subject: [PATCH 24/28] contribs: Fix gnutls UWP build with mingw-w64
---
contrib/src/gnutls/winstore.patch | 20 ++++++++++++++++++++
......@@ -36,5 +36,5 @@ index d59863d000..68e4b3c609 100644
+
+ #include <winapifamily.h>
--
2.19.2
2.20.1
From bbe4d49917ea47f5c66c232ea7a6da13dd6b24a9 Mon Sep 17 00:00:00 2001
From 6d4ca8695fadc1c44481dbb8f323951f94a95bdc Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Mon, 9 Apr 2018 18:46:34 +0200
Subject: [PATCH 26/30] win32: fix crash on closesocket() when a poll() is
Subject: [PATCH 25/28] win32: fix crash on closesocket() when a poll() is
pending
Only for winstore builds for now
......@@ -30,5 +30,5 @@ index 8d56cc859a..bb1ad12985 100644
}
--
2.19.2
2.20.1
From 544ff2a5e7069a0475b7c3606d538a5798ff3eef Mon Sep 17 00:00:00 2001
From fb5cc4b503441750f223dea2fe8fe84575fdbe91 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 27/30] contrib: ffmpeg: Don't check for wincrypt anymore
Subject: [PATCH 26/28] 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 68746815b5..5c44f183ad 100644
index 2c0f4267a9..c68a068102 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -245,6 +245,8 @@ ifdef USE_LIBAV
......@@ -56,5 +56,5 @@ index 68746815b5..5c44f183ad 100644
.ffmpeg: ffmpeg
--
2.19.2
2.20.1
From fbf753341b927aa0b172acd2920dbf75dd0fd688 Mon Sep 17 00:00:00 2001
From 71f994800d6baaca3f3ab38569d44633fbdede83 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 28/30] contrib: gnutls: Use winstorecompat overload when
Subject: [PATCH 27/28] contrib: gnutls: Use winstorecompat overload when
available
---
......@@ -35,5 +35,5 @@ index 68e4b3c609..6d7210b154 100644
+
+ #include "gnutls_int.h"
--
2.19.2
2.20.1
From aea156501b97cafe723c0b53ddaad2faff77f713 Mon Sep 17 00:00:00 2001
From 9a18354eeac967d24759e2f0136a826c30af435e 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 29/30] contrib: mpg123: Simplify unicode checks
Subject: [PATCH 28/28] contrib: mpg123: Simplify unicode checks
---
contrib/src/mpg123/winstore.patch | 46 +++++++++++++++++++++++++++++++
......@@ -62,5 +62,5 @@ index 416faeaba9..3171e1c5fc 100644
+ fi
+ else
--
2.19.2
2.20.1
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