Update to 19.0a1-1

5 files changed, 122 insertions, 261 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8c3284102bb1..a77ed0e1003c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = kodi-devel
-	pkgver = 18.8pre21
+	pkgver = 19.0a1
 	pkgrel = 1
 	url = https://kodi.tv
 	arch = x86_64
@@ -10,7 +10,6 @@ pkgbase = kodi-devel
 	makedepends = curl
 	makedepends = dav1d
 	makedepends = doxygen
-	makedepends = git
 	makedepends = glew
 	makedepends = gperf
 	makedepends = hicolor-icon-theme
@@ -36,10 +35,10 @@ pkgbase = kodi-devel
 	makedepends = lzo
 	makedepends = mesa
 	makedepends = nasm
-	makedepends = python2-pycryptodomex
-	makedepends = python2-pillow6
-	makedepends = python2-pybluez
-	makedepends = python2-simplejson
+	makedepends = python-pycryptodomex
+	makedepends = python-pillow
+	makedepends = python-pybluez
+	makedepends = python-simplejson
 	makedepends = shairplay
 	makedepends = smbclient
 	makedepends = taglib
@@ -49,9 +48,9 @@ pkgbase = kodi-devel
 	makedepends = giflib
 	makedepends = rapidjson
 	makedepends = ghostscript
+	makedepends = git
 	makedepends = meson
 	makedepends = gtest
-	makedepends = graphviz
 	makedepends = wayland-protocols
 	makedepends = waylandpp
 	makedepends = libxkbcommon
@@ -60,104 +59,59 @@ pkgbase = kodi-devel
 	noextract = libdvdnav-6.0.0-Leia-Alpha-3.tar.gz
 	noextract = libdvdread-6.0.0-Leia-Alpha-3.tar.gz
 	noextract = ffmpeg-4.3.1-Matrix-Alpha1-1.tar.gz
-	noextract = fmt-5.1.0.tar.gz
+	noextract = fmt-6.1.2.tar.gz
 	noextract = crossguid-8f399e8bd4.tar.gz
 	noextract = fstrcmp-0.7.D001.tar.gz
-	noextract = flatbuffers-1.9.0.tar.gz
-	source = kodi-18.7.1-Leia.tar.gz::https://github.com/xbmc/xbmc/archive/18.7.1-Leia.tar.gz
+	noextract = flatbuffers-1.11.0.tar.gz
+	noextract = spdlog-1.5.0.tar.gz
+	source = kodi-19.0a1-Matrix.tar.gz::https://github.com/xbmc/xbmc/archive/19.0a1-Matrix.tar.gz
 	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.3.1-Matrix-Alpha1-1.tar.gz::https://github.com/xbmc/FFmpeg/archive/4.3.1-Matrix-Alpha1-1.tar.gz
-	source = http://mirrors.kodi.tv/build-deps/sources/fmt-5.1.0.tar.gz
+	source = http://mirrors.kodi.tv/build-deps/sources/fmt-6.1.2.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
-	source = http://mirrors.kodi.tv/build-deps/sources/flatbuffers-1.9.0.tar.gz
+	source = http://mirrors.kodi.tv/build-deps/sources/flatbuffers-1.11.0.tar.gz
+	source = http://mirrors.kodi.tv/build-deps/sources/spdlog-1.5.0.tar.gz
 	source = cpuinfo
-	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
-	source = 011-PR18056.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18056.patch
-	source = 012-PR18073.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18073.patch
-	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-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
-	source = 021-PR18216.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18216.patch
-	sha256sums = 5cfec391bcd168bbd4f9d38a6c8ec93e42e040cf82cf6ebf23db5e86753816fb
+	source = 000-python3.8.patch
+	sha256sums = 3c66715448e18f95bc5e8a3075f95e643f3b2c0bae3957f2abb5b567b7e7eceb
 	sha256sums = 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d
 	sha256sums = 071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a
 	sha256sums = a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf
 	sha256sums = a7d956dbbe3c2036a8a78976efaf43792e1c7c152a04182024f231f4ee2e7d7e
