Commit cff49670 authored by Steve Lhomme's avatar Steve Lhomme

update patchset

with some fixes for sout support
some patches may be pushed in master (and backported to 3.0)
parent e6c4a735
From 7d3504f10814f45ac9f2747cb8ae33b2bf818670 Mon Sep 17 00:00:00 2001
From 6caad9761747a9d3b24a5ac92009a93349352fbe 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/15] wasapi: Don't fail if the client is already initialized
Subject: [PATCH 01/22] wasapi: Don't fail if the client is already initialized
make the extra test only for Winstore builds
---
......
From 6148cbcca157d7f9f4904f34c57dfa81985179c2 Mon Sep 17 00:00:00 2001
From 6a58901922ad8dd94a0c51ecbe9e7fcfe20497cc 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/15] gnutls: Set cannot_unload_broken_library for winrt
Subject: [PATCH 02/22] gnutls: Set cannot_unload_broken_library for winrt
---
modules/misc/gnutls.c | 3 +++
......
From 78d25860ea0615585e83c83fe5ca0c1b07ce1d7b Mon Sep 17 00:00:00 2001
From 9697dcc2acfe4be995d0157d8603e94e3a056f91 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/15] Cheat for Windows Store subtitles
Subject: [PATCH 03/22] Cheat for Windows Store subtitles
---
lib/video.c | 5 +++++
......
From 36a877447e8e5f4a0fce15db2c0ba71edd09d42d Mon Sep 17 00:00:00 2001
From fbb521380f9d63f94273227802db6dc633a061de 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/15] Accept the weird WinRT pathes
Subject: [PATCH 04/22] Accept the weird WinRT pathes
---
src/text/url.c | 5 +++++
......
From 76c0ef13c646b8f9d92eda94ccd69354061f0731 Mon Sep 17 00:00:00 2001
From 23ca62309fd27d228f45a3bf1f6491392ef2f4e1 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/15] config: cmdline: Use msg_* instead of fprintf
Subject: [PATCH 05/22] config: cmdline: Use msg_* instead of fprintf
---
src/config/cmdline.c | 14 +++++++-------
......
From 647f95c7e0d7c54bf47fb7be11077fdfb5cf849d Mon Sep 17 00:00:00 2001
From 199c0f8d20bb7439963826e8a73a9fc4bd18c601 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/15] plugin cache: Windows doesn't like relative pathes in
Subject: [PATCH 06/22] plugin cache: Windows doesn't like relative pathes in
LoadLibraryEx()
Fixes "vlc-cache-gen ../modules" on Windows and general VLC_PLUGIN_PATH usage.
......
From 0dbef29d136465dccd7faea36c9eead1045a5bba Mon Sep 17 00:00:00 2001
From 3f3cae2869882544bf6477175f9c50468edaf0c4 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/15] TEMPORARY: disable cuda/nvenc when building for
Subject: [PATCH 07/22] TEMPORARY: disable cuda/nvenc when building for
Winstore
---
......
From f7a06ddd59f607c9b55a7bf85d7ce78650a011d2 Mon Sep 17 00:00:00 2001
From 4bc96a804813af82da82eb5bfa4694f41e854b9e 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/15] core: avcodec requires 32-bytes memory alignment in
Subject: [PATCH 08/22] 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 bf4df2a56204e108fd486832fd8c34208281da7b 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/22] contrib: ffmpeg: use bcrypt instead of the old wincrypt
API
When targeting Windows Vista and above
---
contrib/src/ffmpeg/ffmpeg-win32-bcrypt.patch | 59 ++++++++++++++++++++++++++++
contrib/src/ffmpeg/rules.mak | 1 +
2 files changed, 60 insertions(+)
create mode 100644 contrib/src/ffmpeg/ffmpeg-win32-bcrypt.patch
diff --git a/contrib/src/ffmpeg/ffmpeg-win32-bcrypt.patch b/contrib/src/ffmpeg/ffmpeg-win32-bcrypt.patch
new file mode 100644
index 0000000..4565577
--- /dev/null
+++ b/contrib/src/ffmpeg/ffmpeg-win32-bcrypt.patch
@@ -0,0 +1,59 @@
+--- ffmpeg/configure.bcrypt 2018-03-29 15:37:15.629068200 +0200
++++ ffmpeg/configure 2018-03-29 15:34:37.695102800 +0200
+@@ -2058,6 +2058,7 @@ SYSTEM_LIBRARIES="
+ vaapi_drm
+ vaapi_x11
+ vdpau_x11
++ bcrypt
+ wincrypt
+ "
+
+@@ -3325,7 +3326,7 @@ avformat_deps="avcodec avutil"
+ avformat_suggest="libm network zlib"
+ avresample_deps="avutil"
+ avresample_suggest="libm"
+-avutil_suggest="clock_gettime cuda libm libdrm libmfx opencl user32 vaapi videotoolbox corefoundation corevideo coremedia wincrypt"
++avutil_suggest="clock_gettime cuda libm libdrm libmfx opencl user32 vaapi videotoolbox corefoundation corevideo coremedia bcrypt wincrypt"
+ postproc_deps="avutil gpl"
+ postproc_suggest="libm"
+ swresample_deps="avutil"
+@@ -5707,6 +5708,7 @@ check_lib ole32 "windows.h"
+ check_lib shell32 "windows.h shellapi.h" CommandLineToArgvW -lshell32
+ check_lib wincrypt "windows.h wincrypt.h" CryptGenRandom -ladvapi32
+ check_lib psapi "windows.h psapi.h" GetProcessMemoryInfo -lpsapi
++check_cpp_condition windows.h "_WIN32_WINNT >= 0x0600" && check_lib bcrypt "windows.h bcrypt.h" BCryptGenRandom -lbcrypt
+
+ enabled appkit && check_apple_framework AppKit
+ enabled audiotoolbox && check_apple_framework AudioToolbox
+--- ffmpeg/libavutil/random_seed.c.bcrypt 2018-03-29 11:47:52.269305500 +0200
++++ ffmpeg/libavutil/random_seed.c 2018-03-29 11:31:40.524546100 +0200
+@@ -26,7 +26,9 @@
+ #if HAVE_IO_H
+ #include <io.h>
+ #endif
+-#if HAVE_WINCRYPT
++#if HAVE_BCRYPT
++#include <bcrypt.h>
++#elif HAVE_WINCRYPT
+ #include <windows.h>
+ #include <wincrypt.h>
+ #endif
+@@ -121,7 +123,17 @@ uint32_t av_get_random_seed(void)
+ {
+ uint32_t seed;
+
+-#if HAVE_WINCRYPT
++#if HAVE_BCRYPT
++ BCRYPT_ALG_HANDLE algo_handle;
++ NTSTATUS ret = BCryptOpenAlgorithmProvider(&algo_handle, BCRYPT_RNG_ALGORITHM,
++ MS_PRIMITIVE_PROVIDER, 0);
++ if (BCRYPT_SUCCESS(ret)) {
++ NTSTATUS ret = BCryptGenRandom(algo_handle, &seed, sizeof(seed), 0);
++ BCryptCloseAlgorithmProvider(algo_handle, 0);
++ if (BCRYPT_SUCCESS(ret))
++ return seed;
++ }
++#elif HAVE_WINCRYPT
+ HCRYPTPROV provider;
+ 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 92c400d..9513d63 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -241,6 +241,7 @@ endif
ifdef USE_LIBAV
$(APPLY) $(SRC)/ffmpeg/libav_gsm.patch
endif
+ $(APPLY) $(SRC)/ffmpeg/ffmpeg-win32-bcrypt.patch
$(MOVE)
.ffmpeg: ffmpeg
--
2.10.1.windows.1
From 9c90bed7827cd86cbc7ecb22ae15b3942d563bc1 Mon Sep 17 00:00:00 2001
From 2c85ec8cd63c37bbc44ff0c2cf96261b04a8765f 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/15] contrib:avcodec: use a more recent FFmpeg version
Subject: [PATCH 10/22] 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 4535551..b8b5223 100644
index 9513d63..6676484 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -5,7 +5,7 @@
......
From f1386679f8a6d330e25860677954c214455e656f Mon Sep 17 00:00:00 2001
From 0d08e043d8a7916a7cf879213d690fc5051761a1 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/15] contrib:mpg123: don't use forbidden APIs on Phone apps
Subject: [PATCH 11/22] contrib:mpg123: don't use forbidden APIs on Phone apps
---
contrib/src/mpg123/mpg123-winstore.patch | 11 +++++++++++
......
From 7bf671380f7810877e5d8cae6246a3ccc7f7e665 Mon Sep 17 00:00:00 2001
From e0e21250c591db7ae8a8bcbe0eb5b148e9329ddd 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/15] contrib: use live555 version that is compatible with
Subject: [PATCH 12/22] contrib: use live555 version that is compatible with
LGPL2
---
......
From 310fdbbdf51b6e29c225370bcdaacf686dd1ba7b Mon Sep 17 00:00:00 2001
From 81e870b8217449c5e5eedd2700d0af65c30ed6aa 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/15] rand: use bcrypt instead of CryptographicBufferStatics
Subject: [PATCH 13/22] rand: use bcrypt instead of CryptographicBufferStatics
for Winstore builds
It's available to winstore apps and on desktop since Vista.
......
From bd5035c40d0777278d17547b360df99bd84a8f38 Mon Sep 17 00:00:00 2001
From a10c97fe38d89b09324cd1fcb7b6e5cb889fce29 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/15] keystore: CryptUnprotectData is officially found in
Subject: [PATCH 14/22] keystore: CryptUnprotectData is officially found in
dpapi.h
In MS SDKs and in mingw64
......
From 0e8b67f5b51afdeaf62945f835f562a6798a4dc1 Mon Sep 17 00:00:00 2001
From 21d52aa1f7660f8033d8e9f12aff20c0092526fc 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/15] contrib: gnutls: fix Winstore forbidden API calls
Subject: [PATCH 15/22] contrib: gnutls: fix Winstore forbidden API calls
---
contrib/src/gnutls/rules.mak | 3 +
......
From b5ba278849cb6d1d9b3adce95436a7c655b05798 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
---
contrib/src/gnutls/32b5628-upstream.patch | 42 -------------------------------
contrib/src/gnutls/SHA512SUMS | 2 +-
contrib/src/gnutls/rules.mak | 3 +--
3 files changed, 2 insertions(+), 45 deletions(-)
delete mode 100644 contrib/src/gnutls/32b5628-upstream.patch
diff --git a/contrib/src/gnutls/32b5628-upstream.patch b/contrib/src/gnutls/32b5628-upstream.patch
deleted file mode 100644
index 70ffdce..0000000
--- a/contrib/src/gnutls/32b5628-upstream.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 32b56287cc9d07dfbbc2ee21b70a8fbe1f2d9f2f Mon Sep 17 00:00:00 2001
-From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
-Date: Sat, 30 Dec 2017 19:57:08 +0100
-Subject: [PATCH] x509/verify: when verifying against a self signed certificate ignore issuer
-
-That is, ignore issuer when checking the issuer's parameters strength. That
-resolves the issue of marking self-signed certificates as with insecure
-parameters during verification.
-
-Resolves #347
-
-Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
----
- lib/x509/verify.c | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/lib/x509/verify.c b/lib/x509/verify.c
-index 26b1ab3..a59e637 100644
---- a/lib/x509/verify.c
-+++ b/lib/x509/verify.c
-@@ -431,11 +431,13 @@ unsigned _gnutls_is_broken_sig_allowed(const gnutls_sign_entry_st *se, unsigned
- _gnutls_debug_log(#level": certificate's security level is unacceptable\n"); \
- return gnutls_assert_val(0); \
- } \
-- sp = gnutls_pk_bits_to_sec_param(issuer_pkalg, issuer_bits); \
-- if (sp < level) { \
-- _gnutls_cert_log("issuer", issuer); \
-- _gnutls_debug_log(#level": certificate's issuer security level is unacceptable\n"); \
-- return gnutls_assert_val(0); \
-+ if (issuer) { \
-+ sp = gnutls_pk_bits_to_sec_param(issuer_pkalg, issuer_bits); \
-+ if (sp < level) { \
-+ _gnutls_cert_log("issuer", issuer); \
-+ _gnutls_debug_log(#level": certificate's issuer security level is unacceptable\n"); \
-+ return gnutls_assert_val(0); \
-+ } \
- } \
- break;
-
---
-libgit2 0.26.0
-
diff --git a/contrib/src/gnutls/SHA512SUMS b/contrib/src/gnutls/SHA512SUMS
index e5e3af8..79bb5ee 100644
--- a/contrib/src/gnutls/SHA512SUMS
+++ b/contrib/src/gnutls/SHA512SUMS
@@ -1 +1 @@
-451d3167be599ed8e0333dd7c9f8501fcb47b7aa871aeb461c368381c0b7ecd7e2026ec35dbbb2aa685cb2c3a22e9296e0a0699409e3744b731c1bb7e7e69f07 gnutls-3.5.16.tar.xz
+434cf33a4221fe2edce1b531cb53690d14a0991cb2056006021f625fb018987351f8ec917c3a7803e5e64179cf1647a3002ae783736ffca3188d2d294b76df52 gnutls-3.5.18.tar.xz
diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index b04b3c0..78941c1 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -1,6 +1,6 @@
# GnuTLS
-GNUTLS_VERSION := 3.5.16
+GNUTLS_VERSION := 3.5.18
GNUTLS_URL := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-$(GNUTLS_VERSION).tar.xz
ifdef BUILD_NETWORK
@@ -19,7 +19,6 @@ $(TARBALLS)/gnutls-$(GNUTLS_VERSION).tar.xz:
gnutls: gnutls-$(GNUTLS_VERSION).tar.xz .sum-gnutls
$(UNPACK)
- $(APPLY) $(SRC)/gnutls/32b5628-upstream.patch
$(APPLY) $(SRC)/gnutls/gnutls-pkgconfig-static.patch
ifdef HAVE_WIN32
$(APPLY) $(SRC)/gnutls/gnutls-win32.patch
--
2.10.1.windows.1
From b54a77a1af53656e89163328c068fe89c9e5d7af 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
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 ee5312e..2b5b0e1 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.10.1.windows.1
From 6e9033e8f3b61d5a63c10f61cf96edc4c1af6235 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
everywhere
---
contrib/src/shout/rules.mak | 1 +
contrib/src/shout/shout-strings.patch | 36 +++++++++++++++++++++++++++++++++++
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 500420c..ac34c59 100644
--- a/contrib/src/shout/rules.mak
+++ b/contrib/src/shout/rules.mak
@@ -23,6 +23,7 @@ libshout: libshout-$(SHOUT_VERSION).tar.gz .sum-shout
$(APPLY) $(SRC)/shout/bsd.patch
$(APPLY) $(SRC)/shout/libshout-arpa.patch
$(APPLY) $(SRC)/shout/fix-xiph_openssl.patch
+ $(APPLY) $(SRC)/shout/shout-strings.patch
$(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 0000000..438a364
--- /dev/null
+++ b/contrib/src/shout/shout-strings.patch
@@ -0,0 +1,36 @@
+--- libshout/src/common/httpp/encoding.c.strings 2015-11-20 20:51:36.000000000 +0100
++++ libshout/src/common/httpp/encoding.c 2018-03-29 11:00:04.524097700 +0200
+@@ -27,7 +27,9 @@
+ #endif
+
+ #include <sys/types.h>
++#ifdef HAVE_STRINGS_H
+ #include <strings.h>
++#endif
+ #include <string.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+--- libshout/src/proto_http.c.strings 2015-11-20 17:22:27.000000000 +0100
++++ libshout/src/proto_http.c 2018-03-29 10:53:02.770498200 +0200
+@@ -28,7 +28,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifdef HAVE_STRINGS_H
+ #include <strings.h>
++#endif
+
+ #include <shout/shout.h>
+ #include "shout_private.h"
+--- libshout/src/shout.c.strings 2015-11-09 12:54:12.000000000 +0100
++++ libshout/src/shout.c 2018-03-29 10:52:59.169968800 +0200
+@@ -29,7 +29,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifdef HAVE_STRINGS_H
+ #include <strings.h>
++#endif
+ #include <errno.h>
+
+ #include <shout/shout.h>
--
2.10.1.windows.1
From fa422e17ea13c492f2d633460a6cac80479d495e 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
---
contrib/src/shout/rules.mak | 1 +
contrib/src/shout/shout-win32.patch | 14 ++++++++++++++
2 files changed, 15 insertions(+)
create mode 100644 contrib/src/shout/shout-win32.patch
diff --git a/contrib/src/shout/rules.mak b/contrib/src/shout/rules.mak
index ac34c59..5ee5e7d 100644
--- a/contrib/src/shout/rules.mak
+++ b/contrib/src/shout/rules.mak
@@ -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/shout-strings.patch
+ $(APPLY) $(SRC)/shout/shout-win32.patch
$(call pkg_static,"shout.pc.in")
$(UPDATE_AUTOCONFIG)
$(MOVE)
diff --git a/contrib/src/shout/shout-win32.patch b/contrib/src/shout/shout-win32.patch
new file mode 100644
index 0000000..f29926e
--- /dev/null
+++ b/contrib/src/shout/shout-win32.patch
@@ -0,0 +1,14 @@
+--- libshout-2.4.1/examples/nonblocking.c.win32 2018-03-29 11:06:58.356033300 +0200
++++ libshout-2.4.1/examples/nonblocking.c 2018-03-29 11:10:39.018958800 +0200
+@@ -70,7 +70,11 @@ int main()
+ printf("Connection pending...\n");
+
+ while (ret == SHOUTERR_BUSY) {
++#ifdef _WIN32
++ Sleep(10);
++#else
+ usleep(10000);
++#endif
+ ret = shout_get_connected(shout);
+ }
+
--
2.10.1.windows.1
From 87605e79603eb762de678474cbc6ba39959a231d 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
Windows
---
contrib/src/shout/rules.mak | 1 +
contrib/src/shout/shout-timeval.patch | 10 ++++++++++
2 files changed, 11 insertions(+)
create mode 100644 contrib/src/shout/shout-timeval.patch
diff --git a/contrib/src/shout/rules.mak b/contrib/src/shout/rules.mak
index 5ee5e7d..afd75f1 100644
--- a/contrib/src/shout/rules.mak
+++ b/contrib/src/shout/rules.mak
@@ -25,6 +25,7 @@ libshout: libshout-$(SHOUT_VERSION).tar.gz .sum-shout
$(APPLY) $(SRC)/shout/fix-xiph_openssl.patch
$(APPLY) $(SRC)/shout/shout-strings.patch
$(APPLY) $(SRC)/shout/shout-win32.patch
+ $(APPLY) $(SRC)/shout/shout-timeval.patch
$(call pkg_static,"shout.pc.in")
$(UPDATE_AUTOCONFIG)
$(MOVE)
diff --git a/contrib/src/shout/shout-timeval.patch b/contrib/src/shout/shout-timeval.patch
new file mode 100644
index 0000000..6d05058
--- /dev/null
+++ b/contrib/src/shout/shout-timeval.patch
@@ -0,0 +1,10 @@
+--- libshout/src/common/timing/timing.c.timeval 2015-01-27 19:08:54.000000000 +0100
++++ libshout/src/common/timing/timing.c 2018-03-29 10:33:11.505409500 +0200
+@@ -35,6 +35,7 @@
+ #ifdef _WIN32
+ #include <windows.h>
+ #include <mmsystem.h>
++#include <winsock2.h>
+ #else
+ #ifdef TIME_WITH_SYS_TIME
+ # include <sys/time.h>
--
2.10.1.windows.1
From ab426c24c23d473596583576b1809d418ebf6258 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
Windows
and make sure it's found on Windows Store builds as well
---
contrib/src/shout/rules.mak | 1 +
contrib/src/shout/shout-win32-socklen.patch | 12 ++++++++++++
2 files changed, 13 insertions(+)
create mode 100644 contrib/src/shout/shout-win32-socklen.patch
diff --git a/contrib/src/shout/rules.mak b/contrib/src/shout/rules.mak
index afd75f1..90cd2b5 100644
--- a/contrib/src/shout/rules.mak
+++ b/contrib/src/shout/rules.mak
@@ -26,6 +26,7 @@ libshout: libshout-$(SHOUT_VERSION).tar.gz .sum-shout
$(APPLY) $(SRC)/shout/shout-strings.patch
$(APPLY) $(SRC)/shout/shout-win32.patch
$(APPLY) $(SRC)/shout/shout-timeval.patch
+ $(APPLY) $(SRC)/shout/shout-win32-socklen.patch
$(call pkg_static,"shout.pc.in")
$(UPDATE_AUTOCONFIG)
$(MOVE)
diff --git a/contrib/src/shout/shout-win32-socklen.patch b/contrib/src/shout/shout-win32-socklen.patch
new file mode 100644
index 0000000..57821bf
--- /dev/null
+++ b/contrib/src/shout/shout-win32-socklen.patch
@@ -0,0 +1,12 @@
+--- libshout/src/common/net/sock.c.socklen 2018-03-29 15:11:28.885555300 +0200
++++ libshout/src/common/net/sock.c 2018-03-29 11:13:03.178552900 +0200
+@@ -57,6 +57,9 @@
+ #include <netdb.h>
+ #else
+ #include <winsock2.h>
++#undef WINAPI_FAMILY
++#define WINAPI_FAMILY WINAPI_FAMILY_DESKTOP_APP
++#include <ws2tcpip.h>
+ #endif
+
+ #include "sock.h"
--
2.10.1.windows.1
From 388289b746587ff8e010ab375d6bc8a2949cd7ee 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
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 6676484..ea288c7 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.10.1.windows.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