From d21759047dbd44db4e6803f33804130ffa4fee8d 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                       | 16 ++++++++++-
 3 files changed, 44 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..f06781b6373 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"
@@ -13,6 +13,20 @@ homepage="http://openavproductions.com/artyfx/"
 distfiles="https://github.com/openAVproductions/openAV-ArtyFX/archive/release-$version.tar.gz"
 checksum=a2a8d02b47bea44d0053cd4f8c6411f68a6fe9b9e4348a4139cd9bfd70105c00
 
+case "$XBPS_TARGET_MACHINE" in
+	armv7*)
+		build_options="neon"
+		build_options_default="neon"
+		if [ "$build_option_neon" ]; then
+			CXXFLAGS="-mfpu=neon"
+		else
+			CXXFLAGS="-DPFFFT_SIMD_DISABLE=1"
+		fi
+		;;
+	armv*)
+		CXXFLAGS="-DPFFFT_SIMD_DISABLE=1" ;;
+esac
+
 case $XBPS_TARGET_MACHINE in
 	x86_64*|i686*);;
 	*) configure_args+=" -DBUILD_SSE=OFF";;