[PR PATCH] kodi: enable cross compilation for 32bit arm architectures

[PR PATCH] kodi: enable cross compilation for 32bit arm architectures

[marmeladema]

[-- Attachment #1: Type: text/plain, Size: 1635 bytes --]

There is a new pull request by marmeladema against master on the void-packages repository

https://github.com/marmeladema/void-packages kodi-arm-32bit
https://github.com/void-linux/void-packages/pull/29517

kodi: enable cross compilation for 32bit arm architectures
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29517.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kodi-arm-32bit-29517.patch --]
[-- Type: text/x-diff, Size: 1106 bytes --]

From 2f0497e4af5a75dc8dc05d91767de108b7d4884f Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Tue, 16 Mar 2021 22:22:08 +0000
Subject: [PATCH] kodi: enable cross compilation for 32bit arm architectures

---
 srcpkgs/kodi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5eee2d18f2e9..3e227acd8583 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -38,7 +38,7 @@ LDFLAGS+=" -Wl,-z,stack-size=1048576"
 
 lib32disabled=yes
 archs="i686* x86_64* aarch64*
- ppc64*"
+ ppc64* armv6l* armv7l*"
 
 hostmakedepends="
  automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel
@@ -77,7 +77,7 @@ _gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirstSecond"
 _gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirstSecondLast"
 
 case "$XBPS_TARGET_MACHINE" in
-	aarch64*)
+	armv6l* | armv7l* | aarch64*)
 		hostmakedepends+=" libmariadbclient-devel SDL2_image-devel lzo-devel"
 		hostmakedepends+=" libwaylandpp-devel"
 		makedepends+=" python3-devel ffmpeg-devel"

Re: kodi: enable cross compilation for 32bit arm architectures

[marmeladema]

[-- Attachment #1: Type: text/plain, Size: 212 bytes --]

New comment by marmeladema on void-packages repository

https://github.com/void-linux/void-packages/pull/29517#issuecomment-800654080

Comment:
Hopefully this should help provide Kodi 19 for raspberry pie boards

Re: [PR PATCH] [Updated] kodi: enable cross compilation for 32bit arm architectures

[marmeladema]

[-- Attachment #1: Type: text/plain, Size: 1640 bytes --]

There is an updated pull request by marmeladema against master on the void-packages repository

https://github.com/marmeladema/void-packages kodi-arm-32bit
https://github.com/void-linux/void-packages/pull/29517

kodi: enable cross compilation for 32bit arm architectures
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29517.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kodi-arm-32bit-29517.patch --]
[-- Type: text/x-diff, Size: 1787 bytes --]

From bd2d43dd96cb6f6949934db8e9081f7fc0ab6bf5 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Tue, 16 Mar 2021 22:22:08 +0000
Subject: [PATCH] kodi: enable cross compilation for 32bit arm architectures

---
 srcpkgs/kodi/template | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5eee2d18f2e9..087c8d17577a 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=1
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -38,7 +38,7 @@ LDFLAGS+=" -Wl,-z,stack-size=1048576"
 
 lib32disabled=yes
 archs="i686* x86_64* aarch64*
- ppc64*"
+ ppc64* armv6l* armv7l*"
 
 hostmakedepends="
  automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel
@@ -77,11 +77,10 @@ _gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirstSecond"
 _gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirstSecondLast"
 
 case "$XBPS_TARGET_MACHINE" in
-	aarch64*)
-		hostmakedepends+=" libmariadbclient-devel SDL2_image-devel lzo-devel"
-		hostmakedepends+=" libwaylandpp-devel"
-		makedepends+=" python3-devel ffmpeg-devel"
-		configure_args+=" -DENABLE_VAAPI=OFF"
+	armv6l*)
+		makedepends+=" libatomic-devel"
+		configure_args+=" -DCMAKE_EXE_LINKER_FLAGS=-latomic"
+		LDFLAGS+=" -latomic";;
 		;;
 	i686)
 		# Additionaly disable these tests on i686 architecutre
@@ -94,6 +93,10 @@ esac
 
 if [ -z "$CROSS_BUILD" ]; then
 	make_build_target+=" kodi-test"
