From b0015251bd96696e9b87cc320ab5151df490bd99 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Tue, 16 Mar 2021 01:19:44 +0000
Subject: [PATCH 1/9] kodi-platform: update to 20180302 and enable cross
 compilation

---
 common/shlibs                  |  2 +-
 srcpkgs/kodi-platform/template | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 27fdddc90d72..e76c9bfc6f73 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3549,7 +3549,7 @@ libgaminggear.so.0 libgaminggear-0.15.1_1
 libgaminggearfx.so.0 libgaminggear-0.15.1_1
 libgaminggearwidget.so.0 libgaminggear-0.15.1_1
 libopkg.so.1 libopkg-0.4.4_2
-libkodiplatform.so.18.0 kodi-platform-17.1.0_1
+libkodiplatform.so.19.0 kodi-platform-20180302_1
 libQMatrixClient.so.0.5.3 libqmatrixclient-0.5.3.2_1
 libipset.so.13 libipset-7.9_1
 libmp3splt.so.0 libmp3splt-0.9.2_1
diff --git a/srcpkgs/kodi-platform/template b/srcpkgs/kodi-platform/template
index 9eed2ca9851a..33421576459c 100644
--- a/srcpkgs/kodi-platform/template
+++ b/srcpkgs/kodi-platform/template
@@ -1,7 +1,8 @@
 # Template file for 'kodi-platform'
 pkgname=kodi-platform
-version=17.1.0
+version=20180302
 revision=1
+wrksrc=kodi-platform-kodiplatform-${version}
 build_style=cmake
 configure_args="-DCMAKE_INSTALL_LIBDIR=/usr/lib"
 makedepends="kodi-devel tinyxml-devel p8-platform-devel"
