Attachment #221373 for bug #252497




# $FreeBSD$

PORTNAME=	zita-resampler
DISTVERSION=	1.8.0
PORTREVISION=	2
CATEGORIES=	audio
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

USES=		cmake tar:bzip2
USE_LDCONFIG=	yes

CXXFLAGS_amd64+=	-DENABLE_SSE2

USES=		cmake tar:bzip2

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/audio/zita-resampler/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1535358067	1	TIMESTAMP = 1610071104
2	SHA256 (zita-resampler-1.6.2.tar.bz2) = 233baefee297094514bfc9063e47f848e8138dc7c959d9cd957b36019b98c5d7	2	SHA256 (zita-resampler-1.8.0.tar.bz2) = e5744f23c54dd15b3f783a687bd879eee2a690a4545a15b49c4cf037aa464aa2
3	SIZE (zita-resampler-1.6.2.tar.bz2) = 125539	3	SIZE (zita-resampler-1.8.0.tar.bz2) = 131161




From d0fe1bf362820e49594477a5d4c0369f0e2b6c60 Mon Sep 17 00:00:00 2001
From: Daniel Engberg <daniel.engberg.lists@pyret.net>
Date: Fri, 8 Jan 2021 03:03:05 +0100
Subject: [PATCH] cmake

cmake

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
---
 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


Removed Link Here

(-)a/audio/zita-resampler/files/patch-apps_Makefile (-10 lines)
1	--- ../apps/Makefile.orig 2018-10-31 16:04:18.214221199 +0000
2	+++ ../apps/Makefile 2018-10-31 16:04:25.590905029 +0000
3	@@ -25,7 +25,6 @@
4	VERSION = 1.6.0
5	CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\"
6	CXXFLAGS += -O2 -ffast-math -Wall
7	-CXXFLAGS += -march=native
8
9
10	all: zresample zretune zresample.1.gz zretune.1.gz




--- Makefile.orig	2018-08-24 18:41:47 UTC
+++ Makefile
@@ -1,7 +1,7 @@
 # ----------------------------------------------------------------------------
 #
 #  Copyright (C) 2006-2018 Fons Adriaensen <fons@linuxaudio.org>
-#    
+#
 #  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:

Lines 4-7 include/zita-resampler/resampler.h Link Here

(-)b/audio/zita-resampler/pkg-plist (-2 / +1 lines)
4	include/zita-resampler/vresampler.h	4	include/zita-resampler/vresampler.h
5	lib/libzita-resampler.so	5	lib/libzita-resampler.so
6	lib/libzita-resampler.so.1	6	lib/libzita-resampler.so.1
7	lib/libzita-resampler.so.1.6.2	7	lib/libzita-resampler.so.1.8.0
8	-

Return to bug 252497

Lines 2-19 Link Here