+else
+	hostmakedepends+=" libmariadbclient-devel SDL2_image-devel lzo-devel"
+	hostmakedepends+=" libwaylandpp-devel"
+	makedepends+=" python3-devel ffmpeg-devel"
 fi
 
 pre_configure() {

Re: [PR PATCH] [Updated] kodi: enable cross compilation for 32bit arm architectures

[marmeladema]

[-- Attachment #1: Type: text/plain, Size: 1640 bytes --]

There is an updated pull request by marmeladema against master on the void-packages repository

https://github.com/marmeladema/void-packages kodi-arm-32bit
https://github.com/void-linux/void-packages/pull/29517

kodi: enable cross compilation for 32bit arm architectures
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29517.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kodi-arm-32bit-29517.patch --]
[-- Type: text/x-diff, Size: 1785 bytes --]

From 412038cc4753bf1570ecc9bd3fdf80669d9edc66 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Tue, 16 Mar 2021 22:22:08 +0000
Subject: [PATCH] kodi: enable cross compilation for 32bit arm architectures

---
 srcpkgs/kodi/template | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5eee2d18f2e9..2568c0f4b4b6 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=1
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -38,7 +38,7 @@ LDFLAGS+=" -Wl,-z,stack-size=1048576"
 
 lib32disabled=yes
 archs="i686* x86_64* aarch64*
- ppc64*"
+ ppc64* armv6l* armv7l*"
 
 hostmakedepends="
  automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel
@@ -77,11 +77,10 @@ _gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirstSecond"
 _gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirstSecondLast"
 
 case "$XBPS_TARGET_MACHINE" in
-	aarch64*)
-		hostmakedepends+=" libmariadbclient-devel SDL2_image-devel lzo-devel"
-		hostmakedepends+=" libwaylandpp-devel"
-		makedepends+=" python3-devel ffmpeg-devel"
-		configure_args+=" -DENABLE_VAAPI=OFF"
+	armv6l*)
+		makedepends+=" libatomic-devel"
+		configure_args+=" -DCMAKE_EXE_LINKER_FLAGS=-latomic"
+		LDFLAGS+=" -latomic"
 		;;
 	i686)
 		# Additionaly disable these tests on i686 architecutre
@@ -94,6 +93,10 @@ esac
 
 if [ -z "$CROSS_BUILD" ]; then
 	make_build_target+=" kodi-test"
+else
+	hostmakedepends+=" libmariadbclient-devel SDL2_image-devel lzo-devel"
+	hostmakedepends+=" libwaylandpp-devel"
+	makedepends+=" python3-devel ffmpeg-devel"
 fi
 
 pre_configure() {

Re: [PR REVIEW] kodi: enable cross compilation for 32bit arm architectures

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 206 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29517#discussion_r611125768

Comment:
This should be a conditional using `XBPS_TARGET_NO_ATOMIC8`

Re: [PR REVIEW] kodi: enable cross compilation for 32bit arm architectures

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 212 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29517#discussion_r611125830

Comment:
It's just adding new supported archs, so revbump isn't necessary.

Re: [PR PATCH] [Updated] kodi: enable cross compilation for 32bit arm architectures

[marmeladema]

[-- Attachment #1: Type: text/plain, Size: 1640 bytes --]

There is an updated pull request by marmeladema against master on the void-packages repository

https://github.com/marmeladema/void-packages kodi-arm-32bit
https://github.com/void-linux/void-packages/pull/29517

kodi: enable cross compilation for 32bit arm architectures
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29517.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kodi-arm-32bit-29517.patch --]
[-- Type: text/x-diff, Size: 1728 bytes --]

From daed8f78740b10f4f26a80953388d47d0439c4bf Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Tue, 16 Mar 2021 22:22:08 +0000
Subject: [PATCH] kodi: enable cross compilation for 32bit arm architectures

---
 srcpkgs/kodi/template | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 8bb2a2965731..a8f26288639e 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -42,7 +42,7 @@ fi
 
 lib32disabled=yes
 archs="i686* x86_64* aarch64*
- ppc64*"
+ ppc64* armv6l* armv7l*"
 
 hostmakedepends="
  automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel
@@ -81,12 +81,6 @@ _gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirstSecond"
 _gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirstSecondLast"
 
 case "$XBPS_TARGET_MACHINE" in
-	aarch64*)
-		hostmakedepends+=" libmariadbclient-devel SDL2_image-devel lzo-devel"
-		hostmakedepends+=" libwaylandpp-devel"
-		makedepends+=" python3-devel ffmpeg-devel"
-		configure_args+=" -DENABLE_VAAPI=OFF"
-		;;
 	i686)
 		# Additionaly disable these tests on i686 architecutre
 		# https://github.com/void-linux/void-packages/commit/3c0332ab330e30a2c280de2258ed9bf60a9c2e09/checks/2101961301/logs
@@ -98,6 +92,16 @@ esac
 
 if [ -z "$CROSS_BUILD" ]; then
 	make_build_target+=" kodi-test"