@@ -9,9 +10,12 @@ short_desc="Kodi platform support library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/xbmc/kodi-platform"
-distfiles="https://github.com/xbmc/kodi-platform/archive/${version}.tar.gz"
-checksum=39de7eb6db14de3fa33ca0e56243c3307e7598187e73ad930dabccdf068bd9b2
-nocross="kodi cmake files use absolute paths"
+distfiles="https://github.com/xbmc/kodi-platform/archive/kodiplatform-${version}.tar.gz"
+checksum=1d8ddbe444bd42f4b6f2babb9f78d6c1e152d828eff90b07308febf883c05b38
+
+if [ -n "${CROSS_BUILD}" ]; then
+	configure_args+=" -DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake"
+fi
 
 kodi-platform-devel_package() {
 	short_desc+=" - development files"

From a11f406fe04229b3389ac0666e9bba86a93a1c2f Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Tue, 16 Mar 2021 01:31:02 +0000
Subject: [PATCH 2/9] kodi-addon-pvr-iptvsimple: enable cross compilation

---
 srcpkgs/kodi-addon-pvr-iptvsimple/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi-addon-pvr-iptvsimple/template b/srcpkgs/kodi-addon-pvr-iptvsimple/template
index 7628dd6bd31f..fb01d475f8d5 100644
--- a/srcpkgs/kodi-addon-pvr-iptvsimple/template
+++ b/srcpkgs/kodi-addon-pvr-iptvsimple/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-addon-pvr-iptvsimple'
 pkgname=kodi-addon-pvr-iptvsimple
 version=7.5.0
-revision=1
+revision=2
 _kodi_release=Matrix
 wrksrc="pvr.iptvsimple-${version}-${_kodi_release}"
 build_style=cmake
@@ -14,4 +14,8 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/kodi-pvr/pvr.iptvsimple"
 distfiles="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${version}-${_kodi_release}.tar.gz"
 checksum=1cbe623e1eec0246c782398d8a8964d26b0fa68966c7f1422666068e50fb4e00
-nocross="depends on kodi-platform"
+
+if [ -n "${CROSS_BUILD}" ]; then
+	configure_args+=" -DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake"
+	configure_args+=" -DKODI_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/kodi"
+fi

From a77e7914eb4671c24435f85031e7b6f0ded7bfae Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Tue, 16 Mar 2021 01:34:13 +0000
Subject: [PATCH 3/9] kodi-addon-pvr-hts: enable cross compilation

---
 srcpkgs/kodi-addon-pvr-hts/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi-addon-pvr-hts/template b/srcpkgs/kodi-addon-pvr-hts/template
index eeb0d6335275..de380b403e13 100644
--- a/srcpkgs/kodi-addon-pvr-hts/template
+++ b/srcpkgs/kodi-addon-pvr-hts/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-addon-pvr-hts'
 pkgname=kodi-addon-pvr-hts
 version=8.2.3
-revision=1
+revision=2
 _kodi_release=Matrix
 wrksrc="pvr.hts-${version}-${_kodi_release}"
 build_style=cmake
@@ -12,8 +12,12 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/kodi-pvr/pvr.hts"
 distfiles="https://github.com/kodi-pvr/pvr.hts/archive/${version}-${_kodi_release}.tar.gz"
 checksum=bdaf63945d6552bead5a6e8ba4ffe1b8057e3b0c05b52c0fbf93a7834f652330
-nocross="depends on kodi-platform"
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
 fi
+
+if [ -n "${CROSS_BUILD}" ]; then
+	configure_args+=" -DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake"
+	configure_args+=" -DKODI_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/kodi"
+fi

From ae1ff49f234d2af52f23116e103afca252e0ef95 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Tue, 16 Mar 2021 01:37:54 +0000
Subject: [PATCH 4/9] kodi-addon-pvr-zattoo: enable cross compilation

---
 srcpkgs/kodi-addon-pvr-zattoo/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi-addon-pvr-zattoo/template b/srcpkgs/kodi-addon-pvr-zattoo/template
index 1ff40658bcf0..3851b0dddaca 100644
--- a/srcpkgs/kodi-addon-pvr-zattoo/template
+++ b/srcpkgs/kodi-addon-pvr-zattoo/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-addon-pvr-zattoo'
 pkgname=kodi-addon-pvr-zattoo
 version=19.7.8.1
-revision=1
+revision=2
 _kodi_release=Matrix
 wrksrc="pvr.zattoo-${version}-${_kodi_release}"
 build_style=cmake
@@ -15,5 +15,9 @@ license="GPL-2.0-only"
 homepage="https://github.com/rbuehlma/pvr.zattoo"
 distfiles="https://github.com/rbuehlma/pvr.zattoo/archive/${version}-${_kodi_release}.tar.gz"
 checksum=25dc4ea72b5315a65286ba606e6e26d281fb8eb830d5e0164b66b8d7ae90319a
-nocross="depends on kodi-platform"
 make_check=no # No target to "make test"
+
+if [ -n "${CROSS_BUILD}" ]; then
+	configure_args+=" -DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake"
+	configure_args+=" -DKODI_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/kodi"
+fi

From 41e3298476690c4f21a15d94ef34c3803599b6cc Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Tue, 16 Mar 2021 01:42:11 +0000
Subject: [PATCH 5/9] kodi-addon-game-libretro: enable cross compilation

---
 srcpkgs/kodi-addon-game-libretro/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi-addon-game-libretro/template b/srcpkgs/kodi-addon-game-libretro/template
index 6e44c5a1de9c..fba2dea7971a 100644
--- a/srcpkgs/kodi-addon-game-libretro/template
+++ b/srcpkgs/kodi-addon-game-libretro/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-addon-game-libretro'
 pkgname=kodi-addon-game-libretro
 version=2.2.0
-revision=1
+revision=2
 _kodi_release=Matrix
 wrksrc="game.libretro-${version}-${_kodi_release}"
 build_style=cmake
@@ -12,4 +12,8 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/kodi-game/game.libretro"
 distfiles="https://github.com/kodi-game/game.libretro/archive/${version}-${_kodi_release}.tar.gz"
 checksum=b92670065d5644b4766bb90ee51cc69730e11b4a8dc912bbe90dce7d07b39e32
-nocross="depends on kodi-platform"
+
+if [ -n "${CROSS_BUILD}" ]; then
+	configure_args+=" -DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake"
+	configure_args+=" -DKODI_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/kodi"
+fi

From 82d07bd81b2403da3798669e7f5650e37e0eb859 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Tue, 16 Mar 2021 01:44:05 +0000
Subject: [PATCH 6/9] kodi-addon-inputstream-rtmp: enable cross compilation

---
 srcpkgs/kodi-addon-inputstream-rtmp/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index 3e7e4968f8c3..5c3b846e8cd7 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-addon-inputstream-rtmp'
 pkgname=kodi-addon-inputstream-rtmp
 version=3.4.0
-revision=1
+revision=2
 _kodi_release=Matrix
 wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
 build_style=cmake
@@ -14,4 +14,8 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/xbmc/inputstream.rtmp"
 distfiles="https://github.com/xbmc/inputstream.rtmp/archive/${version}-${_kodi_release}.tar.gz"
 checksum=efaaa9b07c18810582a3826df476fc36a2aac82be7512271545073c3f6cc0212
-nocross="depends on kodi-platform"
+
+if [ -n "${CROSS_BUILD}" ]; then
+	configure_args+=" -DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake"
+	configure_args+=" -DKODI_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/kodi"
+fi

From d3bad797d8ee1cfe32d5a638d8503e8cd0efe6d0 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Tue, 16 Mar 2021 01:47:26 +0000
Subject: [PATCH 7/9] kodi-addon-inputstream-adaptive: enable cross compilation

---
 srcpkgs/kodi-addon-inputstream-adaptive/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi-addon-inputstream-adaptive/template b/srcpkgs/kodi-addon-inputstream-adaptive/template
index ca978f1f3d81..579f39bfb0e4 100644
--- a/srcpkgs/kodi-addon-inputstream-adaptive/template
+++ b/srcpkgs/kodi-addon-inputstream-adaptive/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-addon-inputstream-adaptive'
 pkgname=kodi-addon-inputstream-adaptive
 version=2.6.7
-revision=1
+revision=2
 _kodi_release=Matrix
 wrksrc="inputstream.adaptive-${version}-${_kodi_release}"
 build_style=cmake
@@ -13,4 +13,8 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/peak3d/inputstream.adaptive"
 distfiles="https://github.com/peak3d/inputstream.adaptive/archive/${version}-${_kodi_release}.tar.gz"
 checksum=353207f5f98bf81ce8d79cec903c28da8c0227d7c7a632692c910d81e59c2dbe
-nocross="depends on kodi-platform"
+
+if [ -n "${CROSS_BUILD}" ]; then
+	configure_args+=" -DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake"
+	configure_args+=" -DKODI_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/kodi"
+fi

From f733f3cbe6fe2f61a5d649cccb4c5215c3cdf27a Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Tue, 16 Mar 2021 01:48:40 +0000
Subject: [PATCH 8/9] kodi-addon-vfs-sftp: enable cross compilation

---
 srcpkgs/kodi-addon-vfs-sftp/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 40d91f566d62..9c3e23e3b787 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-addon-vfs-sftp'
 pkgname=kodi-addon-vfs-sftp
 version=2.0.0
-revision=1
+revision=2
 _kodi_release=Matrix
 wrksrc="vfs.sftp-${version}-${_kodi_release}"
 build_style=cmake
@@ -13,4 +13,8 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/xbmc/vfs.sftp"
 distfiles="https://github.com/xbmc/vfs.sftp/archive/${version}-${_kodi_release}.tar.gz"
 checksum=b15c5dde7b3aadb3e82e61cb9b0440812b6c2f65b38c6c25aef726f97e746f68
-nocross="depends on kodi-platform"
+
+if [ -n "${CROSS_BUILD}" ]; then
+	configure_args+=" -DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake"
+	configure_args+=" -DKODI_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/kodi"
+fi

From d2ae6f12b3acfb604401d2543b15070b19b508e7 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Tue, 16 Mar 2021 01:50:16 +0000
Subject: [PATCH 9/9] kodi-addon-vfs-rar: enable cross compilation

---
 srcpkgs/kodi-addon-vfs-rar/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi-addon-vfs-rar/template b/srcpkgs/kodi-addon-vfs-rar/template
index 9ae75a72c860..5f36d7367eac 100644
--- a/srcpkgs/kodi-addon-vfs-rar/template
+++ b/srcpkgs/kodi-addon-vfs-rar/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-addon-vfs-rar'
 pkgname=kodi-addon-vfs-rar
 version=4.0.0
-revision=1
+revision=2
 _kodi_release=Matrix
 wrksrc="vfs.rar-${version}-${_kodi_release}"
 build_style=cmake
@@ -12,4 +12,8 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/xbmc/vfs.rar"
 distfiles="https://github.com/xbmc/vfs.rar/archive/${version}-${_kodi_release}.tar.gz"
 checksum=1111d1f90cc4addc2adb0884b779f4b47e30abb2766ba1708053e5f100b514bf
-nocross="depends on kodi-platform"
+
+if [ -n "${CROSS_BUILD}" ]; then
+	configure_args+=" -DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake"
+	configure_args+=" -DKODI_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/kodi"
+fi