(-)b/audio/zita-resampler/Makefile (-6 / +9 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= zita-resampler	4	PORTNAME= zita-resampler
5	PORTVERSION= 1.6.2	5	DISTVERSION= 1.8.0
6	PORTREVISION= 2
7	CATEGORIES= audio	6	CATEGORIES= audio
8	MASTER_SITES= http://kokkinizita.linuxaudio.org/linuxaudio/downloads/	7	MASTER_SITES= https://kokkinizita.linuxaudio.org/linuxaudio/downloads/
9		8
10	MAINTAINER= meka@tilda.center	9	MAINTAINER= meka@tilda.center
11	COMMENT= C++ library for resampling audio signals	10	COMMENT= C++ library for resampling audio signals
12		11
13	LICENSE= GPLv3+	12	LICENSE= GPLv3+
14	LICENSE_FILE= ${WRKSRC}/../COPYING	13	LICENSE_FILE= ${WRKSRC}/COPYING
15		14
16	USES= gmake tar:bzip2	15	USES= cmake tar:bzip2
17	WRKSRC_SUBDIR= source	16	USE_LDCONFIG= yes
		17
		18	CXXFLAGS_amd64+= -DENABLE_SSE2
		19
		20	USES= cmake tar:bzip2
18		21
19	.include <bsd.port.mk>	22	.include <bsd.port.mk>

Added Link Here

(-)b/audio/zita-resampler/files/patch-CMakeLists.txt (+84 lines)
1	From d0fe1bf362820e49594477a5d4c0369f0e2b6c60 Mon Sep 17 00:00:00 2001
2	From: Daniel Engberg <daniel.engberg.lists@pyret.net>
3	Date: Fri, 8 Jan 2021 03:03:05 +0100
4	Subject: [PATCH] cmake
5
6	cmake
7
8	Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
9	---
10	CMakeLists.txt \| 62 ++++++++++++++++++++++++++++++++++++++++++++++++++
11	1 file changed, 62 insertions(+)
12	create mode 100644 CMakeLists.txt
13
14	diff --git a/CMakeLists.txt b/CMakeLists.txt
15	new file mode 100644
16	index 0000000..941f1e8
17	--- /dev/null
18	+++ CMakeLists.txt
19	@@ -0,0 +1,62 @@
20	+cmake_minimum_required(VERSION 3.5)
21	+
22	+project(zita-resampler LANGUAGES CXX)
23	+
24	+option(ZITA_RESAMPLER_ENABLE_SHARED "Build as a shared library" ON)
25	+option(ZITA_RESAMPLER_ENABLE_STATIC "Build as a static library" OFF)
26	+
27	+set(ZITA_RESAMPLER_SOURCES
28	+ "source/cresampler.cc"
29	+ "source/resampler.cc"
30	+ "source/resampler-table.cc"
31	+ "source/vresampler.cc")
32	+
33	+find_package(Threads REQUIRED)
34	+
35	+set(ZITA_RESAMPLER_TARGETS)
36	+
37	+macro(extract_version file setting_name)
38	+ file(STRINGS ${file} VERSION_NUMBER REGEX "^${setting_name}")
39	+ string(REPLACE "= " ";" VERSION_NUMBER_LIST ${VERSION_NUMBER})
40	+ list(GET VERSION_NUMBER_LIST 1 ${setting_name})
41	+endmacro(extract_version)
42	+
43	+extract_version(source/Makefile MAJVERS)
44	+extract_version(source/Makefile MINVERS)
45	+
46	+set(PROJECT_VERSION "${MAJVERS}.${MINVERS}")
47	+
48	+string(REPLACE "." ";" VERSION_LIST ${PROJECT_VERSION})
49	+list(GET VERSION_LIST 0 PROJECT_VERSION_MAJOR)
50	+list(GET VERSION_LIST 1 PROJECT_VERSION_MINOR)
51	+# list(GET VERSION_LIST 2 PROJECT_VERSION_PATCH)
52	+
53	+set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -fPIC -ffast-math")
54	+
55	+if(ZITA_RESAMPLER_ENABLE_SHARED)
56	+ add_library(zita-resampler SHARED ${ZITA_RESAMPLER_SOURCES})
57	+ target_include_directories(zita-resampler
58	+ PUBLIC "${PROJECT_SOURCE_DIR}/source")
59	+ target_link_libraries(zita-resampler PUBLIC ${CMAKE_THREAD_LIBS_INIT})
60	+ set_target_properties(zita-resampler PROPERTIES
61	+ VERSION "${PROJECT_VERSION}"
62	+ SOVERSION "${PROJECT_VERSION_MAJOR}")
63	+ list(APPEND ZITA_RESAMPLER_TARGETS zita-resampler)
64	+endif()
65	+
66	+if(ZITA_RESAMPLER_ENABLE_STATIC)
67	+ add_library(zita-resampler-static STATIC ${ZITA_RESAMPLER_SOURCES})
68	+ target_include_directories(zita-resampler-static
69	+ PUBLIC "${PROJECT_SOURCE_DIR}/source")
70	+ target_link_libraries(zita-resampler-static PUBLIC ${CMAKE_THREAD_LIBS_INIT})
71	+ set_target_properties(zita-resampler-static PROPERTIES
72	+ OUTPUT_NAME "zita-resampler")
73	+ list(APPEND ZITA_RESAMPLER_TARGETS zita-resampler-static)
74	+endif()
75	+
76	+install(TARGETS ${ZITA_RESAMPLER_TARGETS}
77	+ LIBRARY DESTINATION "lib"
78	+ ARCHIVE DESTINATION "lib"
79	+ RUNTIME DESTINATION "bin")
80	+install(DIRECTORY "source/zita-resampler"
81	+ DESTINATION "include")
82	--
83	2.29.2
84

Removed Link Here

(-)a/audio/zita-resampler/files/patch-source_Makefile (-55 lines)
1	--- Makefile.orig 2018-08-24 18:41:47 UTC
2	+++ Makefile
3	@@ -1,7 +1,7 @@
4	# ----------------------------------------------------------------------------
5	#
6	# Copyright (C) 2006-2018 Fons Adriaensen <fons@linuxaudio.org>
7	-#
8	+#
9	# This program is free software; you can redistribute it and/or modify
10	# it under the terms of the GNU General Public License as published by
11	# the Free Software Foundation; either version 3 of the License, or
12	@@ -20,10 +20,9 @@
13
14	# Modify as required.
15	#
16	-SUFFIX := $(shell uname -m \| sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
17	PREFIX ?= /usr/local
18	INCDIR ?= $(PREFIX)/include
19	-LIBDIR ?= $(PREFIX)/lib$(SUFFIX)
20	+LIBDIR ?= $(PREFIX)/lib
21
22	MAJVERS = 1
23	MINVERS = 6.2
24	@@ -33,8 +32,7 @@ DISTDIR = zita-resampler-$(VERSION)
25
26	CPPFLAGS += -I. -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
27	CXXFLAGS += -Wall -fPIC -O2 -ffast-math
28	-CXXFLAGS += -march=native
29	-LDFLAGS +=
30	+LDFLAGS +=
31	LDLIBS +=
32
33
34	@@ -46,6 +44,7 @@ ZITA-RESAMPLER_O = resampler.o vresampler.o resampler-
35	ZITA-RESAMPLER_H = zita-resampler/resampler.h zita-resampler/resampler-table.h \
36	zita-resampler/vresampler.h zita-resampler/cresampler.h
37
38	+all: $(ZITA-RESAMPLER_MIN)
39
40	$(ZITA-RESAMPLER_MIN): $(ZITA-RESAMPLER_O)
41	$(CXX) -shared $(LDFLAGS) -Wl,-soname,$(ZITA-RESAMPLER_MAJ) -o $(ZITA-RESAMPLER_MIN) $(ZITA-RESAMPLER_O) $(ZITA-RESAMPLER_DEP)
42	@@ -56,9 +55,10 @@ $(ZITA-RESAMPLER_O): $(ZITA-RESAMPLER_H)
43	install: $(ZITA-RESAMPLER_MIN)
44	install -d $(DESTDIR)$(INCDIR)/zita-resampler
45	install -d $(DESTDIR)$(LIBDIR)
46	- install -m 644 $(ZITA-RESAMPLER_H) $(DESTDIR)$(INCDIR)/zita-resampler
47	- install -m 755 $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(LIBDIR)
48	- ldconfig
49	+ ${BSD_INSTALL_DATA} -m 644 $(ZITA-RESAMPLER_H) $(DESTDIR)$(INCDIR)/zita-resampler
50	+ ${BSD_INSTALL_LIB} -m 755 $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(LIBDIR)
51	+ # ldconfig
52	+ ln -sf $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(LIBDIR)/$(ZITA-RESAMPLER_MAJ)
53	ln -sf $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(LIBDIR)/$(ZITA-RESAMPLER_SO)
54
55	uninstall: