diff --git a/audio/soundtouch/Makefile b/audio/soundtouch/Makefile index 988a29193efb..532c38271d7a 100644 --- a/audio/soundtouch/Makefile +++ b/audio/soundtouch/Makefile @@ -1,45 +1,45 @@ PORTNAME= soundtouch -DISTVERSION= 2.3.1 +DISTVERSION= 2.3.3 CATEGORIES= audio MASTER_SITES= https://www.surina.net/${PORTNAME}/ MAINTAINER= crees@FreeBSD.org COMMENT= Open-source audio processing library WWW= https://www.surina.net/soundtouch/ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING.TXT -USES= cmake cpe -USE_LDCONFIG= yes - +USES= cmake compiler:c++17-lang cpe pathfix CPE_VENDOR= surina +USE_LDCONFIG= yes +WRKSRC= ${WRKDIR}/${PORTNAME} CFLAGS_i386= -DSOUNDTOUCH_DISABLE_X86_OPTIMIZATIONS CMAKE_ON= BUILD_SHARED_LIBS OPTIONS_DEFINE= INTEGER_SAMPLES OPTIMIZED_CFLAGS OPTIONS_DEFINE_aarch64= NEON OPENMP OPTIONS_DEFINE_amd64= OPENMP OPTIONS_DEFINE_armv7= NEON OPTIONS_DEFINE_i386= OPENMP OPTIONS_DEFINE_powerpc64= OPENMP OPTIONS_DEFINE_powerpc64le= OPENMP OPTIONS_DEFINE_riscv64= OPENMP OPTIONS_DEFAULT= ${MACHINE_CPU:Msoftfp:C/.+/INTEGER_SAMPLES/} OPTIONS_DEFAULT_aarch64= NEON OPENMP OPTIMIZED_CFLAGS OPTIONS_DEFAULT_amd64= OPENMP OPTIMIZED_CFLAGS OPTIONS_DEFAULT_powerpc64= OPENMP OPTIMIZED_CFLAGS OPTIONS_DEFAULT_powerpc64le= OPENMP OPTIMIZED_CFLAGS OPTIONS_DEFAULT_riscv64= OPENMP OPTIMIZED_CFLAGS INTEGER_SAMPLES_DESC= Use integer sample format NEON_DESC= Use NEON instructions INTEGER_SAMPLES_CMAKE_BOOL= INTEGER_SAMPLES NEON_CMAKE_BOOL= NEON OPENMP_CMAKE_BOOL= OPENMP OPTIMIZED_CFLAGS_CFLAGS= -Ofast .include diff --git a/audio/soundtouch/distinfo b/audio/soundtouch/distinfo index 7eaff9c7d400..7ab14a3ce09f 100644 --- a/audio/soundtouch/distinfo +++ b/audio/soundtouch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1634244025 -SHA256 (soundtouch-2.3.1.tar.gz) = 6900996607258496ce126924a19fe9d598af9d892cf3f33d1e4daaa9b42ae0b1 -SIZE (soundtouch-2.3.1.tar.gz) = 524664 +TIMESTAMP = 1712001624 +SHA256 (soundtouch-2.3.3.tar.gz) = 43b23dfac2f64a3aff55d64be096ffc7b73842c3f5665caff44975633a975a99 +SIZE (soundtouch-2.3.3.tar.gz) = 606780 diff --git a/audio/soundtouch/files/patch-CMakeLists.txt b/audio/soundtouch/files/patch-CMakeLists.txt index 35f9563a43fc..8c2e26cab1a5 100644 --- a/audio/soundtouch/files/patch-CMakeLists.txt +++ b/audio/soundtouch/files/patch-CMakeLists.txt @@ -1,46 +1,11 @@ ---- CMakeLists.txt.orig 2021-09-07 15:26:53 UTC +--- CMakeLists.txt.orig 2024-04-01 20:14:00 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) +@@ -13,7 +13,7 @@ else() + if(EMSCRIPTEN) + list(APPEND COMPILE_OPTIONS -O3) + else() +- list(APPEND COMPILE_OPTIONS -Ofast) ++# list(APPEND COMPILE_OPTIONS -Ofast) + endif() 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 diff --git a/audio/soundtouch/pkg-plist b/audio/soundtouch/pkg-plist index 8f22cf4de612..8f1a113b975d 100644 --- a/audio/soundtouch/pkg-plist +++ b/audio/soundtouch/pkg-plist @@ -1,15 +1,15 @@ bin/soundstretch include/soundtouch/BPMDetect.h include/soundtouch/FIFOSampleBuffer.h include/soundtouch/FIFOSamplePipe.h include/soundtouch/STTypes.h include/soundtouch/SoundTouch.h include/soundtouch/soundtouch_config.h lib/cmake/SoundTouch/SoundTouchConfig.cmake lib/cmake/SoundTouch/SoundTouchConfigVersion.cmake lib/cmake/SoundTouch/SoundTouchTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/SoundTouch/SoundTouchTargets.cmake lib/libSoundTouch.so lib/libSoundTouch.so.2 -lib/libSoundTouch.so.2.3.1 +lib/libSoundTouch.so.2.3.3 libdata/pkgconfig/soundtouch.pc