Update to r57330.df99069c252-2

3 files changed, 53 insertions, 180 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d067ef1261f1..d4b2d7efaf66 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = kodi-matrix-git
 	pkgver = r57330.df99069c252
-	pkgrel = 1
+	pkgrel = 2
 	url = https://kodi.tv
 	arch = x86_64
 	license = GPL2
@@ -72,28 +72,26 @@ pkgbase = kodi-matrix-git
 	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.2-Matrix-19.2.tar.gz::https://github.com/xbmc/FFmpeg/archive/4.3.2-Matrix-19.2.tar.gz
 	source = http://mirrors.kodi.tv/build-deps/sources/fmt-6.1.2.tar.gz
+	source = http://mirrors.kodi.tv/build-deps/sources/spdlog-1.5.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
 	source = http://mirrors.kodi.tv/build-deps/sources/flatbuffers-1.12.0.tar.gz
-	source = http://mirrors.kodi.tv/build-deps/sources/spdlog-1.5.0.tar.gz
 	source = http://mirrors.kodi.tv/build-deps/sources/libudfread-1.1.0.tar.gz
 	source = cheat-sse-build.patch
-	source = 0001-allow-separate-windowing-binaries-being-launched-fro.patch
 	b2sums = SKIP
 	b2sums = 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da
 	b2sums = 7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355
 	b2sums = 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c
 	b2sums = 60299be16d73fb689b698f5b322d9cd38093894222070d2f1c28a37477a338405938959440a3f5646d946f3c2287072fdfa582b644a36f3a23e7d637b51113fc
 	b2sums = 36e7451a8732c62dcbf47e6d287ea582827b6196a468b8648803ea1bc9a37a5f681d87488f748d749183d97783ac7fb47a3f2aeed64fc6a684f9ee85b67ae28d
+	b2sums = bac6c6650f8347458dd2dd66f318b43a769b0896d68f6a6f1310754527a69feaa52b2f6f48d67c7e811c2dafa5d3863a9a07c738df8c12abed2718fb06254b28
 	b2sums = e6f1f495adf541102e3b5ac11dfd14b770a52e23ef9d613bc6204f6493ff4df4da9ba290ad6c3a7e5c7fcf159cafdf355bfe668a4ddceb4329df934c65966d19
 	b2sums = a8b68fcb8613f0d30e5ff7b862b37408472162585ca71cdff328e3299ff50476fd265467bbd77b352b22bb88c590969044f74d91c5468475504568fd269fa69e
 	b2sums = 441123be124ad851efa30bda0d828a764ebaf79ba6692a6e5904000b33818e9de78c3a964037ac93ef562890980c58169141e55354dce86857c02bcd917150d6
-	b2sums = bac6c6650f8347458dd2dd66f318b43a769b0896d68f6a6f1310754527a69feaa52b2f6f48d67c7e811c2dafa5d3863a9a07c738df8c12abed2718fb06254b28
 	b2sums = e7fab72ebecb372c54af77b4907e53f77a5503af66e129bd2083ef7f4209ebfbed163ffd552e32b7181829664fff6ab82a1cdf00c81dc6f3cc6bfc8fa7242f6e
 	b2sums = 6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0
-	b2sums = 9745854bab7e7ddf1cb816e536f303513d8792b5431c62d042894e6d2e702939bc1f9a965e7c59207cca832a297cc3c187c9435fc6e3029a3ddc0b13d11c7451
 
-pkgname = kodi-matrix-git-common
+pkgname = kodi-matrix-git
 	pkgdesc = A software media player and entertainment hub for digital media (Matrix branch)
 	depends = bluez-libs
 	depends = curl
@@ -110,6 +108,7 @@ pkgname = kodi-matrix-git-common
 	depends = libplist
 	depends = libpulse
 	depends = libva
+	depends = libvdpau
 	depends = libxslt
 	depends = lirc
 	depends = mariadb-libs
@@ -122,39 +121,27 @@ pkgname = kodi-matrix-git-common
 	depends = sqlite
 	depends = taglib
 	depends = tinyxml
