* [PR PATCH] sonic-visualiser: update to 5.0
@ 2024-09-29 12:46 newbluemoon
2024-10-03 21:14 ` [PR PATCH] [Updated] " newbluemoon
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: newbluemoon @ 2024-09-29 12:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2250 bytes --]
There is a new pull request by newbluemoon against master on the void-packages repository
https://github.com/newbluemoon/void-packages sonic-visualiser
https://github.com/void-linux/void-packages/pull/52406
sonic-visualiser: update to 5.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64 (cross)
- armv7l (cross) --> fails, see below
- x86_64-musl
- i686
There is a problem with 32-bit cross builds on a 64-bit host.
Meson detects Qt6 using pkg-config. However, the corresponding .pc files have
```
prefix=/usr
exec_prefix=${prefix}
bindir=${prefix}/lib32/qt6/bin
libexecdir=${prefix}/lib32/qt6/libexec
libdir=${prefix}/lib
includedir=${prefix}/include/qt6
```
i.e. they have `.../lib32/...` hard coded and so detection of the host tools fails when they are under `.../lib64/...`.
There are not much options to tweak this; using qmake instead of pkg-config yields the same error.
I think a clean solution would be adjusting Qt6’s .pc files to contain `.../lib/...` solely. There shouldn’t be a problem, because `lib32` and `lib64` are symlinks to `lib`, anyway. Everything else I can think of would be quite hacky. I don’t know if this is the only package having this problem; I searched for other templates, but didn’t find anything alike.
Any ideas/suggestions are very welcome :)
A patch file from https://github.com/void-linux/void-packages/pull/52406.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sonic-visualiser-52406.patch --]
[-- Type: text/x-diff, Size: 1748 bytes --]
From 35b21ba6a94138d6fbd794a30c0825bb50520ca0 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 29 Sep 2024 14:19:46 +0200
Subject: [PATCH] sonic-visualiser: update to 5.0
---
srcpkgs/sonic-visualiser/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/sonic-visualiser/template b/srcpkgs/sonic-visualiser/template
index 193b4b18bcae16..8cdaab236fad80 100644
--- a/srcpkgs/sonic-visualiser/template
+++ b/srcpkgs/sonic-visualiser/template
@@ -1,12 +1,12 @@
# Template file for 'sonic-visualiser'
pkgname=sonic-visualiser
-version=4.5.2
-revision=2
+version=5.0
+revision=1
build_style=meson
-hostmakedepends="pkg-config capnproto-devel qt5-host-tools"
+hostmakedepends="pkg-config capnproto-devel qt6-base qt6-tools"
makedepends="capnproto-devel jack-devel libfishsound-devel libid3tag-devel
liblo-devel liblrdf-devel libmad-devel liboggz-devel libsamplerate-devel
- opusfile-devel portaudio-devel pulseaudio-devel qt5-svg-devel rubberband-devel
+ opusfile-devel portaudio-devel pulseaudio-devel qt6-svg-devel rubberband-devel
speex-devel sord-devel vamp-plugin-sdk-devel"
short_desc="Viewing and analysing the contents of music audio files"
maintainer="newbluemoon <blaumolch@mailbox.org>"
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later"
homepage="https://www.sonicvisualiser.org/"
changelog="https://raw.githubusercontent.com/sonic-visualiser/sonic-visualiser/default/CHANGELOG"
distfiles="https://github.com/sonic-visualiser/sonic-visualiser/releases/download/sv_v${version}/sonic-visualiser-${version}.tar.gz"
-checksum=0816e1ba9e3f97af495ece2554186bccad1cf47090ff8a13f1d08322212db487
+checksum=88f479704e0faeff44fa49ef6ecf6abd9a45945f175d6ee99a00fac43f5857bb
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] sonic-visualiser: update to 5.0
2024-09-29 12:46 [PR PATCH] sonic-visualiser: update to 5.0 newbluemoon
@ 2024-10-03 21:14 ` newbluemoon
2024-10-23 19:15 ` [PR PATCH] [Updated] sonic-visualiser: update to 5.0.1 newbluemoon
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: newbluemoon @ 2024-10-03 21:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2284 bytes --]
There is an updated pull request by newbluemoon against master on the void-packages repository
https://github.com/newbluemoon/void-packages sonic-visualiser
https://github.com/void-linux/void-packages/pull/52406
sonic-visualiser: update to 5.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64 (cross)
- armv7l (cross) --> fails on x86_64, succeedes on i686, see below
- x86_64-musl
- i686
There is a problem with 32-bit cross builds on a 64-bit host.
Meson detects Qt6 using pkg-config. However, the corresponding .pc files have
```
prefix=/usr
exec_prefix=${prefix}
bindir=${prefix}/lib32/qt6/bin
libexecdir=${prefix}/lib32/qt6/libexec
libdir=${prefix}/lib
includedir=${prefix}/include/qt6
```
i.e. they have `.../lib32/...` hard coded and so detection of the host tools fails when they are under `.../lib64/...`.
There are not much options to tweak this; using qmake instead of pkg-config yields the same error.
I think a clean solution would be adjusting Qt6’s .pc files to contain `.../lib/...` solely. There shouldn’t be a problem, because `lib32` and `lib64` are symlinks to `lib`, anyway. Everything else I can think of would be quite hacky. I don’t know if this is the only package having this problem; I searched for other templates, but didn’t find anything alike.
Any ideas/suggestions are very welcome :)
A patch file from https://github.com/void-linux/void-packages/pull/52406.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sonic-visualiser-52406.patch --]
[-- Type: text/x-diff, Size: 1752 bytes --]
From f29ac27ad618018f126c777cd6fed345912577ee Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 29 Sep 2024 14:19:46 +0200
Subject: [PATCH] sonic-visualiser: update to 5.0.1
---
srcpkgs/sonic-visualiser/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/sonic-visualiser/template b/srcpkgs/sonic-visualiser/template
index 193b4b18bcae16..1abd69700d03ad 100644
--- a/srcpkgs/sonic-visualiser/template
+++ b/srcpkgs/sonic-visualiser/template
@@ -1,12 +1,12 @@
# Template file for 'sonic-visualiser'
pkgname=sonic-visualiser
-version=4.5.2
-revision=2
+version=5.0.1
+revision=1
build_style=meson
-hostmakedepends="pkg-config capnproto-devel qt5-host-tools"
+hostmakedepends="pkg-config capnproto-devel qt6-base qt6-tools"
makedepends="capnproto-devel jack-devel libfishsound-devel libid3tag-devel
liblo-devel liblrdf-devel libmad-devel liboggz-devel libsamplerate-devel
- opusfile-devel portaudio-devel pulseaudio-devel qt5-svg-devel rubberband-devel
+ opusfile-devel portaudio-devel pulseaudio-devel qt6-svg-devel rubberband-devel
speex-devel sord-devel vamp-plugin-sdk-devel"
short_desc="Viewing and analysing the contents of music audio files"
maintainer="newbluemoon <blaumolch@mailbox.org>"
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later"
homepage="https://www.sonicvisualiser.org/"
changelog="https://raw.githubusercontent.com/sonic-visualiser/sonic-visualiser/default/CHANGELOG"
distfiles="https://github.com/sonic-visualiser/sonic-visualiser/releases/download/sv_v${version}/sonic-visualiser-${version}.tar.gz"
-checksum=0816e1ba9e3f97af495ece2554186bccad1cf47090ff8a13f1d08322212db487
+checksum=b0a7d9df66dc33387afbc47e7ecb68d8a413869a3e7d2c4ceabacd04d9cf6e14
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] sonic-visualiser: update to 5.0.1
2024-09-29 12:46 [PR PATCH] sonic-visualiser: update to 5.0 newbluemoon
2024-10-03 21:14 ` [PR PATCH] [Updated] " newbluemoon
@ 2024-10-23 19:15 ` newbluemoon
2024-11-21 8:45 ` newbluemoon
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: newbluemoon @ 2024-10-23 19:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2286 bytes --]
There is an updated pull request by newbluemoon against master on the void-packages repository
https://github.com/newbluemoon/void-packages sonic-visualiser
https://github.com/void-linux/void-packages/pull/52406
sonic-visualiser: update to 5.0.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64 (cross)
- armv7l (cross) --> fails on x86_64, succeedes on i686, see below
- x86_64-musl
- i686
There is a problem with 32-bit cross builds on a 64-bit host.
Meson detects Qt6 using pkg-config. However, the corresponding .pc files have
```
prefix=/usr
exec_prefix=${prefix}
bindir=${prefix}/lib32/qt6/bin
libexecdir=${prefix}/lib32/qt6/libexec
libdir=${prefix}/lib
includedir=${prefix}/include/qt6
```
i.e. they have `.../lib32/...` hard coded and so detection of the host tools fails when they are under `.../lib64/...`.
There are not much options to tweak this; using qmake instead of pkg-config yields the same error.
I think a clean solution would be adjusting Qt6’s .pc files to contain `.../lib/...` solely. There shouldn’t be a problem, because `lib32` and `lib64` are symlinks to `lib`, anyway. Everything else I can think of would be quite hacky. I don’t know if this is the only package having this problem; I searched for other templates, but didn’t find anything alike.
Any ideas/suggestions are very welcome :)
A patch file from https://github.com/void-linux/void-packages/pull/52406.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sonic-visualiser-52406.patch --]
[-- Type: text/x-diff, Size: 1752 bytes --]
From 808c60110303a972329f3102b3a31943a037fd89 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 29 Sep 2024 14:19:46 +0200
Subject: [PATCH] sonic-visualiser: update to 5.0.1
---
srcpkgs/sonic-visualiser/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/sonic-visualiser/template b/srcpkgs/sonic-visualiser/template
index 193b4b18bcae16..1abd69700d03ad 100644
--- a/srcpkgs/sonic-visualiser/template
+++ b/srcpkgs/sonic-visualiser/template
@@ -1,12 +1,12 @@
# Template file for 'sonic-visualiser'
pkgname=sonic-visualiser
-version=4.5.2
-revision=2
+version=5.0.1
+revision=1
build_style=meson
-hostmakedepends="pkg-config capnproto-devel qt5-host-tools"
+hostmakedepends="pkg-config capnproto-devel qt6-base qt6-tools"
makedepends="capnproto-devel jack-devel libfishsound-devel libid3tag-devel
liblo-devel liblrdf-devel libmad-devel liboggz-devel libsamplerate-devel
- opusfile-devel portaudio-devel pulseaudio-devel qt5-svg-devel rubberband-devel
+ opusfile-devel portaudio-devel pulseaudio-devel qt6-svg-devel rubberband-devel
speex-devel sord-devel vamp-plugin-sdk-devel"
short_desc="Viewing and analysing the contents of music audio files"
maintainer="newbluemoon <blaumolch@mailbox.org>"
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later"
homepage="https://www.sonicvisualiser.org/"
changelog="https://raw.githubusercontent.com/sonic-visualiser/sonic-visualiser/default/CHANGELOG"
distfiles="https://github.com/sonic-visualiser/sonic-visualiser/releases/download/sv_v${version}/sonic-visualiser-${version}.tar.gz"
-checksum=0816e1ba9e3f97af495ece2554186bccad1cf47090ff8a13f1d08322212db487
+checksum=b0a7d9df66dc33387afbc47e7ecb68d8a413869a3e7d2c4ceabacd04d9cf6e14
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] sonic-visualiser: update to 5.0.1
2024-09-29 12:46 [PR PATCH] sonic-visualiser: update to 5.0 newbluemoon
2024-10-03 21:14 ` [PR PATCH] [Updated] " newbluemoon
2024-10-23 19:15 ` [PR PATCH] [Updated] sonic-visualiser: update to 5.0.1 newbluemoon
@ 2024-11-21 8:45 ` newbluemoon
2024-12-19 5:03 ` newbluemoon
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: newbluemoon @ 2024-11-21 8:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2286 bytes --]
There is an updated pull request by newbluemoon against master on the void-packages repository
https://github.com/newbluemoon/void-packages sonic-visualiser
https://github.com/void-linux/void-packages/pull/52406
sonic-visualiser: update to 5.0.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64 (cross)
- armv7l (cross) --> fails on x86_64, succeedes on i686, see below
- x86_64-musl
- i686
There is a problem with 32-bit cross builds on a 64-bit host.
Meson detects Qt6 using pkg-config. However, the corresponding .pc files have
```
prefix=/usr
exec_prefix=${prefix}
bindir=${prefix}/lib32/qt6/bin
libexecdir=${prefix}/lib32/qt6/libexec
libdir=${prefix}/lib
includedir=${prefix}/include/qt6
```
i.e. they have `.../lib32/...` hard coded and so detection of the host tools fails when they are under `.../lib64/...`.
There are not much options to tweak this; using qmake instead of pkg-config yields the same error.
I think a clean solution would be adjusting Qt6’s .pc files to contain `.../lib/...` solely. There shouldn’t be a problem, because `lib32` and `lib64` are symlinks to `lib`, anyway. Everything else I can think of would be quite hacky. I don’t know if this is the only package having this problem; I searched for other templates, but didn’t find anything alike.
Any ideas/suggestions are very welcome :)
A patch file from https://github.com/void-linux/void-packages/pull/52406.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sonic-visualiser-52406.patch --]
[-- Type: text/x-diff, Size: 1752 bytes --]
From 54cfc6895c5287734d28d45d60e6d23623e781db Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 29 Sep 2024 14:19:46 +0200
Subject: [PATCH] sonic-visualiser: update to 5.0.1
---
srcpkgs/sonic-visualiser/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/sonic-visualiser/template b/srcpkgs/sonic-visualiser/template
index 193b4b18bcae16..1abd69700d03ad 100644
--- a/srcpkgs/sonic-visualiser/template
+++ b/srcpkgs/sonic-visualiser/template
@@ -1,12 +1,12 @@
# Template file for 'sonic-visualiser'
pkgname=sonic-visualiser
-version=4.5.2
-revision=2
+version=5.0.1
+revision=1
build_style=meson
-hostmakedepends="pkg-config capnproto-devel qt5-host-tools"
+hostmakedepends="pkg-config capnproto-devel qt6-base qt6-tools"
makedepends="capnproto-devel jack-devel libfishsound-devel libid3tag-devel
liblo-devel liblrdf-devel libmad-devel liboggz-devel libsamplerate-devel
- opusfile-devel portaudio-devel pulseaudio-devel qt5-svg-devel rubberband-devel
+ opusfile-devel portaudio-devel pulseaudio-devel qt6-svg-devel rubberband-devel
speex-devel sord-devel vamp-plugin-sdk-devel"
short_desc="Viewing and analysing the contents of music audio files"
maintainer="newbluemoon <blaumolch@mailbox.org>"
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later"
homepage="https://www.sonicvisualiser.org/"
changelog="https://raw.githubusercontent.com/sonic-visualiser/sonic-visualiser/default/CHANGELOG"
distfiles="https://github.com/sonic-visualiser/sonic-visualiser/releases/download/sv_v${version}/sonic-visualiser-${version}.tar.gz"
-checksum=0816e1ba9e3f97af495ece2554186bccad1cf47090ff8a13f1d08322212db487
+checksum=b0a7d9df66dc33387afbc47e7ecb68d8a413869a3e7d2c4ceabacd04d9cf6e14
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] sonic-visualiser: update to 5.0.1
2024-09-29 12:46 [PR PATCH] sonic-visualiser: update to 5.0 newbluemoon
` (2 preceding siblings ...)
2024-11-21 8:45 ` newbluemoon
@ 2024-12-19 5:03 ` newbluemoon
2024-12-25 9:28 ` newbluemoon
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: newbluemoon @ 2024-12-19 5:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2286 bytes --]
There is an updated pull request by newbluemoon against master on the void-packages repository
https://github.com/newbluemoon/void-packages sonic-visualiser
https://github.com/void-linux/void-packages/pull/52406
sonic-visualiser: update to 5.0.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64 (cross)
- armv7l (cross) --> fails on x86_64, succeedes on i686, see below
- x86_64-musl
- i686
There is a problem with 32-bit cross builds on a 64-bit host.
Meson detects Qt6 using pkg-config. However, the corresponding .pc files have
```
prefix=/usr
exec_prefix=${prefix}
bindir=${prefix}/lib32/qt6/bin
libexecdir=${prefix}/lib32/qt6/libexec
libdir=${prefix}/lib
includedir=${prefix}/include/qt6
```
i.e. they have `.../lib32/...` hard coded and so detection of the host tools fails when they are under `.../lib64/...`.
There are not much options to tweak this; using qmake instead of pkg-config yields the same error.
I think a clean solution would be adjusting Qt6’s .pc files to contain `.../lib/...` solely. There shouldn’t be a problem, because `lib32` and `lib64` are symlinks to `lib`, anyway. Everything else I can think of would be quite hacky. I don’t know if this is the only package having this problem; I searched for other templates, but didn’t find anything alike.
Any ideas/suggestions are very welcome :)
A patch file from https://github.com/void-linux/void-packages/pull/52406.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sonic-visualiser-52406.patch --]
[-- Type: text/x-diff, Size: 1752 bytes --]
From 2f9e642bad88e652e4d4221431dddc7c757e8ab1 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 29 Sep 2024 14:19:46 +0200
Subject: [PATCH] sonic-visualiser: update to 5.0.1
---
srcpkgs/sonic-visualiser/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/sonic-visualiser/template b/srcpkgs/sonic-visualiser/template
index 193b4b18bcae16..1abd69700d03ad 100644
--- a/srcpkgs/sonic-visualiser/template
+++ b/srcpkgs/sonic-visualiser/template
@@ -1,12 +1,12 @@
# Template file for 'sonic-visualiser'
pkgname=sonic-visualiser
-version=4.5.2
-revision=2
+version=5.0.1
+revision=1
build_style=meson
-hostmakedepends="pkg-config capnproto-devel qt5-host-tools"
+hostmakedepends="pkg-config capnproto-devel qt6-base qt6-tools"
makedepends="capnproto-devel jack-devel libfishsound-devel libid3tag-devel
liblo-devel liblrdf-devel libmad-devel liboggz-devel libsamplerate-devel
- opusfile-devel portaudio-devel pulseaudio-devel qt5-svg-devel rubberband-devel
+ opusfile-devel portaudio-devel pulseaudio-devel qt6-svg-devel rubberband-devel
speex-devel sord-devel vamp-plugin-sdk-devel"
short_desc="Viewing and analysing the contents of music audio files"
maintainer="newbluemoon <blaumolch@mailbox.org>"
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later"
homepage="https://www.sonicvisualiser.org/"
changelog="https://raw.githubusercontent.com/sonic-visualiser/sonic-visualiser/default/CHANGELOG"
distfiles="https://github.com/sonic-visualiser/sonic-visualiser/releases/download/sv_v${version}/sonic-visualiser-${version}.tar.gz"
-checksum=0816e1ba9e3f97af495ece2554186bccad1cf47090ff8a13f1d08322212db487
+checksum=b0a7d9df66dc33387afbc47e7ecb68d8a413869a3e7d2c4ceabacd04d9cf6e14
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] sonic-visualiser: update to 5.0.1
2024-09-29 12:46 [PR PATCH] sonic-visualiser: update to 5.0 newbluemoon
` (3 preceding siblings ...)
2024-12-19 5:03 ` newbluemoon
@ 2024-12-25 9:28 ` newbluemoon
2024-12-25 9:35 ` newbluemoon
2025-01-11 17:02 ` [PR PATCH] [Updated] " newbluemoon
6 siblings, 0 replies; 8+ messages in thread
From: newbluemoon @ 2024-12-25 9:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2286 bytes --]
There is an updated pull request by newbluemoon against master on the void-packages repository
https://github.com/newbluemoon/void-packages sonic-visualiser
https://github.com/void-linux/void-packages/pull/52406
sonic-visualiser: update to 5.0.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64 (cross)
- armv7l (cross) --> fails on x86_64, succeedes on i686, see below
- x86_64-musl
- i686
There is a problem with 32-bit cross builds on a 64-bit host.
Meson detects Qt6 using pkg-config. However, the corresponding .pc files have
```
prefix=/usr
exec_prefix=${prefix}
bindir=${prefix}/lib32/qt6/bin
libexecdir=${prefix}/lib32/qt6/libexec
libdir=${prefix}/lib
includedir=${prefix}/include/qt6
```
i.e. they have `.../lib32/...` hard coded and so detection of the host tools fails when they are under `.../lib64/...`.
There are not much options to tweak this; using qmake instead of pkg-config yields the same error.
I think a clean solution would be adjusting Qt6’s .pc files to contain `.../lib/...` solely. There shouldn’t be a problem, because `lib32` and `lib64` are symlinks to `lib`, anyway. Everything else I can think of would be quite hacky. I don’t know if this is the only package having this problem; I searched for other templates, but didn’t find anything alike.
Any ideas/suggestions are very welcome :)
A patch file from https://github.com/void-linux/void-packages/pull/52406.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sonic-visualiser-52406.patch --]
[-- Type: text/x-diff, Size: 3256 bytes --]
From 5fbc9f980e621ce621ba99414daeb8b70ec99cb4 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 29 Sep 2024 14:19:46 +0200
Subject: [PATCH 1/2] sonic-visualiser: update to 5.0.1
---
srcpkgs/sonic-visualiser/template | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/sonic-visualiser/template b/srcpkgs/sonic-visualiser/template
index 193b4b18bcae16..b36afcf720b162 100644
--- a/srcpkgs/sonic-visualiser/template
+++ b/srcpkgs/sonic-visualiser/template
@@ -1,17 +1,18 @@
# Template file for 'sonic-visualiser'
pkgname=sonic-visualiser
-version=4.5.2
-revision=2
+version=5.0.1
+revision=1
build_style=meson
-hostmakedepends="pkg-config capnproto-devel qt5-host-tools"
+hostmakedepends="pkg-config capnproto-devel qt6-base qt6-tools"
makedepends="capnproto-devel jack-devel libfishsound-devel libid3tag-devel
- liblo-devel liblrdf-devel libmad-devel liboggz-devel libsamplerate-devel
- opusfile-devel portaudio-devel pulseaudio-devel qt5-svg-devel rubberband-devel
- speex-devel sord-devel vamp-plugin-sdk-devel"
+ liblo-devel liblrdf-devel libmad-devel liboggz-devel libopusenc-devel
+ libsamplerate-devel opusfile-devel portaudio-devel pulseaudio-devel
+ qt6-svg-devel rubberband-devel sord-devel speex-devel vamp-plugin-sdk-devel"
short_desc="Viewing and analysing the contents of music audio files"
maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-2.0-or-later"
homepage="https://www.sonicvisualiser.org/"
changelog="https://raw.githubusercontent.com/sonic-visualiser/sonic-visualiser/default/CHANGELOG"
distfiles="https://github.com/sonic-visualiser/sonic-visualiser/releases/download/sv_v${version}/sonic-visualiser-${version}.tar.gz"
-checksum=0816e1ba9e3f97af495ece2554186bccad1cf47090ff8a13f1d08322212db487
+checksum=b0a7d9df66dc33387afbc47e7ecb68d8a413869a3e7d2c4ceabacd04d9cf6e14
+LDFLAGS+="-lopusenc"
From 0f6ff18c60c9ec86111093617a76cc797fb1fefa Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Wed, 25 Dec 2024 10:15:14 +0100
Subject: [PATCH 2/2] common: make pkg-config-wrapper look under lib
instead of lib32
cf. #52402, make 32-bit cross builds find qt-host-tools on a 64-bit host
.pc files contain lib32 hardcoded, lib is a symlink to the corresponding
lib{32,64} anyway, so let the wrapper look under lib
---
common/hooks/pre-configure/02-script-wrapper.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh
index 3d5d6c2ab3b8f3..e2db9e400e9cbd 100644
--- a/common/hooks/pre-configure/02-script-wrapper.sh
+++ b/common/hooks/pre-configure/02-script-wrapper.sh
@@ -103,7 +103,7 @@ pkgconfig_wrapper() {
export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
export PKG_CONFIG_PATH="$XBPS_CROSS_BASE/usr/lib/pkgconfig:$XBPS_CROSS_BASE/usr/share/pkgconfig\${PKG_CONFIG_PATH:+:\${PKG_CONFIG_PATH}}"
export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/usr/lib/pkgconfig\${PKG_CONFIG_LIBDIR:+:\${PKG_CONFIG_LIBDIR}}"
-exec /usr/bin/pkg-config "\$@"
+exec /usr/bin/pkg-config "\$@" | sed s/lib32/lib/g
_EOF
chmod 755 ${XBPS_WRAPPERDIR}/${XBPS_CROSS_TRIPLET}-pkg-config
if [ -z "$no_generic_pkgconfig_link" ]; then
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: sonic-visualiser: update to 5.0.1
2024-09-29 12:46 [PR PATCH] sonic-visualiser: update to 5.0 newbluemoon
` (4 preceding siblings ...)
2024-12-25 9:28 ` newbluemoon
@ 2024-12-25 9:35 ` newbluemoon
2025-01-11 17:02 ` [PR PATCH] [Updated] " newbluemoon
6 siblings, 0 replies; 8+ messages in thread
From: newbluemoon @ 2024-12-25 9:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1205 bytes --]
New comment by newbluemoon on void-packages repository
https://github.com/void-linux/void-packages/pull/52406#issuecomment-2561752683
Comment:
Made a slight modification to the pkg-config-wrapper to find the qt6 tools when cross building on 64 bit host for 32 bit target:
```
diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh
index 3d5d6c2ab3b..e2db9e400e9 100644
--- a/common/hooks/pre-configure/02-script-wrapper.sh
+++ b/common/hooks/pre-configure/02-script-wrapper.sh
@@ -103,7 +103,7 @@ pkgconfig_wrapper() {
export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
export PKG_CONFIG_PATH="$XBPS_CROSS_BASE/usr/lib/pkgconfig:$XBPS_CROSS_BASE/usr/share/pkgconfig\${PKG_CONFIG_PATH:+:\${PKG_CONFIG_PATH}}"
export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/usr/lib/pkgconfig\${PKG_CONFIG_LIBDIR:+:\${PKG_CONFIG_LIBDIR}}"
-exec /usr/bin/pkg-config "\$@"
+exec /usr/bin/pkg-config "\$@" | sed s/lib32/lib/g
_EOF
chmod 755 ${XBPS_WRAPPERDIR}/${XBPS_CROSS_TRIPLET}-pkg-config
if [ -z "$no_generic_pkgconfig_link" ]; then
```
This is the smallest change I could come up with that makes it work, but maybe there's a better solution?
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] sonic-visualiser: update to 5.0.1
2024-09-29 12:46 [PR PATCH] sonic-visualiser: update to 5.0 newbluemoon
` (5 preceding siblings ...)
2024-12-25 9:35 ` newbluemoon
@ 2025-01-11 17:02 ` newbluemoon
6 siblings, 0 replies; 8+ messages in thread
From: newbluemoon @ 2025-01-11 17:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2286 bytes --]
There is an updated pull request by newbluemoon against master on the void-packages repository
https://github.com/newbluemoon/void-packages sonic-visualiser
https://github.com/void-linux/void-packages/pull/52406
sonic-visualiser: update to 5.0.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64 (cross)
- armv7l (cross) --> fails on x86_64, succeedes on i686, see below
- x86_64-musl
- i686
There is a problem with 32-bit cross builds on a 64-bit host.
Meson detects Qt6 using pkg-config. However, the corresponding .pc files have
```
prefix=/usr
exec_prefix=${prefix}
bindir=${prefix}/lib32/qt6/bin
libexecdir=${prefix}/lib32/qt6/libexec
libdir=${prefix}/lib
includedir=${prefix}/include/qt6
```
i.e. they have `.../lib32/...` hard coded and so detection of the host tools fails when they are under `.../lib64/...`.
There are not much options to tweak this; using qmake instead of pkg-config yields the same error.
I think a clean solution would be adjusting Qt6’s .pc files to contain `.../lib/...` solely. There shouldn’t be a problem, because `lib32` and `lib64` are symlinks to `lib`, anyway. Everything else I can think of would be quite hacky. I don’t know if this is the only package having this problem; I searched for other templates, but didn’t find anything alike.
Any ideas/suggestions are very welcome :)
A patch file from https://github.com/void-linux/void-packages/pull/52406.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sonic-visualiser-52406.patch --]
[-- Type: text/x-diff, Size: 3256 bytes --]
From 7b84f25f61b4c9c3fdcb3348f78c882de9d2d9a9 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 29 Sep 2024 14:19:46 +0200
Subject: [PATCH 1/2] sonic-visualiser: update to 5.0.1
---
srcpkgs/sonic-visualiser/template | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/sonic-visualiser/template b/srcpkgs/sonic-visualiser/template
index 193b4b18bcae16..b36afcf720b162 100644
--- a/srcpkgs/sonic-visualiser/template
+++ b/srcpkgs/sonic-visualiser/template
@@ -1,17 +1,18 @@
# Template file for 'sonic-visualiser'
pkgname=sonic-visualiser
-version=4.5.2
-revision=2
+version=5.0.1
+revision=1
build_style=meson
-hostmakedepends="pkg-config capnproto-devel qt5-host-tools"
+hostmakedepends="pkg-config capnproto-devel qt6-base qt6-tools"
makedepends="capnproto-devel jack-devel libfishsound-devel libid3tag-devel
- liblo-devel liblrdf-devel libmad-devel liboggz-devel libsamplerate-devel
- opusfile-devel portaudio-devel pulseaudio-devel qt5-svg-devel rubberband-devel
- speex-devel sord-devel vamp-plugin-sdk-devel"
+ liblo-devel liblrdf-devel libmad-devel liboggz-devel libopusenc-devel
+ libsamplerate-devel opusfile-devel portaudio-devel pulseaudio-devel
+ qt6-svg-devel rubberband-devel sord-devel speex-devel vamp-plugin-sdk-devel"
short_desc="Viewing and analysing the contents of music audio files"
maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-2.0-or-later"
homepage="https://www.sonicvisualiser.org/"
changelog="https://raw.githubusercontent.com/sonic-visualiser/sonic-visualiser/default/CHANGELOG"
distfiles="https://github.com/sonic-visualiser/sonic-visualiser/releases/download/sv_v${version}/sonic-visualiser-${version}.tar.gz"
-checksum=0816e1ba9e3f97af495ece2554186bccad1cf47090ff8a13f1d08322212db487
+checksum=b0a7d9df66dc33387afbc47e7ecb68d8a413869a3e7d2c4ceabacd04d9cf6e14
+LDFLAGS+="-lopusenc"
From 77d191c2819fb2fe33045d7c4e153af04d8ff187 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Wed, 25 Dec 2024 10:15:14 +0100
Subject: [PATCH 2/2] common: make pkg-config-wrapper look under lib
instead of lib32
cf. #52402, make 32-bit cross builds find qt-host-tools on a 64-bit host
.pc files contain lib32 hardcoded, lib is a symlink to the corresponding
lib{32,64} anyway, so let the wrapper look under lib
---
common/hooks/pre-configure/02-script-wrapper.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh
index 3d5d6c2ab3b8f3..e2db9e400e9cbd 100644
--- a/common/hooks/pre-configure/02-script-wrapper.sh
+++ b/common/hooks/pre-configure/02-script-wrapper.sh
@@ -103,7 +103,7 @@ pkgconfig_wrapper() {
export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
export PKG_CONFIG_PATH="$XBPS_CROSS_BASE/usr/lib/pkgconfig:$XBPS_CROSS_BASE/usr/share/pkgconfig\${PKG_CONFIG_PATH:+:\${PKG_CONFIG_PATH}}"
export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/usr/lib/pkgconfig\${PKG_CONFIG_LIBDIR:+:\${PKG_CONFIG_LIBDIR}}"
-exec /usr/bin/pkg-config "\$@"
+exec /usr/bin/pkg-config "\$@" | sed s/lib32/lib/g
_EOF
chmod 755 ${XBPS_WRAPPERDIR}/${XBPS_CROSS_TRIPLET}-pkg-config
if [ -z "$no_generic_pkgconfig_link" ]; then
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2025-01-11 17:02 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-09-29 12:46 [PR PATCH] sonic-visualiser: update to 5.0 newbluemoon
2024-10-03 21:14 ` [PR PATCH] [Updated] " newbluemoon
2024-10-23 19:15 ` [PR PATCH] [Updated] sonic-visualiser: update to 5.0.1 newbluemoon
2024-11-21 8:45 ` newbluemoon
2024-12-19 5:03 ` newbluemoon
2024-12-25 9:28 ` newbluemoon
2024-12-25 9:35 ` newbluemoon
2025-01-11 17:02 ` [PR PATCH] [Updated] " newbluemoon
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).