Re: [PR PATCH] [Updated] artyfx: respect our flags

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

[-- Attachment #1: Type: text/plain, Size: 1599 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages artyfx-fix-build-flags
https://github.com/void-linux/void-packages/pull/28998

artyfx: respect our flags
<!-- 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

<!--
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/28998.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-artyfx-fix-build-flags-28998.patch --]
[-- Type: text/x-diff, Size: 3321 bytes --]

From ebb437cdcfbd222f6c8e55c516a0ca839542eaa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 23 Feb 2021 20:53:43 +0700
Subject: [PATCH] artyfx: respect our flags

---
 .../artyfx/patches/fix-avtk-cmake-sse.patch   |  4 +--
 .../artyfx/patches/respect-our-cflags.patch   | 27 +++++++++++++++++++
 srcpkgs/artyfx/template                       |  7 ++++-
 3 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/artyfx/patches/respect-our-cflags.patch

diff --git a/srcpkgs/artyfx/patches/fix-avtk-cmake-sse.patch b/srcpkgs/artyfx/patches/fix-avtk-cmake-sse.patch
index 76a340290b3..1a832155a56 100644
--- a/srcpkgs/artyfx/patches/fix-avtk-cmake-sse.patch
+++ b/srcpkgs/artyfx/patches/fix-avtk-cmake-sse.patch
@@ -6,8 +6,8 @@
  
 -SET(CMAKE_C_FLAGS   "-fPIC -msse -msse2 -mfpmath=sse -g") # -fsanitize=address
 -SET(CMAKE_CXX_FLAGS "-fPIC -msse -msse2 -mfpmath=sse -g") # -fsanitize=address
-+SET(CMAKE_C_FLAGS   "-fPIC -g") # -fsanitize=address
-+SET(CMAKE_CXX_FLAGS "-fPIC -g") # -fsanitize=address
++SET(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -fPIC -g") # -fsanitize=address
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -g") # -fsanitize=address
 +
 +IF(BUILD_SSE)
 +	SET(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -msse -msse2 -mfpmath=sse")
diff --git a/srcpkgs/artyfx/patches/respect-our-cflags.patch b/srcpkgs/artyfx/patches/respect-our-cflags.patch
new file mode 100644
index 00000000000..ee9155c7729
--- /dev/null
+++ b/srcpkgs/artyfx/patches/respect-our-cflags.patch
@@ -0,0 +1,27 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -24,17 +24,17 @@ pkg_check_modules(SND sndfile REQUIRED)
+ include_directories( ${SND_INCLUDE_DIRS}  )
+ #target_link_libraries( avtkDemo ${CAIRO_LIBRARIES}  )
+ 
+-SET(CMAKE_SHARED_LINKER_FLAGS "-fPIC -shared -L./src/avtk -Wl,--no-undefined")
+-SET(CMAKE_C_FLAGS "-g -Wall -O1 -Wno-unused-variable")
+-SET(CMAKE_CXX_FLAGS "-g -Wall -O1 -Wno-unused-variable -ftree-vectorize")
++SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fPIC -shared -L./src/avtk -Wl,--no-undefined")
++SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -O1 -Wno-unused-variable")
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -O1 -Wno-unused-variable -ftree-vectorize")
+ 
+ 
+ # DSP sources
+ FILE(GLOB sources src/dsp/*.cxx src/dsp/rr/*.cxx  src/dsp/eq/*.cc )
+ 
+ IF(BUILD_SSE)
+-  SET(CMAKE_C_FLAGS "-msse2 -mfpmath=sse")
+-  SET(CMAKE_CXX_FLAGS "-msse2 -mfpmath=sse")
++	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -mfpmath=sse")
++	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -mfpmath=sse")
+ ENDIF()
+ 
+ IF(BUILD_GUI)
diff --git a/srcpkgs/artyfx/template b/srcpkgs/artyfx/template
index 49248c67ce6..05fe058d75d 100644
--- a/srcpkgs/artyfx/template
+++ b/srcpkgs/artyfx/template
@@ -1,7 +1,7 @@
 # Template file for 'artyfx'
 pkgname=artyfx
 version=1.3
-revision=1
+revision=2
 wrksrc=openAV-ArtyFX-release-$version
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -17,3 +17,8 @@ case $XBPS_TARGET_MACHINE in
 	x86_64*|i686*);;
 	*) configure_args+=" -DBUILD_SSE=OFF";;
 esac
+
+case $XBPS_TARGET_MACHINE in
+	armv6*) CXXFLAGS="-DPFFFT_SIMD_DISABLE=1" ;;
+	armv7*) CXXFLAGS="-mfpu=neon" ;;
+esac