From b1347d52db86fe74cd33a13d0d0d3a98c4b51cbf Mon Sep 17 00:00:00 2001 From: Daniel Engberg Date: Fri, 8 Jan 2021 03:28:52 +0100 Subject: [PATCH] cmake cmake Signed-off-by: Daniel Engberg --- audio/zita-resampler/Makefile | 15 ++-- audio/zita-resampler/distinfo | 6 +- .../zita-resampler/files/patch-CMakeLists.txt | 84 +++++++++++++++++++ .../zita-resampler/files/patch-apps_Makefile | 10 --- .../files/patch-source_Makefile | 55 ------------ audio/zita-resampler/pkg-plist | 2 +- 6 files changed, 97 insertions(+), 75 deletions(-) create mode 100644 audio/zita-resampler/files/patch-CMakeLists.txt delete mode 100644 audio/zita-resampler/files/patch-apps_Makefile delete mode 100644 audio/zita-resampler/files/patch-source_Makefile diff --git a/audio/zita-resampler/Makefile b/audio/zita-resampler/Makefile index f92afd242369..3e7b8911e542 100644 --- a/audio/zita-resampler/Makefile +++ b/audio/zita-resampler/Makefile @@ -2,18 +2,21 @@ # $FreeBSD$ PORTNAME= zita-resampler -PORTVERSION= 1.6.2 -PORTREVISION= 2 +DISTVERSION= 1.8.0 CATEGORIES= audio -MASTER_SITES= http://kokkinizita.linuxaudio.org/linuxaudio/downloads/ +MASTER_SITES= https://kokkinizita.linuxaudio.org/linuxaudio/downloads/ MAINTAINER= meka@tilda.center COMMENT= C++ library for resampling audio signals LICENSE= GPLv3+ -LICENSE_FILE= ${WRKSRC}/../COPYING +LICENSE_FILE= ${WRKSRC}/COPYING -USES= gmake tar:bzip2 -WRKSRC_SUBDIR= source +USES= cmake tar:bzip2 +USE_LDCONFIG= yes + +CXXFLAGS_amd64+= -DENABLE_SSE2 + +USES= cmake tar:bzip2 .include diff --git a/audio/zita-resampler/distinfo b/audio/zita-resampler/distinfo index 2c57301b2405..b25efd7add0f 100644 --- a/audio/zita-resampler/distinfo +++ b/audio/zita-resampler/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1535358067 -SHA256 (zita-resampler-1.6.2.tar.bz2) = 233baefee297094514bfc9063e47f848e8138dc7c959d9cd957b36019b98c5d7 -SIZE (zita-resampler-1.6.2.tar.bz2) = 125539 +TIMESTAMP = 1610071104 +SHA256 (zita-resampler-1.8.0.tar.bz2) = e5744f23c54dd15b3f783a687bd879eee2a690a4545a15b49c4cf037aa464aa2 +SIZE (zita-resampler-1.8.0.tar.bz2) = 131161 diff --git a/audio/zita-resampler/files/patch-CMakeLists.txt b/audio/zita-resampler/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..e0b62fe21278 --- /dev/null +++ b/audio/zita-resampler/files/patch-CMakeLists.txt @@ -0,0 +1,84 @@ +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 +@@ -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") ++ ++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/files/patch-apps_Makefile b/audio/zita-resampler/files/patch-apps_Makefile deleted file mode 100644 index 6fed4a528908..000000000000 --- a/audio/zita-resampler/files/patch-apps_Makefile +++ /dev/null @@ -1,10 +0,0 @@ ---- ../apps/Makefile.orig 2018-10-31 16:04:18.214221199 +0000 -+++ ../apps/Makefile 2018-10-31 16:04:25.590905029 +0000 -@@ -25,7 +25,6 @@ - VERSION = 1.6.0 - CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\" - CXXFLAGS += -O2 -ffast-math -Wall --CXXFLAGS += -march=native - - - all: zresample zretune zresample.1.gz zretune.1.gz diff --git a/audio/zita-resampler/files/patch-source_Makefile b/audio/zita-resampler/files/patch-source_Makefile deleted file mode 100644 index ba35c0963bc0..000000000000 --- a/audio/zita-resampler/files/patch-source_Makefile +++ /dev/null @@ -1,55 +0,0 @@ ---- Makefile.orig 2018-08-24 18:41:47 UTC -+++ Makefile -@@ -1,7 +1,7 @@ - # ---------------------------------------------------------------------------- - # - # Copyright (C) 2006-2018 Fons Adriaensen --# -+# - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by - # the Free Software Foundation; either version 3 of the License, or -@@ -20,10 +20,9 @@ - - # Modify as required. - # --SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/') - PREFIX ?= /usr/local - INCDIR ?= $(PREFIX)/include --LIBDIR ?= $(PREFIX)/lib$(SUFFIX) -+LIBDIR ?= $(PREFIX)/lib - - MAJVERS = 1 - MINVERS = 6.2 -@@ -33,8 +32,7 @@ DISTDIR = zita-resampler-$(VERSION) - - CPPFLAGS += -I. -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS - CXXFLAGS += -Wall -fPIC -O2 -ffast-math --CXXFLAGS += -march=native --LDFLAGS += -+LDFLAGS += - LDLIBS += - - -@@ -46,6 +44,7 @@ ZITA-RESAMPLER_O = resampler.o vresampler.o resampler- - ZITA-RESAMPLER_H = zita-resampler/resampler.h zita-resampler/resampler-table.h \ - zita-resampler/vresampler.h zita-resampler/cresampler.h - -+all: $(ZITA-RESAMPLER_MIN) - - $(ZITA-RESAMPLER_MIN): $(ZITA-RESAMPLER_O) - $(CXX) -shared $(LDFLAGS) -Wl,-soname,$(ZITA-RESAMPLER_MAJ) -o $(ZITA-RESAMPLER_MIN) $(ZITA-RESAMPLER_O) $(ZITA-RESAMPLER_DEP) -@@ -56,9 +55,10 @@ $(ZITA-RESAMPLER_O): $(ZITA-RESAMPLER_H) - install: $(ZITA-RESAMPLER_MIN) - install -d $(DESTDIR)$(INCDIR)/zita-resampler - install -d $(DESTDIR)$(LIBDIR) -- install -m 644 $(ZITA-RESAMPLER_H) $(DESTDIR)$(INCDIR)/zita-resampler -- install -m 755 $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(LIBDIR) -- ldconfig -+ ${BSD_INSTALL_DATA} -m 644 $(ZITA-RESAMPLER_H) $(DESTDIR)$(INCDIR)/zita-resampler -+ ${BSD_INSTALL_LIB} -m 755 $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(LIBDIR) -+ # ldconfig -+ ln -sf $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(LIBDIR)/$(ZITA-RESAMPLER_MAJ) - ln -sf $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(LIBDIR)/$(ZITA-RESAMPLER_SO) - - uninstall: diff --git a/audio/zita-resampler/pkg-plist b/audio/zita-resampler/pkg-plist index 9b3138495c0b..983facdd0276 100644 --- a/audio/zita-resampler/pkg-plist +++ b/audio/zita-resampler/pkg-plist @@ -4,4 +4,4 @@ include/zita-resampler/resampler.h include/zita-resampler/vresampler.h lib/libzita-resampler.so lib/libzita-resampler.so.1 -lib/libzita-resampler.so.1.6.2 +lib/libzita-resampler.so.1.8.0 -- 2.29.2