[PR PATCH] Kokkinizita [WIP]

[tibequadorian <tibequadorian@users.noreply.github.com>]

[-- 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%%.*}