Update to 18.8pre08-2

3 files changed, 62 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e1028a2f67ce..931c80341b4b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = kodi-devel
 	pkgver = 18.8pre08
-	pkgrel = 1
+	pkgrel = 2
 	url = https://kodi.tv
 	arch = x86_64
 	license = GPL2
@@ -59,7 +59,7 @@ pkgbase = kodi-devel
 	noextract = libdvdcss-1.4.2-Leia-Beta-5.tar.gz
 	noextract = libdvdnav-6.0.0-Leia-Alpha-3.tar.gz
 	noextract = libdvdread-6.0.0-Leia-Alpha-3.tar.gz
-	noextract = ffmpeg-4.2.2-Matrix-Alpha1.tar.gz
+	noextract = ffmpeg-4.3-Matrix-Alpha1.tar.gz
 	noextract = fmt-5.1.0.tar.gz
 	noextract = crossguid-8f399e8bd4.tar.gz
 	noextract = fstrcmp-0.7.D001.tar.gz
@@ -68,7 +68,7 @@ pkgbase = kodi-devel
 	source = libdvdcss-1.4.2-Leia-Beta-5.tar.gz::https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz
 	source = libdvdnav-6.0.0-Leia-Alpha-3.tar.gz::https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz
 	source = libdvdread-6.0.0-Leia-Alpha-3.tar.gz::https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz
-	source = ffmpeg-4.2.2-Matrix-Alpha1.tar.gz::https://github.com/xbmc/FFmpeg/archive/4.2.2-Matrix-Alpha1.tar.gz
+	source = ffmpeg-4.3-Matrix-Alpha1.tar.gz::https://github.com/xbmc/FFmpeg/archive/4.3-Matrix-Alpha1.tar.gz
 	source = http://mirrors.kodi.tv/build-deps/sources/fmt-5.1.0.tar.gz
 	source = http://mirrors.kodi.tv/build-deps/sources/crossguid-8f399e8bd4.tar.gz
 	source = http://mirrors.kodi.tv/build-deps/sources/fstrcmp-0.7.D001.tar.gz
@@ -76,6 +76,7 @@ pkgbase = kodi-devel
 	source = cpuinfo
 	source = 000-PR17300.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/17300.patch
 	source = 000-PR17804.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/17804.patch
+	source = 000-PR18071-mod_for_linux_only.patch
 	source = 001-PR17988.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/17988.patch
 	source = 002-PR17996.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/17996.patch
 	source = 003-PR18008.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18008.patch
@@ -87,7 +88,7 @@ pkgbase = kodi-devel
 	sha256sums = 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d
 	sha256sums = 071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a
 	sha256sums = a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf
-	sha256sums = 0dba571f9809588cfbdc29d6a551dab4cd5736701653d9263847c9ac67bcde86
+	sha256sums = 8e159cdf1dfd3de2ac838fdaecb1fbb315e47f2ee2c542cd9d6efeb545c2b916
 	sha256sums = 73d4cab4fa8a3482643d8703de4d9522d7a56981c938eca42d929106ff474b44
 	sha256sums = 3d77d09a5df0de510aeeb940df4cb534787ddff3bb1828779753f5dfa1229d10
 	sha256sums = e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476
@@ -95,6 +96,7 @@ pkgbase = kodi-devel
 	sha256sums = 27387e49043127f09c5ef0a931fffb864f5730e79629100a6e210b68a1b9f2c1
 	sha256sums = 3aaca3630689b76e7a7f35656a4ada3fb18ecd7e3fe199634264ccf76b96c0f0
 	sha256sums = f11af738b2be8f390a7b515cfb74276a0ccb64ac061b8f5a7b3772e19eb0d203
+	sha256sums = 4d9eb12db337a89b5e17815bd422015f3017c735bd0c5b522f5a5b0c7f81a607
 	sha256sums = 89ac4b3feac908075ddbcdc4f9f1d1703c25e2fdb1661e776c162eb779437bd8
 	sha256sums = f56503139927f0bc8f220c4b4e31266fc938a6612a4c1d2bdd75be3f54eb3a12
 	sha256sums = 995c61de460e0afdc135ba33f9f393a825cb4a0c7954da104d23269fe48ec118
