From: ndowens <ndowens@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP]kodi-platform: fix cross-build
Date: Sun, 03 Jan 2021 03:39:01 +0100 [thread overview]
Message-ID: <20210103023901.seNnRWhpamyWRXLt7Gj_svtXtmU5nAAhv-g4ihI4DJE@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27608@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 434 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages kodi-platform
https://github.com/void-linux/void-packages/pull/27608
[WIP]kodi-platform: fix cross-build
For now this seems to fix for atleast aarch64, until I can see if I can get kodi to build on the others
A patch file from https://github.com/void-linux/void-packages/pull/27608.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kodi-platform-27608.patch --]
[-- Type: text/x-diff, Size: 14534 bytes --]
From a883484baee40dd75fef433be243aba5287f189f Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 2 Jan 2021 19:28:03 -0600
Subject: [PATCH 01/11] kodi-binary-addons: unmark nocross
---
srcpkgs/kodi-binary-addons/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/kodi-binary-addons/template b/srcpkgs/kodi-binary-addons/template
index 9f71df7ac08..4edf9be5042 100644
--- a/srcpkgs/kodi-binary-addons/template
+++ b/srcpkgs/kodi-binary-addons/template
@@ -9,6 +9,5 @@ depends="kodi-addon-pvr-zattoo kodi-addon-game-libretro
kodi-addon-vfs-rar"
short_desc="Meta-package for binary kodi addons"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="metapackage"
+license="BSD-2-Clause"
homepage="https://kodi.tv"
-nocross="addons can't be cross-compiled yet"
From cce1edc4c07ce8de2a2ced550f76b5e3065dc187 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 2 Jan 2021 19:10:58 -0600
Subject: [PATCH 02/11] kodi-addon-game-libretro: unmark nocross
---
srcpkgs/kodi-addon-game-libretro/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/kodi-addon-game-libretro/template b/srcpkgs/kodi-addon-game-libretro/template
index f704ef282df..6a408a1204f 100644
--- a/srcpkgs/kodi-addon-game-libretro/template
+++ b/srcpkgs/kodi-addon-game-libretro/template
@@ -5,6 +5,8 @@ revision=1
_kodi_release=Leia
wrksrc="game.libretro-${version}-${_kodi_release}"
build_style=cmake
+configure_args="-DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake
+ -DKODI_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/kodi"
makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel"
short_desc="Libretro compatibility layer for the Kodi Game API"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -12,4 +14,3 @@ 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=ce9dfe0a99923cb64798bc502c38466c9eeb71bb58b320a73848e4fdf958a00b
-nocross="depends on kodi-platform"
From 8ad961ee98d8c642a70528e99001537984ff123c Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 2 Jan 2021 19:11:23 -0600
Subject: [PATCH 03/11] kodi-addon-peripheral-joystick: unmark nocross
---
srcpkgs/kodi-addon-peripheral-joystick/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kodi-addon-peripheral-joystick/template b/srcpkgs/kodi-addon-peripheral-joystick/template
index 72f28409604..b6156cf56a1 100644
--- a/srcpkgs/kodi-addon-peripheral-joystick/template
+++ b/srcpkgs/kodi-addon-peripheral-joystick/template
@@ -1,10 +1,12 @@
# Template file for 'kodi-addon-peripheral-joystick'
pkgname=kodi-addon-peripheral-joystick
version=1.4.9
-_kodi_release="Leia"
revision=1
+_kodi_release="Leia"
wrksrc="peripheral.joystick-${version}-${_kodi_release}"
build_style=cmake
+configure_args="-DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake
+ -DKODI_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/kodi"
makedepends="kodi-devel kodi-platform-devel p8-platform-devel
eudev-libudev-devel tinyxml-devel"
short_desc="Kodi joystick support (drivers and button maps)"
@@ -13,4 +15,3 @@ license="GPL-2.0-or-later"
homepage="https://github.com/xbmc/peripheral.joystick"
distfiles="https://github.com/xbmc/peripheral.joystick/archive/${version}-${_kodi_release}.tar.gz"
checksum=e83c32380a51ea74bd5f0af74afc747ff5de99167934e2644bc2b3438cd998d0
-nocross="depends on kodi-platform"
From 348f64423c03673b243618530a8013d1d9487283 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 2 Jan 2021 19:11:48 -0600
Subject: [PATCH 04/11] kodi-addon-pvr-hts: unmark nocross
---
srcpkgs/kodi-addon-pvr-hts/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/kodi-addon-pvr-hts/template b/srcpkgs/kodi-addon-pvr-hts/template
index a0b9f28702b..9155ac2e31b 100644
--- a/srcpkgs/kodi-addon-pvr-hts/template
+++ b/srcpkgs/kodi-addon-pvr-hts/template
@@ -5,6 +5,8 @@ revision=1
_kodi_release=Leia
wrksrc="pvr.hts-${version}-${_kodi_release}"
build_style=cmake
+configure_args="-DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake
+ -DKODI_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/kodi"
makedepends="kodi-devel kodi-platform-devel p8-platform-devel"
short_desc="Tvheadend HTSP client addon for Kodi"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -12,7 +14,6 @@ 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=6958b91ca616554e4c068bc303c66388e9a2c3a68b5979d8918b4e0d7b6bb95c
-nocross="depends on kodi-platform"
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" musl-legacy-compat"
From 0817b1ddc6ea9047559521fdab2f929fe71cf72f Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 2 Jan 2021 19:12:20 -0600
Subject: [PATCH 05/11] kodi-addon-pvr-iptvsimple: unmark nocross
---
srcpkgs/kodi-addon-pvr-iptvsimple/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/kodi-addon-pvr-iptvsimple/template b/srcpkgs/kodi-addon-pvr-iptvsimple/template
index b259b86ba34..0fd7bbdc2bf 100644
--- a/srcpkgs/kodi-addon-pvr-iptvsimple/template
+++ b/srcpkgs/kodi-addon-pvr-iptvsimple/template
@@ -5,6 +5,8 @@ revision=1
_kodi_release=Leia
wrksrc="pvr.iptvsimple-${version}-${_kodi_release}"
build_style=cmake
+configure_args="-DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake
+ -DKODI_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/kodi"
hostmakedepends="pkg-config"
makedepends="kodi-devel kodi-platform-devel p8-platform-devel rapidxml
zlib-devel"
@@ -14,4 +16,3 @@ 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=0812e359a943f4ffb763b47fc0440768a8aa09f12172ef8dff4440b0a48f9c96
-nocross="depends on kodi-platform"
From c8439b40e552b6177cd7ca1596452db9e9034f8a Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 2 Jan 2021 19:12:45 -0600
Subject: [PATCH 06/11] kodi-addon-pvr-zattoo: unmark nocross
---
srcpkgs/kodi-addon-pvr-zattoo/template | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kodi-addon-pvr-zattoo/template b/srcpkgs/kodi-addon-pvr-zattoo/template
index 6dba619aa96..b21af2f37cd 100644
--- a/srcpkgs/kodi-addon-pvr-zattoo/template
+++ b/srcpkgs/kodi-addon-pvr-zattoo/template
@@ -5,9 +5,12 @@ revision=2
_kodi_release=Leia
wrksrc="pvr.zattoo-${version}-${_kodi_release}"
build_style=cmake
+configure_args="-DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake
+ -DKODI_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/kodi
+ -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr"
hostmakedepends="pkg-config"
makedepends="kodi-devel kodi-platform-devel p8-platform-devel rapidjson
- tinyxml2-devel tinyxml-devel"
+ tinyxml-devel tinyxml2-devel"
depends="kodi-addon-inputstream-adaptive"
short_desc="Kodi PVR addon for streaming live TV from zattoo"
maintainer="teldra <teldra@rotce.de>"
@@ -15,4 +18,11 @@ 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=19de7bc58bcf37bbcff5ad2cb2f095cb15a4217f9abec5c9ff30d0489dab89d2
-nocross="depends on kodi-platform"
+
+pre_build() {
+ if [ "$CROSS_BUILD" ]; then
+ # Tries to find libtinyxml.so in wrong path
+ vsed -i "s,/usr/lib/libtinyxml.so,${XBPS_CROSS_BASE}/usr/lib/libtinyxml.so,g" \
+ build/CMakeFiles/pvr.zattoo.dir/build.make
+ fi
+}
From 8f838ea556268f37678c3f2a2d60e2ee902b2ead Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 2 Jan 2021 19:13:10 -0600
Subject: [PATCH 07/11] kodi-addon-vfs-rar: unmark nocross
---
srcpkgs/kodi-addon-vfs-rar/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/kodi-addon-vfs-rar/template b/srcpkgs/kodi-addon-vfs-rar/template
index 9b40dace67a..2982773bb61 100644
--- a/srcpkgs/kodi-addon-vfs-rar/template
+++ b/srcpkgs/kodi-addon-vfs-rar/template
@@ -5,6 +5,8 @@ revision=1
_kodi_release=Leia
wrksrc="vfs.rar-${version}-${_kodi_release}"
build_style=cmake
+configure_args="-DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake
+ -DKODI_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/kodi"
makedepends="kodi-devel kodi-platform p8-platform-devel tinyxml-devel"
short_desc="RAR VFS addon for Kodi"
maintainer="Kai Stian Olstad <void@olstad.com>"
@@ -12,4 +14,3 @@ 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=5275c09eed7e8354849caa17c3d9699abcfa2437a7c7af3833bffd10fc1c577f
-nocross="depends on kodi-platform"
From 90a07351b1b7f34a421d472731cc62a2e708a993 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 2 Jan 2021 19:13:40 -0600
Subject: [PATCH 08/11] kodi-addon-vfs-sftp: unmark nocross
---
srcpkgs/kodi-addon-vfs-sftp/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 0a974c1c350..afbd5dc3785 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -5,6 +5,8 @@ revision=1
_kodi_release=Leia
wrksrc="vfs.sftp-${version}-${_kodi_release}"
build_style=cmake
+configure_args="-DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake
+ -DKODI_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/kodi"
hostmakedepends="pkg-config"
makedepends="kodi-devel kodi-platform p8-platform-devel libressl-devel libssh-devel zlib-devel"
short_desc="VFS SFTP addon for Kodi"
@@ -13,4 +15,3 @@ 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=6a6d7fc777f574746bcc34b618700a4db3981aee470b68d60c3407eeeb0c16d9
-nocross="depends on kodi-platform"
From 2fe9ec7d868a082fa5662f291bf08927d745d11f Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 2 Jan 2021 19:14:11 -0600
Subject: [PATCH 09/11] kodi-addon-inputstream-rtmp: unmark nocross
---
srcpkgs/kodi-addon-inputstream-rtmp/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index dc5b7f15d68..35433f6f651 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -5,6 +5,8 @@ revision=1
_kodi_release=Leia
wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
build_style=cmake
+configure_args="-DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake
+ -DKODI_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/kodi"
hostmakedepends="pkg-config"
makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
libressl-devel zlib-devel librtmp-devel"
@@ -14,4 +16,3 @@ 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=56dac63262fa736620863900d903616d4827d735992e6d8beda84e377a5599e5
-nocross="depends on kodi-platform"
From 70d81d83aecb3ae3299ddbba263c0f3544e38f95 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 2 Jan 2021 19:14:31 -0600
Subject: [PATCH 10/11] kodi-addon-inputstream-adaptive: unmark nocross
---
srcpkgs/kodi-addon-inputstream-adaptive/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/kodi-addon-inputstream-adaptive/template b/srcpkgs/kodi-addon-inputstream-adaptive/template
index 23bd6aaecc8..6a4de8f807e 100644
--- a/srcpkgs/kodi-addon-inputstream-adaptive/template
+++ b/srcpkgs/kodi-addon-inputstream-adaptive/template
@@ -5,6 +5,8 @@ revision=1
_kodi_release=Leia
wrksrc="inputstream.adaptive-${version}-${_kodi_release}"
build_style=cmake
+configure_args="-DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake
+ -DKODI_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/kodi"
makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
expat-devel"
short_desc="Kodi inputstream addon for several manifest types"
@@ -13,4 +15,3 @@ 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=ec2264aa620faa547e589b705c0393dbbfe4a8f866215d9a9f3d5b3ceea6560e
-nocross="depends on kodi-platform"
From c0978ec89798434f31197d6b23d461a19d11ca70 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 2 Jan 2021 19:15:11 -0600
Subject: [PATCH 11/11] kodi-platform: fix nocross
---
srcpkgs/kodi-platform/template | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kodi-platform/template b/srcpkgs/kodi-platform/template
index 9eed2ca9851..077ebf8b676 100644
--- a/srcpkgs/kodi-platform/template
+++ b/srcpkgs/kodi-platform/template
@@ -3,7 +3,8 @@ pkgname=kodi-platform
version=17.1.0
revision=1
build_style=cmake
-configure_args="-DCMAKE_INSTALL_LIBDIR=/usr/lib"
+configure_args="-DCMAKE_INSTALL_LIBDIR=/usr/lib
+ -DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake"
makedepends="kodi-devel tinyxml-devel p8-platform-devel"
short_desc="Kodi platform support library"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -11,7 +12,22 @@ 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"
+
+post_build() {
+ # Remove cross-cruft
+ if [ "$CROSS_BUILD" ]; then
+ vsed -e '/libdir/s,=.*,=/usr/lib,' \
+ -e '/CXX/s,=.*,=c++,' \
+ -e '/CC/s,=.*,=gcc,' \
+ -e "s,${XBPS_CROSS_BASE},,g" \
+ -i build/kodiplatform.pc
+
+ vsed -e 's,/usr//,/usr/,g' \
+ -e "s,${XBPS_CROSS_BASE},,g" \
+ -e 's,/usr/usr,/usr,g' \
+ -i build/kodiplatform-config.cmake
+ fi
+}
kodi-platform-devel_package() {
short_desc+=" - development files"
next prev parent reply other threads:[~2021-01-03 2:39 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-01 20:33 [PR PATCH] kodi-platform: " ndowens
2021-01-01 20:34 ` [PR PATCH] [Updated] " ndowens
2021-01-03 1:14 ` [PR PATCH] [Updated] [WIP]kodi-platform: " ndowens
2021-01-03 1:15 ` ndowens
2021-01-03 1:15 ` [PR PATCH] [Closed]: " ndowens
2021-01-03 1:15 ` ndowens
2021-01-03 1:19 ` [PR PATCH] [Updated] " ndowens
2021-01-03 1:19 ` ndowens
2021-01-03 1:30 ` [PR PATCH] [Updated] " ndowens
2021-01-03 1:32 ` ndowens
2021-01-03 1:36 ` ndowens
2021-01-03 2:39 ` ndowens [this message]
2021-01-03 2:48 ` ndowens
2021-02-18 6:46 ` [PR REVIEW] kodi-platform: " ericonr
2021-02-18 6:46 ` ericonr
2021-03-16 21:03 ` ericonr
2021-03-16 21:03 ` [PR PATCH] [Closed]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210103023901.seNnRWhpamyWRXLt7Gj_svtXtmU5nAAhv-g4ihI4DJE@z \
--to=ndowens@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).