moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

artyfx: respect our flags, fix build for arm

Browse source
This commit is contained in:
Đoàn Trần Công Danh 2021-02-23 20:53:43 +07:00
parent 5ac7229d16
commit 64234b1883
3 changed files with 44 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
srcpkgs/artyfx/patches/fix-avtk-cmake-sse.patch
View file

@ -6,8 +6,8 @@
-SET(CMAKE_C_FLAGS "-fPIC -msse -msse2 -mfpmath=sse -g") # -fsanitize=address -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_CXX_FLAGS "-fPIC -msse -msse2 -mfpmath=sse -g") # -fsanitize=address
+SET(CMAKE_C_FLAGS "-fPIC -g") # -fsanitize=address +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -g") # -fsanitize=address
+SET(CMAKE_CXX_FLAGS "-fPIC -g") # -fsanitize=address +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -g") # -fsanitize=address
+ +
+IF(BUILD_SSE) +IF(BUILD_SSE)
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse -msse2 -mfpmath=sse") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse -msse2 -mfpmath=sse")

27
srcpkgs/artyfx/patches/respect-our-cflags.patch Normal file
View file

@ -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)

16
srcpkgs/artyfx/template
View file

@ -1,7 +1,7 @@
# Template file for 'artyfx' # Template file for 'artyfx'
pkgname=artyfx pkgname=artyfx
version=1.3 version=1.3
revision=1 revision=2
wrksrc=openAV-ArtyFX-release-$version wrksrc=openAV-ArtyFX-release-$version
build_style=cmake build_style=cmake
hostmakedepends="pkg-config" hostmakedepends="pkg-config"
@ -13,6 +13,20 @@ homepage="http://openavproductions.com/artyfx/"
distfiles="https://github.com/openAVproductions/openAV-ArtyFX/archive/release-$version.tar.gz" distfiles="https://github.com/openAVproductions/openAV-ArtyFX/archive/release-$version.tar.gz"
checksum=a2a8d02b47bea44d0053cd4f8c6411f68a6fe9b9e4348a4139cd9bfd70105c00 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 case $XBPS_TARGET_MACHINE in
x86_64*|i686*);; x86_64*|i686*);;
*) configure_args+=" -DBUILD_SSE=OFF";; *) configure_args+=" -DBUILD_SSE=OFF";;