-	sha256sums = 73d4cab4fa8a3482643d8703de4d9522d7a56981c938eca42d929106ff474b44
+	sha256sums = 1cafc80701b746085dddf41bd9193e6d35089e1c6ec1940e037fcb9c98f62365
 	sha256sums = 3d77d09a5df0de510aeeb940df4cb534787ddff3bb1828779753f5dfa1229d10
 	sha256sums = e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476
-	sha256sums = 5ca5491e4260cacae30f1a5786d109230db3f3a6e5a0eb45d0d0608293d247e3
+	sha256sums = 1789b97e790da8f2cb5ff827d15580878c8629fd889f5f038d7524dca43eacc9
+	sha256sums = b38e0bbef7faac2b82fed550a0c19b0d4e7f6737d5321d4fd8f216b80f8aee8a
 	sha256sums = 27387e49043127f09c5ef0a931fffb864f5730e79629100a6e210b68a1b9f2c1
-	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
-	sha256sums = 4b009d1acced4912f981d1454ff2add556b79188c003bc837d60224605364353
-	sha256sums = b766ce6bbae0d41abe323866c7ff9dd8ef89fdf214cc6104125c4115cb2bc221
-	sha256sums = 5b19f4f74136f91986e3d3eed93102b06a700dd4b3a561926eabc7997434f22a
-	sha256sums = e4963bdeb1de7c147a364cd3ee2186fb1d0b2fc8f3ea7636054cf2adac040468
-	sha256sums = 7b8a6510bc286d58b4a3d57322362335cbf2a56d1b2bd16bfcdf06d5eef8644d
-	sha256sums = b797150851830c553d84f11dfd6942c551d8e6ce151371e048dd2443493fb779
-	sha256sums = 336df43ee417d50ffa3e025697960828d78a75f4c5b943190103baface402ac8
-	sha256sums = 73024d5c6462a360bb527da2d408343ba6206d513f760a94c97b18e6937c649f
-	sha256sums = c92980e4ecc5e6714b1fd94f1124d49681bf79be5751cb09ecc51ec976ef293d
-	sha256sums = dc7fc1ce45f43e7a18af59c157307a350971a16c2ffad2cf371880fcf1610013
-	sha256sums = 20163cb537030a21e9f2da4534abe2137bbc4046007240eef2b4b506992c4e32
+	sha256sums = edff38cea510817c3682c7c6086054ac49adaa478285093ea294d83db065b83f
 
 pkgname = kodi-devel
 	pkgdesc = Alpha, Beta, or RC versions of the software media player and entertainment hub for digital media
 	depends = desktop-file-utils
 	depends = hicolor-icon-theme
 	depends = mesa
-	depends = python2-pycryptodomex
-	depends = python2-pillow6
-	depends = python2-simplejson
+	depends = python-pycryptodomex
+	depends = python-pillow6
+	depends = python-simplejson
 	depends = xorg-xdpyinfo
 	depends = KODI-BIN
 	optdepends = afpfs-ng: Apple shares support
 	optdepends = bluez: Blutooth support
-	optdepends = python2-pybluez: Bluetooth support
+	optdepends = python-pybluez: Bluetooth support
 	optdepends = libplist: AirPlay support
 	optdepends = pulseaudio: PulseAudio support
 	optdepends = shairplay: AirPlay support
 	optdepends = upower: Display battery level
 	provides = xbmc
-	provides = kodi=18.8pre21
+	provides = kodi=19.0a1
 	conflicts = xbmc
 	replaces = xbmc
 
-pkgname = kodi-x11-devel
+pkgname = kodi-devel-x11
 	pkgdesc = x11 kodi binary
 	depends = bluez-libs
 	depends = curl
@@ -175,16 +129,16 @@ pkgname = kodi-x11-devel
 	depends = libxslt
 	depends = lirc
 	depends = mariadb-libs
-	depends = python2
+	depends = python
 	depends = smbclient
 	depends = taglib
 	depends = tinyxml
 	depends = kodi-devel
 	provides = KODI-BIN
-	provides = kodi-x11=18.8pre21
+	provides = kodi-x11=19.0a1
 	replaces = kodi-bin
 
-pkgname = kodi-wayland-devel
+pkgname = kodi-devel-wayland
 	pkgdesc = wayland kodi binary
 	depends = bluez-libs
 	depends = curl
