Re: [PR PATCH] [Updated] Kokkinizita

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

[-- 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() {