Attachment #250211 for bug #278568




PORTNAME=	soundtouch
DISTVERSION=	2.3.3
CATEGORIES=	audio
MASTER_SITES=	https://www.surina.net/${PORTNAME}/


LICENSE_FILE=	${WRKSRC}/COPYING.TXT

USES=		cmake cpe
CPE_VENDOR=	surina
USE_LDCONFIG=	yes

CMAKE_ON=	BUILD_SHARED_LIBS

CFLAGS_i386=	-DSOUNDTOUCH_DISABLE_X86_OPTIMIZATIONS

WRKSRC=		${WRKDIR}/${PORTNAME}

OPTIONS_DEFINE=			INTEGER_SAMPLES OPTIMIZED_CFLAGS
OPTIONS_DEFINE_aarch64=		NEON OPENMP

Lines 1-3 Link Here

(-)b/audio/soundtouch/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1634244025	1	TIMESTAMP = 1713975706
2	SHA256 (soundtouch-2.3.1.tar.gz) = 6900996607258496ce126924a19fe9d598af9d892cf3f33d1e4daaa9b42ae0b1	2	SHA256 (soundtouch-2.3.3.tar.gz) = 43b23dfac2f64a3aff55d64be096ffc7b73842c3f5665caff44975633a975a99
3	SIZE (soundtouch-2.3.1.tar.gz) = 524664	3	SIZE (soundtouch-2.3.3.tar.gz) = 606780




--- CMakeLists.txt.orig	2021-09-07 15:26:53 UTC
+++ CMakeLists.txt
@@ -6,8 +6,6 @@ include(GNUInstallDirs)
 if(MSVC)
   set(COMPILE_DEFINITIONS /O2 /fp:fast)
   set(COMPILE_OPTIONS )
-else()
-  set(COMPILE_OPTIONS -Ofast)
 endif()
 
 #####################
@@ -59,7 +57,7 @@ else()
   target_compile_definitions(SoundTouch PRIVATE SOUNDTOUCH_FLOAT_SAMPLES)
 endif()
 
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(armv7.*|armv8.*)$")
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(armv7.*|armv8.*|aarch64.*)$")
   set(NEON_CPU ON)
 else()
   set(NEON_CPU OFF)
@@ -68,9 +66,14 @@ endif()
 option(NEON "Use ARM Neon SIMD instructions if in ARM CPU" ON)
 if(${NEON} AND ${NEON_CPU})
   target_compile_definitions(SoundTouch PRIVATE SOUNDTOUCH_USE_NEON)
-  target_compile_options(SoundTouch PRIVATE -mfpu=neon)
 endif()
 
