Attachment #228187 for bug #258730




# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>

PORTNAME=	soundtouch
DISTVERSION=	2.3.1
CATEGORIES=	audio

MAINTAINER=	crees@FreeBSD.org
COMMENT=	Open-source audio processing library

LICENSE=	LGPL21
LICENSE_FILE=	${WRKSRC}/COPYING.TXT

USES=		cmake

USE_GITLAB=	yes
GL_COMMIT=	e1f315f5358d9db5cee35a7a2886425489fcefe8

USE_LDCONFIG=   yes

CMAKE_ON=	BUILD_SHARED_LIBS

OPTIONS_DEFINE=		INTEGER_SAMPLES DOCS
OPTIONS_DEFAULT=	${MACHINE_CPU:Msoftfp:C/.+/INTEGER_SAMPLES/}

INTEGER_SAMPLES_DESC=		Use integer sample format
INTEGER_SAMPLES_CMAKE_BOOL=	INTEGER_SAMPLES
OPTIONS_DEFAULT_i386=	${MACHINE_CPU:tu:MSSE}

INTEGER_SAMPLES_DESC=	Use integer sample format
INTEGER_SAMPLES_CONFIGURE_ENABLE=	integer-samples
OPENMP_CONFIGURE_ENABLE=openmp
OPENMP_USES=		compiler:openmp
SSE_CONFIGURE_ENABLE=	x86-optimizations
SSE_USES=		compiler:c++11-lang

post-patch:
	@${REINPLACE_CMD} -e \
		'/^dist_doc_DATA/s|COPYING.TXT||' \
		${WRKSRC}/Makefile.am
	@${REINPLACE_CMD} -e \
		's|^INCLUDES|AM_CPPFLAGS| ; \
		 s|$$(prefix)/doc|$$(datadir)/doc|' \
		${WRKSRC}/config/am_include.mk
	@${REINPLACE_CMD} -e \
		's|-O[0-9]||;s|-fcheck-new||' \
		${WRKSRC}/source/SoundTouch/Makefile.am

post-install:
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libSoundTouch.so.1.0.0

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/audio/soundtouch/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1617884272	1	TIMESTAMP = 1631831988
2	SHA256 (soundtouch-soundtouch-762f56024b7ade81f6565903161dffec0ad4741e_GL0.tar.gz) = b2515ce4a1b8b69e401ca9d442d1913b23b7447157a76939b2f8791118941bd1	2	SHA256 (soundtouch-soundtouch-e1f315f5358d9db5cee35a7a2886425489fcefe8_GL0.tar.gz) = 633ea27250f465533a5ada4ac0ff276a4be01f43e975e42b8507c50dfbbfd7f9
3	SIZE (soundtouch-soundtouch-762f56024b7ade81f6565903161dffec0ad4741e_GL0.tar.gz) = 523946	3	SIZE (soundtouch-soundtouch-e1f315f5358d9db5cee35a7a2886425489fcefe8_GL0.tar.gz) = 524738




--- 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 "aarch64")
   set(NEON_CPU ON)
 else()
   set(NEON_CPU OFF)
