Update to 18.8pre20-1

3 files changed, 44 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 083f90b61a34..48f24dbf4bfe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = kodi-devel
-	pkgver = 18.8pre18
+	pkgver = 18.8pre20
 	pkgrel = 1
 	url = https://kodi.tv
 	arch = x86_64
@@ -77,12 +77,14 @@ pkgbase = kodi-devel
 	source = 000-PR17300.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/17300.patch
 	source = 18071-mod_for_linux_only.patch
 	source = 000-PR17804.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/17804.patch
+	source = 18029-mod_for_linux_only.patch
 	source = 001-PR17972.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/17972.patch
 	source = 002-PR17988.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/17988.patch
 	source = 003-PR17996.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/17996.patch
 	source = 004-PR18008.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18008.patch
 	source = 005-PR18019.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18019.patch
 	source = 006-PR18024.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18024.patch
+	source = 007-PR18029.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18029.patch
 	source = 008-PR18045.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18045.patch
 	source = 009-PR18047.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18047.patch
 	source = 010-PR18053.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18053.patch
@@ -91,9 +93,11 @@ pkgbase = kodi-devel
 	source = 013-PR18094.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18094.patch
 	source = 014-PR18134.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18134.patch
 	source = 015-PR18151.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18151.patch
-	source = 016-PR18171.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18171.patch
-	source = 017-PR18193.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18193.patch
-	source = 018-PR18202.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18202.patch
+	source = 016-PR18168.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18168.patch
+	source = 017-PR18171.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18171.patch
+	source = 018-PR18193.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18193.patch
+	source = 019-PR18198.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18198.patch
+	source = 020-PR18202.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18202.patch
 	sha256sums = 5cfec391bcd168bbd4f9d38a6c8ec93e42e040cf82cf6ebf23db5e86753816fb
 	sha256sums = 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d
 	sha256sums = 071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a
@@ -107,12 +111,14 @@ pkgbase = kodi-devel
 	sha256sums = 3aaca3630689b76e7a7f35656a4ada3fb18ecd7e3fe199634264ccf76b96c0f0
 	sha256sums = 4d9eb12db337a89b5e17815bd422015f3017c735bd0c5b522f5a5b0c7f81a607
 	sha256sums = f11af738b2be8f390a7b515cfb74276a0ccb64ac061b8f5a7b3772e19eb0d203
+	sha256sums = d444ad0898f93582bef530d0d91952ba5c926b0225372f81b3a4376193cfebb5
 	sha256sums = 15255c5b928b278b15a90468ead80ad75b9331dc7dac91e5da296a66f7b1a6a1
 	sha256sums = 89ac4b3feac908075ddbcdc4f9f1d1703c25e2fdb1661e776c162eb779437bd8
 	sha256sums = f56503139927f0bc8f220c4b4e31266fc938a6612a4c1d2bdd75be3f54eb3a12
 	sha256sums = 995c61de460e0afdc135ba33f9f393a825cb4a0c7954da104d23269fe48ec118
 	sha256sums = 8531da4ce924d80f5b8c8fbcf547e0738e48ffce335f73a4da6466f499ab1bfe
 	sha256sums = 4c2775722998fd0f6111ff841b29e8813c58b7905be1e8a01bf8a768622cb30c
+	sha256sums = 0928d20977cd3b8225ea52ecf1641611ed2ec95dc1b937187a5b796fb570b2f1
 	sha256sums = ff34d94f4ff7f1d9638c948b05da1802638bf66037dda53ce44b9afb501ec1dc
 	sha256sums = f4ac91dbad4014a6707e8bb6f57cac0ec68a852a3e81815a210304a886a665a1
 	sha256sums = 2d31bf616362001a75c590c0ea9ef22f321ffabf1d95f781d558f92e69cdc8c9
@@ -121,8 +127,10 @@ pkgbase = kodi-devel
 	sha256sums = 5b19f4f74136f91986e3d3eed93102b06a700dd4b3a561926eabc7997434f22a
 	sha256sums = e4963bdeb1de7c147a364cd3ee2186fb1d0b2fc8f3ea7636054cf2adac040468
 	sha256sums = 7b8a6510bc286d58b4a3d57322362335cbf2a56d1b2bd16bfcdf06d5eef8644d