+find_package(OpenMP)
+option(OPENMP "Use parallel multicore calculation through OpenMP" ON)
+if(OPENMP AND OPENMP_FOUND)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+endif()
+
 install(
   FILES
     include/BPMDetect.h
@@ -105,6 +108,9 @@ if(SOUNDSTRETCH)
   target_compile_definitions(soundstretch PRIVATE ${COMPILE_DEFINITIONS})
   target_compile_options(soundstretch PRIVATE ${COMPILE_OPTIONS})
   target_link_libraries(soundstretch PRIVATE SoundTouch)
+  if(INTEGER_SAMPLES)
+    target_compile_definitions(soundstretch PRIVATE SOUNDTOUCH_INTEGER_SAMPLES)
+  endif()
 
   install(TARGETS soundstretch
     DESTINATION bin

Lines 11-15 lib/cmake/SoundTouch/SoundTouchTargets-%%CMAKE_BUILD_TYPE%%.cmake Link Here

(-)b/audio/soundtouch/pkg-plist (-2 / +1 lines)
11	lib/cmake/SoundTouch/SoundTouchTargets.cmake	11	lib/cmake/SoundTouch/SoundTouchTargets.cmake
12	lib/libSoundTouch.so	12	lib/libSoundTouch.so
13	lib/libSoundTouch.so.2	13	lib/libSoundTouch.so.2
14	lib/libSoundTouch.so.2.3.1	14	lib/libSoundTouch.so.2.3.3
15	libdata/pkgconfig/soundtouch.pc	15	libdata/pkgconfig/soundtouch.pc
16	-

Return to bug 278568

Lines 1-5 Link Here

(-)b/audio/soundtouch/Makefile (-3 / +4 lines)
1	PORTNAME= soundtouch	1	PORTNAME= soundtouch
2	DISTVERSION= 2.3.1	2	DISTVERSION= 2.3.3
3	CATEGORIES= audio	3	CATEGORIES= audio
4	MASTER_SITES= https://www.surina.net/${PORTNAME}/	4	MASTER_SITES= https://www.surina.net/${PORTNAME}/
5		5
Lines 11-23 LICENSE= LGPL21 Link Here
11	LICENSE_FILE= ${WRKSRC}/COPYING.TXT	11	LICENSE_FILE= ${WRKSRC}/COPYING.TXT
12		12
13	USES= cmake cpe	13	USES= cmake cpe
		14	CPE_VENDOR= surina
14	USE_LDCONFIG= yes	15	USE_LDCONFIG= yes
15		16
16	CPE_VENDOR= surina	17	CMAKE_ON= BUILD_SHARED_LIBS
17		18
18	CFLAGS_i386= -DSOUNDTOUCH_DISABLE_X86_OPTIMIZATIONS	19	CFLAGS_i386= -DSOUNDTOUCH_DISABLE_X86_OPTIMIZATIONS
19		20
20	CMAKE_ON= BUILD_SHARED_LIBS	21	WRKSRC= ${WRKDIR}/${PORTNAME}
21		22
22	OPTIONS_DEFINE= INTEGER_SAMPLES OPTIMIZED_CFLAGS	23	OPTIONS_DEFINE= INTEGER_SAMPLES OPTIMIZED_CFLAGS
23	OPTIONS_DEFINE_aarch64= NEON OPENMP	24	OPTIONS_DEFINE_aarch64= NEON OPENMP

Removed Link Here

(-)a/audio/soundtouch/files/patch-CMakeLists.txt (-46 lines)
1	--- CMakeLists.txt.orig 2021-09-07 15:26:53 UTC
2	+++ CMakeLists.txt
3	@@ -6,8 +6,6 @@ include(GNUInstallDirs)
4	if(MSVC)
5	set(COMPILE_DEFINITIONS /O2 /fp:fast)
6	set(COMPILE_OPTIONS )
7	-else()
8	- set(COMPILE_OPTIONS -Ofast)
9	endif()
10
11	#####################
12	@@ -59,7 +57,7 @@ else()
13	target_compile_definitions(SoundTouch PRIVATE SOUNDTOUCH_FLOAT_SAMPLES)
14	endif()
15
16	-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(armv7.\|armv8.)$")
17	+if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(armv7.\|armv8.\|aarch64.*)$")
18	set(NEON_CPU ON)
19	else()
20	set(NEON_CPU OFF)
21	@@ -68,9 +66,14 @@ endif()
22	option(NEON "Use ARM Neon SIMD instructions if in ARM CPU" ON)
23	if(${NEON} AND ${NEON_CPU})
24	target_compile_definitions(SoundTouch PRIVATE SOUNDTOUCH_USE_NEON)
25	- target_compile_options(SoundTouch PRIVATE -mfpu=neon)
26	endif()
27
28	+find_package(OpenMP)
29	+option(OPENMP "Use parallel multicore calculation through OpenMP" ON)
30	+if(OPENMP AND OPENMP_FOUND)
31	+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
32	+endif()
33	+
34	install(
35	FILES
36	include/BPMDetect.h
37	@@ -105,6 +108,9 @@ if(SOUNDSTRETCH)
38	target_compile_definitions(soundstretch PRIVATE ${COMPILE_DEFINITIONS})
39	target_compile_options(soundstretch PRIVATE ${COMPILE_OPTIONS})
40	target_link_libraries(soundstretch PRIVATE SoundTouch)
41	+ if(INTEGER_SAMPLES)
42	+ target_compile_definitions(soundstretch PRIVATE SOUNDTOUCH_INTEGER_SAMPLES)
43	+ endif()
44
45	install(TARGETS soundstretch
46	DESTINATION bin