@@ -201,16 +155,16 @@ pkgname = kodi-wayland-devel
 	depends = libxslt
 	depends = lirc
 	depends = mariadb-libs
-	depends = python2
+	depends = python
 	depends = smbclient
 	depends = taglib
 	depends = tinyxml
 	depends = waylandpp
 	depends = kodi-devel
 	provides = KODI-BIN
-	provides = kodi-wayland=18.8pre21
+	provides = kodi-wayland=19.0a1
 
-pkgname = kodi-gbm-devel
+pkgname = kodi-devel-gbm
 	pkgdesc = gbm kodi binary
 	depends = bluez-libs
 	depends = curl
@@ -228,32 +182,32 @@ pkgname = kodi-gbm-devel
 	depends = libxslt
 	depends = lirc
 	depends = mariadb-libs
-	depends = python2
+	depends = python
 	depends = smbclient
 	depends = taglib
 	depends = tinyxml
 	depends = kodi-devel
 	provides = KODI-BIN
-	provides = kodi-gbm=18.8pre21
+	provides = kodi-gbm=19.0a1
 
-pkgname = kodi-eventclients-devel
+pkgname = kodi-devel-eventclients
 	pkgdesc = Kodi Event Clients
-	optdepends = python2: most eventclients are implemented in python2
-	provides = kodi-eventclients=18.8pre21
+	optdepends = python: most eventclients are implemented in python
+	provides = kodi-eventclients=19.0a1
 	conflicts = kodi-eventclients
 
-pkgname = kodi-tools-texturepacker-devel
+pkgname = kodi-devel-tools-texturepacker
 	pkgdesc = Kodi Texturepacker tool
 	depends = libpng
 	depends = giflib
 	depends = libjpeg-turbo
 	depends = lzo
-	provides = kodi-tools-texturepacker=18.8pre21
+	provides = kodi-tools-texturepacker=19.0a1
 	conflicts = kodi-tools-texturepacker
 
-pkgname = kodi-dev-devel
+pkgname = kodi-devel-dev
 	pkgdesc = Kodi dev files
 	depends = kodi-devel
-	provides = kodi-dev=18.8pre21
+	provides = kodi-dev=19.0a1
 	conflicts = kodi-dev
 
diff --git a/000-python3.8.patch b/000-python3.8.patch
new file mode 100644
index 000000000000..e26dd3decd9f
--- /dev/null
+++ b/000-python3.8.patch
@@ -0,0 +1,34 @@
+Upstream bug report, https://github.com/xbmc/xbmc/issues/16560
+Patch by asavah, https://forum.kodi.tv/showthread.php?tid=349548
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2fb6bf5bed..52be5b649d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -163,7 +163,7 @@ find_package(JsonSchemaBuilder REQUIRED)
+ core_optional_dep(${optional_deps})
+ core_require_dep(${required_deps})
+
+-SET(PYTHON_VERSION 3.7)
++SET(PYTHON_VERSION 3.8)
+
+ if(ENABLE_MARIADBCLIENT AND NOT ENABLE_MARIADBCLIENT STREQUAL AUTO AND ENABLE_MYSQLCLIENT AND NOT ENABLE_MYSQLCLIENT STREQUAL AUTO)
+   MESSAGE(FATAL_ERROR "You can not use MySql and MariaDB at the same time. Disable one by adding -DENABLE_MYSQLCLIENT=OFF or -DENABLE_MARIADBCLIENT=OFF.")
+diff --git a/xbmc/interfaces/python/PythonInvoker.cpp b/xbmc/interfaces/python/PythonInvoker.cpp
+index 4342e05dcd..660e82c254 100644
+--- a/xbmc/interfaces/python/PythonInvoker.cpp
++++ b/xbmc/interfaces/python/PythonInvoker.cpp
+@@ -8,6 +8,14 @@
+
+ // python.h should always be included first before any other includes
+ #include <Python.h>
++#if PY_VERSION_HEX >= 0x03080000
++# define Py_BUILD_CORE
++# undef HAVE_STD_ATOMIC
++/* for access to the fields of PyInterpreterState */
++#  include "internal/pycore_pystate.h"
++# undef Py_BUILD_CORE
++# define HAVE_STD_ATOMIC
++#endif
+ #include <iterator>
+ #include <osdefs.h>
diff --git a/18029-mod_for_linux_only.patch b/18029-mod_for_linux_only.patch
deleted file mode 100644
index a28625c36777..000000000000
--- a/18029-mod_for_linux_only.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/18071-mod_for_linux_only.patch b/18071-mod_for_linux_only.patch
deleted file mode 100644
index 45890cc97ec9..000000000000
--- a/18071-mod_for_linux_only.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-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 a85d3bea287b..1ea06194e6e2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,33 +19,32 @@
 
 pkgbase=kodi-devel
 pkgname=(
-  "$pkgbase" kodi-x11-devel kodi-wayland-devel kodi-gbm-devel
-  kodi-eventclients-devel kodi-tools-texturepacker-devel kodi-dev-devel
+  "$pkgbase" "$pkgbase-x11" "$pkgbase-wayland" "$pkgbase-gbm"
+  "$pkgbase-eventclients" "$pkgbase-tools-texturepacker" "$pkgbase-dev"
 )
