Commit ae4b8810 authored by Steve Lhomme's avatar Steve Lhomme
Browse files

libvlc: Update patchset

- remove cmake/meson patches that are merged in master
- rebase other patches on master
parent 916cd026
From 565aec3e5b7a8d672ac0acebdb2ae20281c25988 Mon Sep 17 00:00:00 2001
From 8757060e5bbf65b4107c12f67faff50da0f68799 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 08/30] contrib: use live555 version that is compatible with
Subject: [PATCH 07/37] 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 3bb8e78b3d..4e7281bc56 100644
index f5984577dc..0fc15bc9f4 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -1,14 +1,12 @@
......@@ -37,7 +37,7 @@ index 3bb8e78b3d..4e7281bc56 100644
ifeq ($(call need_pkg,"live555"),)
PKGS_FOUND += live555
@@ -93,7 +91,6 @@ endif
@@ -95,7 +93,6 @@ endif
SUBDIRS=groupsock liveMedia UsageEnvironment BasicUsageEnvironment
.live555: live555
......
From 94e6103114c7519d66346fc7810e888fcfbc60de Mon Sep 17 00:00:00 2001
From ae801635cbd7737aed7df0b406ed20f4d3992052 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Tue, 27 Mar 2018 18:57:41 +0200
Subject: [PATCH 09/30] rand: use bcrypt instead of CryptographicBufferStatics
Subject: [PATCH 08/37] rand: use bcrypt instead of CryptographicBufferStatics
for Winstore builds
It's available to winstore apps and on desktop since Vista.
......@@ -12,10 +12,10 @@ The old API is deprecated.
2 files changed, 15 insertions(+), 40 deletions(-)
diff --git a/configure.ac b/configure.ac
index c60fd78e11..9922b4ba3b 100644
index 6ac9a9f256..02151049d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1138,7 +1138,10 @@ AH_BOTTOM([
@@ -1178,7 +1178,10 @@ AH_BOTTOM([
dnl Win32 requires linking to ssp for stack-protection
AS_IF([test "${SYS}" = "mingw32"], [
LDFLAGS="${LDFLAGS} -lssp"
......
From 6c6e732bd63e4c9774887e6cf6e8e0daa5405539 Mon Sep 17 00:00:00 2001
From 152eaddcde3cd5f8caba8b311ec5fdbb86de6fde Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@videolabs.io>
Date: Mon, 23 May 2016 09:18:17 +0200
Subject: [PATCH 10/30] contrib: gnutls: fix Winstore forbidden API calls
Subject: [PATCH 09/37] contrib: gnutls: fix Winstore forbidden API calls
---
contrib/src/gnutls/rules.mak | 3 +
......@@ -10,7 +10,7 @@ Subject: [PATCH 10/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 98bfd33acf..4281419a05 100644
index 7a4f550cce..78f3f4b337 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -38,6 +38,9 @@ ifdef HAVE_MACOSX
......
From 5c57b962f40d1be3a74922a482e4c50f3b07cfe3 Mon Sep 17 00:00:00 2001
From 467d68db66bac32fc9c5e884c96d190a0c38af09 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 29 Mar 2018 15:00:53 +0200
Subject: [PATCH 11/30] contrib: shout: respect the availability of strings.h
Subject: [PATCH 10/37] contrib: shout: respect the availability of strings.h
everywhere
---
......
From 40a7e33739e499194e1489ce51659c107b5a4d3e Mon Sep 17 00:00:00 2001
From ba50872084b27b2bf7961e2c9d1c6a81710f5adf Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 29 Mar 2018 15:06:53 +0200
Subject: [PATCH 12/30] contrib: shout: timeval is defined in winsock2.h on
Subject: [PATCH 11/37] contrib: shout: timeval is defined in winsock2.h on
Windows
---
......
From f5fa91d807b80e9563148a1569745152f7ad12d3 Mon Sep 17 00:00:00 2001
From 4e79e713d4bc0365d49fa4a3beb4c4bf8e0322cc Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 29 Mar 2018 15:13:55 +0200
Subject: [PATCH 13/30] contrib: shout: socklen_t can be found in ws2tcpip.h on
Subject: [PATCH 12/37] 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 79e60263620ae725eac498ae2564e62db70cb272 Mon Sep 17 00:00:00 2001
From d457b59568fdb1b8c4165a54a8cd2b4aace82ccc Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 5 Apr 2018 13:29:40 +0200
Subject: [PATCH 14/30] contrib: gcrypt: use bcrypt rather than wincrypt
Subject: [PATCH 13/37] contrib: gcrypt: use bcrypt rather than wincrypt
---
contrib/src/gcrypt/winrt.patch | 177 +++++++++++++++++++++++----------
......
From a228fc752bd2ef3236a01cfc61c1aacf11f2da69 Mon Sep 17 00:00:00 2001
From ebf47481b54b0bf7b5ad3d35736c0ba34dfce827 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 5 Apr 2018 14:49:26 +0200
Subject: [PATCH 15/30] contrib: libarchive: use bcrypt rather than wincrypt
Subject: [PATCH 14/37] contrib: libarchive: use bcrypt rather than wincrypt
---
.../libarchive/libarchive-win32-bcrypt.patch | 145 ++++++++++++++++++
......@@ -161,7 +161,7 @@ index 0000000000..4fb37a7073
+2.26.0.windows.1
+
diff --git a/contrib/src/libarchive/rules.mak b/contrib/src/libarchive/rules.mak
index 92f58d8e0e..7c2aa6e9be 100644
index fd9fe7c8f6..1920820bee 100644
--- a/contrib/src/libarchive/rules.mak
+++ b/contrib/src/libarchive/rules.mak
@@ -22,6 +22,7 @@ ifdef HAVE_ANDROID
......
From 940a44915c1c10180c0081f162c4dcd04877e2a4 Mon Sep 17 00:00:00 2001
From 8006f5163181279d308ec78c385768ad2f445dea Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Wed, 4 Apr 2018 12:10:17 +0200
Subject: [PATCH 16/30] transcode: do not include the decoder padding in the
Subject: [PATCH 15/37] transcode: do not include the decoder padding in the
output SAR
---
......
From d70032281e8a3f6b3988ce20eb76124ab2fc4449 Mon Sep 17 00:00:00 2001
From fd768acfa555ac1dd4940b6d315997ab7d34ad11 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@videolabs.io>
Date: Thu, 14 Dec 2017 14:20:25 +0100
Subject: [PATCH 17/30] transcode: the visible dimensions are unlikely to be 0
Subject: [PATCH 16/37] transcode: the visible dimensions are unlikely to be 0
---
modules/stream_out/transcode/video.c | 4 ++--
......
From 3c35e7ab21aee6b99332b08797d649502e4a68bc Mon Sep 17 00:00:00 2001
From e11bbec82b105386d4dea9e7937f0dd77652126f Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@videolabs.io>
Date: Mon, 4 Sep 2017 13:59:25 +0200
Subject: [PATCH 18/30] codec: add a set of functions to use a plain FIFO
Subject: [PATCH 17/37] codec: add a set of functions to use a plain FIFO
It's similar to the block FIFO but with no locking.
---
......
From 3fa06b4ee19b5b14013bb603b8d446af70625140 Mon Sep 17 00:00:00 2001
From 5ef3ca08d49ebca49e37166d00378b70d39db941 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@videolabs.io>
Date: Thu, 31 Aug 2017 18:02:31 +0200
Subject: [PATCH 19/30] qsv: CUMULATIVE PATCH to encode from CPU planes
Subject: [PATCH 18/37] qsv: CUMULATIVE PATCH to encode from CPU planes
properly
---
......
From 93229e193c46d616095d619e318bb24cf37880f9 Mon Sep 17 00:00:00 2001
From 501b89908833e4e1f40b68bfd1e62acba450a639 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 5 Apr 2018 09:49:44 +0200
Subject: [PATCH 20/30] chromecast: try to encode with QSV if possible
Subject: [PATCH 19/37] chromecast: try to encode with QSV if possible
It will be handled by the GPU so use less resource.
---
......
From ab912b9c57c9d77a61381a9f93b97b6f4ebd4373 Mon Sep 17 00:00:00 2001
From 6e975999959a1fad00457ea7a612f5f3c31d0284 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Fri, 27 Mar 2020 16:33:33 +0100
Subject: [PATCH 21/30] contrib: libarchive: use the proper define for the
Subject: [PATCH 20/37] contrib: libarchive: use the proper define for the
internal mode_t
---
......
From 9ffcb346f13a5369adab887a87ca6df945b0dc36 Mon Sep 17 00:00:00 2001
From d9434e5f9b7ed5cee41adbe90e825d144c8fca45 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Mon, 9 Apr 2018 09:59:27 +0200
Subject: [PATCH 22/36] contrib: libarchive: Fix winrt build
Subject: [PATCH 21/37] contrib: libarchive: Fix winrt build
don't force compilation for Windows XP
don't call DebugBreak() (in debug builds)
......
From 58a13bea9e2ba9da712a660cc07c3283d0466f64 Mon Sep 17 00:00:00 2001
From 644f908705c0187fa8fbe0083632669d9d613a95 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 23/30] contribs: Fix ffmpeg build with gcrypt.h
Subject: [PATCH 22/37] contribs: Fix ffmpeg build with gcrypt.h
---
contrib/src/ffmpeg/ffmpeg-win32-bcrypt.patch | 12 ++++++++++++
......
From 1e75b272cc855c5e5fc96724100e5c33ee59bb3e Mon Sep 17 00:00:00 2001
From ce398aaec472900f4636deec34ba83d3c67efc75 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 24/30] contribs: Fix gnutls UWP build with mingw-w64
Subject: [PATCH 23/37] contribs: Fix gnutls UWP build with mingw-w64
---
contrib/src/gnutls/winstore.patch | 20 ++++++++++++++++++++
......
From 6724d01f7c75b5d458a97e62c911f6bebc977dd9 Mon Sep 17 00:00:00 2001
From 492ed8db2f7d3cf088f4b16ef7fbcc39109b5b1a Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Mon, 9 Apr 2018 18:46:34 +0200
Subject: [PATCH 25/30] win32: fix crash on closesocket() when a poll() is
Subject: [PATCH 24/37] win32: fix crash on closesocket() when a poll() is
pending
Only for winstore builds for now
......
From a683985662118839f71580287b595e0638d1eabd Mon Sep 17 00:00:00 2001
From 0fff20b1f69903febcfcd5e8df9478aa55453217 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 26/30] contrib: ffmpeg: Don't check for wincrypt anymore
Subject: [PATCH 25/37] 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 0cbe95bce3..eb2ebc9fe7 100644
index 1ec7280cf4..8f32218987 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -250,6 +250,8 @@ ifdef USE_LIBAV
......
From bee07f4d02d4c2579edb864cfe0befce0d290869 Mon Sep 17 00:00:00 2001
From 9cd91578ee4471cdcaa99830fcb046b50e4b6cd0 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 27/30] contrib: gnutls: Use winstorecompat overload when
Subject: [PATCH 26/37] contrib: gnutls: Use winstorecompat overload when
available
---
......
Supports Markdown
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