+	sha256sums = b797150851830c553d84f11dfd6942c551d8e6ce151371e048dd2443493fb779
 	sha256sums = 336df43ee417d50ffa3e025697960828d78a75f4c5b943190103baface402ac8
 	sha256sums = 73024d5c6462a360bb527da2d408343ba6206d513f760a94c97b18e6937c649f
+	sha256sums = c92980e4ecc5e6714b1fd94f1124d49681bf79be5751cb09ecc51ec976ef293d
 	sha256sums = dc7fc1ce45f43e7a18af59c157307a350971a16c2ffad2cf371880fcf1610013
 
 pkgname = kodi-devel
@@ -143,7 +151,7 @@ pkgname = kodi-devel
 	optdepends = shairplay: AirPlay support
 	optdepends = upower: Display battery level
 	provides = xbmc
-	provides = kodi=18.8pre18
+	provides = kodi=18.8pre20
 	conflicts = xbmc
 	replaces = xbmc
 
@@ -171,7 +179,7 @@ pkgname = kodi-x11-devel
 	depends = tinyxml
 	depends = kodi-devel
 	provides = KODI-BIN
-	provides = kodi-x11=18.8pre18
+	provides = kodi-x11=18.8pre20
 	replaces = kodi-bin
 
 pkgname = kodi-wayland-devel
@@ -198,7 +206,7 @@ pkgname = kodi-wayland-devel
 	depends = waylandpp
 	depends = kodi-devel
 	provides = KODI-BIN
-	provides = kodi-wayland=18.8pre18
+	provides = kodi-wayland=18.8pre20
 
 pkgname = kodi-gbm-devel
 	pkgdesc = gbm kodi binary
@@ -224,12 +232,12 @@ pkgname = kodi-gbm-devel
 	depends = tinyxml
 	depends = kodi-devel
 	provides = KODI-BIN
-	provides = kodi-gbm=18.8pre18
+	provides = kodi-gbm=18.8pre20
 
 pkgname = kodi-eventclients-devel
 	pkgdesc = Kodi Event Clients
 	optdepends = python2: most eventclients are implemented in python2
-	provides = kodi-eventclients=18.8pre18
+	provides = kodi-eventclients=18.8pre20
 	conflicts = kodi-eventclients
 
 pkgname = kodi-tools-texturepacker-devel
@@ -238,12 +246,12 @@ pkgname = kodi-tools-texturepacker-devel
 	depends = giflib
 	depends = libjpeg-turbo
 	depends = lzo
-	provides = kodi-tools-texturepacker=18.8pre18
+	provides = kodi-tools-texturepacker=18.8pre20
 	conflicts = kodi-tools-texturepacker
 
 pkgname = kodi-dev-devel
 	pkgdesc = Kodi dev files
 	depends = kodi-devel
-	provides = kodi-dev=18.8pre18
+	provides = kodi-dev=18.8pre20
 	conflicts = kodi-dev
 
diff --git a/18029-mod_for_linux_only.patch b/18029-mod_for_linux_only.patch
new file mode 100644
index 000000000000..a28625c36777
--- /dev/null
+++ b/18029-mod_for_linux_only.patch
@@ -0,0 +1,11 @@
+--- a/version.txt	2020-05-31 09:31:35.000000000 -0400
++++ b/version.txt	2020-07-25 05:44:45.056357778 -0400
+@@ -5,7 +5,7 @@ WEBSITE http://kodi.tv
+ VERSION_MAJOR 18
+ VERSION_MINOR 7
+ VERSION_TAG
+-VERSION_CODE 18.7.1
++VERSION_CODE 18.7.100
+ ADDON_API 18.7
+ APP_PACKAGE org.xbmc.kodi
+ PACKAGE_IDENTITY XBMCFoundation.Kodi
diff --git a/PKGBUILD b/PKGBUILD
index b4a752aab9e8..8b9597c6a13e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,7 +22,7 @@ pkgname=(
   "$pkgbase" kodi-x11-devel kodi-wayland-devel kodi-gbm-devel
   kodi-eventclients-devel kodi-tools-texturepacker-devel kodi-dev-devel
 )
-pkgver=18.8pre18
+pkgver=18.8pre20
 _major=18.7.1
 pkgrel=1
 arch=('x86_64')