+else
+	hostmakedepends+=" libmariadbclient-devel SDL2_image-devel lzo-devel"
+	hostmakedepends+=" libwaylandpp-devel"
+	makedepends+=" python3-devel ffmpeg-devel"
+fi
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_EXE_LINKER_FLAGS=-latomic"
+	LDFLAGS+=" -latomic"
 fi
 
 pre_configure() {

Re: kodi: enable cross compilation for 32bit arm architectures

[marmeladema]

[-- Attachment #1: Type: text/plain, Size: 161 bytes --]

New comment by marmeladema on void-packages repository

https://github.com/void-linux/void-packages/pull/29517#issuecomment-828004610

Comment:
@ericonr updated

Re: [PR REVIEW] kodi: enable cross compilation for 32bit arm architectures

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 259 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29517#discussion_r621678733

Comment:
```suggestion
	hostmakedepends+=" libmariadbclient-devel SDL2_image-devel lzo-devel
	 libwaylandpp-devel"
```

Re: [PR REVIEW] kodi: enable cross compilation for 32bit arm architectures

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 233 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29517#discussion_r621678425

Comment:
Add `python3-devel` unconditionally to `makedepends`, `ffmpeg-devel` is there already.

Re: [PR PATCH] [Updated] kodi: enable cross compilation for 32bit arm architectures

[marmeladema]

[-- Attachment #1: Type: text/plain, Size: 1640 bytes --]

There is an updated pull request by marmeladema against master on the void-packages repository

https://github.com/marmeladema/void-packages kodi-arm-32bit
https://github.com/void-linux/void-packages/pull/29517

kodi: enable cross compilation for 32bit arm architectures
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29517.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kodi-arm-32bit-29517.patch --]
[-- Type: text/x-diff, Size: 2145 bytes --]

From 2549b0cbb8cc6812be18f1b903349a1b025e5670 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Tue, 16 Mar 2021 22:22:08 +0000
Subject: [PATCH] kodi: enable cross compilation for 32bit arm architectures

---
 srcpkgs/kodi/template | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 8bb2a2965731..c64d926eb010 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -42,7 +42,7 @@ fi
 
 lib32disabled=yes
 archs="i686* x86_64* aarch64*
- ppc64*"
+ ppc64* armv6l* armv7l*"
 
 hostmakedepends="
  automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel
@@ -60,7 +60,7 @@ makedepends="
  giflib-devel libxslt-devel gnutls-devel libssh-devel libmicrohttpd-devel
  libcec-devel dcadec-devel flatbuffers-devel fmt-devel lcms2-devel
  libfstrcmp-devel rapidjson libcdio-paranoia spdlog libwaylandpp-devel
- libinput-devel libdav1d-devel gtest-devel"
+ libinput-devel libdav1d-devel gtest-devel python3-devel"
 
 # The following dependencies are dlopen(3)ed.
 depends="libbluray libmad libvorbis libcurl libflac libmodplug libass libmpeg2
@@ -81,12 +81,6 @@ _gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirstSecond"
 _gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirstSecondLast"
 
 case "$XBPS_TARGET_MACHINE" in
-	aarch64*)
-		hostmakedepends+=" libmariadbclient-devel SDL2_image-devel lzo-devel"
-		hostmakedepends+=" libwaylandpp-devel"
-		makedepends+=" python3-devel ffmpeg-devel"
-		configure_args+=" -DENABLE_VAAPI=OFF"
-		;;
 	i686)
 		# Additionaly disable these tests on i686 architecutre
 		# https://github.com/void-linux/void-packages/commit/3c0332ab330e30a2c280de2258ed9bf60a9c2e09/checks/2101961301/logs
@@ -98,6 +92,15 @@ esac
 
 if [ -z "$CROSS_BUILD" ]; then
 	make_build_target+=" kodi-test"
+else
+	hostmakedepends+=" libmariadbclient-devel SDL2_image-devel lzo-devel
+	 libwaylandpp-devel"
+fi
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_EXE_LINKER_FLAGS=-latomic"
+	LDFLAGS+=" -latomic"
 fi
 
 pre_configure() {

Re: [PR REVIEW] kodi: enable cross compilation for 32bit arm architectures

[marmeladema]

[-- Attachment #1: Type: text/plain, Size: 155 bytes --]

New review comment by marmeladema on void-packages repository

https://github.com/void-linux/void-packages/pull/29517#discussion_r621683356

Comment:
Done

Re: [PR REVIEW] kodi: enable cross compilation for 32bit arm architectures

[marmeladema]

[-- Attachment #1: Type: text/plain, Size: 155 bytes --]

New review comment by marmeladema on void-packages repository

https://github.com/void-linux/void-packages/pull/29517#discussion_r621683467

Comment:
Done

Re: [PR PATCH] [Merged]: kodi: enable cross compilation for 32bit arm architectures

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1469 bytes --]

There's a merged pull request on the void-packages repository

kodi: enable cross compilation for 32bit arm architectures
https://github.com/void-linux/void-packages/pull/29517

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->