-pkgver=18.8pre21
-_major=18.7.1
+pkgver=19.0a1
+#_major=18.7.1
 pkgrel=1
 arch=('x86_64')
 url="https://kodi.tv"
 license=('GPL2')
 makedepends=(
-  'afpfs-ng' 'bluez-libs' 'cmake' 'curl' 'dav1d' 'doxygen' 'git' 'glew'
+  'afpfs-ng' 'bluez-libs' 'cmake' 'curl' 'dav1d' 'doxygen' 'glew'
   'gperf' 'hicolor-icon-theme' 'java-runtime' 'libaacs' 'libass'
   'libbluray' 'libcdio' 'libcec' 'libgl' 'mariadb-libs' 'libmicrohttpd'
   'libmodplug' 'libmpeg2' 'libnfs' 'libplist' 'libpulse' 'libva'
   'libvdpau' 'libxrandr' 'libxslt' 'lirc' 'lzo' 'mesa' 'nasm'
-  'python2-pycryptodomex' 'python2-pillow6' 'python2-pybluez'
-  'python2-simplejson' 'shairplay' 'smbclient' 'taglib' 'tinyxml' 'swig'
-  'upower' 'giflib' 'rapidjson' 'ghostscript' 'meson' 'gtest' 'graphviz'
+  'python-pycryptodomex' 'python-pillow' 'python-pybluez' 'python-simplejson'
+  'shairplay' 'smbclient' 'taglib' 'tinyxml' 'swig'
+  'upower' 'giflib' 'rapidjson' 'ghostscript' 'git' 'meson' 'gtest'
   # wayland
   'wayland-protocols' 'waylandpp' 'libxkbcommon'
   # gbm
   'libinput'
 )
 
-_codename=Leia
-#_tag="$pkgver-$_codename"
-_tag="$_major-$_codename"
+_tag="$pkgver-Matrix"
+#_tag="$_major-Matrix"
 
 # Found on their respective github release pages. One can check them against
 # what is pulled down when not specifying them in the cmake step.
@@ -58,14 +57,15 @@ _tag="$_major-$_codename"
 #
 # fmt and crossguid can be found http://mirrors.kodi.tv/build-deps/sources/
 #
-_libdvdcss_version="1.4.2-$_codename-Beta-5"
-_libdvdnav_version="6.0.0-$_codename-Alpha-3"
-_libdvdread_version="6.0.0-$_codename-Alpha-3"
+_libdvdcss_version="1.4.2-Leia-Beta-5"
+_libdvdnav_version="6.0.0-Leia-Alpha-3"
+_libdvdread_version="6.0.0-Leia-Alpha-3"
 _ffmpeg_version="4.3.1-Matrix-Alpha1-1"
-_fmt_version="5.1.0"
+_fmt_version="6.1.2"
 _crossguid_version="8f399e8bd4"
 _fstrcmp_version="0.7.D001"