+	depends = libxrandr
+	depends = libxkbcommon
+	depends = waylandpp
+	depends = libinput
 	optdepends = afpfs-ng: Apple shares support
 	optdepends = bluez: Blutooth support
 	optdepends = python-pybluez: Bluetooth support
 	optdepends = pulseaudio: PulseAudio support
 	optdepends = upower: Display battery level
 	provides = kodi-common=r57330.df99069c252
+	provides = kodi-x11
+	provides = kodi-wayland
+	provides = kodi-gbm
 	conflicts = kodi-common
-	replaces = kodi-common
-
-pkgname = kodi-matrix-git-x11
-	pkgdesc = x11 kodi binary
-	depends = kodi-matrix-git-common
-	depends = libxrandr
-	provides = kodi=r57330.df99069c252
-	replaces = kodi
-
-pkgname = kodi-matrix-git-wayland
-	pkgdesc = wayland kodi binary
-	depends = kodi-matrix-git-common
-	depends = libxkbcommon
-	depends = waylandpp
-	provides = kodi=r57330.df99069c252
+	conflicts = kodi-x11
 	conflicts = kodi-wayland
-	replaces = kodi
-
-pkgname = kodi-matrix-git-gbm
-	pkgdesc = gbm kodi binary
-	depends = kodi-matrix-git-common
-	depends = libxkbcommon
-	depends = libinput
-	provides = kodi=r57330.df99069c252
 	conflicts = kodi-gbm
-	replaces = kodi
+	replaces = kodi-common
+	replaces = kodi-x11
+	replaces = kodi-wayland
+	replaces = kodi-gbm
 
 pkgname = kodi-matrix-git-eventclients
 	pkgdesc = Kodi Event Clients (Matrix branch)
diff --git a/0001-allow-separate-windowing-binaries-being-launched-fro.patch b/0001-allow-separate-windowing-binaries-being-launched-fro.patch
deleted file mode 100644
index df983480594d..000000000000
--- a/0001-allow-separate-windowing-binaries-being-launched-fro.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 5b75228b51c3422644468050debbc495f5195585 Mon Sep 17 00:00:00 2001
-From: BlackEagle <ike.devolder@gmail.com>
-Date: Thu, 25 Feb 2021 15:24:21 +0100
-Subject: [PATCH] allow separate windowing binaries being launched from kodi
- wrapper
-
-Signed-off-by: BlackEagle <ike.devolder@gmail.com>
----
- tools/Linux/kodi.sh.in | 29 ++++++++++++++++++++++++++++-
- 1 file changed, 28 insertions(+), 1 deletion(-)
-
-diff --git a/tools/Linux/kodi.sh.in b/tools/Linux/kodi.sh.in
-index 108c0b0..38a49e0 100644
---- a/tools/Linux/kodi.sh.in
-+++ b/tools/Linux/kodi.sh.in
-@@ -28,6 +28,7 @@ LIBDIR="@libdir@"
- APP_BINARY=$LIBDIR/${bin_name}/@APP_BINARY@
- CRASHLOG_DIR=${CRASHLOG_DIR:-$HOME}
- KODI_DATA=${KODI_DATA:-"${HOME}/.${bin_name}"} # mapped to special://home/
-+WINDOWING=${WINDOWING:-"auto"}
- 
- # Workaround for high CPU load with nvidia GFX
- export __GL_YIELD=USLEEP
-@@ -43,13 +44,39 @@ do
-             LIBDIR="$2"
-             shift; shift
-             ;;
-+        --windowing)
-+            WINDOWING="$2"
-+            echo "$SAVED_ARGS" | sed "s/--windowing[ ]*$2//g"
-+            shift; shift
-+            ;;
-         *)
-             shift
-             ;;
-     esac
- done
- 
--KODI_BINARY=${APP_BINARY}
-+# Note: by default only one of those binaries exists
-+# To be able to select a different one, if has to be compiled specifically
-+# Your distribution might provide extra packages for those
-+if [ "$WINDOWING" = "auto" ]; then
-+    # Wayland
-+    if [ -n "$WAYLAND_DISPLAY" ] && [ -x $LIBDIR/${bin_name}/${bin_name}-wayland ]; then
-+        KODI_BINARY=$LIBDIR/${bin_name}/${bin_name}-wayland
-+    # X11
-+    elif echo $DISPLAY | grep -qE ":[0-9]+" && [ -x $LIBDIR/${bin_name}/${bin_name}-x11 ]; then
-+        KODI_BINARY=$LIBDIR/${bin_name}/${bin_name}-x11
-+    # GBM/DRM
-+    elif [ -z "$DISPLAY" ] && [ -z "$WAYLAND_DISPLAY" ] && [ -x $LIBDIR/${bin_name}/${bin_name}-gbm ]; then
-+        KODI_BINARY=$LIBDIR/${bin_name}/${bin_name}-gbm
-+    # Default kodi.bin
-+    else
-+        KODI_BINARY=${APP_BINARY}
-+    fi
-+elif [ -n "$WINDOWING" ]; then
-+    KODI_BINARY=$LIBDIR/${bin_name}/${bin_name}-${WINDOWING}
-+else
-+    KODI_BINARY=${APP_BINARY}
-+fi
- 
- if [ ! -x ${KODI_BINARY} ]; then
-     echo "Error: ${KODI_BINARY} not found"
--- 
-2.30.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 4318e74694c7..f0cbcd5f80c8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -21,12 +21,9 @@
 _clangbuild=
 
 pkgbase=kodi-matrix-git