@@ -86,15 +86,17 @@ source=(
   # fix for kodi-standalone run without which
   000-PR17804.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/17804.patch
   
+  # needed to get 18029 and 18168 to apply
+  18029-mod_for_linux_only.patch
+  
   # start milestone patches
-  # 18029 does not apply
   001-PR17972.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/17972.patch
   002-PR17988.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/17988.patch
   003-PR17996.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/17996.patch
   004-PR18008.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18008.patch
   005-PR18019.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18019.patch
   006-PR18024.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18024.patch
-  #007-PR18029.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18029.patch
+  007-PR18029.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18029.patch
   008-PR18045.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18045.patch
   009-PR18047.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18047.patch
   010-PR18053.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18053.patch
@@ -103,9 +105,11 @@ source=(
   013-PR18094.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18094.patch
   014-PR18134.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18134.patch
   015-PR18151.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18151.patch
-  016-PR18171.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18171.patch
-  017-PR18193.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18193.patch
-  018-PR18202.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18202.patch
+  016-PR18168.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18168.patch
+  017-PR18171.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18171.patch
+  018-PR18193.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18193.patch
+  019-PR18198.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18198.patch
+  020-PR18202.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18202.patch
 )
 noextract=(
   "libdvdcss-$_libdvdcss_version.tar.gz"
@@ -130,12 +134,14 @@ sha256sums=('5cfec391bcd168bbd4f9d38a6c8ec93e42e040cf82cf6ebf23db5e86753816fb'
             '3aaca3630689b76e7a7f35656a4ada3fb18ecd7e3fe199634264ccf76b96c0f0'
             '4d9eb12db337a89b5e17815bd422015f3017c735bd0c5b522f5a5b0c7f81a607'
             'f11af738b2be8f390a7b515cfb74276a0ccb64ac061b8f5a7b3772e19eb0d203'
+            'd444ad0898f93582bef530d0d91952ba5c926b0225372f81b3a4376193cfebb5'
             '15255c5b928b278b15a90468ead80ad75b9331dc7dac91e5da296a66f7b1a6a1'
             '89ac4b3feac908075ddbcdc4f9f1d1703c25e2fdb1661e776c162eb779437bd8'
             'f56503139927f0bc8f220c4b4e31266fc938a6612a4c1d2bdd75be3f54eb3a12'
             '995c61de460e0afdc135ba33f9f393a825cb4a0c7954da104d23269fe48ec118'
             '8531da4ce924d80f5b8c8fbcf547e0738e48ffce335f73a4da6466f499ab1bfe'
             '4c2775722998fd0f6111ff841b29e8813c58b7905be1e8a01bf8a768622cb30c'
+            '0928d20977cd3b8225ea52ecf1641611ed2ec95dc1b937187a5b796fb570b2f1'
             'ff34d94f4ff7f1d9638c948b05da1802638bf66037dda53ce44b9afb501ec1dc'
             'f4ac91dbad4014a6707e8bb6f57cac0ec68a852a3e81815a210304a886a665a1'
             '2d31bf616362001a75c590c0ea9ef22f321ffabf1d95f781d558f92e69cdc8c9'
@@ -144,8 +150,10 @@ sha256sums=('5cfec391bcd168bbd4f9d38a6c8ec93e42e040cf82cf6ebf23db5e86753816fb'
             '5b19f4f74136f91986e3d3eed93102b06a700dd4b3a561926eabc7997434f22a'
             'e4963bdeb1de7c147a364cd3ee2186fb1d0b2fc8f3ea7636054cf2adac040468'
             '7b8a6510bc286d58b4a3d57322362335cbf2a56d1b2bd16bfcdf06d5eef8644d'
+            'b797150851830c553d84f11dfd6942c551d8e6ce151371e048dd2443493fb779'
             '336df43ee417d50ffa3e025697960828d78a75f4c5b943190103baface402ac8'
             '73024d5c6462a360bb527da2d408343ba6206d513f760a94c97b18e6937c649f'
+            'c92980e4ecc5e6714b1fd94f1124d49681bf79be5751cb09ecc51ec976ef293d'
             'dc7fc1ce45f43e7a18af59c157307a350971a16c2ffad2cf371880fcf1610013')
 prepare() {
   # force python 'binary' as python2