diff --git a/000-PR18071-mod_for_linux_only.patch b/000-PR18071-mod_for_linux_only.patch
new file mode 100644
index 000000000000..45890cc97ec9
--- /dev/null
+++ b/000-PR18071-mod_for_linux_only.patch
@@ -0,0 +1,51 @@
+From 84bb46f393dde388031daef78724a0ed2d6f8c4e Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+Date: Wed, 17 Jun 2020 12:14:12 -0700
+Subject: [PATCH] FFmpeg: Bump to 4.3-Matrix-Alpha1
+
+---
+ cmake/modules/FindFFMPEG.cmake                | 16 ++--
+ .../patches/0001-ffmpeg-detect-openssl.patch  |  4 +-
+ .../0002-ffmpeg-zlib-config-conflict.patch    |  9 +-
+ .../patches/0004-ffmpeg-w32pthreads.patch     | 93 -------------------
+ .../patches/0005-ffmpeg-detect-dav1d.patch    |  6 +-
+ tools/depends/target/ffmpeg/FFMPEG-VERSION    |  2 +-
+ 9 files changed, 28 insertions(+), 118 deletions(-)
+
+diff --git a/cmake/modules/FindFFMPEG.cmake b/cmake/modules/FindFFMPEG.cmake
+index 387b3f926f02..7597ba76e201 100644
+--- a/cmake/modules/FindFFMPEG.cmake
++++ b/cmake/modules/FindFFMPEG.cmake
+@@ -33,14 +33,14 @@
+ #
+ 
+ # required ffmpeg library versions
+-set(REQUIRED_FFMPEG_VERSION 4.2)
+-set(_avcodec_ver ">=58.54.100")
+-set(_avfilter_ver ">=7.57.100")
+-set(_avformat_ver ">=58.29.100")
+-set(_avutil_ver ">=56.31.100")
+-set(_swscale_ver ">=5.5.100")
+-set(_swresample_ver ">=3.5.100")
+-set(_postproc_ver ">=55.5.100")
++set(REQUIRED_FFMPEG_VERSION 4.3)
++set(_avcodec_ver ">=58.91.100")
++set(_avfilter_ver ">=7.85.100")
++set(_avformat_ver ">=58.45.100")
++set(_avutil_ver ">=56.51.100")
++set(_swscale_ver ">=5.7.100")
++set(_swresample_ver ">=3.7.100")
++set(_postproc_ver ">=55.7.100")
+ 
+ 
+ # Allows building with external ffmpeg not found in system paths,
+diff --git a/tools/depends/target/ffmpeg/FFMPEG-VERSION b/tools/depends/target/ffmpeg/FFMPEG-VERSION
+index d105be356ec5..95c44362ea87 100644
+--- a/tools/depends/target/ffmpeg/FFMPEG-VERSION
++++ b/tools/depends/target/ffmpeg/FFMPEG-VERSION
+@@ -1,4 +1,4 @@
+ LIBNAME=ffmpeg
+ BASE_URL=https://github.com/xbmc/FFmpeg
+-VERSION=4.2.2-Matrix-Alpha1
++VERSION=4.3-Matrix-Alpha1
+ ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 24fa7ec2da51..4708bc3737b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -24,7 +24,7 @@ pkgname=(
 )
 pkgver=18.8pre08
 _major=18.7.1
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="https://kodi.tv"
 license=('GPL2')
@@ -61,7 +61,7 @@ _tag="$_major-$_codename"
 _libdvdcss_version="1.4.2-$_codename-Beta-5"
 _libdvdnav_version="6.0.0-$_codename-Alpha-3"
 _libdvdread_version="6.0.0-$_codename-Alpha-3"
-_ffmpeg_version="4.2.2-Matrix-Alpha1"
+_ffmpeg_version="4.3-Matrix-Alpha1"
 _fmt_version="5.1.0"
 _crossguid_version="8f399e8bd4"
 _fstrcmp_version="0.7.D001"
@@ -80,6 +80,7 @@ source=(
   cpuinfo
   000-PR17300.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/17300.patch
   000-PR17804.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/17804.patch
+  000-PR18071-mod_for_linux_only.patch
   # 18029 does not apply
   001-PR17988.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/17988.patch
   002-PR17996.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/17996.patch
@@ -105,7 +106,7 @@ sha256sums=('5cfec391bcd168bbd4f9d38a6c8ec93e42e040cf82cf6ebf23db5e86753816fb'
             '38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d'
             '071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a'
             'a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf'
-            '0dba571f9809588cfbdc29d6a551dab4cd5736701653d9263847c9ac67bcde86'
+            '8e159cdf1dfd3de2ac838fdaecb1fbb315e47f2ee2c542cd9d6efeb545c2b916'
             '73d4cab4fa8a3482643d8703de4d9522d7a56981c938eca42d929106ff474b44'
             '3d77d09a5df0de510aeeb940df4cb534787ddff3bb1828779753f5dfa1229d10'
             'e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476'
@@ -113,6 +114,7 @@ sha256sums=('5cfec391bcd168bbd4f9d38a6c8ec93e42e040cf82cf6ebf23db5e86753816fb'
             '27387e49043127f09c5ef0a931fffb864f5730e79629100a6e210b68a1b9f2c1'
             '3aaca3630689b76e7a7f35656a4ada3fb18ecd7e3fe199634264ccf76b96c0f0'
             'f11af738b2be8f390a7b515cfb74276a0ccb64ac061b8f5a7b3772e19eb0d203'
+            '4d9eb12db337a89b5e17815bd422015f3017c735bd0c5b522f5a5b0c7f81a607'
             '89ac4b3feac908075ddbcdc4f9f1d1703c25e2fdb1661e776c162eb779437bd8'
             'f56503139927f0bc8f220c4b4e31266fc938a6612a4c1d2bdd75be3f54eb3a12'
             '995c61de460e0afdc135ba33f9f393a825cb4a0c7954da104d23269fe48ec118'