-_flatbuffers_version="1.9.0"
+_flatbuffers_version="1.11.0"
+_spdlog_version="1.5.0"
 
 source=(
   "${pkgbase%%-*}-$_tag.tar.gz::https://github.com/xbmc/xbmc/archive/$_tag.tar.gz"
@@ -77,40 +77,9 @@ source=(
   "http://mirrors.kodi.tv/build-deps/sources/crossguid-$_crossguid_version.tar.gz"
   "http://mirrors.kodi.tv/build-deps/sources/fstrcmp-$_fstrcmp_version.tar.gz"
   "http://mirrors.kodi.tv/build-deps/sources/flatbuffers-$_flatbuffers_version.tar.gz"
+  "http://mirrors.kodi.tv/build-deps/sources/spdlog-$_spdlog_version.tar.gz"
   cpuinfo
-  
-  # use newer ffmpeg
-  000-PR17300.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/17300.patch
-  18071-mod_for_linux_only.patch
-  
-  # 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
-  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
-  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
-  011-PR18056.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18056.patch
-  012-PR18073.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18073.patch
-  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-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
-  021-PR18216.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/18216.patch
+  000-python3.8.patch
 )
 noextract=(
   "libdvdcss-$_libdvdcss_version.tar.gz"
@@ -121,48 +90,21 @@ noextract=(
   "crossguid-$_crossguid_version.tar.gz"
   "fstrcmp-$_fstrcmp_version.tar.gz"
   "flatbuffers-$_flatbuffers_version.tar.gz"
+  "spdlog-$_spdlog_version.tar.gz"
 )
-sha256sums=('5cfec391bcd168bbd4f9d38a6c8ec93e42e040cf82cf6ebf23db5e86753816fb'
+sha256sums=('3c66715448e18f95bc5e8a3075f95e643f3b2c0bae3957f2abb5b567b7e7eceb'
             '38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d'
             '071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a'
             'a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf'
             'a7d956dbbe3c2036a8a78976efaf43792e1c7c152a04182024f231f4ee2e7d7e'
-            '73d4cab4fa8a3482643d8703de4d9522d7a56981c938eca42d929106ff474b44'
+            '1cafc80701b746085dddf41bd9193e6d35089e1c6ec1940e037fcb9c98f62365'
             '3d77d09a5df0de510aeeb940df4cb534787ddff3bb1828779753f5dfa1229d10'
             'e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476'
-            '5ca5491e4260cacae30f1a5786d109230db3f3a6e5a0eb45d0d0608293d247e3'
+            '1789b97e790da8f2cb5ff827d15580878c8629fd889f5f038d7524dca43eacc9'
+            'b38e0bbef7faac2b82fed550a0c19b0d4e7f6737d5321d4fd8f216b80f8aee8a'
             '27387e49043127f09c5ef0a931fffb864f5730e79629100a6e210b68a1b9f2c1'
-            '3aaca3630689b76e7a7f35656a4ada3fb18ecd7e3fe199634264ccf76b96c0f0'
-            '4d9eb12db337a89b5e17815bd422015f3017c735bd0c5b522f5a5b0c7f81a607'
-            'f11af738b2be8f390a7b515cfb74276a0ccb64ac061b8f5a7b3772e19eb0d203'
-            'd444ad0898f93582bef530d0d91952ba5c926b0225372f81b3a4376193cfebb5'
-            '15255c5b928b278b15a90468ead80ad75b9331dc7dac91e5da296a66f7b1a6a1'
-            '89ac4b3feac908075ddbcdc4f9f1d1703c25e2fdb1661e776c162eb779437bd8'
-            'f56503139927f0bc8f220c4b4e31266fc938a6612a4c1d2bdd75be3f54eb3a12'
-            '995c61de460e0afdc135ba33f9f393a825cb4a0c7954da104d23269fe48ec118'
-            '8531da4ce924d80f5b8c8fbcf547e0738e48ffce335f73a4da6466f499ab1bfe'
-            '4c2775722998fd0f6111ff841b29e8813c58b7905be1e8a01bf8a768622cb30c'
-            '0928d20977cd3b8225ea52ecf1641611ed2ec95dc1b937187a5b796fb570b2f1'
-            'ff34d94f4ff7f1d9638c948b05da1802638bf66037dda53ce44b9afb501ec1dc'
-            'f4ac91dbad4014a6707e8bb6f57cac0ec68a852a3e81815a210304a886a665a1'
-            '2d31bf616362001a75c590c0ea9ef22f321ffabf1d95f781d558f92e69cdc8c9'
-            '4b009d1acced4912f981d1454ff2add556b79188c003bc837d60224605364353'
-            'b766ce6bbae0d41abe323866c7ff9dd8ef89fdf214cc6104125c4115cb2bc221'
-            '5b19f4f74136f91986e3d3eed93102b06a700dd4b3a561926eabc7997434f22a'
-            'e4963bdeb1de7c147a364cd3ee2186fb1d0b2fc8f3ea7636054cf2adac040468'
-            '7b8a6510bc286d58b4a3d57322362335cbf2a56d1b2bd16bfcdf06d5eef8644d'
-            'b797150851830c553d84f11dfd6942c551d8e6ce151371e048dd2443493fb779'
-            '336df43ee417d50ffa3e025697960828d78a75f4c5b943190103baface402ac8'
-            '73024d5c6462a360bb527da2d408343ba6206d513f760a94c97b18e6937c649f'
-            'c92980e4ecc5e6714b1fd94f1124d49681bf79be5751cb09ecc51ec976ef293d'
-            'dc7fc1ce45f43e7a18af59c157307a350971a16c2ffad2cf371880fcf1610013'
-            '20163cb537030a21e9f2da4534abe2137bbc4046007240eef2b4b506992c4e32')
+            'edff38cea510817c3682c7c6086054ac49adaa478285093ea294d83db065b83f')
 prepare() {
-  # force python 'binary' as python2
-  [[ -d "$srcdir/path" ]] && rm -rf "$srcdir/path"
-  mkdir "$srcdir/path"
-  ln -s /usr/bin/python2 "$srcdir/path/python"
-
   [[ -d kodi-build-x11 ]] && rm -rf kodi-build-x11
   mkdir kodi-build-x11
   [[ -d kodi-build-wayland ]] && rm -rf kodi-build-wayland
@@ -206,7 +148,7 @@ build() {
   # export CFLAGS+=" -march=native"
   # export CXXFLAGS="${CFLAGS}"
 
-  msg2 "building kodi-x11"
+  echo "building kodi-x11"
   cd "$srcdir/kodi-build-x11"
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=/usr/lib \
@@ -216,6 +158,9 @@ build() {
     -DENABLE_INTERNAL_CROSSGUID=ON \
     -DENABLE_INTERNAL_FSTRCMP=ON \
     -DENABLE_INTERNAL_FLATBUFFERS=ON \
+    -DENABLE_INTERNAL_SPDLOG=ON \
+    -DENABLE_MYSQLCLIENT=ON \
+    -DX11_RENDER_SYSTEM=gl \
     -Dlibdvdcss_URL="$srcdir/libdvdcss-$_libdvdcss_version.tar.gz" \
     -Dlibdvdnav_URL="$srcdir/libdvdnav-$_libdvdnav_version.tar.gz" \
     -Dlibdvdread_URL="$srcdir/libdvdread-$_libdvdread_version.tar.gz" \
@@ -224,12 +169,13 @@ build() {
     -DCROSSGUID_URL="$srcdir/crossguid-$_crossguid_version.tar.gz" \
     -DFSTRCMP_URL="$srcdir/fstrcmp-$_fstrcmp_version.tar.gz" \
     -DFLATBUFFERS_URL="$srcdir/flatbuffers-$_flatbuffers_version.tar.gz" \
+    -DSPDLOG_URL="$srcdir/spdlog-$_spdlog_version.tar.gz" \
     -DX11_RENDER_SYSTEM=gl \
     ../"xbmc-$_tag"
   make
   make preinstall
 
-  msg2 "building kodi-wayland"
+  echo "building kodi-wayland"
   cd "$srcdir/kodi-build-wayland"
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=/usr/lib \
@@ -239,6 +185,7 @@ build() {
     -DENABLE_INTERNAL_CROSSGUID=ON \
     -DENABLE_INTERNAL_FSTRCMP=ON \
     -DENABLE_INTERNAL_FLATBUFFERS=ON \
+    -DENABLE_INTERNAL_SPDLOG=ON \
     -Dlibdvdcss_URL="$srcdir/libdvdcss-$_libdvdcss_version.tar.gz" \
     -Dlibdvdnav_URL="$srcdir/libdvdnav-$_libdvdnav_version.tar.gz" \
     -Dlibdvdread_URL="$srcdir/libdvdread-$_libdvdread_version.tar.gz" \
@@ -247,13 +194,14 @@ build() {
     -DCROSSGUID_URL="$srcdir/crossguid-$_crossguid_version.tar.gz" \
     -DFSTRCMP_URL="$srcdir/fstrcmp-$_fstrcmp_version.tar.gz" \
     -DFLATBUFFERS_URL="$srcdir/flatbuffers-$_flatbuffers_version.tar.gz" \
+    -DSPDLOG_URL="$srcdir/spdlog-$_spdlog_version.tar.gz" \
     -DCORE_PLATFORM_NAME=wayland \
     -DWAYLAND_RENDER_SYSTEM=gl \
     ../"xbmc-$_tag"
   make
   make preinstall
 
-  msg2 "building kodi-gbm"
+  echo "building kodi-gbm"
   cd "$srcdir/kodi-build-gbm"
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=/usr/lib \
@@ -263,6 +211,7 @@ build() {
     -DENABLE_INTERNAL_CROSSGUID=ON \
     -DENABLE_INTERNAL_FSTRCMP=ON \
     -DENABLE_INTERNAL_FLATBUFFERS=ON \
+    -DENABLE_INTERNAL_SPDLOG=ON \
     -Dlibdvdcss_URL="$srcdir/libdvdcss-$_libdvdcss_version.tar.gz" \
     -Dlibdvdnav_URL="$srcdir/libdvdnav-$_libdvdnav_version.tar.gz" \
     -Dlibdvdread_URL="$srcdir/libdvdread-$_libdvdread_version.tar.gz" \
@@ -271,6 +220,7 @@ build() {
     -DCROSSGUID_URL="$srcdir/crossguid-$_crossguid_version.tar.gz" \
     -DFSTRCMP_URL="$srcdir/fstrcmp-$_fstrcmp_version.tar.gz" \
     -DFLATBUFFERS_URL="$srcdir/flatbuffers-$_flatbuffers_version.tar.gz" \
+    -DSPDLOG_URL="$srcdir/spdlog-$_spdlog_version.tar.gz" \
     -DCORE_PLATFORM_NAME=gbm \
     -DGBM_RENDER_SYSTEM=gles \
     ../"xbmc-$_tag"
@@ -284,14 +234,14 @@ build() {
 package_kodi-devel() {
   pkgdesc="Alpha, Beta, or RC versions of the software media player and entertainment hub for digital media"
   depends=(
-    'desktop-file-utils' 'hicolor-icon-theme' 'mesa' 'python2-pycryptodomex'
-    'python2-pillow6' 'python2-simplejson' 'xorg-xdpyinfo'
+    'desktop-file-utils' 'hicolor-icon-theme' 'mesa' 'python-pycryptodomex'
+    'python-pillow6' 'python-simplejson' 'xorg-xdpyinfo'
     'KODI-BIN'
   )
   optdepends=(
     'afpfs-ng: Apple shares support'
     'bluez: Blutooth support'
-    'python2-pybluez: Bluetooth support'
+    'python-pybluez: Bluetooth support'
     'libplist: AirPlay support'
     'pulseaudio: PulseAudio support'
     'shairplay: AirPlay support'
@@ -316,11 +266,6 @@ package_kodi-devel() {
      -P cmake_install.cmake
   done
 
-  # python2 is being used
-  cd "$pkgdir"
-  grep -lR '#!.*python' * | \
-    while read file; do sed -s 's/\(#!.*python\)/\12/g' -i "$file"; done
-
   # remove x11 binaries
   rm "$pkgdir/usr/lib/kodi/"{kodi-x11,kodi-xrandr}
 }
@@ -328,14 +273,14 @@ package_kodi-devel() {
 # kodi-x11
 # components: kodi-bin
 
-package_kodi-x11-devel() {
+package_kodi-devel-x11() {
   pkgdesc="x11 kodi binary"
   provides=('KODI-BIN' "kodi-x11=${pkgver}")
   replaces=('kodi-bin')
   depends=(
     'bluez-libs' 'curl' 'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec'
     'libmicrohttpd' 'libnfs' 'libpulse' 'libva' 'libvdpau' 'libxrandr'
-    'libxslt' 'lirc' 'mariadb-libs' 'python2' 'smbclient' 'taglib'
+    'libxslt' 'lirc' 'mariadb-libs' 'python' 'smbclient' 'taglib'
     'tinyxml' "$pkgbase"
   )
 
@@ -347,13 +292,13 @@ package_kodi-x11-devel() {
 # kodi-wayland
 # components: kodi-bin
 
-package_kodi-wayland-devel() {
+package_kodi-devel-wayland() {
   pkgdesc="wayland kodi binary"
   provides=('KODI-BIN' "kodi-wayland=${pkgver}")
   depends=(
     'bluez-libs' 'curl' 'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec'
     'libmicrohttpd' 'libnfs' 'libpulse' 'libva' 'libxkbcommon' 'libxslt'
-    'lirc' 'mariadb-libs' 'python2' 'smbclient' 'taglib' 'tinyxml'
+    'lirc' 'mariadb-libs' 'python' 'smbclient' 'taglib' 'tinyxml'
     'waylandpp' "$pkgbase"
   )
 
@@ -364,13 +309,13 @@ package_kodi-wayland-devel() {
 # kodi-gbm
 # components: kodi-bin
 
-package_kodi-gbm-devel() {
+package_kodi-devel-gbm() {
   pkgdesc="gbm kodi binary"
   provides=('KODI-BIN' "kodi-gbm=${pkgver}")
   depends=(
     'bluez-libs' 'curl' 'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec'
     'libinput' 'libmicrohttpd' 'libnfs' 'libpulse' 'libva' 'libxkbcommon'
-    'libxslt' 'lirc' 'mariadb-libs' 'python2' 'smbclient' 'taglib'
+    'libxslt' 'lirc' 'mariadb-libs' 'python' 'smbclient' 'taglib'
     'tinyxml' "$pkgbase"
   )
 
@@ -381,11 +326,11 @@ package_kodi-gbm-devel() {
 # kodi-eventclients
 # components: kodi-eventclients-common kodi-eventclients-ps3 kodi-eventclients-wiiremote kodi-eventclients-kodi-send
 
-package_kodi-eventclients-devel() {
+package_kodi-devel-eventclients() {
   pkgdesc="Kodi Event Clients"
   provides=("kodi-eventclients=${pkgver}")
   conflicts=('kodi-eventclients')
-  optdepends=('python2: most eventclients are implemented in python2')
+  optdepends=('python: most eventclients are implemented in python')
 
   _components=(
     'kodi-eventclients-common'
@@ -402,17 +347,12 @@ package_kodi-eventclients-devel() {
       -DCMAKE_INSTALL_COMPONENT="$_cmp" \
       -P cmake_install.cmake
   done
-
-  # python2 is being used
-  cd "$pkgdir"
-  grep -lR '#!.*python' * | \
-    while read file; do sed -s 's/\(#!.*python\)/\12/g' -i "$file"; done
 }
 
 # kodi-tools-texturepacker
 # components: kodi-tools-texturepacker
 
-package_kodi-tools-texturepacker-devel() {
+package_kodi-devel-tools-texturepacker() {
   pkgdesc="Kodi Texturepacker tool"
   provides=("kodi-tools-texturepacker=${pkgver}")
   conflicts=('kodi-tools-texturepacker')
@@ -436,7 +376,7 @@ package_kodi-tools-texturepacker-devel() {
 #             kodi-inputstream-dev kodi-peripheral-dev kodi-pvr-dev
 #             kodi-screensaver-dev kodi-visualization-dev
 
-package_kodi-dev-devel() {
+package_kodi-devel-dev() {
   pkgdesc="Kodi dev files"
   depends=("$pkgbase")
   provides=("kodi-dev=${pkgver}")
@@ -463,9 +403,4 @@ package_kodi-dev-devel() {
       -DCMAKE_INSTALL_COMPONENT="$_cmp" \
       -P cmake_install.cmake
   done
-
-  # python2 is being used
-  cd "$pkgdir"
-  grep -lR '#!.*python' * | \
-    while read file; do sed -s 's/\(#!.*python\)/\12/g' -i "$file"; done
 }