* Re: [PR PATCH] [Updated] sonic-visualiser: update to 4.0
2019-10-26 6:14 [PR PATCH] sonic-visualiser: update to 4.0 voidlinux-github
@ 2019-10-26 8:31 ` voidlinux-github
2019-10-26 8:31 ` voidlinux-github
` (9 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: voidlinux-github @ 2019-10-26 8:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 338 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/15804
sonic-visualiser: update to 4.0
A patch file from https://github.com/void-linux/void-packages/pull/15804.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sonic-visualiser-15804.patch --]
[-- Type: text/x-diff, Size: 2125 bytes --]
From 5c421780d47ca09a659164231f9f02bf43d591a7 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 26 Oct 2019 08:12:42 +0200
Subject: [PATCH] sonic-visualiser: update to 4.0
---
srcpkgs/sonic-visualiser/template | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/sonic-visualiser/template b/srcpkgs/sonic-visualiser/template
index 8ad6346646e..9afec92e0a1 100644
--- a/srcpkgs/sonic-visualiser/template
+++ b/srcpkgs/sonic-visualiser/template
@@ -1,6 +1,6 @@
# Template file for 'sonic-visualiser'
pkgname=sonic-visualiser
-version=3.3
+version=4.0
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config capnproto-devel"
@@ -13,8 +13,12 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-2.0-or-later"
homepage="https://www.sonicvisualiser.org/"
changelog="https://code.soundsoftware.ac.uk/projects/sonic-visualiser/repository/entry/CHANGELOG"
-distfiles="https://code.soundsoftware.ac.uk/attachments/download/2491/${pkgname}-${version}.tar.gz"
-checksum=18fa86824146c6338057d9a07377fb8068bab4279b1c77c59191b700048c0f93
+distfiles="https://code.soundsoftware.ac.uk/attachments/download/2580/${pkgname}-${version}.tar.gz"
+checksum=355ee125e7b837fdbd008352c96e25b0271ff8234981375266a88bcdf0b43965
+
+case "$XBPS_TARGET_MACHINE" in
+ armv6*) makedepends+=" libatomic-devel" ;;
+esac
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-qmake qt5-svg-devel"
@@ -29,14 +33,24 @@ post_extract() {
test-svcore-data-model.pro \
test-svcore-system.pro
fi
+
+ case "$XBPS_TARGET_MACHINE" in
+ armv6*) sed -i -e "s/^linux\*:LIBS +=.*/& -latomic/" config.pri.in ;;
+ esac
+}
+
+post_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ sed -i -e "s;\(/usr/lib/libQt5\);${XBPS_CROSS_BASE}\1;g" \
+ Makefile* checker/Makefile*
+ fi
}
do_install() {
vbin sonic-visualiser
vbin piper-vamp-simple-server
vbin vamp-plugin-load-checker
- vlicense COPYING
- vlicense deploy/linux/doc/sonic-visualiser/copyright
+ vdoc deploy/linux/doc/sonic-visualiser/copyright
vdoc README.md
vdoc README.OSC
vdoc CITATION
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PR PATCH] [Updated] sonic-visualiser: update to 4.0
2019-10-26 6:14 [PR PATCH] sonic-visualiser: update to 4.0 voidlinux-github
2019-10-26 8:31 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-10-26 8:31 ` voidlinux-github
2019-10-26 8:45 ` voidlinux-github
` (8 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: voidlinux-github @ 2019-10-26 8:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 338 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/15804
sonic-visualiser: update to 4.0
A patch file from https://github.com/void-linux/void-packages/pull/15804.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sonic-visualiser-15804.patch --]
[-- Type: text/x-diff, Size: 2125 bytes --]
From 5c421780d47ca09a659164231f9f02bf43d591a7 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 26 Oct 2019 08:12:42 +0200
Subject: [PATCH] sonic-visualiser: update to 4.0
---
srcpkgs/sonic-visualiser/template | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/sonic-visualiser/template b/srcpkgs/sonic-visualiser/template
index 8ad6346646e..9afec92e0a1 100644
--- a/srcpkgs/sonic-visualiser/template
+++ b/srcpkgs/sonic-visualiser/template
@@ -1,6 +1,6 @@
# Template file for 'sonic-visualiser'
pkgname=sonic-visualiser
-version=3.3
+version=4.0
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config capnproto-devel"
@@ -13,8 +13,12 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-2.0-or-later"
homepage="https://www.sonicvisualiser.org/"
changelog="https://code.soundsoftware.ac.uk/projects/sonic-visualiser/repository/entry/CHANGELOG"
-distfiles="https://code.soundsoftware.ac.uk/attachments/download/2491/${pkgname}-${version}.tar.gz"
-checksum=18fa86824146c6338057d9a07377fb8068bab4279b1c77c59191b700048c0f93
+distfiles="https://code.soundsoftware.ac.uk/attachments/download/2580/${pkgname}-${version}.tar.gz"
+checksum=355ee125e7b837fdbd008352c96e25b0271ff8234981375266a88bcdf0b43965
+
+case "$XBPS_TARGET_MACHINE" in
+ armv6*) makedepends+=" libatomic-devel" ;;
+esac
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-qmake qt5-svg-devel"
@@ -29,14 +33,24 @@ post_extract() {
test-svcore-data-model.pro \
test-svcore-system.pro
fi
+
+ case "$XBPS_TARGET_MACHINE" in
+ armv6*) sed -i -e "s/^linux\*:LIBS +=.*/& -latomic/" config.pri.in ;;
+ esac
+}
+
+post_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ sed -i -e "s;\(/usr/lib/libQt5\);${XBPS_CROSS_BASE}\1;g" \
+ Makefile* checker/Makefile*
+ fi
}
do_install() {
vbin sonic-visualiser
vbin piper-vamp-simple-server
vbin vamp-plugin-load-checker
- vlicense COPYING
- vlicense deploy/linux/doc/sonic-visualiser/copyright
+ vdoc deploy/linux/doc/sonic-visualiser/copyright
vdoc README.md
vdoc README.OSC
vdoc CITATION
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: sonic-visualiser: update to 4.0
2019-10-26 6:14 [PR PATCH] sonic-visualiser: update to 4.0 voidlinux-github
2019-10-26 8:31 ` [PR PATCH] [Updated] " voidlinux-github
2019-10-26 8:31 ` voidlinux-github
@ 2019-10-26 8:45 ` voidlinux-github
2019-10-26 8:49 ` voidlinux-github
` (7 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: voidlinux-github @ 2019-10-26 8:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 538 bytes --]
New comment by newbluemoon on void-packages repository
https://github.com/void-linux/void-packages/pull/15804#issuecomment-546583684
Comment:
Cross-builds only seem to find the host libraries now so as a quick workaround until something better comes up I just inserted the cross base via sed into the qmake-generated makefiles.
And because the libevent update doesn’t seem to have made it to most cross targets, yet (except for armv6l-musl) I think it’d be better to wait for them to catch up and test this before merging.
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: sonic-visualiser: update to 4.0
2019-10-26 6:14 [PR PATCH] sonic-visualiser: update to 4.0 voidlinux-github
` (2 preceding siblings ...)
2019-10-26 8:45 ` voidlinux-github
@ 2019-10-26 8:49 ` voidlinux-github
2019-10-27 6:03 ` [PR PATCH] [Updated] " voidlinux-github
` (6 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: voidlinux-github @ 2019-10-26 8:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 542 bytes --]
New comment by newbluemoon on void-packages repository
https://github.com/void-linux/void-packages/pull/15804#issuecomment-546583684
Comment:
Cross-builds only seem to find the qt5 host libraries now so as a quick workaround until something better comes up I just inserted the cross base via sed into the qmake-generated makefiles.
And because the libevent update doesn’t seem to have made it to most cross targets, yet (except for armv6l-musl) I think it’d be better to wait for them to catch up and test this before merging.
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PR PATCH] [Updated] sonic-visualiser: update to 4.0
2019-10-26 6:14 [PR PATCH] sonic-visualiser: update to 4.0 voidlinux-github
` (3 preceding siblings ...)
2019-10-26 8:49 ` voidlinux-github
@ 2019-10-27 6:03 ` voidlinux-github
2019-10-27 6:03 ` voidlinux-github
` (5 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: voidlinux-github @ 2019-10-27 6:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 338 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/15804
sonic-visualiser: update to 4.0
A patch file from https://github.com/void-linux/void-packages/pull/15804.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sonic-visualiser-15804.patch --]
[-- Type: text/x-diff, Size: 2125 bytes --]
From e9cb4870be46fa94c507851e7ae8cc09fe67e731 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 26 Oct 2019 08:12:42 +0200
Subject: [PATCH] sonic-visualiser: update to 4.0
---
srcpkgs/sonic-visualiser/template | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/sonic-visualiser/template b/srcpkgs/sonic-visualiser/template
index 8ad6346646e..9afec92e0a1 100644
--- a/srcpkgs/sonic-visualiser/template
+++ b/srcpkgs/sonic-visualiser/template
@@ -1,6 +1,6 @@
# Template file for 'sonic-visualiser'
pkgname=sonic-visualiser
-version=3.3
+version=4.0
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config capnproto-devel"
@@ -13,8 +13,12 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-2.0-or-later"
homepage="https://www.sonicvisualiser.org/"
changelog="https://code.soundsoftware.ac.uk/projects/sonic-visualiser/repository/entry/CHANGELOG"
-distfiles="https://code.soundsoftware.ac.uk/attachments/download/2491/${pkgname}-${version}.tar.gz"
-checksum=18fa86824146c6338057d9a07377fb8068bab4279b1c77c59191b700048c0f93
+distfiles="https://code.soundsoftware.ac.uk/attachments/download/2580/${pkgname}-${version}.tar.gz"
+checksum=355ee125e7b837fdbd008352c96e25b0271ff8234981375266a88bcdf0b43965
+
+case "$XBPS_TARGET_MACHINE" in
+ armv6*) makedepends+=" libatomic-devel" ;;
+esac
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-qmake qt5-svg-devel"
@@ -29,14 +33,24 @@ post_extract() {
test-svcore-data-model.pro \
test-svcore-system.pro
fi
+
+ case "$XBPS_TARGET_MACHINE" in
+ armv6*) sed -i -e "s/^linux\*:LIBS +=.*/& -latomic/" config.pri.in ;;
+ esac
+}
+
+post_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ sed -i -e "s;\(/usr/lib/libQt5\);${XBPS_CROSS_BASE}\1;g" \
+ Makefile* checker/Makefile*
+ fi
}
do_install() {
vbin sonic-visualiser
vbin piper-vamp-simple-server
vbin vamp-plugin-load-checker
- vlicense COPYING
- vlicense deploy/linux/doc/sonic-visualiser/copyright
+ vdoc deploy/linux/doc/sonic-visualiser/copyright
vdoc README.md
vdoc README.OSC
vdoc CITATION
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PR PATCH] [Updated] sonic-visualiser: update to 4.0
2019-10-26 6:14 [PR PATCH] sonic-visualiser: update to 4.0 voidlinux-github
` (4 preceding siblings ...)
2019-10-27 6:03 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-10-27 6:03 ` voidlinux-github
2019-10-27 7:06 ` voidlinux-github
` (4 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: voidlinux-github @ 2019-10-27 6:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 338 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/15804
sonic-visualiser: update to 4.0
A patch file from https://github.com/void-linux/void-packages/pull/15804.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sonic-visualiser-15804.patch --]
[-- Type: text/x-diff, Size: 2125 bytes --]
From e9cb4870be46fa94c507851e7ae8cc09fe67e731 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 26 Oct 2019 08:12:42 +0200
Subject: [PATCH] sonic-visualiser: update to 4.0
---
srcpkgs/sonic-visualiser/template | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/sonic-visualiser/template b/srcpkgs/sonic-visualiser/template
index 8ad6346646e..9afec92e0a1 100644
--- a/srcpkgs/sonic-visualiser/template
+++ b/srcpkgs/sonic-visualiser/template
@@ -1,6 +1,6 @@
# Template file for 'sonic-visualiser'
pkgname=sonic-visualiser
-version=3.3
+version=4.0
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config capnproto-devel"
@@ -13,8 +13,12 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-2.0-or-later"
homepage="https://www.sonicvisualiser.org/"
changelog="https://code.soundsoftware.ac.uk/projects/sonic-visualiser/repository/entry/CHANGELOG"
-distfiles="https://code.soundsoftware.ac.uk/attachments/download/2491/${pkgname}-${version}.tar.gz"
-checksum=18fa86824146c6338057d9a07377fb8068bab4279b1c77c59191b700048c0f93
+distfiles="https://code.soundsoftware.ac.uk/attachments/download/2580/${pkgname}-${version}.tar.gz"
+checksum=355ee125e7b837fdbd008352c96e25b0271ff8234981375266a88bcdf0b43965
+
+case "$XBPS_TARGET_MACHINE" in
+ armv6*) makedepends+=" libatomic-devel" ;;
+esac
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-qmake qt5-svg-devel"
@@ -29,14 +33,24 @@ post_extract() {
test-svcore-data-model.pro \
test-svcore-system.pro
fi
+
+ case "$XBPS_TARGET_MACHINE" in
+ armv6*) sed -i -e "s/^linux\*:LIBS +=.*/& -latomic/" config.pri.in ;;
+ esac
+}
+
+post_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ sed -i -e "s;\(/usr/lib/libQt5\);${XBPS_CROSS_BASE}\1;g" \
+ Makefile* checker/Makefile*
+ fi
}
do_install() {
vbin sonic-visualiser
vbin piper-vamp-simple-server
vbin vamp-plugin-load-checker
- vlicense COPYING
- vlicense deploy/linux/doc/sonic-visualiser/copyright
+ vdoc deploy/linux/doc/sonic-visualiser/copyright
vdoc README.md
vdoc README.OSC
vdoc CITATION
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PR PATCH] [Updated] sonic-visualiser: update to 4.0
2019-10-26 6:14 [PR PATCH] sonic-visualiser: update to 4.0 voidlinux-github
` (5 preceding siblings ...)
2019-10-27 6:03 ` voidlinux-github
@ 2019-10-27 7:06 ` voidlinux-github
2019-10-27 7:06 ` voidlinux-github
` (3 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: voidlinux-github @ 2019-10-27 7:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 338 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/15804
sonic-visualiser: update to 4.0
A patch file from https://github.com/void-linux/void-packages/pull/15804.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sonic-visualiser-15804.patch --]
[-- Type: text/x-diff, Size: 3335 bytes --]
From 50dd11091d406a98bf11a505145ed9267c3e0a47 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 26 Oct 2019 08:12:42 +0200
Subject: [PATCH] sonic-visualiser: update to 4.0
---
srcpkgs/sonic-visualiser/template | 51 +++++++++++++++++++++++++++----
1 file changed, 45 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/sonic-visualiser/template b/srcpkgs/sonic-visualiser/template
index 8ad6346646e..30b859e38f9 100644
--- a/srcpkgs/sonic-visualiser/template
+++ b/srcpkgs/sonic-visualiser/template
@@ -1,6 +1,6 @@
# Template file for 'sonic-visualiser'
pkgname=sonic-visualiser
-version=3.3
+version=4.0
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config capnproto-devel"
@@ -13,30 +13,69 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-2.0-or-later"
homepage="https://www.sonicvisualiser.org/"
changelog="https://code.soundsoftware.ac.uk/projects/sonic-visualiser/repository/entry/CHANGELOG"
-distfiles="https://code.soundsoftware.ac.uk/attachments/download/2491/${pkgname}-${version}.tar.gz"
-checksum=18fa86824146c6338057d9a07377fb8068bab4279b1c77c59191b700048c0f93
+distfiles="https://code.soundsoftware.ac.uk/attachments/download/2580/${pkgname}-${version}.tar.gz"
+checksum=355ee125e7b837fdbd008352c96e25b0271ff8234981375266a88bcdf0b43965
+
+case "$XBPS_TARGET_MACHINE" in
+ armv6*) makedepends+=" libatomic-devel" ;;
+esac
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-qmake qt5-svg-devel"
fi
post_extract() {
- # don’t run target-built testing-binaries when cross building
if [ "$CROSS_BUILD" ]; then
+ # don’t run target-built testing-binaries when cross building
sed -i -e '/QMAKE_POST_LINK/d' \
test-svcore-base.pro \
test-svcore-data-fileio.pro \
test-svcore-data-model.pro \
test-svcore-system.pro
+
+ # It’s a mixed build-style: gnu-configure calls qmake:
+ # create the cross-qt.conf file from the qmake build-style
+ # and make qmake use it
+ cat > "${wrksrc}/qt.conf" <<_EOF
+[Paths]
+Sysroot=${XBPS_CROSS_BASE}
+Prefix=${XBPS_CROSS_BASE}/usr
+ArchData=${XBPS_CROSS_BASE}/usr/lib/qt5
+Data=${XBPS_CROSS_BASE}/usr/share/qt5
+Documentation=${XBPS_CROSS_BASE}/usr/share/doc/qt5
+Headers=${XBPS_CROSS_BASE}/usr/include/qt5
+Libraries=${XBPS_CROSS_BASE}/usr/lib
+LibraryExecutables=/usr/lib/qt5/libexec
+Binaries=/usr/lib/qt5/bin
+Tests=${XBPS_CROSS_BASE}/usr/tests
+Plugins=/usr/lib/qt5/plugins
+Imports=${XBPS_CROSS_BASE}/usr/lib/qt5/imports
+Qml2Imports=${XBPS_CROSS_BASE}/usr/lib/qt5/qml
+Translations=${XBPS_CROSS_BASE}/usr/share/qt5/translations
+Settings=${XBPS_CROSS_BASE}/etc/xdg
+Examples=${XBPS_CROSS_BASE}/usr/share/qt5/examples
+HostPrefix=/usr
+HostData=/usr/lib/qt5
+HostBinaries=/usr/lib/qt5/bin
+HostLibraries=/usr/lib
+Spec=linux-g++
+TargetSpec=linux-g++
+_EOF
+
+ sed -i -e "s;\(\$QMAKE -r\) \(sonic-visualiser.pro\);\1 -qtconf ${wrksrc}/qt.conf \2;" \
+ configure
fi
+
+ case "$XBPS_TARGET_MACHINE" in
+ armv6*) sed -i -e "s/^linux\*:LIBS +=.*/& -latomic/" config.pri.in ;;
+ esac
}
do_install() {
vbin sonic-visualiser
vbin piper-vamp-simple-server
vbin vamp-plugin-load-checker
- vlicense COPYING
- vlicense deploy/linux/doc/sonic-visualiser/copyright
+ vdoc deploy/linux/doc/sonic-visualiser/copyright
vdoc README.md
vdoc README.OSC
vdoc CITATION
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PR PATCH] [Updated] sonic-visualiser: update to 4.0
2019-10-26 6:14 [PR PATCH] sonic-visualiser: update to 4.0 voidlinux-github
` (6 preceding siblings ...)
2019-10-27 7:06 ` voidlinux-github
@ 2019-10-27 7:06 ` voidlinux-github
2019-10-27 7:44 ` voidlinux-github
` (2 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: voidlinux-github @ 2019-10-27 7:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 338 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/15804
sonic-visualiser: update to 4.0
A patch file from https://github.com/void-linux/void-packages/pull/15804.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sonic-visualiser-15804.patch --]
[-- Type: text/x-diff, Size: 3335 bytes --]
From 50dd11091d406a98bf11a505145ed9267c3e0a47 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 26 Oct 2019 08:12:42 +0200
Subject: [PATCH] sonic-visualiser: update to 4.0
---
srcpkgs/sonic-visualiser/template | 51 +++++++++++++++++++++++++++----
1 file changed, 45 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/sonic-visualiser/template b/srcpkgs/sonic-visualiser/template
index 8ad6346646e..30b859e38f9 100644
--- a/srcpkgs/sonic-visualiser/template
+++ b/srcpkgs/sonic-visualiser/template
@@ -1,6 +1,6 @@
# Template file for 'sonic-visualiser'
pkgname=sonic-visualiser
-version=3.3
+version=4.0
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config capnproto-devel"
@@ -13,30 +13,69 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-2.0-or-later"
homepage="https://www.sonicvisualiser.org/"
changelog="https://code.soundsoftware.ac.uk/projects/sonic-visualiser/repository/entry/CHANGELOG"
-distfiles="https://code.soundsoftware.ac.uk/attachments/download/2491/${pkgname}-${version}.tar.gz"
-checksum=18fa86824146c6338057d9a07377fb8068bab4279b1c77c59191b700048c0f93
+distfiles="https://code.soundsoftware.ac.uk/attachments/download/2580/${pkgname}-${version}.tar.gz"
+checksum=355ee125e7b837fdbd008352c96e25b0271ff8234981375266a88bcdf0b43965
+
+case "$XBPS_TARGET_MACHINE" in
+ armv6*) makedepends+=" libatomic-devel" ;;
+esac
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-qmake qt5-svg-devel"
fi
post_extract() {
- # don’t run target-built testing-binaries when cross building
if [ "$CROSS_BUILD" ]; then
+ # don’t run target-built testing-binaries when cross building
sed -i -e '/QMAKE_POST_LINK/d' \
test-svcore-base.pro \
test-svcore-data-fileio.pro \
test-svcore-data-model.pro \
test-svcore-system.pro
+
+ # It’s a mixed build-style: gnu-configure calls qmake:
+ # create the cross-qt.conf file from the qmake build-style
+ # and make qmake use it
+ cat > "${wrksrc}/qt.conf" <<_EOF
+[Paths]
+Sysroot=${XBPS_CROSS_BASE}
+Prefix=${XBPS_CROSS_BASE}/usr
+ArchData=${XBPS_CROSS_BASE}/usr/lib/qt5
+Data=${XBPS_CROSS_BASE}/usr/share/qt5
+Documentation=${XBPS_CROSS_BASE}/usr/share/doc/qt5
+Headers=${XBPS_CROSS_BASE}/usr/include/qt5
+Libraries=${XBPS_CROSS_BASE}/usr/lib
+LibraryExecutables=/usr/lib/qt5/libexec
+Binaries=/usr/lib/qt5/bin
+Tests=${XBPS_CROSS_BASE}/usr/tests
+Plugins=/usr/lib/qt5/plugins
+Imports=${XBPS_CROSS_BASE}/usr/lib/qt5/imports
+Qml2Imports=${XBPS_CROSS_BASE}/usr/lib/qt5/qml
+Translations=${XBPS_CROSS_BASE}/usr/share/qt5/translations
+Settings=${XBPS_CROSS_BASE}/etc/xdg
+Examples=${XBPS_CROSS_BASE}/usr/share/qt5/examples
+HostPrefix=/usr
+HostData=/usr/lib/qt5
+HostBinaries=/usr/lib/qt5/bin
+HostLibraries=/usr/lib
+Spec=linux-g++
+TargetSpec=linux-g++
+_EOF
+
+ sed -i -e "s;\(\$QMAKE -r\) \(sonic-visualiser.pro\);\1 -qtconf ${wrksrc}/qt.conf \2;" \
+ configure
fi
+
+ case "$XBPS_TARGET_MACHINE" in
+ armv6*) sed -i -e "s/^linux\*:LIBS +=.*/& -latomic/" config.pri.in ;;
+ esac
}
do_install() {
vbin sonic-visualiser
vbin piper-vamp-simple-server
vbin vamp-plugin-load-checker
- vlicense COPYING
- vlicense deploy/linux/doc/sonic-visualiser/copyright
+ vdoc deploy/linux/doc/sonic-visualiser/copyright
vdoc README.md
vdoc README.OSC
vdoc CITATION
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: sonic-visualiser: update to 4.0
2019-10-26 6:14 [PR PATCH] sonic-visualiser: update to 4.0 voidlinux-github
` (7 preceding siblings ...)
2019-10-27 7:06 ` voidlinux-github
@ 2019-10-27 7:44 ` voidlinux-github
2019-10-29 15:09 ` voidlinux-github
2019-10-29 20:16 ` [PR PATCH] [Merged]: " voidlinux-github
10 siblings, 0 replies; 12+ messages in thread
From: voidlinux-github @ 2019-10-27 7:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 792 bytes --]
New comment by newbluemoon on void-packages repository
https://github.com/void-linux/void-packages/pull/15804#issuecomment-546669667
Comment:
The problem with sonic-visualiser is that it is a mixed build-style: gnu-configure runs qmake in the end so that in cross cases qmake isn’t set up properly. To work-around this I just copied the creation of the `qt.conf` file from the qmake build-style and made qmake use it.
The xlint error is because of creating the custom `qt.conf`. Everything else is fine now. Tested on x86_64, x86_64-musl, and armv7l-musl (RPi).
But I think there are some other templates which are mixed qmake build-styles. Would it make sense to create a qmake-cross-wrapper (but only when the build-style is not qmake) which sets up and uses a `qt.conf` file?
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: sonic-visualiser: update to 4.0
2019-10-26 6:14 [PR PATCH] sonic-visualiser: update to 4.0 voidlinux-github
` (8 preceding siblings ...)
2019-10-27 7:44 ` voidlinux-github
@ 2019-10-29 15:09 ` voidlinux-github
2019-10-29 20:16 ` [PR PATCH] [Merged]: " voidlinux-github
10 siblings, 0 replies; 12+ messages in thread
From: voidlinux-github @ 2019-10-29 15:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
New comment by Hoshpak on void-packages repository
https://github.com/void-linux/void-packages/pull/15804#issuecomment-547469262
Comment:
I just stumbled upon the same issue with smplayer which uses a makefile to call qmake so I think it would be beneficial to have a build_helper or similar for that case.
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PR PATCH] [Merged]: sonic-visualiser: update to 4.0
2019-10-26 6:14 [PR PATCH] sonic-visualiser: update to 4.0 voidlinux-github
` (9 preceding siblings ...)
2019-10-29 15:09 ` voidlinux-github
@ 2019-10-29 20:16 ` voidlinux-github
10 siblings, 0 replies; 12+ messages in thread
From: voidlinux-github @ 2019-10-29 20:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 165 bytes --]
There's a merged pull request on the void-packages repository
sonic-visualiser: update to 4.0
https://github.com/void-linux/void-packages/pull/15804
Description:
^ permalink raw reply [flat|nested] 12+ messages in thread