-pkgname=(
-  "$pkgbase-common" "$pkgbase-x11" "$pkgbase-wayland" "$pkgbase-gbm"
-  "$pkgbase-eventclients" "$pkgbase-tools-texturepacker" "$pkgbase-dev"
-)
+pkgname=("$pkgbase" "$pkgbase-eventclients" "$pkgbase-tools-texturepacker" "$pkgbase-dev")
 pkgver=r57330.df99069c252
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="https://kodi.tv"
 license=('GPL2')
@@ -79,13 +76,12 @@ source=(
   "libdvdread-$_libdvdread_version.tar.gz::https://github.com/xbmc/libdvdread/archive/$_libdvdread_version.tar.gz"
   "ffmpeg-$_ffmpeg_version.tar.gz::https://github.com/xbmc/FFmpeg/archive/$_ffmpeg_version.tar.gz"
   "http://mirrors.kodi.tv/build-deps/sources/fmt-$_fmt_version.tar.gz"
+  "http://mirrors.kodi.tv/build-deps/sources/spdlog-$_spdlog_version.tar.gz"
   "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"
   "http://mirrors.kodi.tv/build-deps/sources/libudfread-$_libudfread_version.tar.gz"
   'cheat-sse-build.patch'
-  '0001-allow-separate-windowing-binaries-being-launched-fro.patch'
 )
 noextract=(
   "libdvdcss-$_libdvdcss_version.tar.gz"
@@ -105,13 +101,12 @@ b2sums=('SKIP'
         '0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c'
         '60299be16d73fb689b698f5b322d9cd38093894222070d2f1c28a37477a338405938959440a3f5646d946f3c2287072fdfa582b644a36f3a23e7d637b51113fc'
         '36e7451a8732c62dcbf47e6d287ea582827b6196a468b8648803ea1bc9a37a5f681d87488f748d749183d97783ac7fb47a3f2aeed64fc6a684f9ee85b67ae28d'
+        'bac6c6650f8347458dd2dd66f318b43a769b0896d68f6a6f1310754527a69feaa52b2f6f48d67c7e811c2dafa5d3863a9a07c738df8c12abed2718fb06254b28'
         'e6f1f495adf541102e3b5ac11dfd14b770a52e23ef9d613bc6204f6493ff4df4da9ba290ad6c3a7e5c7fcf159cafdf355bfe668a4ddceb4329df934c65966d19'
         'a8b68fcb8613f0d30e5ff7b862b37408472162585ca71cdff328e3299ff50476fd265467bbd77b352b22bb88c590969044f74d91c5468475504568fd269fa69e'
         '441123be124ad851efa30bda0d828a764ebaf79ba6692a6e5904000b33818e9de78c3a964037ac93ef562890980c58169141e55354dce86857c02bcd917150d6'
-        'bac6c6650f8347458dd2dd66f318b43a769b0896d68f6a6f1310754527a69feaa52b2f6f48d67c7e811c2dafa5d3863a9a07c738df8c12abed2718fb06254b28'
         'e7fab72ebecb372c54af77b4907e53f77a5503af66e129bd2083ef7f4209ebfbed163ffd552e32b7181829664fff6ab82a1cdf00c81dc6f3cc6bfc8fa7242f6e'
-        '6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0'
-        '9745854bab7e7ddf1cb816e536f303513d8792b5431c62d042894e6d2e702939bc1f9a965e7c59207cca832a297cc3c187c9435fc6e3029a3ddc0b13d11c7451')
+        '6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0')
 
 pkgver() {
   cd "$_gitname"
@@ -126,12 +121,7 @@ prepare() {
 
   [[ "$_sse_workaround" -eq 1 ]] && patch -p1 -i "$srcdir/cheat-sse-build.patch"
 
-  patch -p1 -i "$srcdir/0001-allow-separate-windowing-binaries-being-launched-fro.patch"
-
   if [[ -n "$_clangbuild" ]]; then
-    git cherry-pick --no-commit -n f5512d575dfc872d51632c9bf79d58e39be60cfb
-    git cherry-pick --no-commit -n 94a934227b234bfbbe1e3cdfdb71dc7d39ac0e7a
-    git cherry-pick --no-commit -n e32eeb6a4897ea6ff7ac461b848e60f7794037c2
     msg "Building with clang"
     export CC=clang CXX=clang++
   fi
@@ -145,12 +135,33 @@ build() {
   # export CXXFLAGS="${CFLAGS}"
 
   _args=(
+    -DCMAKE_BUILD_TYPE=Release
     -DCMAKE_INSTALL_PREFIX=/usr
     -DCMAKE_INSTALL_LIBDIR=/usr/lib
     -DUSE_LTO=$(nproc)
     -DVERBOSE=ON
     -DENABLE_LDGOLD=OFF
+    -DENABLE_AIRTUNES=ON
+    -DENABLE_ALSA=ON
+    -DENABLE_AVAHI=ON
+    -DENABLE_BLURAY=ON
+    -DENABLE_CEC=ON
+    -DENABLE_DBUS=ON
+    -DENABLE_DVDCSS=ON
+    -DENABLE_EGL=ON
     -DENABLE_EVENTCLIENTS=ON
+    -DENABLE_MICROHTTPD=ON
+    -DENABLE_MYSQLCLIENT=ON
+    -DENABLE_NFS=ON
+    -DENABLE_OPTICAL=ON
+    -DENABLE_PULSEAUDIO=ON
+    -DENABLE_SMBCLIENT=ON
+    -DENABLE_UDEV=ON
+    -DENABLE_UPNP=ON
+    -DENABLE_VAAPI=ON
+    -DENABLE_VDPAU=ON
+    -DENABLE_XSLT=ON
+    -DENABLE_LIRCCLIENT=ON
     -DENABLE_INTERNAL_FFMPEG=ON
     -DENABLE_INTERNAL_FMT=ON
     -DENABLE_INTERNAL_SPDLOG=ON
@@ -158,9 +169,6 @@ build() {
     -DENABLE_INTERNAL_FSTRCMP=ON
     -DENABLE_INTERNAL_FLATBUFFERS=ON
     -DENABLE_INTERNAL_UDFREAD=ON
-    -DENABLE_MYSQLCLIENT=ON
-    -DENABLE_VAAPI=ON
-    -DENABLE_VDPAU=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"
@@ -172,32 +180,25 @@ build() {
     -DFLATBUFFERS_URL="$srcdir/flatbuffers-$_flatbuffers_version.tar.gz"
     -DUDFREAD_URL="$srcdir/libudfread-$_libudfread_version.tar.gz"
     -DAPP_RENDER_SYSTEM=gl
+    -DCORE_PLATFORM_NAME="x11 wayland gbm"
   )
 
-  echo "building kodi-wayland"
-  cmake "${_args[@]}" -DCORE_PLATFORM_NAME=wayland ../"$_gitname"
-  make
-
-  echo "building kodi-gbm"
-  cmake "${_args[@]}" -DCORE_PLATFORM_NAME=gbm ../"$_gitname"
-  make
-
-  # build x11 version last that will make it fallback in the launcher script
-  echo "building kodi-x11"
-  cmake "${_args[@]}" -DCORE_PLATFORM_NAME=x11 ../"$_gitname"
+  echo "building kodi"
+  cmake "${_args[@]}" ../"$_gitname"
   make
 }
 
 # kodi
 # components: kodi
-package_kodi-matrix-git-common() {
+package_kodi-matrix-git() {
   pkgdesc="A software media player and entertainment hub for digital media (Matrix branch)"
   depends=(
     'bluez-libs' 'curl' 'dav1d' 'desktop-file-utils' 'hicolor-icon-theme'
     'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec' 'libmicrohttpd' 'libnfs'
-    'libplist' 'libpulse' 'libva' 'libxslt' 'lirc' 'mariadb-libs' 'mesa'
-    'python-pillow' 'python-pycryptodomex' 'python-simplejson'
+    'libplist' 'libpulse' 'libva' 'libvdpau' 'libxslt' 'lirc' 'mariadb-libs'
+    'mesa' 'python-pillow' 'python-pycryptodomex' 'python-simplejson'
     'shairplay' 'smbclient' 'sqlite' 'taglib' 'tinyxml'
+    'libxrandr' 'libxkbcommon' 'waylandpp' 'libinput'
   )
   [[ -n "$_clangbuild" ]] && depends+=('glu')
 
@@ -208,9 +209,9 @@ package_kodi-matrix-git-common() {
     'pulseaudio: PulseAudio support'
     'upower: Display battery level'
   )
-  provides=("kodi-common=${pkgver}")
-  conflicts=('kodi-common')
-  replaces=('kodi-common')
+  provides=("kodi-common=${pkgver}" 'kodi-x11' 'kodi-wayland' 'kodi-gbm')
+  replaces=('kodi-common' 'kodi-x11' 'kodi-wayland' 'kodi-gbm')
+  conflicts=('kodi-common' 'kodi-x11' 'kodi-wayland' 'kodi-gbm')
 
   _components=(
     'kodi'
@@ -223,54 +224,6 @@ package_kodi-matrix-git-common() {
     -DCMAKE_INSTALL_COMPONENT="$_cmp" \
      -P cmake_install.cmake
   done
-
-  # remove windowing specific binaries
-  rm -f "$pkgdir/usr/lib/kodi/"{kodi-x11,kodi-xrandr,kodi-wayland,kodi-gbm}
-}
-
-# kodi-x11
-# components: kodi-bin
-package_kodi-matrix-git-x11() {
-  pkgdesc="x11 kodi binary"
-  provides=("kodi=${pkgver}")
-  replaces=('kodi')
-  depends=(
-    'kodi-matrix-git-common' 'libxrandr'
-  )
-
-  cd kodi-build
-  install -Dm755 kodi-x11 "$pkgdir/usr/lib/kodi/kodi-x11"
-  install -Dm755 kodi-xrandr "$pkgdir/usr/lib/kodi/kodi-xrandr"
-}
-
-# kodi-wayland
-# components: kodi-bin
-package_kodi-matrix-git-wayland() {
-  pkgdesc="wayland kodi binary"
-  provides=("kodi=${pkgver}")
-  conflicts=('kodi-wayland')
-  replaces=('kodi')
-  depends=(
-    'kodi-matrix-git-common' 'libxkbcommon' 'waylandpp'
-  )
-
-  cd kodi-build
-  install -Dm755 kodi-wayland "$pkgdir/usr/lib/kodi/kodi-wayland"
-}
-
-# kodi-gbm
-# components: kodi-bin
-package_kodi-matrix-git-gbm() {
-  pkgdesc="gbm kodi binary"
-  provides=("kodi=${pkgver}")
-  conflicts=('kodi-gbm')
-  replaces=('kodi')
-  depends=(
-    'kodi-matrix-git-common' 'libxkbcommon' 'libinput'
-  )
-
-  cd kodi-build
-  install -Dm755 kodi-gbm "$pkgdir/usr/lib/kodi/kodi-gbm"
 }
 
 # kodi-eventclients