* [PR PATCH] kodi-platform: fix cross-build
@ 2021-01-01 20:33 ndowens
2021-01-01 20:34 ` [PR PATCH] [Updated] " ndowens
` (15 more replies)
0 siblings, 16 replies; 17+ messages in thread
From: ndowens @ 2021-01-01 20:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 321 bytes --]
There is a new 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
kodi-platform: fix cross-build
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: 1646 bytes --]
From 24ad155ab6cffd3f086e3c7fd68142d653742cef Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Fri, 1 Jan 2021 10:14:09 -0600
Subject: [PATCH] kodi-platform: fix cross-build
---
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 71884f3ee38..1765054e374 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="Helmut Pozimski <helmut@pozimski.eu>"
@@ -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"
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] kodi-platform: fix cross-build
2021-01-01 20:33 [PR PATCH] kodi-platform: fix cross-build ndowens
@ 2021-01-01 20:34 ` ndowens
2021-01-03 1:14 ` [PR PATCH] [Updated] [WIP]kodi-platform: " ndowens
` (14 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: ndowens @ 2021-01-01 20:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 326 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
kodi-platform: fix cross-build
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: 1645 bytes --]
From fcca2082ddd6e804af034bea25ca048bbd6830e2 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Fri, 1 Jan 2021 10:14:09 -0600
Subject: [PATCH] kodi-platform: fix cross-build
---
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 71884f3ee38..653d6ec8f90 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="Helmut Pozimski <helmut@pozimski.eu>"
@@ -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"
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] [WIP]kodi-platform: fix cross-build
2021-01-01 20:33 [PR PATCH] kodi-platform: fix cross-build ndowens
2021-01-01 20:34 ` [PR PATCH] [Updated] " ndowens
@ 2021-01-03 1:14 ` ndowens
2021-01-03 1:15 ` ndowens
` (13 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: ndowens @ 2021-01-03 1:14 UTC (permalink / raw)
To: ml
[-- 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: 101960 bytes --]
From fcca2082ddd6e804af034bea25ca048bbd6830e2 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Fri, 1 Jan 2021 10:14:09 -0600
Subject: [PATCH 01/73] kodi-platform: fix cross-build
---
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 71884f3ee38..653d6ec8f90 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="Helmut Pozimski <helmut@pozimski.eu>"
@@ -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"
From ab33d6d279c8326fa8addebac7bd706840efa920 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 23:28:55 +0700
Subject: [PATCH 02/73] mutt: update to 2.0.4.
---
srcpkgs/mutt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index 805b22623b9..bf3f40777ce 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,6 +1,6 @@
# Template file for 'mutt'
pkgname=mutt
-version=2.0.3
+version=2.0.4
revision=1
build_style=gnu-configure
configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later"
homepage="http://www.mutt.org"
changelog="http://mutt.org/relnotes/${version%.*}"
distfiles="http://ftp.mutt.org/pub/mutt/${pkgname}-${version}.tar.gz"
-checksum=9c327cafb7acbfd4a57e7c817148fe438720a4545a5f628926f7745bc752c1ed
+checksum=45087e78105e9abc7cc37827865d319081587cb53a94412aa4e3118e937991d4
post_install() {
# provided by mime-types
From e88e00a5818fe4131ff630f85f7b8c79d0b890bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 23:28:08 +0700
Subject: [PATCH 03/73] python3-xmlschema: update to 1.4.1.
---
srcpkgs/python3-xmlschema/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-xmlschema/template b/srcpkgs/python3-xmlschema/template
index 9ff021b03d2..c8629becabe 100644
--- a/srcpkgs/python3-xmlschema/template
+++ b/srcpkgs/python3-xmlschema/template
@@ -1,6 +1,6 @@
# Template file for 'python3-xmlschema'
pkgname=python3-xmlschema
-version=1.3.1
+version=1.4.1
revision=1
wrksrc=xmlschema-${version}
build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="MIT"
homepage="https://github.com/sissaschool/xmlschema"
distfiles="${PYPI_SITE}/x/xmlschema/xmlschema-${version}.tar.gz"
-checksum=ef25efd054afe5bbbbe0c5f86f32bd8e8afd566c90986d6b80a2abb8e6a4c46e
+checksum=ade693114ff2e4a9ed5a2371ce29ae888f689bc58e326e5796f8a7dc8954dd4a
do_check() {
PYTHONPATH=$(pwd)/build/lib python3 -m unittest
From 2b92f028033d8154c302b2cc8eb0b02fbfb7be25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 23:28:19 +0700
Subject: [PATCH 04/73] python3-elementpath: update to 2.0.5.
---
srcpkgs/python3-elementpath/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-elementpath/template b/srcpkgs/python3-elementpath/template
index 1915d58cb72..697c055ada6 100644
--- a/srcpkgs/python3-elementpath/template
+++ b/srcpkgs/python3-elementpath/template
@@ -1,6 +1,6 @@
# Template file for 'python3-elementpath'
pkgname=python3-elementpath
-version=2.0.4
+version=2.0.5
revision=1
wrksrc=elementpath-${version}
build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="MIT"
homepage="https://github.com/sissaschool/elementpath"
distfiles="${PYPI_SITE}/e/elementpath/elementpath-${version}.tar.gz"
-checksum=ed52e3fa33855a266a42b6a34c7aae41f73170e5a2d316e61198878d9ad74b41
+checksum=d9612efed8ec2a5611f8fac90111e4c49464084eae9087028e63ac4b0b99cd90
post_patch() {
# locale handling in musl is NOT that ideal,
From 38bbe4e17f07cb27f85770af18b316823925e42a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 23:28:48 +0700
Subject: [PATCH 05/73] python3-Pebble: update to 4.6.0.
---
srcpkgs/python3-Pebble/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-Pebble/template b/srcpkgs/python3-Pebble/template
index 7ce41a31eae..ab67f64d2bc 100644
--- a/srcpkgs/python3-Pebble/template
+++ b/srcpkgs/python3-Pebble/template
@@ -1,7 +1,7 @@
# Template file for 'python3-Pebble'
pkgname=python3-Pebble
-version=4.5.3
-revision=2
+version=4.6.0
+revision=1
wrksrc=Pebble-${version}
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="LGPL-3.0-or-later"
homepage="https://pebble.readthedocs.io/en/latest/"
distfiles="${PYPI_SITE}/P/Pebble/Pebble-${version}.tar.gz"
-checksum=e2cfc81bf1e627ff6314f4e1ca0c3414779d408594f807d702d088c19ff5070b
+checksum=10bd8c42573b05c78ad280ce2e53fb892d8fd7405dac3419ed09b95c8f2ba928
do_check() {
PYTHONPATH=$(pwd)/build/lib pytest
From c06b149db97741994c83c8018ab3654c2537fc19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 23:28:52 +0700
Subject: [PATCH 06/73] python3-Sphinx: update to 3.4.1.
---
srcpkgs/python3-Sphinx/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-Sphinx/template b/srcpkgs/python3-Sphinx/template
index 1857ea60a59..e7425648cfd 100644
--- a/srcpkgs/python3-Sphinx/template
+++ b/srcpkgs/python3-Sphinx/template
@@ -1,6 +1,6 @@
# Template file for 'python3-Sphinx'
pkgname=python3-Sphinx
-version=3.3.1
+version=3.4.1
revision=1
wrksrc=Sphinx-${version}
build_style=python3-module
@@ -18,7 +18,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="BSD-3-Clause"
homepage="http://sphinx-doc.org"
distfiles="${PYPI_SITE}/S/Sphinx/Sphinx-${version}.tar.gz"
-checksum=1e8d592225447104d1172be415bc2972bd1357e3e12fdc76edf2261105db4300
+checksum=e450cb205ff8924611085183bf1353da26802ae73d9251a8fcdf220a8f8712ef
conflicts="python-Sphinx>=0"
do_check() {
From 2e64563c8ba795911f596d212e9bb8f662298bc5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Jan 2021 15:33:28 +0100
Subject: [PATCH 07/73] bdf2psf: update to 1.200.
---
srcpkgs/bdf2psf/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/bdf2psf/template b/srcpkgs/bdf2psf/template
index 78d3ffe7d33..9a110266695 100644
--- a/srcpkgs/bdf2psf/template
+++ b/srcpkgs/bdf2psf/template
@@ -1,15 +1,15 @@
# Template file for 'bdf2psf'
pkgname=bdf2psf
-version=1.199
+version=1.200
revision=1
-wrksrc="console-setup"
+wrksrc="console-setup-${version}"
depends="perl"
short_desc="Generate console fonts from BDF source fonts"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later"
homepage="https://packages.debian.org/sid/bdf2psf"
distfiles="${DEBIAN_SITE}/main/c/console-setup/console-setup_${version}.tar.xz"
-checksum=aaaa21205dfbae9781459b15c88e449625529d2d7cbbcd0941475c50fe16dffb
+checksum=dea2eb7e1a278cdc902f6a672b2833d7f27d47b26089bd411bf17e544208c6f0
post_extract() {
sed -i '44s/if (/if (\$\#ARGV \< 0 \|\| /' Fonts/bdf2psf
From 47626bec82416c4c7c297ba7b8fd046cbb7676f9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Jan 2021 15:35:32 +0100
Subject: [PATCH 08/73] tab: update to 8.0.
---
srcpkgs/tab/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/tab/template b/srcpkgs/tab/template
index 2044ed808f6..81d18abf5bb 100644
--- a/srcpkgs/tab/template
+++ b/srcpkgs/tab/template
@@ -1,14 +1,14 @@
# Template file for 'tab'
pkgname=tab
-version=7.2
+version=8.0
revision=1
-wrksrc="tkatchev-tab-f2e160ebddf8"
+wrksrc="tkatchev-tab-39f1ea7c81e7"
short_desc="Shell language for text/number manipulation"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSL-1.0"
homepage="http://tkatchev.bitbucket.io/tab/"
distfiles="https://bitbucket.org/tkatchev/${pkgname}/get/${version}.tar.bz2"
-checksum=446703528a7e51601371240a8fb74665aa98b02b2c89034ed61705bb3ff488b4
+checksum=294993423eb9aae1ab7a4a3f10f31911766115e39ef11d5c77e067395bcf7794
do_build() {
${CXX} ${CXXFLAGS} -std=c++11 -Wall -Iaxe *.cc -o tab ${LDFLAGS} -pthread -lm
From c8f645a7ba884c0482c9b91ca3ee0c48ede1d36a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Jan 2021 15:36:04 +0100
Subject: [PATCH 09/73] python3-boto3: update to 1.16.47.
---
srcpkgs/python3-boto3/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index 1edeed8add4..acd9b54e1c2 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
# Template file for 'python3-boto3'
pkgname=python3-boto3
-version=1.16.42
+version=1.16.47
revision=1
wrksrc="boto3-${version}"
build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://github.com/boto/boto3"
distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=6034c00b6b79a3a10c2981df281488103f895e60af9dca8828729ff9bedd8b24
+checksum=4cea6387bdde7c3d291ae1734a0530576abbd1e86e6cdf2a7f8d3aa44e9d9d11
post_install() {
vlicense LICENSE
From c2109ae75b8a9ed37b04147a7ba985caa7058605 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Jan 2021 15:38:18 +0100
Subject: [PATCH 10/73] public-inbox: update to 1.6.1.
---
srcpkgs/public-inbox/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/public-inbox/template b/srcpkgs/public-inbox/template
index 3b1ce1ef7e3..88fef050b83 100644
--- a/srcpkgs/public-inbox/template
+++ b/srcpkgs/public-inbox/template
@@ -1,7 +1,7 @@
# Template file for 'public-inbox'
pkgname=public-inbox
-version=1.6.0
-revision=2
+version=1.6.1
+revision=1
wrksrc="${pkgname}-${version/pre/-pre}"
build_style=perl-module
hostmakedepends="git perl perl-DBD-SQLite perl-Danga-Socket
@@ -18,7 +18,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="AGPL-3.0-or-later"
homepage="https://public-inbox.org/"
distfiles="https://public-inbox.org/public-inbox.git/snapshot/${pkgname}-${version}.tar.gz"
-checksum=66ad5c15cd4f66010c12e56dda93c02b8e5c6be1433d27c5097682fe701b4a5e
+checksum=099c222622fc425f7490f52cff298238705d294120d54852a78096b031722857
pre_check() {
mkdir -p ~/.public-inbox
From cb19e9702582ac34ec5668827328377f2f84097f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 22:07:11 +0700
Subject: [PATCH 11/73] parsec: not depends on libglib-static
---
srcpkgs/parsec/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/parsec/template b/srcpkgs/parsec/template
index ba9141c2118..0a40b877ac4 100644
--- a/srcpkgs/parsec/template
+++ b/srcpkgs/parsec/template
@@ -1,10 +1,10 @@
# Template file for 'parsec'
pkgname=parsec
version=150.28
-revision=1
+revision=2
archs="x86_64"
build_style=fetch
-depends="libgcc virtual?libGL libglib-static libSM libsndio libstdc++ libX11 libXxf86vm"
+depends="libgcc virtual?libGL libSM libsndio libstdc++ libX11 libXxf86vm"
short_desc="Low latency proprietary game streaming application"
maintainer="Kozova1 <mug66kk@gmail.com>"
license="Proprietary"
From e52bd7a2119ad339caf25c1c0ed237fa230896ce Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 1 Jan 2021 14:33:10 +0100
Subject: [PATCH 12/73] ghc: fix bindist option
---
srcpkgs/ghc/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 86af6494615..053814800d8 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -79,9 +79,9 @@ post_install() {
if [ "$build_option_bindist" ]; then
msg_normal "Creating binary distribution for ${XBPS_TARGET_MACHINE}...\n"
make ${makejobs} binary-dist
- dest="${XBPS_SRCDISTDIR}"/distfiles/ghc-${version}-void-linux-${XBPS_TARGET_LIBC}.tar.xz
- install -d -m 0644 ghc-${version}-*-unknown-linux.tar.xz "${dest}"
- msg_normal "Installed in ${dest}\n"
+ mkdir -p ${XBPS_SRCDISTDIR}/distfiles
+ install -m 0644 ghc-${version}-*-linux.tar.xz ${XBPS_SRCDISTDIR}/distfiles
+ exit 1
fi
}
From 5a86ad59ee5eabca6800d667db77a29acc75ee51 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 1 Jan 2021 14:37:53 +0100
Subject: [PATCH 13/73] ghc-bin: enable for ppc64le-musl
---
srcpkgs/ghc-bin/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index 3f7cdfa780b..b6009ed7c6b 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -2,7 +2,7 @@
pkgname=ghc-bin
version=8.8.4
revision=1
-archs="i686 x86_64* ppc64le"
+archs="i686 x86_64* ppc64le*"
wrksrc="ghc-${version%[!0-9]}"
hostmakedepends="ncurses perl libffi libnuma"
depends="ncurses perl gcc libffi-devel gmp-devel"
@@ -31,6 +31,10 @@ ppc64le)
distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux.tar.xz"
checksum=4a13d36a3e3d605db02b89269ed727c3ba23c9d03b84b72c1716a910a28f8074
;;
+ppc64le-musl)
+ distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux-musl.tar.xz"
+ checksum=b35ba0cb20a05555ac6c2c92f9f090c665e55b3d295d58a801eb88bd4f6baab3
+ ;;
esac
do_configure() {
From 69c61c160e14f14243ffc2c5a6a3bd442bef9210 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 1 Jan 2021 14:37:22 +0200
Subject: [PATCH 14/73] notcurses: update to 2.1.3.
---
srcpkgs/notcurses/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index d9023e6e870..0fcf9f8f134 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
# Template file for 'notcurses'
pkgname=notcurses
-version=2.1.2
+version=2.1.3
revision=1
build_style=cmake
configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -13,7 +13,7 @@ license="Apache-2.0"
homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=1e5ff83e9cd9f295914a96449b8345e55f43eeb3667ac68b8167c6e4590a2844
+checksum=5c83bbfaea4457d482f0b3be07150fa6051651d97fb56d9f7811e4b2d6771d0a
build_options="man"
desc_option_man="Use pandoc for manpages"
From 094856bd5cfb25fd76e1f1a9688a3d62f52dacf5 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Fri, 1 Jan 2021 06:08:36 -0600
Subject: [PATCH 15/73] catch2: update to 2.13.4.
---
srcpkgs/catch2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/catch2/template b/srcpkgs/catch2/template
index 8a0b9f817de..23e59016d31 100644
--- a/srcpkgs/catch2/template
+++ b/srcpkgs/catch2/template
@@ -1,6 +1,6 @@
# Template file for 'catch2'
pkgname=catch2
-version=2.13.3
+version=2.13.4
revision=1
wrksrc="Catch2-${version}"
build_style=cmake
@@ -14,7 +14,7 @@ maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
license="BSL-1.0"
homepage="https://github.com/catchorg/Catch2"
distfiles="https://github.com/catchorg/Catch2/archive/v${version}/${pkgname}-v${version}.tar.gz"
-checksum=fedc5b008f7eb574f45098e7c7138211c543f0f8ad04792090e790511697a877
+checksum=e7eb70b3d0ac2ed7dcf14563ad808740c29e628edde99e973adad373a2b5e4df
post_install() {
vlicense LICENSE.txt
From 91713ff33c3f32ae07721d9b14a49cc5df9db4d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 28 Dec 2020 15:41:49 +0100
Subject: [PATCH 16/73] libtorrent-rasterbar: update to 1.2.11
Enforce using -std=c++11 for compatibility with dependencies
---
srcpkgs/libtorrent-rasterbar/template | 55 ++++++++++++---------------
1 file changed, 25 insertions(+), 30 deletions(-)
diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 913b14a6558..e7e0daed934 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -1,50 +1,43 @@
# Template file for 'libtorrent-rasterbar'
# Breaks ABI/API without changing soname, revbump all dependants
pkgname=libtorrent-rasterbar
-reverts="1.2.9_1"
-version=1.2.7
-revision=4
-build_style=gnu-configure
-configure_args="--enable-examples --enable-python-binding
- --with-boost=${XBPS_CROSS_BASE}/usr
- --with-boost-python=boost_python${py3_ver//./}"
-hostmakedepends="automake pkg-config intltool libtool python3-devel"
+version=1.2.11
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
+ -Dpython-bindings=ON"
+hostmakedepends="pkg-config intltool libtool python3-devel"
makedepends="libressl-devel boost-devel geoip-devel python3-devel"
short_desc="C++ bittorrent library by Rasterbar Software"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="BSD-3-Clause"
homepage="https://libtorrent.org/"
-distfiles="https://github.com/arvidn/libtorrent/releases/download/libtorrent_${version//./_}/libtorrent-rasterbar-${version}.tar.gz"
-checksum=bc00069e65c0825cbe1eee5cdd26f94fcd9a621c4e7f791810b12fab64192f00
+distfiles="https://github.com/arvidn/libtorrent/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=cb6a9cc3c9a9e485174394baa82744cef8415d23a357f5721dcc9ee7622c4efb
+
+if [ "$XBPS_CHECK_PKGS" ]; then
+ configure_args+=" -Dbuild_tests=ON"
+fi
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
- LDFLAGS+=" -latomic"
fi
pre_configure() {
- local _py3_ver=${py3_ver}${py3_abiver}
- export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python${_py3_ver}"
- export PYTHON_CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python${_py3_ver}"
- export PYTHON_EXTRA_LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib -lpython${_py3_ver}"
- autoreconf -fi
-}
-
-pre_build() {
- if [ "$CROSS_BUILD" ]; then
- for f in ${XBPS_CROSS_BASE}/${py3_lib}/_sysconfigdata_*; do
- f=${f##*/}
- export _PYTHON_SYSCONFIGDATA_NAME=${f%.py}
- done
- export PYTHONPATH=${XBPS_CROSS_BASE}/${py3_lib}
+ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ vsed -i CMakeLists.txt -e "s;Threads::Threads;& atomic;"
fi
}
-pre_install() {
- pre_build
-}
post_install() {
+ local f
+
+ # Install examples. They are not installed with make install :P
+ for f in client_test connection_tester dump_torrent simple_client upnp_test \
+ custom_storage make_torrent stats_counters; do
+ vbin ${wrksrc}/build/examples/${f}
+ done
vlicense LICENSE
}
@@ -58,13 +51,15 @@ libtorrent-rasterbar-python3_package() {
libtorrent-rasterbar-devel_package() {
depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel"
+ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ depends+=" libatomic-devel"
+ fi
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/share/cmake
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
- vmove "usr/lib/*.a"
}
}
From 324e67c11eb0664b667a91167937c8ac11077b11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 28 Dec 2020 15:42:22 +0100
Subject: [PATCH 17/73] qbittorrent: update to 4.3.2
---
srcpkgs/qbittorrent/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index fdccf72aa5b..f808c46595a 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,6 +1,6 @@
# Template file for 'qbittorrent'
pkgname=qbittorrent
-version=4.3.1
+version=4.3.2
revision=1
create_wrksrc=yes
build_style=qmake
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
homepage="http://www.qbittorrent.org/"
changelog="https://www.qbittorrent.org/news.php"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=796bd81f50b83dc6bde9a0c726137aca3df7d3385e779360b2304dfda6c151c5
+checksum=b58e377a26c6de91aa61a56cddc9399c52fb9c752444c761a52784943b2b8b4b
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-svg-devel"
From f31571bca4771e50dcb92bef6f947f1957c23d82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 28 Dec 2020 15:44:53 +0100
Subject: [PATCH 18/73] deluge: revbump for libtorrent-rasterbar-1.2.11
---
srcpkgs/deluge/template | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 660a8d7eb7c..e54a8d57181 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,13 +1,14 @@
# Template file for 'deluge'
pkgname=deluge
version=2.0.3
-revision=9
+revision=10
build_style=python3-module
# TODO package python3-slimit to minify javascript
hostmakedepends="intltool python3-setuptools python3-wheel"
depends="python3-setuptools python3-chardet python3-Twisted python3-Mako
python3-xdg python3-rencode python3-setproctitle libtorrent-rasterbar-python3
python3-Pillow"
+checkdepends="python3-pytest $depends"
short_desc="Fully-featured cross-platform BitTorrent client"
maintainer="Alexey Rochev <equeim@gmail.com>"
license="GPL-3.0-or-later"
@@ -25,6 +26,10 @@ post_install() {
vsv deluged
}
+do_check() {
+ python3 -m pytest || : # fails
+}
+
deluge-gtk_package() {
replaces="deluge<1.3.14_1"
short_desc+=" - GTK+ frontend"
From 8a08d5fa8c2aa019f7ce67b4334723e4fc8ec852 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 28 Dec 2020 15:46:51 +0100
Subject: [PATCH 19/73] btfs: revbump for libtorrent-rasterbar-1.2.11
---
srcpkgs/btfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/btfs/template b/srcpkgs/btfs/template
index b70ea7d79be..78af3c6bcc9 100644
--- a/srcpkgs/btfs/template
+++ b/srcpkgs/btfs/template
@@ -1,7 +1,7 @@
# Template file for 'btfs'
pkgname=btfs
version=2.23
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake pkg-config"
makedepends="boost-devel fuse-devel libcurl-devel libtorrent-rasterbar-devel"
From a2ee0656c451626312611017a822846cc81d8da9 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 1 Jan 2021 19:21:30 +0100
Subject: [PATCH 20/73] amsynth: enable man on ppc64le-musl
---
srcpkgs/amsynth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/amsynth/template b/srcpkgs/amsynth/template
index 30346a5b43a..8a762ee4981 100644
--- a/srcpkgs/amsynth/template
+++ b/srcpkgs/amsynth/template
@@ -18,5 +18,5 @@ build_options="man"
desc_option_man="Use pandoc for manpages"
case "$XBPS_MACHINE" in
- x86_64*|i686|ppc64le) build_options_default="man" ;;
+ x86_64*|i686|ppc64le*) build_options_default="man" ;;
esac
From cfad38127427a04a209112faaa6d893bfde3b669 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 1 Jan 2021 19:21:59 +0100
Subject: [PATCH 21/73] bird_exporter: enable man on ppc64le-musl
---
srcpkgs/bird_exporter/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bird_exporter/template b/srcpkgs/bird_exporter/template
index bed02e553cb..c74d5f92b59 100644
--- a/srcpkgs/bird_exporter/template
+++ b/srcpkgs/bird_exporter/template
@@ -17,7 +17,7 @@ build_options="man"
desc_option_man="Use pandoc for manpages"
case "$XBPS_MACHINE" in
- x86_64*|i686|ppc64le) build_options_default="man" ;;
+ x86_64*|i686|ppc64le*) build_options_default="man" ;;
esac
post_build() {
From 10db1b386912675476cc31487b0ff91d0cc41f43 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 1 Jan 2021 19:22:46 +0100
Subject: [PATCH 22/73] bluez-alsa: enable man on ppc64le-musl
---
srcpkgs/bluez-alsa/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bluez-alsa/template b/srcpkgs/bluez-alsa/template
index cbe4fcf4ef3..2d6ba4ff38a 100644
--- a/srcpkgs/bluez-alsa/template
+++ b/srcpkgs/bluez-alsa/template
@@ -23,7 +23,7 @@ build_options="man"
desc_option_man="Use pandoc to build manpages"
case "$XBPS_MACHINE" in
- x86_64*|i686|ppc64le) build_options_default="man";;
+ x86_64*|i686|ppc64le*) build_options_default="man";;
*) ;;
esac
From 1336f26ffbf34147f9a26c61bc0c68652a1a7950 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 1 Jan 2021 19:23:16 +0100
Subject: [PATCH 23/73] earlyoom: enable man on ppc64le-musl
---
srcpkgs/earlyoom/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/earlyoom/template b/srcpkgs/earlyoom/template
index 5e9c5836bb1..503236afde6 100644
--- a/srcpkgs/earlyoom/template
+++ b/srcpkgs/earlyoom/template
@@ -18,7 +18,7 @@ build_options="man"
desc_option_man="Use pandoc for manpages"
case "$XBPS_MACHINE" in
- x86_64*|i686|ppc64le) build_options_default="man" ;;
+ x86_64*|i686|ppc64le*) build_options_default="man" ;;
esac
do_install() {
From f78e4fd1ee15da8346760bacdab5731109505e32 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 1 Jan 2021 19:23:40 +0100
Subject: [PATCH 24/73] growlight: enable man on ppc64le-musl
---
srcpkgs/growlight/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/growlight/template b/srcpkgs/growlight/template
index c80c05861df..ef690e3baec 100644
--- a/srcpkgs/growlight/template
+++ b/srcpkgs/growlight/template
@@ -22,7 +22,7 @@ desc_option_man="Use pandoc for manpages"
desc_option_zfs="Build with ZFS Support"
case "$XBPS_MACHINE" in
- x86_64*|i686|ppc64le) build_options_default="man" ;;
+ x86_64*|i686|ppc64le*) build_options_default="man" ;;
esac
pre_configure() {
From f66570b7c7825cbb05a08f02ded8607eb904c4f2 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 1 Jan 2021 19:24:02 +0100
Subject: [PATCH 25/73] notcurses: enable man on ppc64le-musl
---
srcpkgs/notcurses/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 0fcf9f8f134..11002c5a5d5 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -19,7 +19,7 @@ build_options="man"
desc_option_man="Use pandoc for manpages"
case "$XBPS_MACHINE" in
- x86_64*|i686|ppc64le) build_options_default="man" ;;
+ x86_64*|i686|ppc64le*) build_options_default="man" ;;
esac
notcurses-devel_package() {
From a41d52976c19fd91bdb434567187df9530bdac73 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 1 Jan 2021 19:24:25 +0100
Subject: [PATCH 26/73] nvimpager: enable man on ppc64le-musl
---
srcpkgs/nvimpager/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nvimpager/template b/srcpkgs/nvimpager/template
index ce957ff0a0f..5f3050e84a9 100644
--- a/srcpkgs/nvimpager/template
+++ b/srcpkgs/nvimpager/template
@@ -24,7 +24,7 @@ build_options="man"
desc_option_man="Use pandoc for manpages"
case "$XBPS_MACHINE" in
- x86_64*|i686|ppc64le) build_options_default="man" ;;
+ x86_64*|i686|ppc64le*) build_options_default="man" ;;
esac
pre_build() {
From ebe3d9b705f18b7677b53728e727f3767feaaf69 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 1 Jan 2021 19:24:52 +0100
Subject: [PATCH 27/73] pelican: pandoc in checkdepends for ppc64le-musl
---
srcpkgs/pelican/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pelican/template b/srcpkgs/pelican/template
index 2edd0e74024..9ec36fe8c05 100644
--- a/srcpkgs/pelican/template
+++ b/srcpkgs/pelican/template
@@ -21,7 +21,7 @@ distfiles="https://github.com/getpelican/pelican/archive/${version}.tar.gz"
checksum=b47c65f663bf6f2513b8ebc1f096e51f4d7865c17b36c370f83eadd80b6ba702
case "$XBPS_MACHINE" in
- x86_64*|i686|ppc64le) checkdepends+=" pandoc";;
+ x86_64*|i686|ppc64le*) checkdepends+=" pandoc";;
esac
post_extract() {
From 5b72a3d26f4952cb708d0a73d7b46cf2cae8750c Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 1 Jan 2021 19:26:02 +0100
Subject: [PATCH 28/73] vimpager: enable man for ppc64le-musl
---
srcpkgs/vimpager/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpager/template b/srcpkgs/vimpager/template
index d6884b3f17d..71ea5ec5e7a 100644
--- a/srcpkgs/vimpager/template
+++ b/srcpkgs/vimpager/template
@@ -15,7 +15,7 @@ build_options="man"
desc_option_man="Use pandoc for manpages"
case "$XBPS_MACHINE" in
- x86_64*|i686|ppc64le) build_options_default="man" ;;
+ x86_64*|i686|ppc64le*) build_options_default="man" ;;
esac
post_install() {
From 90f57f4b87147d7491c854ed81a2390f3d5edc48 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 1 Jan 2021 19:58:42 +0100
Subject: [PATCH 29/73] hedgewars: need -fcommon when building using pas2c
---
srcpkgs/hedgewars/template | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/hedgewars/template b/srcpkgs/hedgewars/template
index ed711da0cbe..d2294cf572f 100644
--- a/srcpkgs/hedgewars/template
+++ b/srcpkgs/hedgewars/template
@@ -43,10 +43,13 @@ if [ -n "$_use_c_engine" ]; then
fi
pre_configure() {
- # remove option not supported by clang
if [ -n "$_use_c_engine" ]; then
+ # remove option not supported by clang
CFLAGS=${CFLAGS/-fstack-clash-protection/}
CXXFLAGS=${CXXFLAGS/-fstack-clash-protection/}
+ # prevent multiple definitions
+ CFLAGS+=" -fcommon"
+ CXXFLAGS+=" -fcommon"
fi
}
From e2cfb545c48d099210008d32c6536c2d32dec0a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 1 Jan 2021 16:03:23 -0300
Subject: [PATCH 30/73] docker: enable for armv6l.
Seems like a historical mistake that it wasn't enabled.
Fixes #27604.
---
srcpkgs/docker/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index 5141443fa58..823d471d214 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -29,7 +29,7 @@ checksum="b2ff08675738031b6d6d59a90226657c16726851957c11b5fb85a4598b933b92
depends+=" iptables xz git"
nopie=yes
nostrip=yes
-archs="aarch64* armv7l* x86_64* ppc64le*"
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
system_groups="docker"
do_configure() {
From 19ed78432fdd84c932e10dfb2ab479800d66a52e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 1 Jan 2021 20:31:21 +0100
Subject: [PATCH 31/73] sbcl: enable on ppc64le*
might enable on other ppc later, but that needs more testing
---
srcpkgs/sbcl/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index a696bfc4d74..5e57358bd65 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -2,7 +2,7 @@
pkgname=sbcl
version=2.1.0
revision=1
-archs="i686 x86_64* armv7l aarch64"
+archs="i686 x86_64* armv7l aarch64 ppc64le*"
hostmakedepends="iana-etc"
makedepends="zlib-devel"
conf_files="/etc/sbclrc"
@@ -34,7 +34,7 @@ aarch64)
distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.3.9-arm64-linux-binary.tar.bz2"
checksum+=" 494829f8e3ea7eb1c308b343cc390daf94a6215030a5f2b9ee0cded67511e918"
;;
-*-musl)
+ppc*|*-musl)
makedepends+=" ecl"
_bootstrap_lisp="ecl"
;;
From 7aea9b475014630ea042f06c0dbd5c673387ecb2 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 1 Jan 2021 21:57:32 +0100
Subject: [PATCH 32/73] next: fix checksum, fix build on non-x86 systems
---
srcpkgs/next/template | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/next/template b/srcpkgs/next/template
index cf803dd16ab..d6e20377f46 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/next/template
@@ -2,6 +2,7 @@
pkgname=next
version=1.5.0
revision=1
+wrksrc=nyxt-${version}
build_style=gnu-makefile
hostmakedepends="sbcl curl pkg-config"
makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
@@ -10,12 +11,28 @@ short_desc="Keyboard-oriented, extensible web-browser"
maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
license="BSD-3-Clause"
homepage="https://next.atlas.engineer/"
-distfiles="https://github.com/atlas-engineer/next/archive/${version}.tar.gz"
-checksum=b8688d056d40778fa6dd8ccd3ba7b5a00f16ea1e81ea8293ebe58e28f63c7e22
+# we need this commit to fix non-x86 builds
+# it is the only commit on top of 0.53 release
+# remove the whole vendoring thing when 0.54 is out
+# this will probably be the next time we update this...
+_ironclad_rev=f215e183e7fe0b66da009c07d70e6f738ea1da03
+distfiles="https://github.com/atlas-engineer/nyxt/archive/${version}.tar.gz
+ https://github.com/sharplispers/ironclad/archive/${_ironclad_rev}.tar.gz"
+checksum="bfd1e2e6f43385b8dc07d4860da6ef99d9e94aba4c688eddd05930c5a2e36637
+ 988ccefa88b47f97dc8fb52a475a444c0b1bc45fdca64009140d41d397980ca6"
nostrip=yes
nopie=yes
nocross="https://travis-ci.org/void-linux/void-packages/builds/590346382"
+post_extract() {
+ mkdir ${wrksrc}/vendor
+ mv ../ironclad-* ${wrksrc}/vendor/ironclad
+}
+
+pre_install() {
+ export CL_SOURCE_REGISTRY=${wrksrc}/vendor/ironclad
+}
+
post_install() {
vlicense LICENSE
}
From 1ad3e4942659afa349c3f09c76320e805fc9ee09 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 1 Jan 2021 22:06:31 +0100
Subject: [PATCH 33/73] sbcl: add missing patch
---
srcpkgs/sbcl/patches/ppc-musl.patch | 10 ++++++++++
1 file changed, 10 insertions(+)
create mode 100644 srcpkgs/sbcl/patches/ppc-musl.patch
diff --git a/srcpkgs/sbcl/patches/ppc-musl.patch b/srcpkgs/sbcl/patches/ppc-musl.patch
new file mode 100644
index 00000000000..63478d43ab4
--- /dev/null
+++ b/srcpkgs/sbcl/patches/ppc-musl.patch
@@ -0,0 +1,10 @@
+--- src/runtime/ppc-linux-os.c
++++ src/runtime/ppc-linux-os.c
+@@ -33,6 +33,7 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <sys/prctl.h>
++#include <asm/ptrace.h>
+
+ #include "validate.h"
+ #include "ppc-linux-mcontext.h"
From 66244765f7eef5b265a7fc533860fce59801bebe Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 1 Jan 2021 22:08:55 +0100
Subject: [PATCH 34/73] openblas: use DYNAMIC_ARCH on aarch64 and ppc
---
srcpkgs/openblas/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/openblas/template b/srcpkgs/openblas/template
index 93b834496ce..3fbec6b61e4 100644
--- a/srcpkgs/openblas/template
+++ b/srcpkgs/openblas/template
@@ -1,7 +1,7 @@
# Template file for 'openblas'
pkgname=openblas
version=0.3.12
-revision=1
+revision=2
wrksrc="OpenBLAS-${version}"
build_style=gnu-makefile
make_build_args=" HOSTCC=gcc USE_OPENMP=1"
@@ -19,11 +19,11 @@ case "${XBPS_TARGET_MACHINE}" in
armv5*) make_build_args+=" TARGET=ARMV5" ;;
armv6*) make_build_args+=" TARGET=ARMV6" ;;
armv7*) make_build_args+=" TARGET=ARMV7" ;;
- aarch64*) make_build_args+=" TARGET=ARMV8" ;;
+ aarch64*) make_build_args+=" TARGET=ARMV8 DYNAMIC_ARCH=1" ;;
i686*) make_build_args+=" BINARY=32 DYNAMIC_ARCH=1" ;;
x86_64*) make_build_args+=" BINARY=64 DYNAMIC_ARCH=1" ;;
- ppc64le*) make_build_args+=" TARGET=POWER8" ;;
- ppc64*) make_build_args+=" TARGET=POWER6" ;;
+ ppc64le*) make_build_args+=" TARGET=POWER8 DYNAMIC_ARCH=1" ;;
+ ppc64*) make_build_args+=" TARGET=GENERIC DYNAMIC_ARCH=1" ;;
ppc*) broken="64 bit ppc only" ;;
mips*) broken="Not supported" ;;
esac
From 5c3e1cf910424a11e2d329df0eab7d5ee39bf365 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 1 Jan 2021 21:08:48 -0300
Subject: [PATCH 35/73] foobillard++: fix location of data directory.
Remove the code that it uses to guess the data directory and simply
default to /usr/share/foobillardplus. Without this, the program panics
at launch (it was likely panicking ever since it was updated, given that
the sed command for src/language.c no longer had any effect).
At the moment, the game more often that not segfaults at launch on musl,
but I'm not marking it broken because it's been in the repos for a long
time already. If anyone complains, we can try to fix the issue then
(extremely likely to be a race condition; maybe tries to pthread_join a
dead thread?).
Also xlint.
Fixes #27598
---
srcpkgs/foobillard++/patches/data-dir.patch | 43 +++++++++++++++++++++
srcpkgs/foobillard++/template | 21 +++++-----
2 files changed, 54 insertions(+), 10 deletions(-)
create mode 100644 srcpkgs/foobillard++/patches/data-dir.patch
diff --git a/srcpkgs/foobillard++/patches/data-dir.patch b/srcpkgs/foobillard++/patches/data-dir.patch
new file mode 100644
index 00000000000..986b1e14a34
--- /dev/null
+++ b/srcpkgs/foobillard++/patches/data-dir.patch
@@ -0,0 +1,43 @@
+diff --git src/sys_stuff.c src/sys_stuff.c
+index 8f65f6b..7b905cf 100644
+--- src/sys_stuff.c
++++ src/sys_stuff.c
+@@ -756,37 +756,18 @@ void sys_main_loop(void) {
+ * Find the program's "data" directory and chdir into it *
+ ***********************************************************************/
+
+-static char data_dir[512];
++static char data_dir[512] = "/usr/share/foobillardplus";
+
+ void enter_data_dir() {
+ int success = 1;
+
+ #ifdef POSIX
+- char proc_exe[20];
+- char *slash_pos;
+ #endif
+
+ do {
+ success = 0;
+
+ #ifdef POSIX
+- snprintf(proc_exe, sizeof(proc_exe), "/proc/%d/exe", getpid());
+- if (readlink(proc_exe, data_dir, sizeof(data_dir)) < 0) {
+- perror("readlink failed");
+- break;
+- }
+-
+- // Remove program name
+- slash_pos = strrchr(data_dir, '/');
+- if (!slash_pos) break;
+- *slash_pos = '\0';
+-
+- // Go one dir up
+- slash_pos = strrchr(data_dir, '/');
+- if (!slash_pos) break;
+-
+- // Add "/data"
+- strncpy(slash_pos, "/data", sizeof(data_dir) - (slash_pos - data_dir));
+ #else
+ /* ### TODO ### Get the working directory of the program
+ * Mac OS X: _NSGetExecutablePath() (man 3 dyld)
diff --git a/srcpkgs/foobillard++/template b/srcpkgs/foobillard++/template
index 6d73a67f4ed..98923393e99 100644
--- a/srcpkgs/foobillard++/template
+++ b/srcpkgs/foobillard++/template
@@ -1,29 +1,30 @@
# Template file for 'foobillard++'
+# often segfaults at launch on musl, but not marking broken yet
pkgname=foobillard++
version=3.42beta
-revision=3
+revision=4
wrksrc=foobillardplus-${version}
build_style=gnu-configure
configure_args="--enable-standard"
-homepage="http://foobillardplus.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/foobillardplus/foobillardplus-$version.tar.gz"
hostmakedepends="automake pkg-config"
makedepends="libICE-devel freetype-devel libpng-devel glu-devel SDL_mixer-devel SDL_net-devel"
depends="desktop-file-utils"
-short_desc="An OpenGL billard game - fork of foobillard"
+short_desc="OpenGL billard game - fork of foobillard"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
+homepage="http://foobillardplus.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/foobillardplus/foobillardplus-$version.tar.gz"
checksum=e276b70674a7d788c45eeff89f1f5db5d48d871a1ab92103813d424a3761e1d9
CFLAGS+=" -fgnu89-inline"
pre_configure() {
autoreconf -fi
- sed -i 's|$prefix/foobillardplus|$prefix|' configure
- sed -i 's|$prefix/data|$prefix/share/foobillardplus|' configure
- sed -i 's|"/data"|"/share/foobillardplus"|' src/language.c
- sed -i 's|/opt/foobillardplus/bin/||' foobillardplus.desktop
- sed -i 's|/opt/foobillardplus/||' foobillardplus.desktop
+ vsed -i 's|$prefix/foobillardplus|$prefix|' configure
+ vsed -i 's|$prefix/data|$prefix/share/foobillardplus|' configure
+ vsed -i 's|/opt/foobillardplus/bin/||' foobillardplus.desktop
+ vsed -i 's|/opt/foobillardplus/||' foobillardplus.desktop
}
+
do_install() {
vbin src/foobillardplus
vmkdir usr/share/foobillardplus
From 4b894b354ddbc3ba417a1ff760264bb2ba12d997 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Fri, 1 Jan 2021 21:18:39 +0100
Subject: [PATCH 36/73] ethtool: update to 5.10.
---
srcpkgs/ethtool/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ethtool/template b/srcpkgs/ethtool/template
index 42006cf57f9..19c9799eaa6 100644
--- a/srcpkgs/ethtool/template
+++ b/srcpkgs/ethtool/template
@@ -1,6 +1,6 @@
# Template file for 'ethtool'
pkgname=ethtool
-version=5.9
+version=5.10
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-only"
homepage="http://www.kernel.org/pub/software/network/ethtool/"
distfiles="http://www.kernel.org/pub/software/network/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=512932010af87bc3e09773c89baea44bca96c1da1151bbcf109fa0e055a88a6f
+checksum=817d5396a9307b4c637b435d4c558b8f5f964a1464a035ca3c0180f4cc93cfcf
From 3c344db4d92ba03b721d5939cc5a8e87f61369b0 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Fri, 1 Jan 2021 21:55:35 +0100
Subject: [PATCH 37/73] openblas: update to 0.3.13.
---
srcpkgs/openblas/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/openblas/template b/srcpkgs/openblas/template
index 3fbec6b61e4..c417ecda1ae 100644
--- a/srcpkgs/openblas/template
+++ b/srcpkgs/openblas/template
@@ -1,7 +1,7 @@
# Template file for 'openblas'
pkgname=openblas
-version=0.3.12
-revision=2
+version=0.3.13
+revision=1
wrksrc="OpenBLAS-${version}"
build_style=gnu-makefile
make_build_args=" HOSTCC=gcc USE_OPENMP=1"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
homepage="https://www.openblas.net/"
changelog="https://raw.githubusercontent.com/xianyi/OpenBLAS/v${version}/Changelog.txt"
distfiles="https://github.com/xianyi/OpenBLAS/archive/v${version}.tar.gz"
-checksum=65a7d3a4010a4e3bd5c0baa41a234797cd3a1735449a4a5902129152601dc57b
+checksum=79197543b17cc314b7e43f7a33148c308b0807cd6381ee77f77e15acf3e6459e
case "${XBPS_TARGET_MACHINE}" in
armv5*) make_build_args+=" TARGET=ARMV5" ;;
From d8c0c50ce167dfafb23dbae93b53fbfff81df7ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 31 Dec 2020 13:56:25 -0300
Subject: [PATCH 38/73] linux-tools: update to 5.10.4.
---
.../patches/bfd_section_flags.patch | 26 -------------------
srcpkgs/linux-tools/template | 23 +++++++---------
2 files changed, 10 insertions(+), 39 deletions(-)
delete mode 100644 srcpkgs/linux-tools/patches/bfd_section_flags.patch
diff --git a/srcpkgs/linux-tools/patches/bfd_section_flags.patch b/srcpkgs/linux-tools/patches/bfd_section_flags.patch
deleted file mode 100644
index aa10648bb95..00000000000
--- a/srcpkgs/linux-tools/patches/bfd_section_flags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: The binutils macros for bfd section access changed slightly.
-
---- tools/perf/util/srcline.c 2020-05-20 08:20:41.000000000 +0200
-+++ tools/perf/util/srcline.c 2020-05-27 13:48:11.606027082 +0200
-@@ -197,7 +197,7 @@
- if (a2l->found)
- return;
-
-- if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0)
-+ if ((bfd_section_flags(section) & SEC_ALLOC) == 0)
- return;
-
- pc = a2l->addr;
-@@ -201,8 +201,8 @@
- return;
-
- pc = a2l->addr;
-- vma = bfd_get_section_vma(abfd, section);
-- size = bfd_get_section_size(section);
-+ vma = bfd_section_vma(section);
-+ size = bfd_section_size(section);
-
- if (pc < vma || pc >= vma + size)
- return;
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 2d3c4f038e9..e23f9da7ed3 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,20 +1,21 @@
# Template file for 'linux-tools'
pkgname=linux-tools
-version=5.4.42
-revision=3
+version=5.10.4
+revision=1
wrksrc="linux-${version}"
build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3 xmlto"
makedepends="babeltrace-devel binutils-devel eudev-libudev-devel
libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
- libzstd-devel ncurses-devel pciutils-devel python3-devel slang-devel"
+ libzstd-devel ncurses-devel pciutils-devel python3-devel slang-devel
+ elfutils-devel"
depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"
short_desc="Linux kernel tools meta-pkg"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="${KERNEL_SITE}/kernel/v5.x/linux-${version}.tar.xz"
-checksum=4e431b7c0266a07b76fdb77f8917ad681f0fa34ffba0eb8a172b67f7ef57bc31
+checksum=904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec
python_version=3
subpackages="cpupower libcpupower libcpupower-devel libusbip libusbip-devel usbip perf freefall tmon"
@@ -37,15 +38,14 @@ esac
nocross=yes
post_extract() {
- sed -i 's/\$(LIBS)/& $(LDFLAGS)/' tools/power/cpupower/bench/Makefile
- sed -i 's/SIGCLD/SIGCHLD/g' tools/usb/usbip/src/usbipd.c
- sed -i 's/^CFLAGS/override &/g' tools/thermal/tmon/Makefile
- sed -i 's/ \-Werror / /g' tools/build/feature/Makefile \
+ vsed -i 's/\$(LIBS)/& $(LDFLAGS)/' tools/power/cpupower/bench/Makefile
+ vsed -i 's/ \-Werror / /g' tools/build/feature/Makefile \
tools/lib/bpf/Makefile
}
do_build() {
cd ${wrksrc}/tools/perf
- make ${makejobs} CC=$CC LD=$LD CFLAGS="$CFLAGS" EXTRA_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
+ make ${makejobs} \
+ CC=$CC LD=$LD CFLAGS="$CFLAGS" EXTRA_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
WERROR=0 DESTDIR=${DESTDIR} prefix=/usr lib=lib/perf \
NO_GTK2=1 NO_SDT=1 PYTHON=python3 \
PERF_VERSION=${version}_${revision} \
@@ -108,10 +108,7 @@ do_install() {
printf 'usbip-core\nusbip-host\n' > \
${DESTDIR}/usr/lib/modules-load.d/usbip.conf
- if [ -d ${DESTDIR}/usr/lib64 ]; then
- mv ${DESTDIR}/usr/lib64/* ${DESTDIR}/usr/lib/
- fi
- rm -f ${DESTDIR}/usr/include/cpuidle.h
+ rm ${DESTDIR}/usr/include/cpuidle.h
}
cpupower_package() {
From bf396128cf2c4b09f0f73e83bfeeb10003cf03b1 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Thu, 31 Dec 2020 08:27:27 -0700
Subject: [PATCH 39/73] protontricks: update to 1.4.3.
---
srcpkgs/protontricks/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index c0dd70f767b..d53364f804a 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,6 +1,6 @@
# Template file for 'protontricks'
pkgname=protontricks
-version=1.4.2
+version=1.4.3
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-only"
homepage="https://github.com/Matoking/protontricks"
distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=e7f006784a4f494806d3df1aea58a590b6c23672f4f9b3d837190a1db8fedf25
+checksum=ef65f18a2934d56d510ee03ea9031623db72ab9a22c760a97d5176bdb89e7922
From f8751647e5451e433adc85ceb5884de09941d568 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 1 Jan 2021 14:27:58 +0200
Subject: [PATCH 40/73] mtpaint: update to 3.50.
---
srcpkgs/mtpaint/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mtpaint/template b/srcpkgs/mtpaint/template
index 2ed7fdd5a96..98787e3e22f 100644
--- a/srcpkgs/mtpaint/template
+++ b/srcpkgs/mtpaint/template
@@ -1,8 +1,8 @@
# Template file for 'mtpaint'
pkgname=mtpaint
-version=3.49.34
+version=3.50
revision=1
-_commit=b30486e0594d7ac3bf8d4242d74d910d3172a9b9
+_commit=b0b023ba7ae231415d556ea88b2239fecf693faf
wrksrc="mtPaint-${_commit}"
build_style=configure
configure_args="--prefix=/usr --mandir=/usr/share/man
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
homepage="http://mtpaint.sourceforge.net/"
changelog="https://raw.githubusercontent.com/wjaguar/mtPaint/master/NEWS"
distfiles="https://github.com/wjaguar/mtPaint/archive/${_commit}.tar.gz"
-checksum=853423eca1b0bffcacdbbecec676fd3ae29846c43f3fee5848eaa9cc2ec9a56e
+checksum=b002718b3a5b907edfe6f6d9a1eaaa3287d98bc921da7137e32a4c06c29ae075
post_install() {
vdoc doc/vcode.t2t
From 5195f8e6eed07cca58f513203ac2159f552e1f0c Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Thu, 31 Dec 2020 07:01:13 -0700
Subject: [PATCH 41/73] winetricks: update to 20201206.
---
srcpkgs/winetricks/template | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/winetricks/template b/srcpkgs/winetricks/template
index 471ba9ca896..c6610df85c2 100644
--- a/srcpkgs/winetricks/template
+++ b/srcpkgs/winetricks/template
@@ -1,7 +1,7 @@
# Template file for 'winetricks'
pkgname=winetricks
-version=20200412
-revision=2
+version=20201206
+revision=1
build_style=gnu-makefile
depends="cabextract unzip xmessage" # actually it depends on wine
short_desc="Script to install various redistributable runtime libraries in Wine"
@@ -9,4 +9,9 @@ maintainer="mater11234 <mater11234@riseup.net>"
license="LGPL-3.0-or-later"
homepage="http://wiki.winehq.org/winetricks"
distfiles="https://github.com/Winetricks/winetricks/archive/$version.tar.gz"
-checksum=4b0aa4f11dbc30d10a8edd2bb83fcc34f9b143ab58ccce7b99cd54ebff7ec260
+checksum=2eb5c09e30be942383e242694e654aa294ed2a396e68c68b5eaa17427bd8242b
+
+do_check() {
+ # Needs python3-bashate
+ :
+}
From c9294d5b39d21bf6b2910ea462565b7df4374e55 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 1 Jan 2021 19:20:17 +0100
Subject: [PATCH 42/73] wget: update to 1.21
---
srcpkgs/wget/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 71e0b746558..348efcec677 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -1,7 +1,7 @@
# Template file for 'wget'
pkgname=wget
-version=1.20.3
-revision=3
+version=1.21
+revision=1
build_style=gnu-configure
configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl=gnutls')"
conf_files="/etc/wgetrc"
@@ -16,7 +16,7 @@ license="GPL-3.0-or-later"
#changelog="https://git.savannah.gnu.org/cgit/wget.git/plain/NEWS"
homepage="http://www.gnu.org/software/wget/wget.html"
distfiles="${GNU_SITE}/wget/wget-${version}.tar.gz"
-checksum=31cccfc6630528db1c8e3a06f6decf2a370060b982841cfab2b8677400a5092e
+checksum=b3bc1a9bd0c19836c9709c318d41c19c11215a07514f49f89b40b9d50ab49325
build_options="gnutls ssl"
build_options_default="ssl"
From 4f9e7c00653c0144896e9b34cda692ef19f56ea4 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Thu, 31 Dec 2020 09:20:46 -0600
Subject: [PATCH 43/73] ZMusic: fix cross build
---
srcpkgs/ZMusic/patches/0001-fix-cross.patch | 28 +++++++++++++++++++++
srcpkgs/ZMusic/template | 1 -
2 files changed, 28 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ZMusic/patches/0001-fix-cross.patch
diff --git a/srcpkgs/ZMusic/patches/0001-fix-cross.patch b/srcpkgs/ZMusic/patches/0001-fix-cross.patch
new file mode 100644
index 00000000000..ede6c979833
--- /dev/null
+++ b/srcpkgs/ZMusic/patches/0001-fix-cross.patch
@@ -0,0 +1,28 @@
+From b430f543c850acfb98751bfcf5343afb397cf049 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Thu, 31 Dec 2020 09:18:14 -0600
+Subject: [PATCH] fix cross
+
+---
+ CMakeLists.txt | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git CMakeLists.txt CMakeLists.txt
+index 5f4cb14..28e622b 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -24,11 +24,6 @@ if( FORCE_CROSSCOMPILE )
+ set( CMAKE_CROSSCOMPILING TRUE )
+ endif()
+
+-if(CMAKE_CROSSCOMPILING)
+- set(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Export file from native build.")
+- include(${IMPORT_EXECUTABLES})
+-endif()
+-
+
+ # Macro for building libraries without debugging information
+ macro( make_release_only )
+--
+2.30.0
+
diff --git a/srcpkgs/ZMusic/template b/srcpkgs/ZMusic/template
index b75b6d0c409..4151153cc83 100644
--- a/srcpkgs/ZMusic/template
+++ b/srcpkgs/ZMusic/template
@@ -14,7 +14,6 @@ license="GPL-3.0-or-later"
homepage="https://github.com/coelckers/ZMusic"
distfiles="${homepage}/archive/${version}.tar.gz"
checksum=5f432b022e023175eae7701625f79287e9ffe889a444179681381026b4fb93bf
-nocross=yes
if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" musl-fts-devel"
From f3487982ae618a24e0178a3dba7b8a38aa8cbef0 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 31 Dec 2020 11:21:04 +0100
Subject: [PATCH 44/73] bsdiff: patch for CVE-2014-9862; fix broken distfiles
url
---
srcpkgs/bsdiff/patches/CVE-2014-9862.diff | 13 +++++++++++++
srcpkgs/bsdiff/template | 5 +++--
2 files changed, 16 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/bsdiff/patches/CVE-2014-9862.diff
diff --git a/srcpkgs/bsdiff/patches/CVE-2014-9862.diff b/srcpkgs/bsdiff/patches/CVE-2014-9862.diff
new file mode 100644
index 00000000000..eb2710d8afb
--- /dev/null
+++ b/srcpkgs/bsdiff/patches/CVE-2014-9862.diff
@@ -0,0 +1,13 @@
+--- bspatch.c.orig
++++ bspatch.c
+@@ -164,6 +164,10 @@
+ }
+
+ /* Sanity-check */
++ if ((ctrl[0] < 0) || (ctrl[1] < 0))
++ errx(1,"Corrupt patch\n");
++
++ /* Sanity-check */
+ if(newpos+ctrl[0]>newsize)
+ errx(1,"Corrupt patch\n");
+
diff --git a/srcpkgs/bsdiff/template b/srcpkgs/bsdiff/template
index 9b557c128ad..d1396b8c707 100644
--- a/srcpkgs/bsdiff/template
+++ b/srcpkgs/bsdiff/template
@@ -1,13 +1,14 @@
# Template file for 'bsdiff'
pkgname=bsdiff
version=4.3
-revision=4
+revision=5
makedepends="bzip2-devel"
short_desc="Binary diff/patch utility"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
homepage="http://www.daemonology.net/bsdiff"
-distfiles="${homepage}/${pkgname}-${version}.tar.gz"
+distfiles="${DEBIAN_SITE}/main/b/bsdiff/bsdiff_${version}.orig.tar.gz"
+#distfiles="${homepage}/${pkgname}-${version}.tar.gz"
checksum=18821588b2dc5bf159aa37d3bcb7b885d85ffd1e19f23a0c57a58723fea85f48
do_build() {
From 4887d5bbb1eae520292b7f829fe26129c433136b Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Wed, 30 Dec 2020 22:40:12 -0600
Subject: [PATCH 45/73] procmail: switch distfiles to fossies
Seems upstream's source is unavailable
and homepage is blank
---
srcpkgs/procmail/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/procmail/template b/srcpkgs/procmail/template
index 6941e331461..4518f5caac5 100644
--- a/srcpkgs/procmail/template
+++ b/srcpkgs/procmail/template
@@ -2,15 +2,15 @@
pkgname=procmail
version=3.22
revision=3
-patch_args="-Np1"
hostmakedepends="opensmtpd"
depends="virtual?smtp-server"
short_desc="Autonomous mail processor"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2.0-or-later, Artistic"
+license="GPL-2.0-or-later, Artistic-1.0-cl8"
homepage="http://www.procmail.org"
-distfiles="ftp://ftp.informatik.rwth-aachen.de/pub/packages/procmail/${pkgname}-${version}.tar.gz"
+distfiles="https://fossies.org/linux/misc/old/procmail-${version}.tar.gz"
checksum=087c75b34dd33d8b9df5afe9e42801c9395f4bf373a784d9bc97153b0062e117
+patch_args="-Np1"
nocross="./autoconf: line 1396: ./_autotst: No such file or directory"
post_extract() {
From db78fd3a2793a93988b7980bfd27c5f8de44eaf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Wed, 30 Dec 2020 16:20:50 +0100
Subject: [PATCH 46/73] deutex: update to 5.2.2.
---
srcpkgs/deutex/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/deutex/template b/srcpkgs/deutex/template
index 88846dd7f70..f1563a89b97 100644
--- a/srcpkgs/deutex/template
+++ b/srcpkgs/deutex/template
@@ -1,6 +1,6 @@
# Template file for 'deutex'
pkgname=deutex
-version=5.2.1
+version=5.2.2
revision=1
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config asciidoc"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="GPL-2.0-only, LGPL-2.0-or-later"
homepage="https://github.com/Doom-Utils/deutex"
distfiles="https://github.com/Doom-Utils/deutex/archive/v${version}.tar.gz"
-checksum=5b4b2d5a0c85fcccb206a94685ecf5558a891ee6ce9e0cdbf96d4c4a129d5bcc
+checksum=767e75eb3615bb732947448b81031410e26f808dfc3a099d64a483931fe0b313
pre_configure() {
autoreconf -fi
From fcdd74995645d4edd739938d6fd6a71880c9c7e4 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Wed, 30 Dec 2020 23:57:18 +0100
Subject: [PATCH 47/73] passwordsafe: update to 1.12
Closes: #27562 [via git-merge-pr]
---
srcpkgs/passwordsafe/patches/__time64_t.patch | 24 -------------------
srcpkgs/passwordsafe/template | 21 ++++++----------
srcpkgs/passwordsafe/update | 4 ++--
3 files changed, 9 insertions(+), 40 deletions(-)
delete mode 100644 srcpkgs/passwordsafe/patches/__time64_t.patch
diff --git a/srcpkgs/passwordsafe/patches/__time64_t.patch b/srcpkgs/passwordsafe/patches/__time64_t.patch
deleted file mode 100644
index 00ebf3444c7..00000000000
--- a/srcpkgs/passwordsafe/patches/__time64_t.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-related issue: https://github.com/pwsafe/pwsafe/issues/563
-
-Also:
-
-https://github.com/pwsafe/pwsafe/commit/412458d281f98ea7649d2957f88ebad701b6cd18
-
---- src/os/unix/pws_time.h
-+++ src/os/unix/pws_time.h
-@@ -14,9 +14,11 @@
- #include <time.h>
- #endif
-
--typedef time_t __time32_t;
--#ifndef __time64_t
--typedef uint64_t __time64_t;
-+#ifndef __TIME64_T_TYPE
-+#define __TIME64_T_TYPE uint64_t
-+#endif
-+#ifndef time64_t
-+typedef __TIME64_T_TYPE __time64_t;
- #endif
-
- extern int localtime64_r(const __time64_t *timep, struct tm *result);
-
diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 986de16cfe7..435612f3ae7 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -1,33 +1,26 @@
# Template file for 'passwordsafe'
pkgname=passwordsafe
-version=1.08.1BETA
+version=1.12.0
revision=1
wrksrc="pwsafe-${version}"
build_style=cmake
+build_helper=cmake-wxWidgets-gtk3
+# testing disabled: want to build gtest from source (package gtest-devel useless)
configure_args="-DNO_GTEST=ON"
# build process uses perl to generate core_st.cpp and zip to generate help files
hostmakedepends="perl zip pkg-config gettext"
makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
- libykpers-devel gtest-devel qrencode-devel libressl-devel libcurl-devel"
+ libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
short_desc="Simple & Secure Password Management"
maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
license="Artistic-2.0"
homepage="https://pwsafe.org"
-distfiles="https://github.com/pwsafe/pwsafe/archive/${version}.tar.gz>pwsafe-${version}.tar.gz"
-checksum=2c3648e8189a32c107c7d7bc0527c919db36b3940f19b0e58b37f0f992ea42a7
-
-# wx-config-gtk3 crossbuild handled via wrapper
-if [ -z "$CROSS_BUILD" ]; then
- configure_args+=" -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3"
-
-fi
+distfiles="https://github.com/pwsafe/pwsafe/archive/${version}.tar.gz"
+checksum=8d331019170f2920a28ccda08ae420c78e016f41d3ccedb7b4dba1f5f7f25bcb
pre_configure() {
# ykpers-1 includes are hardcoded, add cross base
- sed -i -e "s|-I\(/usr/include/ykpers-1\)|-I${XBPS_CROSS_BASE}\1|" CMakeLists.txt
-
- # icons in right place
- sed -i -e "s|share/pixmaps|share/icons/hicolor/48x48/apps|" CMakeLists.txt
+ vsed -e "s|-I\(/usr/include/ykpers-1\)|-I${XBPS_CROSS_BASE}\1|" -i CMakeLists.txt
}
post_install() {
diff --git a/srcpkgs/passwordsafe/update b/srcpkgs/passwordsafe/update
index 6469882cd10..bd4bb512ea0 100644
--- a/srcpkgs/passwordsafe/update
+++ b/srcpkgs/passwordsafe/update
@@ -1,2 +1,2 @@
-# Passwordsafe linux port uses "BETA" in release name
-pattern="\K[\d.]+BETA(?=)"
+# 1.x for linux, 3.x for windows
+ignore="3.*"
From 127afc51dca01ff180a287e07006de55052fa9f5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 01:12:04 +0100
Subject: [PATCH 48/73] goodvibes: update to 0.6.1.
Closes: #27544 [via git-merge-pr]
---
srcpkgs/goodvibes/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/goodvibes/template b/srcpkgs/goodvibes/template
index 89b0ee240e8..d098fa9fd13 100644
--- a/srcpkgs/goodvibes/template
+++ b/srcpkgs/goodvibes/template
@@ -1,6 +1,6 @@
# Template file for 'goodvibes'
pkgname=goodvibes
-version=0.6
+version=0.6.1
revision=1
wrksrc="goodvibes-v${version}"
build_style=meson
@@ -12,9 +12,9 @@ short_desc="Light and simple internet radio player"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://gitlab.com/goodvibes/goodvibes"
-changelog="https://gitlab.com/goodvibes/goodvibes/raw/v${version}/NEWS"
+changelog="https://gitlab.com/goodvibes/goodvibes/-/raw/master/NEWS"
distfiles="https://gitlab.com/goodvibes/goodvibes/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
-checksum=b3cb769ff2813e38ac5211be5af97a32f17b31ba48c0133d8a406005262f76a5
+checksum=f71e8b5a843b53ca24ec93da2c9c402a71ac2a594434636a83a6b8fd5937f228
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" glib-devel"
From 0ab788a4dc106f215a8757f2ebe9ff40d780671a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 00:53:59 +0100
Subject: [PATCH 49/73] frankenwm: update to 1.0.23.
---
srcpkgs/frankenwm/template | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/frankenwm/template b/srcpkgs/frankenwm/template
index d2b4152f0fd..7b70d3ccd1f 100644
--- a/srcpkgs/frankenwm/template
+++ b/srcpkgs/frankenwm/template
@@ -1,19 +1,17 @@
# Template file for 'frankenwm'
pkgname=frankenwm
-_pkgname=FrankenWM
-version=1.0.21
+version=1.0.23
revision=1
-wrksrc="${_pkgname}-${version}"
+wrksrc="FrankenWM-${version}"
build_style=gnu-makefile
hostmakedepends="pkg-config"
makedepends="libxcb-devel xcb-util-devel xcb-util-wm-devel xcb-util-keysyms-devel libX11-devel"
short_desc="XCB dynamic tiling WM"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="https://github.com/sulami/${_pkgname}"
-distfiles="https://github.com/sulami/${_pkgname}/archive/v${version}.tar.gz"
-checksum=9fa4a3ff02fd7b225e378e1f5160c362b48528b52e462c91f25015ab98162df9
-replaces="frankenwm-git>=0"
+homepage="https://github.com/sulami/FrankenWM"
+distfiles="https://github.com/sulami/FrankenWM/archive/v${version}.tar.gz"
+checksum=64f63f8fcd824d892087b62f9459a2eba7d3dc29ae39a4558315297b32afdf6a
pre_build() {
[ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h
From 6e053918b78f1d09283ae06083c46a9a55c263bc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 00:44:49 +0100
Subject: [PATCH 50/73] menumaker: update to 0.99.12.
---
srcpkgs/menumaker/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/menumaker/template b/srcpkgs/menumaker/template
index 54b2dc8a008..7a057147d0c 100644
--- a/srcpkgs/menumaker/template
+++ b/srcpkgs/menumaker/template
@@ -1,6 +1,6 @@
# Template file for 'menumaker'
pkgname=menumaker
-version=0.99.11
+version=0.99.12
revision=2
build_style=gnu-configure
pycompile_dirs="/usr/share/menumaker"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
homepage="http://menumaker.sourceforge.net"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
-checksum=9d831adbaef2101d8b8d82e48d764c2c1a80a38e97dcf90740eb540e6db3f936
+checksum=e3a3566186a5a9ed4d721c1e7788a5af243c8c8a45b96fe6fff3e94580289b0c
python_version=2
post_install() {
From a9f13a89722f45f26ed79f773e7ca1e559015ffa Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 00:37:17 +0100
Subject: [PATCH 51/73] herbstluftwm: update to 0.9.1.
---
srcpkgs/herbstluftwm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index 62e78c6f0b2..a76fb7bd911 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,6 +1,6 @@
# Template file for 'herbstluftwm'
pkgname=herbstluftwm
-version=0.9.0
+version=0.9.1
revision=1
build_style=cmake
hostmakedepends="pkg-config asciidoc"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
homepage="http://herbstluftwm.org"
changelog="https://raw.githubusercontent.com/herbstluftwm/herbstluftwm/master/NEWS"
distfiles="http://herbstluftwm.org/tarballs/${pkgname}-${version}.tar.gz"
-checksum=7162e3e6ab6c93b4694c2cb28797ae6246a5be59ff68eeb55a7271dfb29e616d
+checksum=1e16277127e24f119b0f110b66a2723b9987bf70e4db0b2ec20c9fb4e9549864
post_install() {
vlicense LICENSE
From cf784f8560785ba0fb675ce665a737869a6b7937 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Tue, 29 Dec 2020 17:42:05 -0600
Subject: [PATCH 52/73] element-desktop: update to 1.7.16.
Remove unnecessary nocross= and INSTALL.msg.
Closes: #27539 [via git-merge-pr]
---
srcpkgs/element-desktop/INSTALL.msg | 5 -----
srcpkgs/element-desktop/template | 7 +++----
2 files changed, 3 insertions(+), 9 deletions(-)
delete mode 100644 srcpkgs/element-desktop/INSTALL.msg
diff --git a/srcpkgs/element-desktop/INSTALL.msg b/srcpkgs/element-desktop/INSTALL.msg
deleted file mode 100644
index 72f9e09ec32..00000000000
--- a/srcpkgs/element-desktop/INSTALL.msg
+++ /dev/null
@@ -1,5 +0,0 @@
-Riot is now called Element.
-https://element.io/blog/welcome-to-element/
-
-Element 1.6.8 has upgraded to Electron 9, with support for tray icons. It
-should no longer be necessary to use a package like snixembed.
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 8a8e049b1d8..194a88fbc3e 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'element-desktop'
pkgname=element-desktop
-version=1.7.14
+version=1.7.16
revision=1
wrksrc="element-web-${version}"
conf_files="/etc/${pkgname}/config.json"
@@ -18,9 +18,8 @@ _ghpage="https://github.com/vector-im"
_archive="archive/v${version}.tar.gz"
distfiles="${_ghpage}/element-desktop/${_archive}>element-desktop.tar.gz
${_ghpage}/element-web/${_archive}>element-web.tar.gz"
-checksum="15f332f03b03a4ea585ea47b033f77ccd9a6e1f77b6a9e886d7940300fc0f8d5
- 863db71b73169b30b5ee3829ab6a488ed054d293cf80d6226b267ce2efcacdc2"
-nocross="depends on electron9"
+checksum="1aac1c80370d62c82d1c8befe167cf838f66ad477a47ea0c5a020913ed36e1ed
+ 4a4821a046ea1f81852de95a4c83fe0f1aaa371fad65e63b48216889c065d155"
export USE_SYSTEM_APP_BUILDER=true
From 95dd85edebe52ea8a4c15b9a1f43def155544b06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 1 Jan 2021 22:57:52 -0300
Subject: [PATCH 53/73] foobillard++: fix cross builds.
No idea how it worked previously.
---
srcpkgs/foobillard++/template | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/foobillard++/template b/srcpkgs/foobillard++/template
index 98923393e99..d92355a8cab 100644
--- a/srcpkgs/foobillard++/template
+++ b/srcpkgs/foobillard++/template
@@ -15,7 +15,10 @@ license="GPL-2.0-only"
homepage="http://foobillardplus.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/foobillardplus/foobillardplus-$version.tar.gz"
checksum=e276b70674a7d788c45eeff89f1f5db5d48d871a1ab92103813d424a3761e1d9
-CFLAGS+=" -fgnu89-inline"
+CFLAGS="-fgnu89-inline"
+# flags from freetype-config and sdl-config
+CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/freetype2"
+CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/SDL -D_GNU_SOURCE=1"
pre_configure() {
autoreconf -fi
From beaf2d075e91a9572538a8fa47f54e758ae0340f Mon Sep 17 00:00:00 2001
From: Logen Kain <logen@sudotask.com>
Date: Fri, 25 Dec 2020 01:25:08 -0500
Subject: [PATCH 54/73] cherrytree: update to 0.99.27
---
srcpkgs/cherrytree/template | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index de4faaae43b..f3c8286b11d 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,20 +1,18 @@
# Template file for 'cherrytree'
pkgname=cherrytree
-version=0.99.21
+version=0.99.27
revision=1
build_style=cmake
hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
makedepends="cpputest uchardet-devel libcurl-devel sqlite-devel
libxml++-devel gtksourceviewmm-devel gspell-devel gtkmm-devel"
depends="desktop-file-utils"
-checkdepends="xvfb-run"
short_desc="Hierarchial note taking application with syntax highlighting"
maintainer="Logen K <logen@sudotask.com>"
license="GPL-3.0-or-later"
homepage="https://www.giuspen.com/cherrytree/"
distfiles="https://github.com/giuspen/cherrytree/archive/$version.tar.gz"
-checksum=5c180fdf5cbab43bc496a246ce952e7f39e84b2a7b4cabdb22773b9d4a415850
-
-do_check() {
- xvfb-run make -C build test
-}
+checksum=fff13c6b764eaa952616308a53cb5bd863b37f913bd74891117b4da20ff29832
+configure_args+=" -DBUILD_GMOCK:BOOL='OFF'
+ -DBUILD_GTEST:BOOL='OFF'
+ -DBUILD_TESTING:BOOL='OFF'"
From 6274ac41f032088b3de0a43b8d5867b2f35c9e6c Mon Sep 17 00:00:00 2001
From: mag <mag-one@autistici.org>
Date: Thu, 24 Dec 2020 17:01:56 +0100
Subject: [PATCH 55/73] guitarix2: update to 0.42.0
---
srcpkgs/guitarix2/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/guitarix2/template b/srcpkgs/guitarix2/template
index 95c6253c8da..3aabb9c8ff9 100644
--- a/srcpkgs/guitarix2/template
+++ b/srcpkgs/guitarix2/template
@@ -1,14 +1,14 @@
# Template file for 'guitarix2'
pkgname=guitarix2
-version=0.39.0
+version=0.42.0
revision=1
wrksrc="guitarix-${version}"
build_style=waf3
configure_args="--cxxflags-release=-DNDEBUG --ladspa --new-ladspa --no-faust
$(vopt_if avahi '' '--no-avahi') $(vopt_if bluez '' '--no-bluez')"
make_build_args="--progress"
-hostmakedepends="gperf intltool pkg-config"
-makedepends="boost-devel eigen fftw-devel gtkmm2-devel jack-devel
+hostmakedepends="gperf intltool pkg-config sassc"
+makedepends="boost-devel eigen fftw-devel gtkmm-devel jack-devel
ladspa-sdk liblrdf-devel libsndfile-devel lilv-devel lv2 sratom-devel
zita-convolver-devel zita-resampler-devel
$(vopt_if avahi avahi-glib-libs-devel) $(vopt_if bluez libbluetooth-devel)"
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://guitarix.org"
distfiles="${SOURCEFORGE_SITE}/guitarix/guitarix/guitarix2-${version}.tar.xz"
-checksum=490ff3f856282f776456b8e27366dd074d663870c0a89fccded03d854305c8da
+checksum=fb1b75b7ea9f140c2b2df50982e14616dcaffaf65425ca531fcf6f27dd956405
build_options="avahi bluez"
desc_option_avahi="Build with avahi support"
@@ -27,7 +27,8 @@ desc_option_bluez="Build with bluez support"
CXXFLAGS="-fpermissive"
case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*) ;;
+ x86_64*) ;;
+ i686*) configure_args+=" --cxxflags=-mfxsr" ;;
*) configure_args+=" --disable-sse" ;;
esac
From f9997b3a7de203bbcd7b04655de488028d0ddb3c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 1 Jan 2021 22:00:34 -0500
Subject: [PATCH 56/73] libvirt: fix deadlocks with musl
Alpine Linux includes two patches to fix deadlocks with musl. Because
upstream is not interested in merging these patches, conditionally apply
one only for musl archs. The other is guarded by conditional compilation
directives, so there is no harm in applying the patch unconditionally.
Closes #25905.
---
srcpkgs/libvirt/files/musl-fork-nofree.patch | 137 ++++++++++++++++++
.../improve-generic-mass-close-of-fds.patch | 131 +++++++++++++++++
srcpkgs/libvirt/template | 10 +-
3 files changed, 277 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/libvirt/files/musl-fork-nofree.patch
create mode 100644 srcpkgs/libvirt/patches/improve-generic-mass-close-of-fds.patch
diff --git a/srcpkgs/libvirt/files/musl-fork-nofree.patch b/srcpkgs/libvirt/files/musl-fork-nofree.patch
new file mode 100644
index 00000000000..4e680840311
--- /dev/null
+++ b/srcpkgs/libvirt/files/musl-fork-nofree.patch
@@ -0,0 +1,137 @@
+https://www.redhat.com/archives/libvir-list/2020-August/msg00596.html
+
+Doing malloc/free after fork is technically not allowed in POSIX and
+deadlocks[1] with musl libc.
+
+[1]: https://gitlab.com/libvirt/libvirt/-/issues/52
+
+Signed-off-by: Natanael Copa <ncopa alpinelinux org>
+---
+ src/util/vircommand.c | 4 ++--
+ src/util/virlog.c | 44 +++++++++++++++++++++++++++++++++----------
+ src/util/virlog.h | 1 +
+ 3 files changed, 37 insertions(+), 12 deletions(-)
+
+diff -ur src/util/vircommand.c src/util/vircommand.c
+--- src/util/vircommand.c
++++ src/util/vircommand.c
+@@ -304,7 +304,7 @@
+ /* Make sure any hook logging is sent to stderr, since child
+ * process may close the logfile FDs */
+ logprio = virLogGetDefaultPriority();
+- virLogReset();
++ virLogResetWithoutFree();
+ virLogSetDefaultPriority(logprio);
+
+ /* Clear out all signal handlers from parent so nothing
+@@ -897,7 +897,7 @@
+ goto fork_error;
+
+ /* Close logging again to ensure no FDs leak to child */
+- virLogReset();
++ virLogResetWithoutFree();
+
+ if (cmd->env)
+ execve(binary, cmd->args, cmd->env);
+diff -ur src/util/virlog.c src/util/virlog.c
+--- src/util/virlog.c
++++ src/util/virlog.c
+@@ -108,8 +108,8 @@
+ */
+ static virLogPriority virLogDefaultPriority = VIR_LOG_DEFAULT;
+
+-static void virLogResetFilters(void);
+-static void virLogResetOutputs(void);
++static void virLogResetFilters(bool freemem);
++static void virLogResetOutputs(bool freemem);
+ static void virLogOutputToFd(virLogSourcePtr src,
+ virLogPriority priority,
+ const char *filename,
+@@ -284,8 +284,30 @@
+ return -1;
+
+ virLogLock();
+- virLogResetFilters();
+- virLogResetOutputs();
++ virLogResetFilters(true);
++ virLogResetOutputs(true);
++ virLogDefaultPriority = VIR_LOG_DEFAULT;
++ virLogUnlock();
++ return 0;
++}
++
++/**
++ * virLogResetWithoutFree:
++ *
++ * Reset the logging module to its default initial state, but avoid doing
++ * free() so it can be used after fork and before exec.
++ *
++ * Returns 0 if successful, and -1 in case or error
++ */
++int
++virLogResetWithoutFree(void)
++{
++ if (virLogInitialize() < 0)
++ return -1;
++
++ virLogLock();
++ virLogResetFilters(false);
++ virLogResetOutputs(false);
+ virLogDefaultPriority = VIR_LOG_DEFAULT;
+ virLogUnlock();
+ return 0;
+@@ -324,9 +346,10 @@
+ * Removes the set of logging filters defined.
+ */
+ static void
+-virLogResetFilters(void)
++virLogResetFilters(bool freemem)
+ {
+- virLogFilterListFree(virLogFilters, virLogNbFilters);
++ if (freemem)
++ virLogFilterListFree(virLogFilters, virLogNbFilters);
+ virLogFilters = NULL;
+ virLogNbFilters = 0;
+ virLogFiltersSerial++;
+@@ -371,9 +394,10 @@
+ * Removes the set of logging output defined.
+ */
+ static void
+-virLogResetOutputs(void)
++virLogResetOutputs(bool freemem)
+ {
+- virLogOutputListFree(virLogOutputs, virLogNbOutputs);
++ if (freemem)
++ virLogOutputListFree(virLogOutputs, virLogNbOutputs);
+ virLogOutputs = NULL;
+ virLogNbOutputs = 0;
+ }
+@@ -1379,7 +1403,7 @@
+ return -1;
+
+ virLogLock();
+- virLogResetOutputs();
++ virLogResetOutputs(true);
+
+ #if WITH_SYSLOG_H
+ /* syslog needs to be special-cased, since it keeps the fd in private */
+@@ -1422,7 +1446,7 @@
+ return -1;
+
+ virLogLock();
+- virLogResetFilters();
++ virLogResetFilters(true);
+ virLogFilters = filters;
+ virLogNbFilters = nfilters;
+ virLogUnlock();
+diff -ur src/util/virlog.h src/util/virlog.h
+--- src/util/virlog.h
++++ src/util/virlog.h
+@@ -168,6 +168,7 @@
+ void virLogLock(void);
+ void virLogUnlock(void);
+ int virLogReset(void);
++int virLogResetWithoutFree(void);
+ int virLogParseDefaultPriority(const char *priority);
+ int virLogPriorityFromSyslog(int priority);
+ void virLogMessage(virLogSourcePtr source,
diff --git a/srcpkgs/libvirt/patches/improve-generic-mass-close-of-fds.patch b/srcpkgs/libvirt/patches/improve-generic-mass-close-of-fds.patch
new file mode 100644
index 00000000000..6647588f3f1
--- /dev/null
+++ b/srcpkgs/libvirt/patches/improve-generic-mass-close-of-fds.patch
@@ -0,0 +1,131 @@
+https://www.redhat.com/archives/libvir-list/2020-August/msg00598.html
+
+Add a portable generic implementation of virMassClose as fallback on
+non-FreeBSD and non-glibc.
+
+This implementation uses poll(2) to look for open files to keep
+performance reasonable while not using any mallocs.
+
+This solves a deadlock with musl libc.
+
+Signed-off-by: Natanael Copa <ncopa alpinelinux org>
+---
+ src/util/vircommand.c | 76 +++++++++++++++++++++++++++++++++----------
+ 1 file changed, 58 insertions(+), 18 deletions(-)
+
+diff -ur src/util/vircommand.c src/util/vircommand.c
+--- src/util/vircommand.c
++++ src/util/vircommand.c
+@@ -443,7 +443,7 @@
+ return 0;
+ }
+
+-# ifdef __linux__
++# if defined(__linux__) && defined(__GLIBC__)
+ /* On Linux, we can utilize procfs and read the table of opened
+ * FDs and selectively close only those FDs we don't want to pass
+ * onto child process (well, the one we will exec soon since this
+@@ -478,17 +478,7 @@
+
+ return 0;
+ }
+-
+-# else /* !__linux__ */
+-
+-static int
+-virCommandMassCloseGetFDsGeneric(virCommandPtr cmd G_GNUC_UNUSED,
+- virBitmapPtr fds)
+-{
+- virBitmapSetAll(fds);
+- return 0;
+-}
+-# endif /* !__linux__ */
++# endif /* __linux__ && __GLIBC__ */
+
+ # ifdef __FreeBSD__
+
+@@ -542,7 +532,7 @@
+ return 0;
+ }
+
+-# else /* ! __FreeBSD__ */
++# elif defined(__GLIBC__) /* ! __FreeBSD__ */
+
+ static int
+ virCommandMassClose(virCommandPtr cmd,
+@@ -569,13 +559,8 @@
+
+ fds = virBitmapNew(openmax);
+
+-# ifdef __linux__
+ if (virCommandMassCloseGetFDsLinux(cmd, fds) < 0)
+ return -1;
+-# else
+- if (virCommandMassCloseGetFDsGeneric(cmd, fds) < 0)
+- return -1;
+-# endif
+
+ fd = virBitmapNextSetBit(fds, 2);
+ for (; fd >= 0; fd = virBitmapNextSetBit(fds, fd)) {
+@@ -593,6 +578,61 @@
+ return 0;
+ }
+
++#else /* ! __FreeBSD__ && ! __GLIBC__ */
++static int
++virCommandMassClose(virCommandPtr cmd,
++ int childin,
++ int childout,
++ int childerr)
++{
++ static struct pollfd pfds[1024];
++ int fd = 0;
++ int i, total;
++ int max_fd = sysconf(_SC_OPEN_MAX);
++
++ if (max_fd < 0) {
++ virReportSystemError(errno, "%s", _("sysconf(_SC_OPEN_MAX) failed"));
++ return -1;
++ }
++
++ total = max_fd - fd;
++ for (i = 0; i < (total < 1024 ? total : 1024); i++)
++ pfds[i].events = 0;
++
++ while (fd < max_fd) {
++ int nfds, r = 0;
++
++ total = max_fd - fd;
++ nfds = total < 1024 ? total : 1024;
++
++ for (i = 0; i < nfds; i++)
++ pfds[i].fd = fd + i;
++
++ do {
++ r = poll(pfds, nfds, 0);
++ } while (r == -1 && errno == EINTR);
++
++ if (r < 0) {
++ virReportSystemError(errno, "%s", _("poll() failed"));
++ return -1;
++ }
++
++ for (i = 0; i < nfds; i++)
++ if (pfds[i].revents != POLLNVAL) {
++ if (pfds[i].fd == childin || pfds[i].fd == childout || pfds[i].fd == childerr)
++ continue;
++ if (!virCommandFDIsSet(cmd, pfds[i].fd)) {
++ VIR_MASS_CLOSE(pfds[i].fd);
++ } else if (virSetInherit(pfds[i].fd, true) < 0) {
++ virReportSystemError(errno, _("failed to preserve fd %d"), pfds[i].fd);
++ return -1;
++ }
++ }
++ fd += nfds;
++ }
++ return 0;
++}
++
+ # endif /* ! __FreeBSD__ */
+
+ /*
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 4e87007c5ea..09255adbda3 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,7 +1,7 @@
# Template file for 'libvirt'
pkgname=libvirt
version=6.10.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
hostmakedepends="automake libtool perl pkg-config lvm2 parted gettext-devel
@@ -62,6 +62,14 @@ make_dirs="
/var/libvirt/boot 0755 root root
/var/cache/libvirt/qemu 0755 root root"
+post_patch() {
+ # Upstream doesn't want to accept this patch from Alpine, but libvirt
+ # is broken on musl without it, so apply it only for musl
+ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+ patch -Np0 < ${FILESDIR}/musl-fork-nofree.patch
+ fi
+}
+
post_install() {
# runit services
vsv libvirtd
From 6444f5a98b9b002705e4dfd9ad00a48e7d8260a6 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Wed, 30 Dec 2020 19:26:53 -0600
Subject: [PATCH 57/73] libdnet: update to 1.14.
---
srcpkgs/libdnet/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libdnet/template b/srcpkgs/libdnet/template
index bbfbe881568..431974d5a6c 100644
--- a/srcpkgs/libdnet/template
+++ b/srcpkgs/libdnet/template
@@ -1,16 +1,16 @@
# Template file for 'libdnet'
pkgname=libdnet
-version=1.12
-revision=2
+version=1.14
+revision=1
wrksrc="libdnet-libdnet-${version}"
build_style=gnu-configure
hostmakedepends="automake libtool autoconf pkg-config"
-short_desc="A portable interface to low level networking routines"
+short_desc="Portable interface to low level networking routines"
maintainer="Carson Page <pagem.carson@gmail.com>"
license="BSD-3-Clause"
homepage="https://github.com/dugsong/libdnet"
distfiles="https://github.com/dugsong/libdnet/archive/libdnet-${version}.tar.gz"
-checksum=b6360659c93fa2e3cde9e0a1fc9c07bc4111f3448c5de856e095eb98315dd424
+checksum=592599c54a57102a177270f3a2caabda2c2ac7768b977d7458feba97da923dfe
pre_configure() {
autoreconf -I config --force --install
From 55ae46a45a759128baf20636d881dfa7eecec0d8 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 2 Jan 2021 07:54:20 +0100
Subject: [PATCH 58/73] kodi: Orphan package
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 01b341192ab..4c035767e4d 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -7,7 +7,7 @@ wrksrc="xbmc-${version}-${_codename}"
build_style=cmake
configure_args="-DENABLE_INTERNAL_CROSSGUID=OFF -DWITH_FFMPEG=/usr"
short_desc="Software media player and entertainment hub for digital media"
-maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.kodi.tv"
distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
From a7b18c02b03db5789785380cf2112d2335107462 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 2 Jan 2021 07:57:06 +0100
Subject: [PATCH 59/73] kodi-addon-game-libretro: Orphan package
---
srcpkgs/kodi-addon-game-libretro/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi-addon-game-libretro/template b/srcpkgs/kodi-addon-game-libretro/template
index c0866a2de2a..f704ef282df 100644
--- a/srcpkgs/kodi-addon-game-libretro/template
+++ b/srcpkgs/kodi-addon-game-libretro/template
@@ -7,7 +7,7 @@ wrksrc="game.libretro-${version}-${_kodi_release}"
build_style=cmake
makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel"
short_desc="Libretro compatibility layer for the Kodi Game API"
-maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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"
From 9bf6f48065e0de175eb996de16bba3790e96eaba Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 2 Jan 2021 07:57:23 +0100
Subject: [PATCH 60/73] kodi-addon-inputstream-rtmp: Orphan package
---
srcpkgs/kodi-addon-inputstream-rtmp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index d6cd3159035..dc5b7f15d68 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config"
makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
libressl-devel zlib-devel librtmp-devel"
short_desc="RTMP input stream add-on for Kodi"
-maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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"
From 2c509422aac0acf66a785873d3d60562b43ec22e Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 2 Jan 2021 07:57:41 +0100
Subject: [PATCH 61/73] kodi-binary-addons: Orphan package
---
srcpkgs/kodi-binary-addons/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi-binary-addons/template b/srcpkgs/kodi-binary-addons/template
index b659ad31f86..9f71df7ac08 100644
--- a/srcpkgs/kodi-binary-addons/template
+++ b/srcpkgs/kodi-binary-addons/template
@@ -8,7 +8,7 @@ depends="kodi-addon-pvr-zattoo kodi-addon-game-libretro
kodi-addon-inputstream-adaptive kodi-addon-pvr-hts kodi-addon-pvr-iptvsimple
kodi-addon-vfs-rar"
short_desc="Meta-package for binary kodi addons"
-maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="metapackage"
homepage="https://kodi.tv"
nocross="addons can't be cross-compiled yet"
From ada8ae01ef3ea4bd056830bb6b8290f2afe3b4c3 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 2 Jan 2021 07:57:58 +0100
Subject: [PATCH 62/73] kodi-platform: Orphan package
---
srcpkgs/kodi-platform/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/kodi-platform/template b/srcpkgs/kodi-platform/template
index 653d6ec8f90..250f781d70b 100644
--- a/srcpkgs/kodi-platform/template
+++ b/srcpkgs/kodi-platform/template
@@ -7,7 +7,7 @@ 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="Helmut Pozimski <helmut@pozimski.eu>"
+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"
@@ -27,7 +27,6 @@ post_build() {
-e 's,/usr/usr,/usr,g' \
-i build/kodiplatform-config.cmake
fi
-}
kodi-platform-devel_package() {
short_desc+=" - development files"
From 8add5b248d47e2e4d511bf5b5e80d3a52518d3e0 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 2 Jan 2021 19:14:54 -0600
Subject: [PATCH 63/73] kodi-binary-addons: unmark nocross
---
srcpkgs/kodi-binary-addons/template | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/kodi-binary-addons/template b/srcpkgs/kodi-binary-addons/template
index 9f71df7ac08..67f05af9d67 100644
--- a/srcpkgs/kodi-binary-addons/template
+++ b/srcpkgs/kodi-binary-addons/template
@@ -11,4 +11,3 @@ short_desc="Meta-package for binary kodi addons"
maintainer="Orphaned <orphan@voidlinux.org>"
license="metapackage"
homepage="https://kodi.tv"
-nocross="addons can't be cross-compiled yet"
From 26da82526fd8be63fe3da4e9e38b223625bb03fc Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 2 Jan 2021 19:10:58 -0600
Subject: [PATCH 64/73] 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 22d931a4acd069fc8e0532b98f9a831db46483c9 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 2 Jan 2021 19:11:23 -0600
Subject: [PATCH 65/73] kodi-addon-peripheral-joystick: unmark nocross
---
srcpkgs/kodi-addon-peripheral-joystick/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/kodi-addon-peripheral-joystick/template b/srcpkgs/kodi-addon-peripheral-joystick/template
index 72f28409604..b975cd72d4d 100644
--- a/srcpkgs/kodi-addon-peripheral-joystick/template
+++ b/srcpkgs/kodi-addon-peripheral-joystick/template
@@ -5,6 +5,8 @@ _kodi_release="Leia"
revision=1
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 c82524dbe4e0e4824b71a58c49ed5b846e3396c8 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 2 Jan 2021 19:11:48 -0600
Subject: [PATCH 66/73] 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 112b4ee5d686fad40511defe65ad4b9c481815f1 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 2 Jan 2021 19:12:20 -0600
Subject: [PATCH 67/73] 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 9535af17f0c195705e9b426e88e4523ea16711f8 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 2 Jan 2021 19:12:45 -0600
Subject: [PATCH 68/73] kodi-addon-pvr-zattoo: unmark nocross
---
srcpkgs/kodi-addon-pvr-zattoo/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/kodi-addon-pvr-zattoo/template b/srcpkgs/kodi-addon-pvr-zattoo/template
index 6dba619aa96..16d8517c18f 100644
--- a/srcpkgs/kodi-addon-pvr-zattoo/template
+++ b/srcpkgs/kodi-addon-pvr-zattoo/template
@@ -5,6 +5,8 @@ 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"
hostmakedepends="pkg-config"
makedepends="kodi-devel kodi-platform-devel p8-platform-devel rapidjson
tinyxml2-devel tinyxml-devel"
@@ -15,4 +17,3 @@ 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"
From 635192c10da35a2ec2cafe2de0653fe0a0756e9b Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 2 Jan 2021 19:13:10 -0600
Subject: [PATCH 69/73] 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 740f4c0e1732ac4c1837dcef6531bf608681691e Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 2 Jan 2021 19:13:40 -0600
Subject: [PATCH 70/73] 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 7884a9f6adf66b85036518993790a57af97e60a3 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 2 Jan 2021 19:14:11 -0600
Subject: [PATCH 71/73] 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 54abf6aa601e44c04d0780a858aa664d682c7460 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 2 Jan 2021 19:14:31 -0600
Subject: [PATCH 72/73] 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 b4b7b641485b8a241014fc96aa3aeda19461cb2a Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 2 Jan 2021 19:15:11 -0600
Subject: [PATCH 73/73] kodi-platform: fix nocross
---
srcpkgs/kodi-platform/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/kodi-platform/template b/srcpkgs/kodi-platform/template
index 250f781d70b..077ebf8b676 100644
--- a/srcpkgs/kodi-platform/template
+++ b/srcpkgs/kodi-platform/template
@@ -27,6 +27,7 @@ post_build() {
-e 's,/usr/usr,/usr,g' \
-i build/kodiplatform-config.cmake
fi
+}
kodi-platform-devel_package() {
short_desc+=" - development files"
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] [WIP]kodi-platform: fix cross-build
2021-01-01 20:33 [PR PATCH] kodi-platform: fix cross-build 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
` (12 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: ndowens @ 2021-01-03 1:15 UTC (permalink / raw)
To: ml
[-- 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: 15110 bytes --]
From dd7387b8b68d12daa07bf90c90f18bf025d3ce9f Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Fri, 1 Jan 2021 10:14:09 -0600
Subject: [PATCH 01/13] kodi-platform: fix cross-build
---
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"
From be07d6d3d55f2ca66a8df368082c6aea4b56c113 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 2 Jan 2021 07:57:58 +0100
Subject: [PATCH 02/13] kodi-platform: Orphan package
---
srcpkgs/kodi-platform/template | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/kodi-platform/template b/srcpkgs/kodi-platform/template
index 077ebf8b676..250f781d70b 100644
--- a/srcpkgs/kodi-platform/template
+++ b/srcpkgs/kodi-platform/template
@@ -27,7 +27,6 @@ post_build() {
-e 's,/usr/usr,/usr,g' \
-i build/kodiplatform-config.cmake
fi
-}
kodi-platform-devel_package() {
short_desc+=" - development files"
From 5bc8db0593add8ab4fa0b2bee989a96f61984ef0 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 2 Jan 2021 19:14:54 -0600
Subject: [PATCH 03/13] kodi-binary-addons: unmark nocross
---
srcpkgs/kodi-binary-addons/template | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/kodi-binary-addons/template b/srcpkgs/kodi-binary-addons/template
index 9f71df7ac08..67f05af9d67 100644
--- a/srcpkgs/kodi-binary-addons/template
+++ b/srcpkgs/kodi-binary-addons/template
@@ -11,4 +11,3 @@ short_desc="Meta-package for binary kodi addons"
maintainer="Orphaned <orphan@voidlinux.org>"
license="metapackage"
homepage="https://kodi.tv"
-nocross="addons can't be cross-compiled yet"
From 760a7471701212e77840d58b021277b6d31c2413 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 2 Jan 2021 19:10:58 -0600
Subject: [PATCH 04/13] 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 d16b01364de42d657e86d0151ca8fc030c5e42bf Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 2 Jan 2021 19:11:23 -0600
Subject: [PATCH 05/13] kodi-addon-peripheral-joystick: unmark nocross
---
srcpkgs/kodi-addon-peripheral-joystick/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/kodi-addon-peripheral-joystick/template b/srcpkgs/kodi-addon-peripheral-joystick/template
index 72f28409604..b975cd72d4d 100644
--- a/srcpkgs/kodi-addon-peripheral-joystick/template
+++ b/srcpkgs/kodi-addon-peripheral-joystick/template
@@ -5,6 +5,8 @@ _kodi_release="Leia"
revision=1
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 44ab93bd79a742c804f74c489c8996bea5cdd2e2 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 2 Jan 2021 19:11:48 -0600
Subject: [PATCH 06/13] 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 771c013c42f90f8192300b962de277a28b19e1d3 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 2 Jan 2021 19:12:20 -0600
Subject: [PATCH 07/13] 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 297e003f80990d3ca788fd09c1999caecf491047 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 2 Jan 2021 19:12:45 -0600
Subject: [PATCH 08/13] kodi-addon-pvr-zattoo: unmark nocross
---
srcpkgs/kodi-addon-pvr-zattoo/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/kodi-addon-pvr-zattoo/template b/srcpkgs/kodi-addon-pvr-zattoo/template
index 6dba619aa96..16d8517c18f 100644
--- a/srcpkgs/kodi-addon-pvr-zattoo/template
+++ b/srcpkgs/kodi-addon-pvr-zattoo/template
@@ -5,6 +5,8 @@ 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"
hostmakedepends="pkg-config"
makedepends="kodi-devel kodi-platform-devel p8-platform-devel rapidjson
tinyxml2-devel tinyxml-devel"
@@ -15,4 +17,3 @@ 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"
From 4ba04e08bb892b50fe6938994c6d805a018f68f4 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 2 Jan 2021 19:13:10 -0600
Subject: [PATCH 09/13] 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 101a71eed3e8ed927d57e4309df46b6abf3bf2c0 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 2 Jan 2021 19:13:40 -0600
Subject: [PATCH 10/13] 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 2f4972c0be2abab71386376121bfe35236741f73 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 2 Jan 2021 19:14:11 -0600
Subject: [PATCH 11/13] 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 6f27333b719c400e28036c045efe44db409b0cae Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 2 Jan 2021 19:14:31 -0600
Subject: [PATCH 12/13] 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 46f2342e23fe0f6423f8115f5062c96eeb6e9e78 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 2 Jan 2021 19:15:11 -0600
Subject: [PATCH 13/13] kodi-platform: fix nocross
---
srcpkgs/kodi-platform/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/kodi-platform/template b/srcpkgs/kodi-platform/template
index 250f781d70b..077ebf8b676 100644
--- a/srcpkgs/kodi-platform/template
+++ b/srcpkgs/kodi-platform/template
@@ -27,6 +27,7 @@ post_build() {
-e 's,/usr/usr,/usr,g' \
-i build/kodiplatform-config.cmake
fi
+}
kodi-platform-devel_package() {
short_desc+=" - development files"
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Closed]: [WIP]kodi-platform: fix cross-build
2021-01-01 20:33 [PR PATCH] kodi-platform: fix cross-build ndowens
` (2 preceding siblings ...)
2021-01-03 1:15 ` ndowens
@ 2021-01-03 1:15 ` ndowens
2021-01-03 1:15 ` ndowens
` (11 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: ndowens @ 2021-01-03 1:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 272 bytes --]
There's a closed pull request on the void-packages repository
[WIP]kodi-platform: fix cross-build
https://github.com/void-linux/void-packages/pull/27608
Description:
For now this seems to fix for atleast aarch64, until I can see if I can get kodi to build on the others
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [WIP]kodi-platform: fix cross-build
2021-01-01 20:33 [PR PATCH] kodi-platform: fix cross-build ndowens
` (3 preceding siblings ...)
2021-01-03 1:15 ` [PR PATCH] [Closed]: " ndowens
@ 2021-01-03 1:15 ` ndowens
2021-01-03 1:19 ` [PR PATCH] [Updated] " ndowens
` (10 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: ndowens @ 2021-01-03 1:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 194 bytes --]
New comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/27608#issuecomment-753552492
Comment:
Sorry messed up PR, tried rebasing but did not fix it
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] [WIP]kodi-platform: fix cross-build
2021-01-01 20:33 [PR PATCH] kodi-platform: fix cross-build ndowens
` (4 preceding siblings ...)
2021-01-03 1:15 ` ndowens
@ 2021-01-03 1:19 ` ndowens
2021-01-03 1:19 ` ndowens
` (9 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: ndowens @ 2021-01-03 1:19 UTC (permalink / raw)
To: ml
[-- 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: 13408 bytes --]
From 24e83aa8546926b45ba964c4a1a16c11465c4452 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 2 Jan 2021 19:14:54 -0600
Subject: [PATCH 01/11] kodi-binary-addons: unmark nocross
---
srcpkgs/kodi-binary-addons/template | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/kodi-binary-addons/template b/srcpkgs/kodi-binary-addons/template
index 9f71df7ac08..67f05af9d67 100644
--- a/srcpkgs/kodi-binary-addons/template
+++ b/srcpkgs/kodi-binary-addons/template
@@ -11,4 +11,3 @@ short_desc="Meta-package for binary kodi addons"
maintainer="Orphaned <orphan@voidlinux.org>"
license="metapackage"
homepage="https://kodi.tv"
-nocross="addons can't be cross-compiled yet"
From 44eebaa8752e31f0dfcc40718a444dc357b99e7b 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 2c5501b822652453716a064796670cbd91c87b50 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 | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/kodi-addon-peripheral-joystick/template b/srcpkgs/kodi-addon-peripheral-joystick/template
index 72f28409604..b975cd72d4d 100644
--- a/srcpkgs/kodi-addon-peripheral-joystick/template
+++ b/srcpkgs/kodi-addon-peripheral-joystick/template
@@ -5,6 +5,8 @@ _kodi_release="Leia"
revision=1
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 ffa04c07bb1026b525d0785d28dd908882b93cd6 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 a3bd0f7f07a16ca392a06159cccbd27cbd73827d 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 c197f2ebd6c6b752984c1d07a1e24377144f7781 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 | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/kodi-addon-pvr-zattoo/template b/srcpkgs/kodi-addon-pvr-zattoo/template
index 6dba619aa96..16d8517c18f 100644
--- a/srcpkgs/kodi-addon-pvr-zattoo/template
+++ b/srcpkgs/kodi-addon-pvr-zattoo/template
@@ -5,6 +5,8 @@ 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"
hostmakedepends="pkg-config"
makedepends="kodi-devel kodi-platform-devel p8-platform-devel rapidjson
tinyxml2-devel tinyxml-devel"
@@ -15,4 +17,3 @@ 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"
From 28c9937902230c3a810e4e24c16b574069b08329 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 0927d93f44b1d734d3af7a758b0a0d6e25d6ef44 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 23b2b26621a9af7ae66058fc0035dad306d9dd95 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 936f9f09f6a55db7c3e90dc0676f7633def29fca 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 4204210aeca3ffd0c6ccee04c7ea3d5864b6327f 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 | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/kodi-platform/template b/srcpkgs/kodi-platform/template
index 9eed2ca9851..752f09746dc 100644
--- a/srcpkgs/kodi-platform/template
+++ b/srcpkgs/kodi-platform/template
@@ -11,7 +11,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"
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [WIP]kodi-platform: fix cross-build
2021-01-01 20:33 [PR PATCH] kodi-platform: fix cross-build ndowens
` (5 preceding siblings ...)
2021-01-03 1:19 ` [PR PATCH] [Updated] " ndowens
@ 2021-01-03 1:19 ` ndowens
2021-01-03 1:30 ` [PR PATCH] [Updated] " ndowens
` (8 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: ndowens @ 2021-01-03 1:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 194 bytes --]
New comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/27608#issuecomment-753552492
Comment:
Sorry messed up PR, tried rebasing but did not fix it
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] [WIP]kodi-platform: fix cross-build
2021-01-01 20:33 [PR PATCH] kodi-platform: fix cross-build ndowens
` (6 preceding siblings ...)
2021-01-03 1:19 ` ndowens
@ 2021-01-03 1:30 ` ndowens
2021-01-03 1:32 ` ndowens
` (7 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: ndowens @ 2021-01-03 1:30 UTC (permalink / raw)
To: ml
[-- 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: 14064 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 30a1ad0cd48c041f0420dcf5e69dbd5a76d7a84a 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 | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/kodi-addon-pvr-zattoo/template b/srcpkgs/kodi-addon-pvr-zattoo/template
index 6dba619aa96..16d8517c18f 100644
--- a/srcpkgs/kodi-addon-pvr-zattoo/template
+++ b/srcpkgs/kodi-addon-pvr-zattoo/template
@@ -5,6 +5,8 @@ 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"
hostmakedepends="pkg-config"
makedepends="kodi-devel kodi-platform-devel p8-platform-devel rapidjson
tinyxml2-devel tinyxml-devel"
@@ -15,4 +17,3 @@ 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"
From e7e647bbabe6a69e1af9f923da1f50195ef6de4b 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 df671269d272b6459e11c0810da3c79da50aacd8 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 d49ce009ff4bfb58bd54e2378309979f58039b72 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 e25d8abecb68369d28d0bbf9df80b944c2b86917 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 6524e6f36ee9b632892d487c119351aacbe5f9b1 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"
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [WIP]kodi-platform: fix cross-build
2021-01-01 20:33 [PR PATCH] kodi-platform: fix cross-build ndowens
` (7 preceding siblings ...)
2021-01-03 1:30 ` [PR PATCH] [Updated] " ndowens
@ 2021-01-03 1:32 ` ndowens
2021-01-03 1:36 ` ndowens
` (6 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: ndowens @ 2021-01-03 1:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 378 bytes --]
New comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/27608#issuecomment-753553832
Comment:
According to Manual.md it says meta-package should be BSD-2-Clause so I fixed that, but new lint issue of course is no use of vlicense.
kodi-platform's fix may be sorta hacky, but it seems to work fine with cross and non-cross builds.
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [WIP]kodi-platform: fix cross-build
2021-01-01 20:33 [PR PATCH] kodi-platform: fix cross-build ndowens
` (8 preceding siblings ...)
2021-01-03 1:32 ` ndowens
@ 2021-01-03 1:36 ` ndowens
2021-01-03 2:39 ` [PR PATCH] [Updated] " ndowens
` (5 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: ndowens @ 2021-01-03 1:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 549 bytes --]
New comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/27608#issuecomment-753553832
Comment:
According to Manual.md it says meta-package should be BSD-2-Clause so I fixed that, but new lint issue of course is no use of vlicense.
kodi-platform's fix may be sorta hacky, but it seems to work fine with cross and non-cross builds.
Edit: An alternative to using sed is to maybe use echo and manually create atleast the .pc file and maybe the *-config.cmake file as well, whichever way would be best.
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] [WIP]kodi-platform: fix cross-build
2021-01-01 20:33 [PR PATCH] kodi-platform: fix cross-build ndowens
` (9 preceding siblings ...)
2021-01-03 1:36 ` ndowens
@ 2021-01-03 2:39 ` ndowens
2021-01-03 2:48 ` ndowens
` (4 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: ndowens @ 2021-01-03 2:39 UTC (permalink / raw)
To: ml
[-- 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"
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [WIP]kodi-platform: fix cross-build
2021-01-01 20:33 [PR PATCH] kodi-platform: fix cross-build ndowens
` (10 preceding siblings ...)
2021-01-03 2:39 ` [PR PATCH] [Updated] " ndowens
@ 2021-01-03 2:48 ` ndowens
2021-02-18 6:46 ` [PR REVIEW] kodi-platform: " ericonr
` (3 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: ndowens @ 2021-01-03 2:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 265 bytes --]
New comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/27608#issuecomment-753559652
Comment:
@ericonr told you I was working on kodi-addon :) figured I'd tag you since I mentioned it to you and also to get your input.
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR REVIEW] kodi-platform: fix cross-build
2021-01-01 20:33 [PR PATCH] kodi-platform: fix cross-build ndowens
` (11 preceding siblings ...)
2021-01-03 2:48 ` ndowens
@ 2021-02-18 6:46 ` ericonr
2021-02-18 6:46 ` ericonr
` (2 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: ericonr @ 2021-02-18 6:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 186 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27608#discussion_r578168121
Comment:
I would just remove these by default...
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR REVIEW] kodi-platform: fix cross-build
2021-01-01 20:33 [PR PATCH] kodi-platform: fix cross-build ndowens
` (12 preceding siblings ...)
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
15 siblings, 0 replies; 17+ messages in thread
From: ericonr @ 2021-02-18 6:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 705 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27608#discussion_r578168482
Comment:
Given that the file looks like
```
prefix=/usr
libdir=/usr//usr/lib
includedir=/usr/include
CXX=/usr/lib/ccache/bin/g++
CC=/usr/lib/ccache/bin/cc
DEPENDENCIES=/usr/lib/libtinyxml.so
Name: kodiplatform
Description: Kodi add-on platform support library 18.0
Version: 18.0
Libs: -L -l:kodiplatform -ltinyxml
Cflags: -fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe -g -std=c++11 -fPIC
```
for native builds, the issue is that `/usr//usr/lib` appears at all. I would attribute it to `-DCMAKE_INSTALL_LIBDIR=/usr/lib`.
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: kodi-platform: fix cross-build
2021-01-01 20:33 [PR PATCH] kodi-platform: fix cross-build ndowens
` (13 preceding siblings ...)
2021-02-18 6:46 ` ericonr
@ 2021-03-16 21:03 ` ericonr
2021-03-16 21:03 ` [PR PATCH] [Closed]: " ericonr
15 siblings, 0 replies; 17+ messages in thread
From: ericonr @ 2021-03-16 21:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 171 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27608#issuecomment-800603310
Comment:
Fixed by @marmeladema, thanks!
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Closed]: kodi-platform: fix cross-build
2021-01-01 20:33 [PR PATCH] kodi-platform: fix cross-build ndowens
` (14 preceding siblings ...)
2021-03-16 21:03 ` ericonr
@ 2021-03-16 21:03 ` ericonr
15 siblings, 0 replies; 17+ messages in thread
From: ericonr @ 2021-03-16 21:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 267 bytes --]
There's a closed pull request on the void-packages repository
kodi-platform: fix cross-build
https://github.com/void-linux/void-packages/pull/27608
Description:
For now this seems to fix for atleast aarch64, until I can see if I can get kodi to build on the others
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2021-03-16 21:03 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-01 20:33 [PR PATCH] kodi-platform: fix cross-build 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 ` [PR PATCH] [Updated] " ndowens
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
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).