* [PR PATCH] Kokkinizita [WIP]
@ 2021-02-17 3:42 tibequadorian
2021-02-17 3:44 ` [PR PATCH] [Updated] " tibequadorian
` (24 more replies)
0 siblings, 25 replies; 26+ messages in thread
From: tibequadorian @ 2021-02-17 3:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1968 bytes --]
There is a new pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages kokkinizita
https://github.com/void-linux/void-packages/pull/28809
Kokkinizita [WIP]
<!-- 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
Setting CXXFLAGS in Makefile doesn't seem to work anymore since [void-packages#2325ae1](https://github.com/void-linux/void-packages/commit/2325ae153bd6011682782a6712f87338a9747ac7) so we need to set them in the template.
I've adapted them to those in the Makefile (e.g. `-ffast-math`) and enabled `-march=native` for non-cross builds.
I'll have to test this though.
<!--
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/28809.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kokkinizita-28809.patch --]
[-- Type: text/x-diff, Size: 11156 bytes --]
From 6045995cd73a58fb7559dd86f228255c02d5ea5c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:47:52 +0100
Subject: [PATCH 1/8] clthreads: fix build flags
update maintainer
---
srcpkgs/clthreads/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/clthreads/template b/srcpkgs/clthreads/template
index 5bd8b35621d..d2e1310662b 100644
--- a/srcpkgs/clthreads/template
+++ b/srcpkgs/clthreads/template
@@ -1,22 +1,21 @@
# Template file for 'clthreads'
pkgname=clthreads
version=2.4.2
-revision=1
+revision=2
build_wrksrc=source
build_style=gnu-makefile
make_install_args="LIBDIR=/usr/lib"
short_desc="C++ wrapper library around the POSIX threads API"
-maintainer="bluntphenomena <gregwyd@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="LGPL-2.1-or-later"
homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
checksum=c659b14c0c4055c44432cb83060b95d30ae0c1ecc6f50d73968e239c100f7a31
CXXFLAGS="-fPIC"
-
-pre_build() {
- vsed -i Makefile -e '/march=native/d'
-}
+if [ ! "${CROSS_BUILD}" ]; then
+ CXXFLAGS+=" -march=native"
+fi
pre_install() {
# fix wrong path
From 14ecd3e3240670ce83b1ae7dd3297bebddecf4a0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:48:28 +0100
Subject: [PATCH 2/8] clxclient: fix build flags
update maintainer
---
srcpkgs/clxclient/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clxclient/template b/srcpkgs/clxclient/template
index 6391174621a..a9265fce384 100644
--- a/srcpkgs/clxclient/template
+++ b/srcpkgs/clxclient/template
@@ -1,23 +1,25 @@
# Template file for 'clxclient'
pkgname=clxclient
version=3.9.2
-revision=1
+revision=2
build_wrksrc=source
build_style=gnu-makefile
make_install_args="LIBDIR=/usr/lib"
hostmakedepends="pkg-config"
makedepends="libX11-devel libXft-devel clthreads-devel freetype-devel"
short_desc="C++ wrapper library around the X Window System API"
-maintainer="bluntphenomena <gregwyd@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="LGPL-2.1-or-later"
homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
checksum=8501e964f0e0746abc5083a0b75fe3b937281cc4a9f7d1450ff98e86bc337881
CXXFLAGS="-fPIC"
+if [ ! "${CROSS_BUILD}" ]; then
+ CXXFLAGS+=" -march=native"
+fi
pre_build() {
- sed -i '/march=native/d' Makefile
# fix wrong header import
vsed -i 's/<clxclient.h>/"clxclient.h"/' enumip.cc
# change pkgconf to pkg-config
From ef9512357b33d6a4399267469954ee44246440a4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:48:50 +0100
Subject: [PATCH 3/8] jaaa: fix build flags
update maintainer
---
srcpkgs/jaaa/template | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/jaaa/template b/srcpkgs/jaaa/template
index 27cf147efb2..975666e69b6 100644
--- a/srcpkgs/jaaa/template
+++ b/srcpkgs/jaaa/template
@@ -1,21 +1,24 @@
# Template file for 'jaaa'
pkgname=jaaa
version=0.9.2
-revision=1
+revision=2
build_wrksrc=source
build_style=gnu-makefile
hostmakedepends="pkg-config"
makedepends="zita-alsa-pcmi-devel clthreads-devel clxclient-devel freetype-devel
alsa-lib-devel fftw-devel jack-devel libX11-devel libXft-devel"
short_desc="JACK and ALSA Audio Analyser"
-maintainer="bluntphenomena <gregwyd@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="GPL-2.0-or-later"
homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
checksum=6cf55a3924694179d83e9d49f557896fcebdc1a7f89477e601caa2277ad7f3b3
+if [ ! "${CROSS_BUILD}" ]; then
+ CXXFLAGS+=" -march=native"
+fi
+
pre_build() {
- sed -i '/march=native/d' Makefile
# change pkgconf to pkg-config
sed -i 's/pkgconf/pkg-config/' Makefile
}
From 9d119cf9c68548521f1efcd435f6390af6b3c662 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:49:54 +0100
Subject: [PATCH 4/8] zita-alsa-pcmi: fix build flags
---
srcpkgs/zita-alsa-pcmi/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/zita-alsa-pcmi/template b/srcpkgs/zita-alsa-pcmi/template
index 2090b4dec82..4e3145846a7 100644
--- a/srcpkgs/zita-alsa-pcmi/template
+++ b/srcpkgs/zita-alsa-pcmi/template
@@ -1,7 +1,7 @@
# Template file for 'zita-alsa-pcmi'
pkgname=zita-alsa-pcmi
version=0.3.2
-revision=1
+revision=2
build_wrksrc="source"
build_style=gnu-makefile
make_install_args="LIBDIR=/usr/lib"
@@ -14,10 +14,9 @@ distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${
checksum=1a1d9f7e373032bd5702382e4c923407911f4f791c449c0c0f027a725edba789
CXXFLAGS="-fPIC -DPIC"
-
-pre_build() {
- sed -i '/march=native/d' Makefile
-}
+if [ ! "${CROSS_BUILD}" ]; then
+ CXXFLAGS+=" -march=native"
+fi
post_install() {
# add missing symlink
From eda9ade07d518378e3de7e912336b25d1c6bee1b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:50:51 +0100
Subject: [PATCH 5/8] zita-at1: fix build flags
update maintainer
---
srcpkgs/zita-at1/template | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zita-at1/template b/srcpkgs/zita-at1/template
index c92d4c699e3..f3afa2b5994 100644
--- a/srcpkgs/zita-at1/template
+++ b/srcpkgs/zita-at1/template
@@ -1,7 +1,7 @@
# Template file for 'zita-at1'
pkgname=zita-at1
version=0.6.2
-revision=2
+revision=3
build_wrksrc=source
build_style=gnu-makefile
make_build_args="PREFIX=/usr"
@@ -9,12 +9,17 @@ hostmakedepends="pkg-config"
makedepends="clxclient-devel clthreads-devel zita-resampler-devel cairo-devel
freetype-devel fftw-devel jack-devel libpng-devel libXft-devel libX11-devel"
short_desc="Audio autotuner for JACK"
-maintainer="bluntphenomena <gregwyd@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="GPL-3.0-or-later"
homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
checksum=19bb3ddc02b32d6ad15fdd928ee66c2e5bb5e4c7fe465c431e98c2fd83b1ae57
+CXXFLAGS="-ffast-math"
+if [ ! "${CROSS_BUILD}" ]; then
+ CXXFLAGS+=" -march=native"
+fi
+
pre_build() {
# change pkgconf to pkg-config
vsed -e 's/pkgconf/pkg-config/' -i Makefile
From fe23a4b610ab7da5d42f5fd5e15afeb0e5009221 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:51:23 +0100
Subject: [PATCH 6/8] zita-convolver: fix build flags
---
srcpkgs/zita-convolver/template | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/zita-convolver/template b/srcpkgs/zita-convolver/template
index 14cd977773a..fadfaa365ef 100644
--- a/srcpkgs/zita-convolver/template
+++ b/srcpkgs/zita-convolver/template
@@ -1,24 +1,23 @@
# Template file for 'zita-convolver'
pkgname=zita-convolver
version=4.0.3
-revision=1
+revision=2
+build_wrksrc="source"
build_style=gnu-makefile
make_install_args="LIBDIR=/usr/lib"
hostmakedepends="pkg-config"
makedepends="fftw-devel"
-build_wrksrc="source"
-short_desc="A fast partitioned convolution engine library"
+short_desc="Fast partitioned convolution engine library"
maintainer="silvernode <mollusk@homebutter.com>"
license="GPL-3.0-or-later"
homepage="http://kokkinizita.linuxaudio.org/linuxaudio/"
distfiles="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
checksum=9aa11484fb30b4e6ef00c8a3281eebcfad9221e3937b1beb5fe21b748d89325f
-CXXFLAGS="-fPIC -DPIC"
-
-pre_build() {
- sed -i '/march=native/d' Makefile
-}
+CXXFLAGS="-fPIC -ffast-math -funroll-loops"
+if [ ! "${CROSS_BUILD}" ]; then
+ CXXFLAGS+=" -march=native"
+fi
post_install() {
# add missing symlink
From ae865170346767acd79837fba7accbeaa5eda477 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:57:45 +0100
Subject: [PATCH 7/8] zita-resampler: fix build flags
---
srcpkgs/zita-resampler/template | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/zita-resampler/template b/srcpkgs/zita-resampler/template
index 56bd795af99..ca69f664f41 100644
--- a/srcpkgs/zita-resampler/template
+++ b/srcpkgs/zita-resampler/template
@@ -1,23 +1,22 @@
# Template file for 'zita-resampler'
pkgname=zita-resampler
version=1.6.2
-revision=1
+revision=2
+build_wrksrc="source"
build_style=gnu-makefile
make_install_args="LIBDIR=/usr/lib"
hostmakedepends="pkg-config"
-build_wrksrc="source"
-short_desc="A library for resampling audio signals"
+short_desc="Library for resampling audio signals"
maintainer="silvernode <mollusk@homebutter.com>"
license="GPL-3.0-or-later"
homepage="http://kokkinizita.linuxaudio.org/linuxaudio/zita-resampler/resampler.html"
distfiles="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
checksum=233baefee297094514bfc9063e47f848e8138dc7c959d9cd957b36019b98c5d7
-CXXFLAGS="-fPIC -DPIC"
-
-pre_build() {
- sed -i '/march=native/d' Makefile
-}
+CXXFLAGS="-fPIC -ffast-math"
+if [ ! "${CROSS_BUILD}" ]; then
+ CXXFLAGS+=" -march=native"
+fi
post_install() {
# add missing symlink
From 85a62397f8223b7acc4052e074cbbc8843107af2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:58:05 +0100
Subject: [PATCH 8/8] zita-resampler: update to 1.8.0.
enable SSE2 only for supported archs
---
srcpkgs/zita-resampler/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/zita-resampler/template b/srcpkgs/zita-resampler/template
index ca69f664f41..dcd0d049946 100644
--- a/srcpkgs/zita-resampler/template
+++ b/srcpkgs/zita-resampler/template
@@ -1,7 +1,7 @@
# Template file for 'zita-resampler'
pkgname=zita-resampler
-version=1.6.2
-revision=2
+version=1.8.0
+revision=1
build_wrksrc="source"
build_style=gnu-makefile
make_install_args="LIBDIR=/usr/lib"
@@ -11,13 +11,20 @@ maintainer="silvernode <mollusk@homebutter.com>"
license="GPL-3.0-or-later"
homepage="http://kokkinizita.linuxaudio.org/linuxaudio/zita-resampler/resampler.html"
distfiles="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
-checksum=233baefee297094514bfc9063e47f848e8138dc7c959d9cd957b36019b98c5d7
+checksum=e5744f23c54dd15b3f783a687bd879eee2a690a4545a15b49c4cf037aa464aa2
CXXFLAGS="-fPIC -ffast-math"
if [ ! "${CROSS_BUILD}" ]; then
CXXFLAGS+=" -march=native"
fi
+pre_build() {
+ case "${XBPS_TARGET_MACHINE}" in
+ x86_64*|i686*) ;;
+ *) vsed -i '/DENABLE_SSE2/d' Makefile ;;
+ esac
+}
+
post_install() {
# add missing symlink
ln -s libzita-resampler.so.${version} ${PKGDESTDIR}/usr/lib/libzita-resampler.so.${version%%.*}
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR PATCH] [Updated] Kokkinizita [WIP]
2021-02-17 3:42 [PR PATCH] Kokkinizita [WIP] tibequadorian
@ 2021-02-17 3:44 ` tibequadorian
2021-02-17 4:12 ` sgn
` (23 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: tibequadorian @ 2021-02-17 3:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1973 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages kokkinizita
https://github.com/void-linux/void-packages/pull/28809
Kokkinizita [WIP]
<!-- 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
Setting CXXFLAGS in Makefile doesn't seem to work anymore since [void-packages#2325ae1](https://github.com/void-linux/void-packages/commit/2325ae153bd6011682782a6712f87338a9747ac7) so we need to set them in the template.
I've adapted them to those in the Makefile (e.g. `-ffast-math`) and enabled `-march=native` for non-cross builds.
I'll have to test this though.
<!--
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/28809.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kokkinizita-28809.patch --]
[-- Type: text/x-diff, Size: 11254 bytes --]
From 6045995cd73a58fb7559dd86f228255c02d5ea5c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:47:52 +0100
Subject: [PATCH 1/8] clthreads: fix build flags
update maintainer
---
srcpkgs/clthreads/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/clthreads/template b/srcpkgs/clthreads/template
index 5bd8b35621d..d2e1310662b 100644
--- a/srcpkgs/clthreads/template
+++ b/srcpkgs/clthreads/template
@@ -1,22 +1,21 @@
# Template file for 'clthreads'
pkgname=clthreads
version=2.4.2
-revision=1
+revision=2
build_wrksrc=source
build_style=gnu-makefile
make_install_args="LIBDIR=/usr/lib"
short_desc="C++ wrapper library around the POSIX threads API"
-maintainer="bluntphenomena <gregwyd@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="LGPL-2.1-or-later"
homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
checksum=c659b14c0c4055c44432cb83060b95d30ae0c1ecc6f50d73968e239c100f7a31
CXXFLAGS="-fPIC"
-
-pre_build() {
- vsed -i Makefile -e '/march=native/d'
-}
+if [ ! "${CROSS_BUILD}" ]; then
+ CXXFLAGS+=" -march=native"
+fi
pre_install() {
# fix wrong path
From 14ecd3e3240670ce83b1ae7dd3297bebddecf4a0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:48:28 +0100
Subject: [PATCH 2/8] clxclient: fix build flags
update maintainer
---
srcpkgs/clxclient/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clxclient/template b/srcpkgs/clxclient/template
index 6391174621a..a9265fce384 100644
--- a/srcpkgs/clxclient/template
+++ b/srcpkgs/clxclient/template
@@ -1,23 +1,25 @@
# Template file for 'clxclient'
pkgname=clxclient
version=3.9.2
-revision=1
+revision=2
build_wrksrc=source
build_style=gnu-makefile
make_install_args="LIBDIR=/usr/lib"
hostmakedepends="pkg-config"
makedepends="libX11-devel libXft-devel clthreads-devel freetype-devel"
short_desc="C++ wrapper library around the X Window System API"
-maintainer="bluntphenomena <gregwyd@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="LGPL-2.1-or-later"
homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
checksum=8501e964f0e0746abc5083a0b75fe3b937281cc4a9f7d1450ff98e86bc337881
CXXFLAGS="-fPIC"
+if [ ! "${CROSS_BUILD}" ]; then
+ CXXFLAGS+=" -march=native"
+fi
pre_build() {
- sed -i '/march=native/d' Makefile
# fix wrong header import
vsed -i 's/<clxclient.h>/"clxclient.h"/' enumip.cc
# change pkgconf to pkg-config
From ef9512357b33d6a4399267469954ee44246440a4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:48:50 +0100
Subject: [PATCH 3/8] jaaa: fix build flags
update maintainer
---
srcpkgs/jaaa/template | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/jaaa/template b/srcpkgs/jaaa/template
index 27cf147efb2..975666e69b6 100644
--- a/srcpkgs/jaaa/template
+++ b/srcpkgs/jaaa/template
@@ -1,21 +1,24 @@
# Template file for 'jaaa'
pkgname=jaaa
version=0.9.2
-revision=1
+revision=2
build_wrksrc=source
build_style=gnu-makefile
hostmakedepends="pkg-config"
makedepends="zita-alsa-pcmi-devel clthreads-devel clxclient-devel freetype-devel
alsa-lib-devel fftw-devel jack-devel libX11-devel libXft-devel"
short_desc="JACK and ALSA Audio Analyser"
-maintainer="bluntphenomena <gregwyd@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="GPL-2.0-or-later"
homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
checksum=6cf55a3924694179d83e9d49f557896fcebdc1a7f89477e601caa2277ad7f3b3
+if [ ! "${CROSS_BUILD}" ]; then
+ CXXFLAGS+=" -march=native"
+fi
+
pre_build() {
- sed -i '/march=native/d' Makefile
# change pkgconf to pkg-config
sed -i 's/pkgconf/pkg-config/' Makefile
}
From 5951d4782a1898c38204eee76aea7e0a323620a7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:49:54 +0100
Subject: [PATCH 4/8] zita-alsa-pcmi: fix build flags
---
srcpkgs/zita-alsa-pcmi/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/zita-alsa-pcmi/template b/srcpkgs/zita-alsa-pcmi/template
index 2090b4dec82..6c55c477e65 100644
--- a/srcpkgs/zita-alsa-pcmi/template
+++ b/srcpkgs/zita-alsa-pcmi/template
@@ -1,7 +1,7 @@
# Template file for 'zita-alsa-pcmi'
pkgname=zita-alsa-pcmi
version=0.3.2
-revision=1
+revision=2
build_wrksrc="source"
build_style=gnu-makefile
make_install_args="LIBDIR=/usr/lib"
@@ -13,11 +13,10 @@ homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
checksum=1a1d9f7e373032bd5702382e4c923407911f4f791c449c0c0f027a725edba789
-CXXFLAGS="-fPIC -DPIC"
-
-pre_build() {
- sed -i '/march=native/d' Makefile
-}
+CXXFLAGS="-fPIC"
+if [ ! "${CROSS_BUILD}" ]; then
+ CXXFLAGS+=" -march=native"
+fi
post_install() {
# add missing symlink
From 7c862c5bae9589416aa61da7bab584f00360be47 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:50:51 +0100
Subject: [PATCH 5/8] zita-at1: fix build flags
update maintainer
---
srcpkgs/zita-at1/template | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zita-at1/template b/srcpkgs/zita-at1/template
index c92d4c699e3..f3afa2b5994 100644
--- a/srcpkgs/zita-at1/template
+++ b/srcpkgs/zita-at1/template
@@ -1,7 +1,7 @@
# Template file for 'zita-at1'
pkgname=zita-at1
version=0.6.2
-revision=2
+revision=3
build_wrksrc=source
build_style=gnu-makefile
make_build_args="PREFIX=/usr"
@@ -9,12 +9,17 @@ hostmakedepends="pkg-config"
makedepends="clxclient-devel clthreads-devel zita-resampler-devel cairo-devel
freetype-devel fftw-devel jack-devel libpng-devel libXft-devel libX11-devel"
short_desc="Audio autotuner for JACK"
-maintainer="bluntphenomena <gregwyd@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="GPL-3.0-or-later"
homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
checksum=19bb3ddc02b32d6ad15fdd928ee66c2e5bb5e4c7fe465c431e98c2fd83b1ae57
+CXXFLAGS="-ffast-math"
+if [ ! "${CROSS_BUILD}" ]; then
+ CXXFLAGS+=" -march=native"
+fi
+
pre_build() {
# change pkgconf to pkg-config
vsed -e 's/pkgconf/pkg-config/' -i Makefile
From 9b3be5ea0f4345df6272c2ec3d4f96713ae6a5a7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:51:23 +0100
Subject: [PATCH 6/8] zita-convolver: fix build flags
---
srcpkgs/zita-convolver/template | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/zita-convolver/template b/srcpkgs/zita-convolver/template
index 14cd977773a..fadfaa365ef 100644
--- a/srcpkgs/zita-convolver/template
+++ b/srcpkgs/zita-convolver/template
@@ -1,24 +1,23 @@
# Template file for 'zita-convolver'
pkgname=zita-convolver
version=4.0.3
-revision=1
+revision=2
+build_wrksrc="source"
build_style=gnu-makefile
make_install_args="LIBDIR=/usr/lib"
hostmakedepends="pkg-config"
makedepends="fftw-devel"
-build_wrksrc="source"
-short_desc="A fast partitioned convolution engine library"
+short_desc="Fast partitioned convolution engine library"
maintainer="silvernode <mollusk@homebutter.com>"
license="GPL-3.0-or-later"
homepage="http://kokkinizita.linuxaudio.org/linuxaudio/"
distfiles="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
checksum=9aa11484fb30b4e6ef00c8a3281eebcfad9221e3937b1beb5fe21b748d89325f
-CXXFLAGS="-fPIC -DPIC"
-
-pre_build() {
- sed -i '/march=native/d' Makefile
-}
+CXXFLAGS="-fPIC -ffast-math -funroll-loops"
+if [ ! "${CROSS_BUILD}" ]; then
+ CXXFLAGS+=" -march=native"
+fi
post_install() {
# add missing symlink
From 3ebb521c5331061fdc40e46f49683c7c95ce4253 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:57:45 +0100
Subject: [PATCH 7/8] zita-resampler: fix build flags
---
srcpkgs/zita-resampler/template | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/zita-resampler/template b/srcpkgs/zita-resampler/template
index 56bd795af99..ca69f664f41 100644
--- a/srcpkgs/zita-resampler/template
+++ b/srcpkgs/zita-resampler/template
@@ -1,23 +1,22 @@
# Template file for 'zita-resampler'
pkgname=zita-resampler
version=1.6.2
-revision=1
+revision=2
+build_wrksrc="source"
build_style=gnu-makefile
make_install_args="LIBDIR=/usr/lib"
hostmakedepends="pkg-config"
-build_wrksrc="source"
-short_desc="A library for resampling audio signals"
+short_desc="Library for resampling audio signals"
maintainer="silvernode <mollusk@homebutter.com>"
license="GPL-3.0-or-later"
homepage="http://kokkinizita.linuxaudio.org/linuxaudio/zita-resampler/resampler.html"
distfiles="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
checksum=233baefee297094514bfc9063e47f848e8138dc7c959d9cd957b36019b98c5d7
-CXXFLAGS="-fPIC -DPIC"
-
-pre_build() {
- sed -i '/march=native/d' Makefile
-}
+CXXFLAGS="-fPIC -ffast-math"
+if [ ! "${CROSS_BUILD}" ]; then
+ CXXFLAGS+=" -march=native"
+fi
post_install() {
# add missing symlink
From 7716d751f6462e73da0fc46c96de79ad83530eed Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:58:05 +0100
Subject: [PATCH 8/8] zita-resampler: update to 1.8.0.
enable SSE2 only for supported archs
---
srcpkgs/zita-resampler/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/zita-resampler/template b/srcpkgs/zita-resampler/template
index ca69f664f41..dcd0d049946 100644
--- a/srcpkgs/zita-resampler/template
+++ b/srcpkgs/zita-resampler/template
@@ -1,7 +1,7 @@
# Template file for 'zita-resampler'
pkgname=zita-resampler
-version=1.6.2
-revision=2
+version=1.8.0
+revision=1
build_wrksrc="source"
build_style=gnu-makefile
make_install_args="LIBDIR=/usr/lib"
@@ -11,13 +11,20 @@ maintainer="silvernode <mollusk@homebutter.com>"
license="GPL-3.0-or-later"
homepage="http://kokkinizita.linuxaudio.org/linuxaudio/zita-resampler/resampler.html"
distfiles="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
-checksum=233baefee297094514bfc9063e47f848e8138dc7c959d9cd957b36019b98c5d7
+checksum=e5744f23c54dd15b3f783a687bd879eee2a690a4545a15b49c4cf037aa464aa2
CXXFLAGS="-fPIC -ffast-math"
if [ ! "${CROSS_BUILD}" ]; then
CXXFLAGS+=" -march=native"
fi
+pre_build() {
+ case "${XBPS_TARGET_MACHINE}" in
+ x86_64*|i686*) ;;
+ *) vsed -i '/DENABLE_SSE2/d' Makefile ;;
+ esac
+}
+
post_install() {
# add missing symlink
ln -s libzita-resampler.so.${version} ${PKGDESTDIR}/usr/lib/libzita-resampler.so.${version%%.*}
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: Kokkinizita [WIP]
2021-02-17 3:42 [PR PATCH] Kokkinizita [WIP] tibequadorian
2021-02-17 3:44 ` [PR PATCH] [Updated] " tibequadorian
@ 2021-02-17 4:12 ` sgn
2021-02-17 4:43 ` tibequadorian
` (22 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: sgn @ 2021-02-17 4:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 162 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/28809#issuecomment-780284451
Comment:
No `-march=native` please
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: Kokkinizita [WIP]
2021-02-17 3:42 [PR PATCH] Kokkinizita [WIP] tibequadorian
2021-02-17 3:44 ` [PR PATCH] [Updated] " tibequadorian
2021-02-17 4:12 ` sgn
@ 2021-02-17 4:43 ` tibequadorian
2021-02-17 7:56 ` Chocimier
` (21 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: tibequadorian @ 2021-02-17 4:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 236 bytes --]
New comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/28809#issuecomment-780294134
Comment:
> No `-march=native` please
Okay! I thought it was just harmful for cross-compiling...
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: Kokkinizita [WIP]
2021-02-17 3:42 [PR PATCH] Kokkinizita [WIP] tibequadorian
` (2 preceding siblings ...)
2021-02-17 4:43 ` tibequadorian
@ 2021-02-17 7:56 ` Chocimier
2021-02-17 10:39 ` [PR PATCH] [Updated] " tibequadorian
` (20 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: Chocimier @ 2021-02-17 7:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 421 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/28809#issuecomment-780375613
Comment:
`-march=native` is harmful for native builds as well, because it makes binaries not work on computers that do not have extensions used on builders. Also not that helpful, because everyone's `native` differs. If you want it, drop it into cflags in `etc/conf` and make own builds.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR PATCH] [Updated] Kokkinizita [WIP]
2021-02-17 3:42 [PR PATCH] Kokkinizita [WIP] tibequadorian
` (3 preceding siblings ...)
2021-02-17 7:56 ` Chocimier
@ 2021-02-17 10:39 ` tibequadorian
2021-02-17 10:57 ` tibequadorian
` (19 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: tibequadorian @ 2021-02-17 10:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1973 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages kokkinizita
https://github.com/void-linux/void-packages/pull/28809
Kokkinizita [WIP]
<!-- 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
Setting CXXFLAGS in Makefile doesn't seem to work anymore since [void-packages#2325ae1](https://github.com/void-linux/void-packages/commit/2325ae153bd6011682782a6712f87338a9747ac7) so we need to set them in the template.
I've adapted them to those in the Makefile (e.g. `-ffast-math`) and enabled `-march=native` for non-cross builds.
I'll have to test this though.
<!--
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/28809.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kokkinizita-28809.patch --]
[-- Type: text/x-diff, Size: 10790 bytes --]
From 35c2d461fd2f0b3b6514eca7dd56ff5d85bad7d1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:47:52 +0100
Subject: [PATCH 1/8] clthreads: fix build flags
update maintainer
---
srcpkgs/clthreads/template | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/clthreads/template b/srcpkgs/clthreads/template
index 5bd8b35621d..e3be0e9ded6 100644
--- a/srcpkgs/clthreads/template
+++ b/srcpkgs/clthreads/template
@@ -1,12 +1,12 @@
# Template file for 'clthreads'
pkgname=clthreads
version=2.4.2
-revision=1
+revision=2
build_wrksrc=source
build_style=gnu-makefile
make_install_args="LIBDIR=/usr/lib"
short_desc="C++ wrapper library around the POSIX threads API"
-maintainer="bluntphenomena <gregwyd@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="LGPL-2.1-or-later"
homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
@@ -14,10 +14,6 @@ checksum=c659b14c0c4055c44432cb83060b95d30ae0c1ecc6f50d73968e239c100f7a31
CXXFLAGS="-fPIC"
-pre_build() {
- vsed -i Makefile -e '/march=native/d'
-}
-
pre_install() {
# fix wrong path
vsed -i 's/$(DESTDIR)$(PREFIX)\//$(DESTDIR)/g' Makefile
From bcdca6e5e2e8c058bb1eb237b3a4e050e9b723c2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:48:28 +0100
Subject: [PATCH 2/8] clxclient: fix build flags
update maintainer
---
srcpkgs/clxclient/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clxclient/template b/srcpkgs/clxclient/template
index 6391174621a..53ebd71d980 100644
--- a/srcpkgs/clxclient/template
+++ b/srcpkgs/clxclient/template
@@ -1,14 +1,14 @@
# Template file for 'clxclient'
pkgname=clxclient
version=3.9.2
-revision=1
+revision=2
build_wrksrc=source
build_style=gnu-makefile
make_install_args="LIBDIR=/usr/lib"
hostmakedepends="pkg-config"
makedepends="libX11-devel libXft-devel clthreads-devel freetype-devel"
short_desc="C++ wrapper library around the X Window System API"
-maintainer="bluntphenomena <gregwyd@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="LGPL-2.1-or-later"
homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
@@ -17,7 +17,6 @@ checksum=8501e964f0e0746abc5083a0b75fe3b937281cc4a9f7d1450ff98e86bc337881
CXXFLAGS="-fPIC"
pre_build() {
- sed -i '/march=native/d' Makefile
# fix wrong header import
vsed -i 's/<clxclient.h>/"clxclient.h"/' enumip.cc
# change pkgconf to pkg-config
From 95a4d41c6b27a22023750b33f3be9aaa925f5647 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:48:50 +0100
Subject: [PATCH 3/8] jaaa: fix build flags
update maintainer
---
srcpkgs/jaaa/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/jaaa/template b/srcpkgs/jaaa/template
index 27cf147efb2..964c8b85903 100644
--- a/srcpkgs/jaaa/template
+++ b/srcpkgs/jaaa/template
@@ -1,21 +1,20 @@
# Template file for 'jaaa'
pkgname=jaaa
version=0.9.2
-revision=1
+revision=2
build_wrksrc=source
build_style=gnu-makefile
hostmakedepends="pkg-config"
makedepends="zita-alsa-pcmi-devel clthreads-devel clxclient-devel freetype-devel
alsa-lib-devel fftw-devel jack-devel libX11-devel libXft-devel"
short_desc="JACK and ALSA Audio Analyser"
-maintainer="bluntphenomena <gregwyd@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="GPL-2.0-or-later"
homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
checksum=6cf55a3924694179d83e9d49f557896fcebdc1a7f89477e601caa2277ad7f3b3
pre_build() {
- sed -i '/march=native/d' Makefile
# change pkgconf to pkg-config
sed -i 's/pkgconf/pkg-config/' Makefile
}
From eaf37738cc20da251de921df356a07ab58e1ec24 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:49:54 +0100
Subject: [PATCH 4/8] zita-alsa-pcmi: fix build flags
---
srcpkgs/zita-alsa-pcmi/template | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/zita-alsa-pcmi/template b/srcpkgs/zita-alsa-pcmi/template
index 2090b4dec82..23ec1132120 100644
--- a/srcpkgs/zita-alsa-pcmi/template
+++ b/srcpkgs/zita-alsa-pcmi/template
@@ -1,7 +1,7 @@
# Template file for 'zita-alsa-pcmi'
pkgname=zita-alsa-pcmi
version=0.3.2
-revision=1
+revision=2
build_wrksrc="source"
build_style=gnu-makefile
make_install_args="LIBDIR=/usr/lib"
@@ -13,11 +13,7 @@ homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
checksum=1a1d9f7e373032bd5702382e4c923407911f4f791c449c0c0f027a725edba789
-CXXFLAGS="-fPIC -DPIC"
-
-pre_build() {
- sed -i '/march=native/d' Makefile
-}
+CXXFLAGS="-fPIC"
post_install() {
# add missing symlink
From 418373e37ce8d6d5456e4286122fbfef7f51abb5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:50:51 +0100
Subject: [PATCH 5/8] zita-at1: fix build flags
update maintainer
---
srcpkgs/zita-at1/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zita-at1/template b/srcpkgs/zita-at1/template
index c92d4c699e3..9325c5930ac 100644
--- a/srcpkgs/zita-at1/template
+++ b/srcpkgs/zita-at1/template
@@ -1,7 +1,7 @@
# Template file for 'zita-at1'
pkgname=zita-at1
version=0.6.2
-revision=2
+revision=3
build_wrksrc=source
build_style=gnu-makefile
make_build_args="PREFIX=/usr"
@@ -9,12 +9,14 @@ hostmakedepends="pkg-config"
makedepends="clxclient-devel clthreads-devel zita-resampler-devel cairo-devel
freetype-devel fftw-devel jack-devel libpng-devel libXft-devel libX11-devel"
short_desc="Audio autotuner for JACK"
-maintainer="bluntphenomena <gregwyd@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="GPL-3.0-or-later"
homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
checksum=19bb3ddc02b32d6ad15fdd928ee66c2e5bb5e4c7fe465c431e98c2fd83b1ae57
+CXXFLAGS="-ffast-math"
+
pre_build() {
# change pkgconf to pkg-config
vsed -e 's/pkgconf/pkg-config/' -i Makefile
From a60196b1e99972fea71e7b160c0427a05ee2bb0d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:51:23 +0100
Subject: [PATCH 6/8] zita-convolver: fix build flags
---
srcpkgs/zita-convolver/template | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/zita-convolver/template b/srcpkgs/zita-convolver/template
index 14cd977773a..fb0371162b0 100644
--- a/srcpkgs/zita-convolver/template
+++ b/srcpkgs/zita-convolver/template
@@ -1,24 +1,20 @@
# Template file for 'zita-convolver'
pkgname=zita-convolver
version=4.0.3
-revision=1
+revision=2
+build_wrksrc="source"
build_style=gnu-makefile
make_install_args="LIBDIR=/usr/lib"
hostmakedepends="pkg-config"
makedepends="fftw-devel"
-build_wrksrc="source"
-short_desc="A fast partitioned convolution engine library"
+short_desc="Fast partitioned convolution engine library"
maintainer="silvernode <mollusk@homebutter.com>"
license="GPL-3.0-or-later"
homepage="http://kokkinizita.linuxaudio.org/linuxaudio/"
distfiles="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
checksum=9aa11484fb30b4e6ef00c8a3281eebcfad9221e3937b1beb5fe21b748d89325f
-CXXFLAGS="-fPIC -DPIC"
-
-pre_build() {
- sed -i '/march=native/d' Makefile
-}
+CXXFLAGS="-fPIC -ffast-math -funroll-loops"
post_install() {
# add missing symlink
From 0738c437f4e5e0ab0a4b2997af3fb00992b5bea0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:57:45 +0100
Subject: [PATCH 7/8] zita-resampler: fix build flags
---
srcpkgs/zita-resampler/template | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/zita-resampler/template b/srcpkgs/zita-resampler/template
index 56bd795af99..f795d9ea328 100644
--- a/srcpkgs/zita-resampler/template
+++ b/srcpkgs/zita-resampler/template
@@ -1,23 +1,19 @@
# Template file for 'zita-resampler'
pkgname=zita-resampler
version=1.6.2
-revision=1
+revision=2
+build_wrksrc="source"
build_style=gnu-makefile
make_install_args="LIBDIR=/usr/lib"
hostmakedepends="pkg-config"
-build_wrksrc="source"
-short_desc="A library for resampling audio signals"
+short_desc="Library for resampling audio signals"
maintainer="silvernode <mollusk@homebutter.com>"
license="GPL-3.0-or-later"
homepage="http://kokkinizita.linuxaudio.org/linuxaudio/zita-resampler/resampler.html"
distfiles="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
checksum=233baefee297094514bfc9063e47f848e8138dc7c959d9cd957b36019b98c5d7
-CXXFLAGS="-fPIC -DPIC"
-
-pre_build() {
- sed -i '/march=native/d' Makefile
-}
+CXXFLAGS="-fPIC -ffast-math"
post_install() {
# add missing symlink
From 5d6db354b10058ec01820437781cb67e1ba04385 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:58:05 +0100
Subject: [PATCH 8/8] zita-resampler: update to 1.8.0.
enable SSE2 only for supported archs
---
srcpkgs/zita-resampler/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/zita-resampler/template b/srcpkgs/zita-resampler/template
index f795d9ea328..7edb548ff5e 100644
--- a/srcpkgs/zita-resampler/template
+++ b/srcpkgs/zita-resampler/template
@@ -1,7 +1,7 @@
# Template file for 'zita-resampler'
pkgname=zita-resampler
-version=1.6.2
-revision=2
+version=1.8.0
+revision=1
build_wrksrc="source"
build_style=gnu-makefile
make_install_args="LIBDIR=/usr/lib"
@@ -11,10 +11,17 @@ maintainer="silvernode <mollusk@homebutter.com>"
license="GPL-3.0-or-later"
homepage="http://kokkinizita.linuxaudio.org/linuxaudio/zita-resampler/resampler.html"
distfiles="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
-checksum=233baefee297094514bfc9063e47f848e8138dc7c959d9cd957b36019b98c5d7
+checksum=e5744f23c54dd15b3f783a687bd879eee2a690a4545a15b49c4cf037aa464aa2
CXXFLAGS="-fPIC -ffast-math"
+pre_build() {
+ case "${XBPS_TARGET_MACHINE}" in
+ x86_64*|i686*) ;;
+ *) vsed -i '/DENABLE_SSE2/d' Makefile ;;
+ esac
+}
+
post_install() {
# add missing symlink
ln -s libzita-resampler.so.${version} ${PKGDESTDIR}/usr/lib/libzita-resampler.so.${version%%.*}
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: Kokkinizita [WIP]
2021-02-17 3:42 [PR PATCH] Kokkinizita [WIP] tibequadorian
` (4 preceding siblings ...)
2021-02-17 10:39 ` [PR PATCH] [Updated] " tibequadorian
@ 2021-02-17 10:57 ` tibequadorian
2021-02-17 11:37 ` tibequadorian
` (18 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: tibequadorian @ 2021-02-17 10:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 368 bytes --]
New comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/28809#issuecomment-780475729
Comment:
@Chocimier ah, thank you for explaining! I've updated it now.
But not passing `-march=native` causes the build on i686 to fail. Probably because SSE2 is not available on all i686 platforms, but on the one that CI uses?
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: Kokkinizita [WIP]
2021-02-17 3:42 [PR PATCH] Kokkinizita [WIP] tibequadorian
` (5 preceding siblings ...)
2021-02-17 10:57 ` tibequadorian
@ 2021-02-17 11:37 ` tibequadorian
2021-02-17 11:43 ` tibequadorian
` (17 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: tibequadorian @ 2021-02-17 11:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 270 bytes --]
New comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/28809#issuecomment-780497928
Comment:
Okay I think I got it: It has to be compiled with `-msse2` but this would throw illegal instructions on some i686 hardware.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: Kokkinizita [WIP]
2021-02-17 3:42 [PR PATCH] Kokkinizita [WIP] tibequadorian
` (6 preceding siblings ...)
2021-02-17 11:37 ` tibequadorian
@ 2021-02-17 11:43 ` tibequadorian
2021-02-17 12:03 ` [PR PATCH] [Updated] " tibequadorian
` (16 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: tibequadorian @ 2021-02-17 11:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 385 bytes --]
New comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/28809#issuecomment-780475729
Comment:
@Chocimier ah, thank you for explaining! I've updated it now.
But not passing `-march=native` causes the `zita-resampler` build on i686 to fail. Probably because SSE2 is not available on all i686 platforms, but on the one that CI uses?
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR PATCH] [Updated] Kokkinizita [WIP]
2021-02-17 3:42 [PR PATCH] Kokkinizita [WIP] tibequadorian
` (7 preceding siblings ...)
2021-02-17 11:43 ` tibequadorian
@ 2021-02-17 12:03 ` tibequadorian
2021-02-17 12:14 ` tibequadorian
` (15 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: tibequadorian @ 2021-02-17 12:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1973 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages kokkinizita
https://github.com/void-linux/void-packages/pull/28809
Kokkinizita [WIP]
<!-- 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
Setting CXXFLAGS in Makefile doesn't seem to work anymore since [void-packages#2325ae1](https://github.com/void-linux/void-packages/commit/2325ae153bd6011682782a6712f87338a9747ac7) so we need to set them in the template.
I've adapted them to those in the Makefile (e.g. `-ffast-math`) and enabled `-march=native` for non-cross builds.
I'll have to test this though.
<!--
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/28809.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kokkinizita-28809.patch --]
[-- Type: text/x-diff, Size: 10775 bytes --]
From 35c2d461fd2f0b3b6514eca7dd56ff5d85bad7d1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:47:52 +0100
Subject: [PATCH 1/8] clthreads: fix build flags
update maintainer
---
srcpkgs/clthreads/template | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/clthreads/template b/srcpkgs/clthreads/template
index 5bd8b35621d..e3be0e9ded6 100644
--- a/srcpkgs/clthreads/template
+++ b/srcpkgs/clthreads/template
@@ -1,12 +1,12 @@
# Template file for 'clthreads'
pkgname=clthreads
version=2.4.2
-revision=1
+revision=2
build_wrksrc=source
build_style=gnu-makefile
make_install_args="LIBDIR=/usr/lib"
short_desc="C++ wrapper library around the POSIX threads API"
-maintainer="bluntphenomena <gregwyd@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="LGPL-2.1-or-later"
homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
@@ -14,10 +14,6 @@ checksum=c659b14c0c4055c44432cb83060b95d30ae0c1ecc6f50d73968e239c100f7a31
CXXFLAGS="-fPIC"
-pre_build() {
- vsed -i Makefile -e '/march=native/d'
-}
-
pre_install() {
# fix wrong path
vsed -i 's/$(DESTDIR)$(PREFIX)\//$(DESTDIR)/g' Makefile
From bcdca6e5e2e8c058bb1eb237b3a4e050e9b723c2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:48:28 +0100
Subject: [PATCH 2/8] clxclient: fix build flags
update maintainer
---
srcpkgs/clxclient/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clxclient/template b/srcpkgs/clxclient/template
index 6391174621a..53ebd71d980 100644
--- a/srcpkgs/clxclient/template
+++ b/srcpkgs/clxclient/template
@@ -1,14 +1,14 @@
# Template file for 'clxclient'
pkgname=clxclient
version=3.9.2
-revision=1
+revision=2
build_wrksrc=source
build_style=gnu-makefile
make_install_args="LIBDIR=/usr/lib"
hostmakedepends="pkg-config"
makedepends="libX11-devel libXft-devel clthreads-devel freetype-devel"
short_desc="C++ wrapper library around the X Window System API"
-maintainer="bluntphenomena <gregwyd@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="LGPL-2.1-or-later"
homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
@@ -17,7 +17,6 @@ checksum=8501e964f0e0746abc5083a0b75fe3b937281cc4a9f7d1450ff98e86bc337881
CXXFLAGS="-fPIC"
pre_build() {
- sed -i '/march=native/d' Makefile
# fix wrong header import
vsed -i 's/<clxclient.h>/"clxclient.h"/' enumip.cc
# change pkgconf to pkg-config
From 95a4d41c6b27a22023750b33f3be9aaa925f5647 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:48:50 +0100
Subject: [PATCH 3/8] jaaa: fix build flags
update maintainer
---
srcpkgs/jaaa/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/jaaa/template b/srcpkgs/jaaa/template
index 27cf147efb2..964c8b85903 100644
--- a/srcpkgs/jaaa/template
+++ b/srcpkgs/jaaa/template
@@ -1,21 +1,20 @@
# Template file for 'jaaa'
pkgname=jaaa
version=0.9.2
-revision=1
+revision=2
build_wrksrc=source
build_style=gnu-makefile
hostmakedepends="pkg-config"
makedepends="zita-alsa-pcmi-devel clthreads-devel clxclient-devel freetype-devel
alsa-lib-devel fftw-devel jack-devel libX11-devel libXft-devel"
short_desc="JACK and ALSA Audio Analyser"
-maintainer="bluntphenomena <gregwyd@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="GPL-2.0-or-later"
homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
checksum=6cf55a3924694179d83e9d49f557896fcebdc1a7f89477e601caa2277ad7f3b3
pre_build() {
- sed -i '/march=native/d' Makefile
# change pkgconf to pkg-config
sed -i 's/pkgconf/pkg-config/' Makefile
}
From eaf37738cc20da251de921df356a07ab58e1ec24 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:49:54 +0100
Subject: [PATCH 4/8] zita-alsa-pcmi: fix build flags
---
srcpkgs/zita-alsa-pcmi/template | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/zita-alsa-pcmi/template b/srcpkgs/zita-alsa-pcmi/template
index 2090b4dec82..23ec1132120 100644
--- a/srcpkgs/zita-alsa-pcmi/template
+++ b/srcpkgs/zita-alsa-pcmi/template
@@ -1,7 +1,7 @@
# Template file for 'zita-alsa-pcmi'
pkgname=zita-alsa-pcmi
version=0.3.2
-revision=1
+revision=2
build_wrksrc="source"
build_style=gnu-makefile
make_install_args="LIBDIR=/usr/lib"
@@ -13,11 +13,7 @@ homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
checksum=1a1d9f7e373032bd5702382e4c923407911f4f791c449c0c0f027a725edba789
-CXXFLAGS="-fPIC -DPIC"
-
-pre_build() {
- sed -i '/march=native/d' Makefile
-}
+CXXFLAGS="-fPIC"
post_install() {
# add missing symlink
From 418373e37ce8d6d5456e4286122fbfef7f51abb5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:50:51 +0100
Subject: [PATCH 5/8] zita-at1: fix build flags
update maintainer
---
srcpkgs/zita-at1/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zita-at1/template b/srcpkgs/zita-at1/template
index c92d4c699e3..9325c5930ac 100644
--- a/srcpkgs/zita-at1/template
+++ b/srcpkgs/zita-at1/template
@@ -1,7 +1,7 @@
# Template file for 'zita-at1'
pkgname=zita-at1
version=0.6.2
-revision=2
+revision=3
build_wrksrc=source
build_style=gnu-makefile
make_build_args="PREFIX=/usr"
@@ -9,12 +9,14 @@ hostmakedepends="pkg-config"
makedepends="clxclient-devel clthreads-devel zita-resampler-devel cairo-devel
freetype-devel fftw-devel jack-devel libpng-devel libXft-devel libX11-devel"
short_desc="Audio autotuner for JACK"
-maintainer="bluntphenomena <gregwyd@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="GPL-3.0-or-later"
homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
checksum=19bb3ddc02b32d6ad15fdd928ee66c2e5bb5e4c7fe465c431e98c2fd83b1ae57
+CXXFLAGS="-ffast-math"
+
pre_build() {
# change pkgconf to pkg-config
vsed -e 's/pkgconf/pkg-config/' -i Makefile
From a60196b1e99972fea71e7b160c0427a05ee2bb0d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:51:23 +0100
Subject: [PATCH 6/8] zita-convolver: fix build flags
---
srcpkgs/zita-convolver/template | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/zita-convolver/template b/srcpkgs/zita-convolver/template
index 14cd977773a..fb0371162b0 100644
--- a/srcpkgs/zita-convolver/template
+++ b/srcpkgs/zita-convolver/template
@@ -1,24 +1,20 @@
# Template file for 'zita-convolver'
pkgname=zita-convolver
version=4.0.3
-revision=1
+revision=2
+build_wrksrc="source"
build_style=gnu-makefile
make_install_args="LIBDIR=/usr/lib"
hostmakedepends="pkg-config"
makedepends="fftw-devel"
-build_wrksrc="source"
-short_desc="A fast partitioned convolution engine library"
+short_desc="Fast partitioned convolution engine library"
maintainer="silvernode <mollusk@homebutter.com>"
license="GPL-3.0-or-later"
homepage="http://kokkinizita.linuxaudio.org/linuxaudio/"
distfiles="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
checksum=9aa11484fb30b4e6ef00c8a3281eebcfad9221e3937b1beb5fe21b748d89325f
-CXXFLAGS="-fPIC -DPIC"
-
-pre_build() {
- sed -i '/march=native/d' Makefile
-}
+CXXFLAGS="-fPIC -ffast-math -funroll-loops"
post_install() {
# add missing symlink
From 0738c437f4e5e0ab0a4b2997af3fb00992b5bea0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:57:45 +0100
Subject: [PATCH 7/8] zita-resampler: fix build flags
---
srcpkgs/zita-resampler/template | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/zita-resampler/template b/srcpkgs/zita-resampler/template
index 56bd795af99..f795d9ea328 100644
--- a/srcpkgs/zita-resampler/template
+++ b/srcpkgs/zita-resampler/template
@@ -1,23 +1,19 @@
# Template file for 'zita-resampler'
pkgname=zita-resampler
version=1.6.2
-revision=1
+revision=2
+build_wrksrc="source"
build_style=gnu-makefile
make_install_args="LIBDIR=/usr/lib"
hostmakedepends="pkg-config"
-build_wrksrc="source"
-short_desc="A library for resampling audio signals"
+short_desc="Library for resampling audio signals"
maintainer="silvernode <mollusk@homebutter.com>"
license="GPL-3.0-or-later"
homepage="http://kokkinizita.linuxaudio.org/linuxaudio/zita-resampler/resampler.html"
distfiles="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
checksum=233baefee297094514bfc9063e47f848e8138dc7c959d9cd957b36019b98c5d7
-CXXFLAGS="-fPIC -DPIC"
-
-pre_build() {
- sed -i '/march=native/d' Makefile
-}
+CXXFLAGS="-fPIC -ffast-math"
post_install() {
# add missing symlink
From c5559986b387f58eed2a8f92fd912de43b4b67b2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:58:05 +0100
Subject: [PATCH 8/8] zita-resampler: update to 1.8.0.
enable SSE2 only for x86_64
---
srcpkgs/zita-resampler/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/zita-resampler/template b/srcpkgs/zita-resampler/template
index f795d9ea328..761247870ee 100644
--- a/srcpkgs/zita-resampler/template
+++ b/srcpkgs/zita-resampler/template
@@ -1,7 +1,7 @@
# Template file for 'zita-resampler'
pkgname=zita-resampler
-version=1.6.2
-revision=2
+version=1.8.0
+revision=1
build_wrksrc="source"
build_style=gnu-makefile
make_install_args="LIBDIR=/usr/lib"
@@ -11,10 +11,17 @@ maintainer="silvernode <mollusk@homebutter.com>"
license="GPL-3.0-or-later"
homepage="http://kokkinizita.linuxaudio.org/linuxaudio/zita-resampler/resampler.html"
distfiles="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
-checksum=233baefee297094514bfc9063e47f848e8138dc7c959d9cd957b36019b98c5d7
+checksum=e5744f23c54dd15b3f783a687bd879eee2a690a4545a15b49c4cf037aa464aa2
CXXFLAGS="-fPIC -ffast-math"
+pre_build() {
+ case "${XBPS_TARGET_MACHINE}" in
+ x86_64*) ;;
+ *) vsed -i '/DENABLE_SSE2/d' Makefile ;;
+ esac
+}
+
post_install() {
# add missing symlink
ln -s libzita-resampler.so.${version} ${PKGDESTDIR}/usr/lib/libzita-resampler.so.${version%%.*}
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: Kokkinizita [WIP]
2021-02-17 3:42 [PR PATCH] Kokkinizita [WIP] tibequadorian
` (8 preceding siblings ...)
2021-02-17 12:03 ` [PR PATCH] [Updated] " tibequadorian
@ 2021-02-17 12:14 ` tibequadorian
2021-02-19 5:12 ` [PR REVIEW] Kokkinizita ericonr
` (14 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: tibequadorian @ 2021-02-17 12:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 174 bytes --]
New comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/28809#issuecomment-780516515
Comment:
Disabled SSE2 for i686 now.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR REVIEW] Kokkinizita
2021-02-17 3:42 [PR PATCH] Kokkinizita [WIP] tibequadorian
` (9 preceding siblings ...)
2021-02-17 12:14 ` tibequadorian
@ 2021-02-19 5:12 ` ericonr
2021-02-19 10:02 ` tibequadorian
` (13 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: ericonr @ 2021-02-19 5:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 210 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28809#discussion_r578933835
Comment:
I assume they removed `-march=native` from their own makefiles?
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR REVIEW] Kokkinizita
2021-02-17 3:42 [PR PATCH] Kokkinizita [WIP] tibequadorian
` (10 preceding siblings ...)
2021-02-19 5:12 ` [PR REVIEW] Kokkinizita ericonr
@ 2021-02-19 10:02 ` tibequadorian
2021-02-19 10:04 ` tibequadorian
` (12 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: tibequadorian @ 2021-02-19 10:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 280 bytes --]
New review comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/28809#discussion_r579066922
Comment:
no but i find it misleading to keep these patches since it doesnt affect the build process (look my initial comment on this PR)
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR REVIEW] Kokkinizita
2021-02-17 3:42 [PR PATCH] Kokkinizita [WIP] tibequadorian
` (11 preceding siblings ...)
2021-02-19 10:02 ` tibequadorian
@ 2021-02-19 10:04 ` tibequadorian
2021-02-19 22:25 ` tibequadorian
` (11 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: tibequadorian @ 2021-02-19 10:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 281 bytes --]
New review comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/28809#discussion_r579066922
Comment:
no but i find it misleading to keep these patches since they don't affect the build process (look my initial comment on this PR)
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR REVIEW] Kokkinizita
2021-02-17 3:42 [PR PATCH] Kokkinizita [WIP] tibequadorian
` (12 preceding siblings ...)
2021-02-19 10:04 ` tibequadorian
@ 2021-02-19 22:25 ` tibequadorian
2021-02-19 23:51 ` ericonr
` (10 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: tibequadorian @ 2021-02-19 22:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 252 bytes --]
New review comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/28809#discussion_r579511146
Comment:
same as https://github.com/void-linux/void-packages/commit/c9f3bfc141fe09072d0339417f808faacd3a70f6
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR REVIEW] Kokkinizita
2021-02-17 3:42 [PR PATCH] Kokkinizita [WIP] tibequadorian
` (13 preceding siblings ...)
2021-02-19 22:25 ` tibequadorian
@ 2021-02-19 23:51 ` ericonr
2021-02-19 23:53 ` sgn
` (9 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: ericonr @ 2021-02-19 23:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 261 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28809#discussion_r579542663
Comment:
Sure, I was missing that piece of context, since the vsed doesn't make it clear it was dealing with those flags :)
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR REVIEW] Kokkinizita
2021-02-17 3:42 [PR PATCH] Kokkinizita [WIP] tibequadorian
` (14 preceding siblings ...)
2021-02-19 23:51 ` ericonr
@ 2021-02-19 23:53 ` sgn
2021-02-20 0:03 ` ericonr
` (8 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: sgn @ 2021-02-19 23:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 203 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/28809#discussion_r579543370
Comment:
So, the change won't do anything? I prefer to left it there.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR REVIEW] Kokkinizita
2021-02-17 3:42 [PR PATCH] Kokkinizita [WIP] tibequadorian
` (15 preceding siblings ...)
2021-02-19 23:53 ` sgn
@ 2021-02-20 0:03 ` ericonr
2021-02-20 0:56 ` tibequadorian
` (7 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: ericonr @ 2021-02-20 0:03 UTC (permalink / raw)
To: ml
[-- 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/28809#discussion_r579545783
Comment:
It avoids carrying changes which are no longer necessary...
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR REVIEW] Kokkinizita
2021-02-17 3:42 [PR PATCH] Kokkinizita [WIP] tibequadorian
` (16 preceding siblings ...)
2021-02-20 0:03 ` ericonr
@ 2021-02-20 0:56 ` tibequadorian
2021-02-24 4:16 ` ericonr
` (6 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: tibequadorian @ 2021-02-20 0:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 330 bytes --]
New review comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/28809#discussion_r579557691
Comment:
I agree @ericonr. I think part of the purpose of https://github.com/void-linux/void-packages/commit/2325ae153bd6011682782a6712f87338a9747ac7 was to eliminate patches like these?
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR REVIEW] Kokkinizita
2021-02-17 3:42 [PR PATCH] Kokkinizita [WIP] tibequadorian
` (17 preceding siblings ...)
2021-02-20 0:56 ` tibequadorian
@ 2021-02-24 4:16 ` ericonr
2021-02-25 8:48 ` [PR PATCH] [Updated] Kokkinizita tibequadorian
` (5 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: ericonr @ 2021-02-24 4:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 252 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28809#discussion_r581611112
Comment:
IMO you can depend on SSE2: https://github.com/void-linux/void-packages/pull/28825#issuecomment-781502744
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR PATCH] [Updated] Kokkinizita
2021-02-17 3:42 [PR PATCH] Kokkinizita [WIP] tibequadorian
` (18 preceding siblings ...)
2021-02-24 4:16 ` ericonr
@ 2021-02-25 8:48 ` tibequadorian
2021-02-25 8:50 ` [PR REVIEW] Kokkinizita tibequadorian
` (4 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: tibequadorian @ 2021-02-25 8:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1933 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages kokkinizita
https://github.com/void-linux/void-packages/pull/28809
Kokkinizita
<!-- 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?
- [x] 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
Setting CXXFLAGS in Makefile doesn't seem to work anymore since [void-packages#2325ae1](https://github.com/void-linux/void-packages/commit/2325ae153bd6011682782a6712f87338a9747ac7) so we need to set them in the template.
I've adapted them to those in the Makefile (e.g. `-ffast-math`) ~and enabled -march=native for non-cross builds~.
<!--
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/28809.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kokkinizita-28809.patch --]
[-- Type: text/x-diff, Size: 9064 bytes --]
From bf5ca6077e3d3d99dcf5ebf1c7185672d9b17952 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:47:52 +0100
Subject: [PATCH 1/7] clthreads: remove build flags fix
also update maintainer
---
srcpkgs/clthreads/template | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/srcpkgs/clthreads/template b/srcpkgs/clthreads/template
index 5bd8b35621d..ccc157d80e9 100644
--- a/srcpkgs/clthreads/template
+++ b/srcpkgs/clthreads/template
@@ -6,7 +6,7 @@ build_wrksrc=source
build_style=gnu-makefile
make_install_args="LIBDIR=/usr/lib"
short_desc="C++ wrapper library around the POSIX threads API"
-maintainer="bluntphenomena <gregwyd@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="LGPL-2.1-or-later"
homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
@@ -14,10 +14,6 @@ checksum=c659b14c0c4055c44432cb83060b95d30ae0c1ecc6f50d73968e239c100f7a31
CXXFLAGS="-fPIC"
-pre_build() {
- vsed -i Makefile -e '/march=native/d'
-}
-
pre_install() {
# fix wrong path
vsed -i 's/$(DESTDIR)$(PREFIX)\//$(DESTDIR)/g' Makefile
From fee72168bb884e35bc3ebfc08a09cbe7bb96b38d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:48:28 +0100
Subject: [PATCH 2/7] clxclient: remove build flags fix
also update maintainer
---
srcpkgs/clxclient/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/clxclient/template b/srcpkgs/clxclient/template
index 6391174621a..31efa292c1d 100644
--- a/srcpkgs/clxclient/template
+++ b/srcpkgs/clxclient/template
@@ -8,7 +8,7 @@ make_install_args="LIBDIR=/usr/lib"
hostmakedepends="pkg-config"
makedepends="libX11-devel libXft-devel clthreads-devel freetype-devel"
short_desc="C++ wrapper library around the X Window System API"
-maintainer="bluntphenomena <gregwyd@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="LGPL-2.1-or-later"
homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
@@ -17,7 +17,6 @@ checksum=8501e964f0e0746abc5083a0b75fe3b937281cc4a9f7d1450ff98e86bc337881
CXXFLAGS="-fPIC"
pre_build() {
- sed -i '/march=native/d' Makefile
# fix wrong header import
vsed -i 's/<clxclient.h>/"clxclient.h"/' enumip.cc
# change pkgconf to pkg-config
From f27b54741fd38dcb13e7118786f3d234b40549c5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:48:50 +0100
Subject: [PATCH 3/7] jaaa: remove build flags fix
also update maintainer
---
srcpkgs/jaaa/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/jaaa/template b/srcpkgs/jaaa/template
index 27cf147efb2..d27eed8e701 100644
--- a/srcpkgs/jaaa/template
+++ b/srcpkgs/jaaa/template
@@ -8,14 +8,13 @@ hostmakedepends="pkg-config"
makedepends="zita-alsa-pcmi-devel clthreads-devel clxclient-devel freetype-devel
alsa-lib-devel fftw-devel jack-devel libX11-devel libXft-devel"
short_desc="JACK and ALSA Audio Analyser"
-maintainer="bluntphenomena <gregwyd@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="GPL-2.0-or-later"
homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
checksum=6cf55a3924694179d83e9d49f557896fcebdc1a7f89477e601caa2277ad7f3b3
pre_build() {
- sed -i '/march=native/d' Makefile
# change pkgconf to pkg-config
sed -i 's/pkgconf/pkg-config/' Makefile
}
From 6e1e5035c779b0919ae47e8683f06850e7c3f83a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:49:54 +0100
Subject: [PATCH 4/7] zita-alsa-pcmi: remove build flags fix
---
srcpkgs/zita-alsa-pcmi/template | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/srcpkgs/zita-alsa-pcmi/template b/srcpkgs/zita-alsa-pcmi/template
index 2090b4dec82..908642f6e3f 100644
--- a/srcpkgs/zita-alsa-pcmi/template
+++ b/srcpkgs/zita-alsa-pcmi/template
@@ -13,11 +13,7 @@ homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
checksum=1a1d9f7e373032bd5702382e4c923407911f4f791c449c0c0f027a725edba789
-CXXFLAGS="-fPIC -DPIC"
-
-pre_build() {
- sed -i '/march=native/d' Makefile
-}
+CXXFLAGS="-fPIC"
post_install() {
# add missing symlink
From b2ed8d754098039b95eb64c7731efe808b9cb326 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:50:51 +0100
Subject: [PATCH 5/7] zita-at1: enable recommended build flags
also update maintainer
---
srcpkgs/zita-at1/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zita-at1/template b/srcpkgs/zita-at1/template
index c92d4c699e3..9325c5930ac 100644
--- a/srcpkgs/zita-at1/template
+++ b/srcpkgs/zita-at1/template
@@ -1,7 +1,7 @@
# Template file for 'zita-at1'
pkgname=zita-at1
version=0.6.2
-revision=2
+revision=3
build_wrksrc=source
build_style=gnu-makefile
make_build_args="PREFIX=/usr"
@@ -9,12 +9,14 @@ hostmakedepends="pkg-config"
makedepends="clxclient-devel clthreads-devel zita-resampler-devel cairo-devel
freetype-devel fftw-devel jack-devel libpng-devel libXft-devel libX11-devel"
short_desc="Audio autotuner for JACK"
-maintainer="bluntphenomena <gregwyd@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="GPL-3.0-or-later"
homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
checksum=19bb3ddc02b32d6ad15fdd928ee66c2e5bb5e4c7fe465c431e98c2fd83b1ae57
+CXXFLAGS="-ffast-math"
+
pre_build() {
# change pkgconf to pkg-config
vsed -e 's/pkgconf/pkg-config/' -i Makefile
From 257edc25c85098fe2504348bbae4f4e4239270dd Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:51:23 +0100
Subject: [PATCH 6/7] zita-convolver: remove build flags fix
and enable recommended build flags
---
srcpkgs/zita-convolver/template | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/zita-convolver/template b/srcpkgs/zita-convolver/template
index 14cd977773a..fb0371162b0 100644
--- a/srcpkgs/zita-convolver/template
+++ b/srcpkgs/zita-convolver/template
@@ -1,24 +1,20 @@
# Template file for 'zita-convolver'
pkgname=zita-convolver
version=4.0.3
-revision=1
+revision=2
+build_wrksrc="source"
build_style=gnu-makefile
make_install_args="LIBDIR=/usr/lib"
hostmakedepends="pkg-config"
makedepends="fftw-devel"
-build_wrksrc="source"
-short_desc="A fast partitioned convolution engine library"
+short_desc="Fast partitioned convolution engine library"
maintainer="silvernode <mollusk@homebutter.com>"
license="GPL-3.0-or-later"
homepage="http://kokkinizita.linuxaudio.org/linuxaudio/"
distfiles="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
checksum=9aa11484fb30b4e6ef00c8a3281eebcfad9221e3937b1beb5fe21b748d89325f
-CXXFLAGS="-fPIC -DPIC"
-
-pre_build() {
- sed -i '/march=native/d' Makefile
-}
+CXXFLAGS="-fPIC -ffast-math -funroll-loops"
post_install() {
# add missing symlink
From 412f6d64303e74a7cdde87212dacff9acd122843 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:57:45 +0100
Subject: [PATCH 7/7] zita-resampler: update to 1.8.0.
also remove build flags fix
and enable recommended build flags
---
srcpkgs/zita-resampler/template | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/zita-resampler/template b/srcpkgs/zita-resampler/template
index 56bd795af99..c4075abef3b 100644
--- a/srcpkgs/zita-resampler/template
+++ b/srcpkgs/zita-resampler/template
@@ -1,22 +1,25 @@
# Template file for 'zita-resampler'
pkgname=zita-resampler
-version=1.6.2
+version=1.8.0
revision=1
+build_wrksrc="source"
build_style=gnu-makefile
make_install_args="LIBDIR=/usr/lib"
hostmakedepends="pkg-config"
-build_wrksrc="source"
-short_desc="A library for resampling audio signals"
+short_desc="Library for resampling audio signals"
maintainer="silvernode <mollusk@homebutter.com>"
license="GPL-3.0-or-later"
homepage="http://kokkinizita.linuxaudio.org/linuxaudio/zita-resampler/resampler.html"
distfiles="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
-checksum=233baefee297094514bfc9063e47f848e8138dc7c959d9cd957b36019b98c5d7
+checksum=e5744f23c54dd15b3f783a687bd879eee2a690a4545a15b49c4cf037aa464aa2
-CXXFLAGS="-fPIC -DPIC"
+CXXFLAGS="-fPIC -ffast-math"
pre_build() {
- sed -i '/march=native/d' Makefile
+ case "${XBPS_TARGET_MACHINE}" in
+ x86_64*|i686*) CXXFLAGS=" -msse2" ;;
+ *) vsed -i '/DENABLE_SSE2/d' Makefile ;;
+ esac
}
post_install() {
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR REVIEW] Kokkinizita
2021-02-17 3:42 [PR PATCH] Kokkinizita [WIP] tibequadorian
` (19 preceding siblings ...)
2021-02-25 8:48 ` [PR PATCH] [Updated] Kokkinizita tibequadorian
@ 2021-02-25 8:50 ` tibequadorian
2021-02-25 8:51 ` [PR PATCH] [Updated] Kokkinizita tibequadorian
` (3 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: tibequadorian @ 2021-02-25 8:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 177 bytes --]
New review comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/28809#discussion_r582647637
Comment:
oh I didn't know that :D
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR PATCH] [Updated] Kokkinizita
2021-02-17 3:42 [PR PATCH] Kokkinizita [WIP] tibequadorian
` (20 preceding siblings ...)
2021-02-25 8:50 ` [PR REVIEW] Kokkinizita tibequadorian
@ 2021-02-25 8:51 ` tibequadorian
2021-02-25 8:59 ` Kokkinizita tibequadorian
` (2 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: tibequadorian @ 2021-02-25 8:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1933 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages kokkinizita
https://github.com/void-linux/void-packages/pull/28809
Kokkinizita
<!-- 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?
- [x] 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
Setting CXXFLAGS in Makefile doesn't seem to work anymore since [void-packages#2325ae1](https://github.com/void-linux/void-packages/commit/2325ae153bd6011682782a6712f87338a9747ac7) so we need to set them in the template.
I've adapted them to those in the Makefile (e.g. `-ffast-math`) ~and enabled -march=native for non-cross builds~.
<!--
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/28809.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kokkinizita-28809.patch --]
[-- Type: text/x-diff, Size: 9065 bytes --]
From bf5ca6077e3d3d99dcf5ebf1c7185672d9b17952 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:47:52 +0100
Subject: [PATCH 1/7] clthreads: remove build flags fix
also update maintainer
---
srcpkgs/clthreads/template | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/srcpkgs/clthreads/template b/srcpkgs/clthreads/template
index 5bd8b35621d..ccc157d80e9 100644
--- a/srcpkgs/clthreads/template
+++ b/srcpkgs/clthreads/template
@@ -6,7 +6,7 @@ build_wrksrc=source
build_style=gnu-makefile
make_install_args="LIBDIR=/usr/lib"
short_desc="C++ wrapper library around the POSIX threads API"
-maintainer="bluntphenomena <gregwyd@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="LGPL-2.1-or-later"
homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
@@ -14,10 +14,6 @@ checksum=c659b14c0c4055c44432cb83060b95d30ae0c1ecc6f50d73968e239c100f7a31
CXXFLAGS="-fPIC"
-pre_build() {
- vsed -i Makefile -e '/march=native/d'
-}
-
pre_install() {
# fix wrong path
vsed -i 's/$(DESTDIR)$(PREFIX)\//$(DESTDIR)/g' Makefile
From fee72168bb884e35bc3ebfc08a09cbe7bb96b38d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:48:28 +0100
Subject: [PATCH 2/7] clxclient: remove build flags fix
also update maintainer
---
srcpkgs/clxclient/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/clxclient/template b/srcpkgs/clxclient/template
index 6391174621a..31efa292c1d 100644
--- a/srcpkgs/clxclient/template
+++ b/srcpkgs/clxclient/template
@@ -8,7 +8,7 @@ make_install_args="LIBDIR=/usr/lib"
hostmakedepends="pkg-config"
makedepends="libX11-devel libXft-devel clthreads-devel freetype-devel"
short_desc="C++ wrapper library around the X Window System API"
-maintainer="bluntphenomena <gregwyd@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="LGPL-2.1-or-later"
homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
@@ -17,7 +17,6 @@ checksum=8501e964f0e0746abc5083a0b75fe3b937281cc4a9f7d1450ff98e86bc337881
CXXFLAGS="-fPIC"
pre_build() {
- sed -i '/march=native/d' Makefile
# fix wrong header import
vsed -i 's/<clxclient.h>/"clxclient.h"/' enumip.cc
# change pkgconf to pkg-config
From f27b54741fd38dcb13e7118786f3d234b40549c5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:48:50 +0100
Subject: [PATCH 3/7] jaaa: remove build flags fix
also update maintainer
---
srcpkgs/jaaa/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/jaaa/template b/srcpkgs/jaaa/template
index 27cf147efb2..d27eed8e701 100644
--- a/srcpkgs/jaaa/template
+++ b/srcpkgs/jaaa/template
@@ -8,14 +8,13 @@ hostmakedepends="pkg-config"
makedepends="zita-alsa-pcmi-devel clthreads-devel clxclient-devel freetype-devel
alsa-lib-devel fftw-devel jack-devel libX11-devel libXft-devel"
short_desc="JACK and ALSA Audio Analyser"
-maintainer="bluntphenomena <gregwyd@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="GPL-2.0-or-later"
homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
checksum=6cf55a3924694179d83e9d49f557896fcebdc1a7f89477e601caa2277ad7f3b3
pre_build() {
- sed -i '/march=native/d' Makefile
# change pkgconf to pkg-config
sed -i 's/pkgconf/pkg-config/' Makefile
}
From 6e1e5035c779b0919ae47e8683f06850e7c3f83a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:49:54 +0100
Subject: [PATCH 4/7] zita-alsa-pcmi: remove build flags fix
---
srcpkgs/zita-alsa-pcmi/template | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/srcpkgs/zita-alsa-pcmi/template b/srcpkgs/zita-alsa-pcmi/template
index 2090b4dec82..908642f6e3f 100644
--- a/srcpkgs/zita-alsa-pcmi/template
+++ b/srcpkgs/zita-alsa-pcmi/template
@@ -13,11 +13,7 @@ homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
checksum=1a1d9f7e373032bd5702382e4c923407911f4f791c449c0c0f027a725edba789
-CXXFLAGS="-fPIC -DPIC"
-
-pre_build() {
- sed -i '/march=native/d' Makefile
-}
+CXXFLAGS="-fPIC"
post_install() {
# add missing symlink
From b2ed8d754098039b95eb64c7731efe808b9cb326 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:50:51 +0100
Subject: [PATCH 5/7] zita-at1: enable recommended build flags
also update maintainer
---
srcpkgs/zita-at1/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zita-at1/template b/srcpkgs/zita-at1/template
index c92d4c699e3..9325c5930ac 100644
--- a/srcpkgs/zita-at1/template
+++ b/srcpkgs/zita-at1/template
@@ -1,7 +1,7 @@
# Template file for 'zita-at1'
pkgname=zita-at1
version=0.6.2
-revision=2
+revision=3
build_wrksrc=source
build_style=gnu-makefile
make_build_args="PREFIX=/usr"
@@ -9,12 +9,14 @@ hostmakedepends="pkg-config"
makedepends="clxclient-devel clthreads-devel zita-resampler-devel cairo-devel
freetype-devel fftw-devel jack-devel libpng-devel libXft-devel libX11-devel"
short_desc="Audio autotuner for JACK"
-maintainer="bluntphenomena <gregwyd@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="GPL-3.0-or-later"
homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
checksum=19bb3ddc02b32d6ad15fdd928ee66c2e5bb5e4c7fe465c431e98c2fd83b1ae57
+CXXFLAGS="-ffast-math"
+
pre_build() {
# change pkgconf to pkg-config
vsed -e 's/pkgconf/pkg-config/' -i Makefile
From 257edc25c85098fe2504348bbae4f4e4239270dd Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:51:23 +0100
Subject: [PATCH 6/7] zita-convolver: remove build flags fix
and enable recommended build flags
---
srcpkgs/zita-convolver/template | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/zita-convolver/template b/srcpkgs/zita-convolver/template
index 14cd977773a..fb0371162b0 100644
--- a/srcpkgs/zita-convolver/template
+++ b/srcpkgs/zita-convolver/template
@@ -1,24 +1,20 @@
# Template file for 'zita-convolver'
pkgname=zita-convolver
version=4.0.3
-revision=1
+revision=2
+build_wrksrc="source"
build_style=gnu-makefile
make_install_args="LIBDIR=/usr/lib"
hostmakedepends="pkg-config"
makedepends="fftw-devel"
-build_wrksrc="source"
-short_desc="A fast partitioned convolution engine library"
+short_desc="Fast partitioned convolution engine library"
maintainer="silvernode <mollusk@homebutter.com>"
license="GPL-3.0-or-later"
homepage="http://kokkinizita.linuxaudio.org/linuxaudio/"
distfiles="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
checksum=9aa11484fb30b4e6ef00c8a3281eebcfad9221e3937b1beb5fe21b748d89325f
-CXXFLAGS="-fPIC -DPIC"
-
-pre_build() {
- sed -i '/march=native/d' Makefile
-}
+CXXFLAGS="-fPIC -ffast-math -funroll-loops"
post_install() {
# add missing symlink
From 5a095603cbc0cb64b037345aa3eb4db8a1b836b6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:57:45 +0100
Subject: [PATCH 7/7] zita-resampler: update to 1.8.0.
also remove build flags fix
and enable recommended build flags
---
srcpkgs/zita-resampler/template | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/zita-resampler/template b/srcpkgs/zita-resampler/template
index 56bd795af99..b84ba815877 100644
--- a/srcpkgs/zita-resampler/template
+++ b/srcpkgs/zita-resampler/template
@@ -1,22 +1,25 @@
# Template file for 'zita-resampler'
pkgname=zita-resampler
-version=1.6.2
+version=1.8.0
revision=1
+build_wrksrc="source"
build_style=gnu-makefile
make_install_args="LIBDIR=/usr/lib"
hostmakedepends="pkg-config"
-build_wrksrc="source"
-short_desc="A library for resampling audio signals"
+short_desc="Library for resampling audio signals"
maintainer="silvernode <mollusk@homebutter.com>"
license="GPL-3.0-or-later"
homepage="http://kokkinizita.linuxaudio.org/linuxaudio/zita-resampler/resampler.html"
distfiles="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
-checksum=233baefee297094514bfc9063e47f848e8138dc7c959d9cd957b36019b98c5d7
+checksum=e5744f23c54dd15b3f783a687bd879eee2a690a4545a15b49c4cf037aa464aa2
-CXXFLAGS="-fPIC -DPIC"
+CXXFLAGS="-fPIC -ffast-math"
pre_build() {
- sed -i '/march=native/d' Makefile
+ case "${XBPS_TARGET_MACHINE}" in
+ x86_64*|i686*) CXXFLAGS+=" -msse2" ;;
+ *) vsed -i '/DENABLE_SSE2/d' Makefile ;;
+ esac
}
post_install() {
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: Kokkinizita
2021-02-17 3:42 [PR PATCH] Kokkinizita [WIP] tibequadorian
` (21 preceding siblings ...)
2021-02-25 8:51 ` [PR PATCH] [Updated] Kokkinizita tibequadorian
@ 2021-02-25 8:59 ` tibequadorian
2021-02-26 4:59 ` [PR PATCH] [Merged]: Kokkinizita ericonr
2021-02-26 4:59 ` [PR REVIEW] Kokkinizita ericonr
24 siblings, 0 replies; 26+ messages in thread
From: tibequadorian @ 2021-02-25 8:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 356 bytes --]
New comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/28809#issuecomment-785734055
Comment:
> I think fixing all these packages is fine, but is it necessary to revbump as well?
Alright, now I've only revbumped those with new build options.
Also reworded commit messages to make it more meaningful.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR PATCH] [Merged]: Kokkinizita
2021-02-17 3:42 [PR PATCH] Kokkinizita [WIP] tibequadorian
` (22 preceding siblings ...)
2021-02-25 8:59 ` Kokkinizita tibequadorian
@ 2021-02-26 4:59 ` ericonr
2021-02-26 4:59 ` [PR REVIEW] Kokkinizita ericonr
24 siblings, 0 replies; 26+ messages in thread
From: ericonr @ 2021-02-26 4:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1761 bytes --]
There's a merged pull request on the void-packages repository
Kokkinizita
https://github.com/void-linux/void-packages/pull/28809
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?
- [x] 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
Setting CXXFLAGS in Makefile doesn't seem to work anymore since [void-packages#2325ae1](https://github.com/void-linux/void-packages/commit/2325ae153bd6011682782a6712f87338a9747ac7) so we need to set them in the template.
I've adapted them to those in the Makefile (e.g. `-ffast-math`) ~and enabled -march=native for non-cross builds~.
<!--
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
-->
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR REVIEW] Kokkinizita
2021-02-17 3:42 [PR PATCH] Kokkinizita [WIP] tibequadorian
` (23 preceding siblings ...)
2021-02-26 4:59 ` [PR PATCH] [Merged]: Kokkinizita ericonr
@ 2021-02-26 4:59 ` ericonr
24 siblings, 0 replies; 26+ messages in thread
From: ericonr @ 2021-02-26 4:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 179 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28809#discussion_r583384573
Comment:
Please try to get this upstream!
^ permalink raw reply [flat|nested] 26+ messages in thread
end of thread, other threads:[~2021-02-26 4:59 UTC | newest]
Thread overview: 26+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-17 3:42 [PR PATCH] Kokkinizita [WIP] tibequadorian
2021-02-17 3:44 ` [PR PATCH] [Updated] " tibequadorian
2021-02-17 4:12 ` sgn
2021-02-17 4:43 ` tibequadorian
2021-02-17 7:56 ` Chocimier
2021-02-17 10:39 ` [PR PATCH] [Updated] " tibequadorian
2021-02-17 10:57 ` tibequadorian
2021-02-17 11:37 ` tibequadorian
2021-02-17 11:43 ` tibequadorian
2021-02-17 12:03 ` [PR PATCH] [Updated] " tibequadorian
2021-02-17 12:14 ` tibequadorian
2021-02-19 5:12 ` [PR REVIEW] Kokkinizita ericonr
2021-02-19 10:02 ` tibequadorian
2021-02-19 10:04 ` tibequadorian
2021-02-19 22:25 ` tibequadorian
2021-02-19 23:51 ` ericonr
2021-02-19 23:53 ` sgn
2021-02-20 0:03 ` ericonr
2021-02-20 0:56 ` tibequadorian
2021-02-24 4:16 ` ericonr
2021-02-25 8:48 ` [PR PATCH] [Updated] Kokkinizita tibequadorian
2021-02-25 8:50 ` [PR REVIEW] Kokkinizita tibequadorian
2021-02-25 8:51 ` [PR PATCH] [Updated] Kokkinizita tibequadorian
2021-02-25 8:59 ` Kokkinizita tibequadorian
2021-02-26 4:59 ` [PR PATCH] [Merged]: Kokkinizita ericonr
2021-02-26 4:59 ` [PR REVIEW] Kokkinizita 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).