@@ -68,7 +66,6 @@ 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()
 
 install(
@@ -105,6 +102,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 5-13 include/soundtouch/FIFOSamplePipe.h Link Here

(-)b/audio/soundtouch/pkg-plist (-3 / +6 lines)
5	include/soundtouch/STTypes.h	5	include/soundtouch/STTypes.h
6	include/soundtouch/SoundTouch.h	6	include/soundtouch/SoundTouch.h
7	include/soundtouch/soundtouch_config.h	7	include/soundtouch/soundtouch_config.h
		8	lib/cmake/SoundTouch/SoundTouchConfig.cmake
		9	lib/cmake/SoundTouch/SoundTouchConfigVersion.cmake
		10	lib/cmake/SoundTouch/SoundTouchTargets-%%CMAKE_BUILD_TYPE%%.cmake
		11	lib/cmake/SoundTouch/SoundTouchTargets.cmake
8	lib/libSoundTouch.so	12	lib/libSoundTouch.so
9	lib/libSoundTouch.so.1	13	lib/libSoundTouch.so.2
10	lib/libSoundTouch.so.1.0.0	14	lib/libSoundTouch.so.2.3.1
11	libdata/pkgconfig/soundtouch.pc	15	libdata/pkgconfig/soundtouch.pc
12	share/aclocal/soundtouch.m4
13	%%PORTDOCS%%%%DOCSDIR%%/README.html	16	%%PORTDOCS%%%%DOCSDIR%%/README.html

Return to bug 258730

Lines 1-48 Link Here

(-)b/audio/soundtouch/Makefile (-32 / +12 lines)
1	# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>	1	# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
2		2
3	PORTNAME= soundtouch	3	PORTNAME= soundtouch
4	DISTVERSION= 2.2	4	DISTVERSION= 2.3.1
5	CATEGORIES= audio	5	CATEGORIES= audio
6		6
7	MAINTAINER= crees@FreeBSD.org	7	MAINTAINER= crees@FreeBSD.org
8	COMMENT= Open-source audio processing library	8	COMMENT= Open-source audio processing library
9		9
10	LICENSE= LGPL21	10	LICENSE= LGPL21
		11	LICENSE_FILE= ${WRKSRC}/COPYING.TXT
		12
		13	USES= cmake
11		14
12	USE_GITLAB= yes	15	USE_GITLAB= yes
13	GL_COMMIT= 762f56024b7ade81f6565903161dffec0ad4741e	16	GL_COMMIT= e1f315f5358d9db5cee35a7a2886425489fcefe8
14	GNU_CONFIGURE= yes	17
15	USE_LDCONFIG= yes	18	USE_LDCONFIG= yes
16		19
17	USES= autoreconf libtool pathfix	20	CMAKE_ON= BUILD_SHARED_LIBS
18		21
19	OPTIONS_DEFINE= INTEGER_SAMPLES DOCS OPENMP	22	OPTIONS_DEFINE= INTEGER_SAMPLES DOCS
20	OPTIONS_DEFAULT= ${MACHINE_CPU:Msoftfp:C/.+/INTEGER_SAMPLES/}	23	OPTIONS_DEFAULT= ${MACHINE_CPU:Msoftfp:C/.+/INTEGER_SAMPLES/}
21	OPTIONS_DEFINE_amd64= SSE	24
22	OPTIONS_DEFINE_i386= SSE	25	INTEGER_SAMPLES_DESC= Use integer sample format
23	OPTIONS_DEFAULT_amd64= SSE	26	INTEGER_SAMPLES_CMAKE_BOOL= INTEGER_SAMPLES
24	OPTIONS_DEFAULT_i386= ${MACHINE_CPU:tu:MSSE}
25
26	INTEGER_SAMPLES_DESC= Use integer sample format
27	INTEGER_SAMPLES_CONFIGURE_ENABLE= integer-samples
28	OPENMP_CONFIGURE_ENABLE=openmp
29	OPENMP_USES= compiler:openmp
30	SSE_CONFIGURE_ENABLE= x86-optimizations
31	SSE_USES= compiler:c++11-lang
32
33	post-patch:
34	@${REINPLACE_CMD} -e \
35	'/^dist_doc_DATA/s\|COPYING.TXT\|\|' \
36	${WRKSRC}/Makefile.am
37	@${REINPLACE_CMD} -e \
38	's\|^INCLUDES\|AM_CPPFLAGS\| ; \
39	s\|$$(prefix)/doc\|$$(datadir)/doc\|' \
40	${WRKSRC}/config/am_include.mk
41	@${REINPLACE_CMD} -e \
42	's\|-O[0-9]\|\|;s\|-fcheck-new\|\|' \
43	${WRKSRC}/source/SoundTouch/Makefile.am
44
45	post-install:
46	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libSoundTouch.so.1.0.0
47		27
48	.include <bsd.port.mk>	28	.include <bsd.port.mk>

Added Link Here

(-)b/audio/soundtouch/files/patch-CMakeLists.txt (+38 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 "aarch64")
18	set(NEON_CPU ON)
19	else()
20	set(NEON_CPU OFF)
21	@@ -68,7 +66,6 @@ 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	install(
29	@@ -105,6 +102,9 @@ if(SOUNDSTRETCH)
30	target_compile_definitions(soundstretch PRIVATE ${COMPILE_DEFINITIONS})
31	target_compile_options(soundstretch PRIVATE ${COMPILE_OPTIONS})
32	target_link_libraries(soundstretch PRIVATE SoundTouch)
33	+ if(INTEGER_SAMPLES)
34	+ target_compile_definitions(soundstretch PRIVATE SOUNDTOUCH_INTEGER_SAMPLES)
35	+ endif()
36
37	install(TARGETS soundstretch
38	DESTINATION bin