diff --git a/audio/zita-resampler/Makefile b/audio/zita-resampler/Makefile index 0025ee20e67c..e9d8e357d7ee 100644 --- a/audio/zita-resampler/Makefile +++ b/audio/zita-resampler/Makefile @@ -1,18 +1,23 @@ PORTNAME= zita-resampler -DISTVERSION= 1.8.0 +DISTVERSION= 1.10.1 CATEGORIES= audio MASTER_SITES= https://kokkinizita.linuxaudio.org/linuxaudio/downloads/ MAINTAINER= meka@tilda.center COMMENT= C++ library for resampling audio signals WWW= https://kokkinizita.linuxaudio.org/linuxaudio/zita-resampler/resampler.html LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= cmake tar:bzip2 +USES= cmake tar:xz USE_LDCONFIG= yes CXXFLAGS_amd64+= -DENABLE_SSE2 +OPTIONS_DEFINE= OPTIMIZED_CFLAGS +OPTIONS_DEFAULT= OPTIMIZED_CFLAGS + +OPTIMIZED_CFLAGS_CFLAGS= -ffast-math + .include diff --git a/audio/zita-resampler/distinfo b/audio/zita-resampler/distinfo index b25efd7add0f..7b92277b326e 100644 --- a/audio/zita-resampler/distinfo +++ b/audio/zita-resampler/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1610071104 -SHA256 (zita-resampler-1.8.0.tar.bz2) = e5744f23c54dd15b3f783a687bd879eee2a690a4545a15b49c4cf037aa464aa2 -SIZE (zita-resampler-1.8.0.tar.bz2) = 131161 +TIMESTAMP = 1676766785 +SHA256 (zita-resampler-1.10.1.tar.xz) = 71bbb1fa416578ea1ef0df39c4036d6d6a07a7e97bc24062f1d4003b491601ef +SIZE (zita-resampler-1.10.1.tar.xz) = 118800 diff --git a/audio/zita-resampler/files/patch-CMakeLists.txt b/audio/zita-resampler/files/patch-CMakeLists.txt index e0b62fe21278..55c67696aed8 100644 --- a/audio/zita-resampler/files/patch-CMakeLists.txt +++ b/audio/zita-resampler/files/patch-CMakeLists.txt @@ -1,84 +1,73 @@ From d0fe1bf362820e49594477a5d4c0369f0e2b6c60 Mon Sep 17 00:00:00 2001 From: Daniel Engberg Date: Fri, 8 Jan 2021 03:03:05 +0100 Subject: [PATCH] cmake cmake Signed-off-by: Daniel Engberg ---- - CMakeLists.txt | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 62 insertions(+) - create mode 100644 CMakeLists.txt - -diff --git a/CMakeLists.txt b/CMakeLists.txt -new file mode 100644 -index 0000000..941f1e8 ---- /dev/null +--- CMakeLists.txt.orig 2023-02-19 00:41:59 UTC +++ CMakeLists.txt @@ -0,0 +1,62 @@ +cmake_minimum_required(VERSION 3.5) + +project(zita-resampler LANGUAGES CXX) + +option(ZITA_RESAMPLER_ENABLE_SHARED "Build as a shared library" ON) +option(ZITA_RESAMPLER_ENABLE_STATIC "Build as a static library" OFF) + +set(ZITA_RESAMPLER_SOURCES + "source/cresampler.cc" + "source/resampler.cc" + "source/resampler-table.cc" + "source/vresampler.cc") + +find_package(Threads REQUIRED) + +set(ZITA_RESAMPLER_TARGETS) + +macro(extract_version file setting_name) + file(STRINGS ${file} VERSION_NUMBER REGEX "^${setting_name}") + string(REPLACE "= " ";" VERSION_NUMBER_LIST ${VERSION_NUMBER}) + list(GET VERSION_NUMBER_LIST 1 ${setting_name}) +endmacro(extract_version) + +extract_version(source/Makefile MAJVERS) +extract_version(source/Makefile MINVERS) + +set(PROJECT_VERSION "${MAJVERS}.${MINVERS}") + +string(REPLACE "." ";" VERSION_LIST ${PROJECT_VERSION}) +list(GET VERSION_LIST 0 PROJECT_VERSION_MAJOR) +list(GET VERSION_LIST 1 PROJECT_VERSION_MINOR) +# list(GET VERSION_LIST 2 PROJECT_VERSION_PATCH) + -+set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -fPIC -ffast-math") ++set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DZITA_RESAMPLER_MAJOR_VERSION=${MAJVERS} -DZITA_RESAMPLER_MINOR_VERSION=${MINVERS} -fPIC") + +if(ZITA_RESAMPLER_ENABLE_SHARED) + add_library(zita-resampler SHARED ${ZITA_RESAMPLER_SOURCES}) + target_include_directories(zita-resampler + PUBLIC "${PROJECT_SOURCE_DIR}/source") + target_link_libraries(zita-resampler PUBLIC ${CMAKE_THREAD_LIBS_INIT}) + set_target_properties(zita-resampler PROPERTIES + VERSION "${PROJECT_VERSION}" + SOVERSION "${PROJECT_VERSION_MAJOR}") + list(APPEND ZITA_RESAMPLER_TARGETS zita-resampler) +endif() + +if(ZITA_RESAMPLER_ENABLE_STATIC) + add_library(zita-resampler-static STATIC ${ZITA_RESAMPLER_SOURCES}) + target_include_directories(zita-resampler-static + PUBLIC "${PROJECT_SOURCE_DIR}/source") + target_link_libraries(zita-resampler-static PUBLIC ${CMAKE_THREAD_LIBS_INIT}) + set_target_properties(zita-resampler-static PROPERTIES + OUTPUT_NAME "zita-resampler") + list(APPEND ZITA_RESAMPLER_TARGETS zita-resampler-static) +endif() + +install(TARGETS ${ZITA_RESAMPLER_TARGETS} + LIBRARY DESTINATION "lib" + ARCHIVE DESTINATION "lib" + RUNTIME DESTINATION "bin") +install(DIRECTORY "source/zita-resampler" + DESTINATION "include") --- -2.29.2 - diff --git a/audio/zita-resampler/pkg-plist b/audio/zita-resampler/pkg-plist index 983facdd0276..30476c81c6c6 100644 --- a/audio/zita-resampler/pkg-plist +++ b/audio/zita-resampler/pkg-plist @@ -1,7 +1,7 @@ include/zita-resampler/cresampler.h include/zita-resampler/resampler-table.h include/zita-resampler/resampler.h include/zita-resampler/vresampler.h lib/libzita-resampler.so lib/libzita-resampler.so.1 -lib/libzita-resampler.so.1.8.0 +lib/libzita-resampler.so.1.10.1