From: tibequadorian <tibequadorian@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Kokkinizita [WIP]
Date: Wed, 17 Feb 2021 11:39:01 +0100 [thread overview]
Message-ID: <20210217103901.unzdBGYyusA2uJ4qN4hYBzf7tlyZJ4HI89A8rw6YJcA@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28809@inbox.vuxu.org>
[-- 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%%.*}
next prev parent reply other threads:[~2021-02-17 10:39 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-17 3:42 [PR PATCH] " 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 ` tibequadorian [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210217103901.unzdBGYyusA2uJ4qN4hYBzf7tlyZJ4HI89A8rw6YJcA@z \
--to=tibequadorian@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).