Attachment #202337 for bug #236000

View | Details | Raw Unified | Return to bug 236000
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	sonic-visualiser
PORTVERSION=	3.2.1
PORTREVISION=	4
CATEGORIES=	audio
MASTER_SITES=	https://code.soundsoftware.ac.uk/attachments/download/2434/

MAINTAINER=	uddka@student.kit.edu
COMMENT=	Program for viewing and analysing the contents of music audio files


LIB_DEPENDS=	libfftw3.so:math/fftw3 \
		libfftw3f.so:math/fftw3-float \
		libcapnp.so:devel/capnproto \
		libsamplerate.so:audio/libsamplerate \
		libsndfile.so:audio/libsndfile \
		librubberband.so:audio/rubberband \

		libsord-0.so:devel/sord \
		libvamp-hostsdk.so:audio/vamp-plugin-sdk

USES=	autoreconf desktop-file-utils gl gmake pkgconfig qt:5

GNU_CONFIGURE=	yes
USE_QT=		buildtools_build core gui network qmake_build svg testlib widgets xml
USE_XORG=	x11
USE_GL=		gl


Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1487954437	1	TIMESTAMP = 1551027440
2	SHA256 (sonic-visualiser-2.5.tar.gz) = 5a66f20bae002876c64bc26d79dcba4f4c96c3c71ae160b5aafb40cfeacecdbe	2	SHA256 (sonic-visualiser-3.2.1.tar.gz) = e79955e4e50c6149dff527655061c8e2fb95929e9d8baed12cf7a920d1cc3a42
3	SIZE (sonic-visualiser-2.5.tar.gz) = 4112133	3	SIZE (sonic-visualiser-3.2.1.tar.gz) = 5597276




--- base.pri.orig	2019-01-08 14:32:16.000000000 +0100
+++ base.pri	2019-02-24 20:22:20.573083000 +0100
@@ -16,10 +16,7 @@
 	svcore/data \
 	svcore/plugin/api/alsa \
 	svgui \
-	svapp \
-	vamp-plugin-sdk \
-        rubberband \
-        rubberband/src
+	svapp
 
 DEPENDPATH += $$SV_INCLUDEPATH
 INCLUDEPATH += $$SV_INCLUDEPATH
@@ -34,6 +31,7 @@
 DEFINES += USE_SORD
 
 # Defines for Rubber Band
+freebsd*:   DEFINES += USE_PTHREADS
 linux*:   DEFINES += USE_PTHREADS
 macx*:    DEFINES += USE_PTHREADS
 




--- base.pro.orig	2019-02-24 20:51:22.585365000 +0100
+++ base.pro	2019-02-24 20:52:25.795850000 +0100
@@ -25,9 +25,7 @@
 }
 
 include(bq-files.pri)
-include(vamp-plugin-sdk-files.pri)
 include(svcore/files.pri)
-include(capnp-regen.pri)
 
 DATAQUAY_SOURCES=$$fromfile(dataquay/lib.pro, SOURCES)
 DATAQUAY_HEADERS=$$fromfile(dataquay/lib.pro, HEADERS)




--- bqvec/src/VectorOpsComplex.cpp.orig	2019-02-24 19:47:00.932155000 +0100
+++ bqvec/src/VectorOpsComplex.cpp	2019-02-24 19:47:27.692142000 +0100
@@ -45,15 +45,6 @@
 #endif
 #endif
 
-#if defined(_MSC_VER) || defined(WIN32)
-#include <malloc.h>
-#ifndef alloca
-#define alloca _alloca
-#endif
-#else
-#include <alloca.h>
-#endif
-
 #include <iostream>
 
 using namespace std;




--- rubberband/src/StretcherImpl.cpp.orig	2019-02-24 20:03:17.214195000 +0100
+++ rubberband/src/StretcherImpl.cpp	2019-02-24 20:03:23.369920000 +0100
@@ -37,10 +37,6 @@
 
 #include "base/Profiler.h"
 
-#ifndef _WIN32
-#include <alloca.h>
-#endif
-
 #include <cassert>
 #include <cmath>
 #include <set>




--- rubberband/src/StretcherProcess.cpp.orig	2019-02-24 20:01:56.974984000 +0100
+++ rubberband/src/StretcherProcess.cpp	2019-02-24 20:02:05.506472000 +0100
@@ -34,10 +34,6 @@
 #include "base/Profiler.h"
 #include "system/VectorOps.h"
 
-#ifndef _WIN32
-#include <alloca.h>
-#endif
-
 #include <cassert>
 #include <cmath>
 #include <set>




--- rubberband/src/kissfft/kiss_fft.h.orig	2019-02-24 20:09:18.566723000 +0100
+++ rubberband/src/kissfft/kiss_fft.h	2019-02-24 20:09:30.503363000 +0100
@@ -5,9 +5,6 @@
 #include <stdio.h>
 #include <math.h>
 #include <memory.h>
-#ifndef __APPLE__
-#include <malloc.h>
-#endif
 
 #ifdef __cplusplus
 extern "C" {

Line 0 Link Here

(-)files/patch-rubberband_src_system_sysutils.h (+11 lines)
	1	--- rubberband/src/system/sysutils.h.orig 2019-02-24 19:42:14.471255000 +0100
	2	+++ rubberband/src/system/sysutils.h 2019-02-24 19:42:27.408497000 +0100
	3	@@ -47,7 +47,7 @@
	4	#include <malloc.h>
	5	#else
	6	#ifndef __MSVC__
	7	-#include <alloca.h>
	8	+/* #include <alloca.h> */
	9	#endif
	10	#endif
	11

Lines 1-11 Link Here

(-)files/patch-sonic-visualiser.pro (-11 lines)
1	Disable building the tests. They prevent building sonic-visualiser in parallel.
2	--- sonic-visualiser.pro.orig 2017-02-24 17:52:22 UTC
3	+++ sonic-visualiser.pro
4	@@ -5,7 +5,6 @@ SUBDIRS = sub_dataquay svcore svgui svap
5	# We should build and run the tests on any platform,
6	# but doing it automatically doesn't work so well from
7	# within an IDE on Windows, so remove that from here
8	- SUBDIRS += svcore/base/test svcore/data/fileio/test svcore/data/model/test
9	}
10
11	sub_sv.file = sv.pro

Lines 1-11 Link Here

(-)files/patch-svapp_audioio_AudioJACKTarget.cpp (-11 lines)
1	--- svapp/audioio/AudioJACKTarget.cpp.orig 2015-10-22 11:26:02 UTC
2	+++ svapp/audioio/AudioJACKTarget.cpp
3	@@ -21,8 +21,6 @@
4	#include <iostream>
5	#include <cmath>
6
7	-#include <alloca.h>
8	-
9	//#define DEBUG_AUDIO_JACK_TARGET 1
10
11	#ifdef BUILD_STATIC

Lines 1-11 Link Here

(-)files/patch-svcore_base_RealTime.cpp (-11 lines)
1	--- svcore/base/RealTime.cpp.orig 2015-10-22 11:26:02 UTC
2	+++ svcore/base/RealTime.cpp
3	@@ -105,7 +105,7 @@ RealTime::fromXsdDuration(std::string xs
4	char *eptr = 0;
5
6	if (isdigit(s[i]) \|\| s[i] == '.') {
7	- value = strtod(&s[i], &eptr);
8	+ value = strtod_l(&s[i], &eptr, NULL);
9	i = int(eptr - s);
10	}
11

Lines 6-9 Link Here

(-)pkg-descr (-1 / +1 lines)
6	annotated and played back featuring time streching. Furthermore it	6	annotated and played back featuring time streching. Furthermore it
7	can be extended by third-party vamp plugins for feature extraction.	7	can be extended by third-party vamp plugins for feature extraction.
8		8
9	WWW: http://www.sonicvisualiser.org/	9	WWW: https://www.sonicvisualiser.org/

Return to bug 236000

Lines 1-10 Link Here

(-)Makefile (-5 / +5 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= sonic-visualiser	3	PORTNAME= sonic-visualiser
4	PORTVERSION= 2.5	4	PORTVERSION= 3.2.1
5	PORTREVISION= 4
6	CATEGORIES= audio	5	CATEGORIES= audio
7	MASTER_SITES= https://code.soundsoftware.ac.uk/attachments/download/1675/	6	MASTER_SITES= https://code.soundsoftware.ac.uk/attachments/download/2434/
8		7
9	MAINTAINER= uddka@student.kit.edu	8	MAINTAINER= uddka@student.kit.edu
10	COMMENT= Program for viewing and analysing the contents of music audio files	9	COMMENT= Program for viewing and analysing the contents of music audio files
Lines 14-19 Link Here
14		13
15	LIB_DEPENDS= libfftw3.so:math/fftw3 \	14	LIB_DEPENDS= libfftw3.so:math/fftw3 \
16	libfftw3f.so:math/fftw3-float \	15	libfftw3f.so:math/fftw3-float \
		16	libcapnp.so:devel/capnproto \
17	libsamplerate.so:audio/libsamplerate \	17	libsamplerate.so:audio/libsamplerate \
18	libsndfile.so:audio/libsndfile \	18	libsndfile.so:audio/libsndfile \
19	librubberband.so:audio/rubberband \	19	librubberband.so:audio/rubberband \
Lines 21-30 Link Here
21	libsord-0.so:devel/sord \	21	libsord-0.so:devel/sord \
22	libvamp-hostsdk.so:audio/vamp-plugin-sdk	22	libvamp-hostsdk.so:audio/vamp-plugin-sdk
23		23
24	USES= autoreconf desktop-file-utils gmake pkgconfig qt:5	24	USES= autoreconf desktop-file-utils gl gmake pkgconfig qt:5
25		25
26	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
27	USE_QT= buildtools_build core gui network qmake_build testlib widgets xml	27	USE_QT= buildtools_build core gui network qmake_build svg testlib widgets xml
28	USE_XORG= x11	28	USE_XORG= x11
29	USE_GL= gl	29	USE_GL= gl
30		30

Line 0 Link Here

(-)files/patch-base.pri (+22 lines)
	1	--- base.pri.orig 2019-01-08 14:32:16.000000000 +0100
	2	+++ base.pri 2019-02-24 20:22:20.573083000 +0100
	3	@@ -16,10 +16,7 @@
	4	svcore/data \
	5	svcore/plugin/api/alsa \
	6	svgui \
	7	- svapp \
	8	- vamp-plugin-sdk \
	9	- rubberband \
	10	- rubberband/src
	11	+ svapp
	12
	13	DEPENDPATH += $$SV_INCLUDEPATH
	14	INCLUDEPATH += $$SV_INCLUDEPATH
	15	@@ -34,6 +31,7 @@
	16	DEFINES += USE_SORD
	17
	18	# Defines for Rubber Band
	19	+freebsd*: DEFINES += USE_PTHREADS
	20	linux*: DEFINES += USE_PTHREADS
	21	macx*: DEFINES += USE_PTHREADS
	22

Line 0 Link Here

(-)files/patch-base.pro (+12 lines)
	1	--- base.pro.orig 2019-02-24 20:51:22.585365000 +0100
	2	+++ base.pro 2019-02-24 20:52:25.795850000 +0100
	3	@@ -25,9 +25,7 @@
	4	}
	5
	6	include(bq-files.pri)
	7	-include(vamp-plugin-sdk-files.pri)
	8	include(svcore/files.pri)
	9	-include(capnp-regen.pri)
	10
	11	DATAQUAY_SOURCES=$$fromfile(dataquay/lib.pro, SOURCES)
	12	DATAQUAY_HEADERS=$$fromfile(dataquay/lib.pro, HEADERS)

Line 0 Link Here

(-)files/patch-bqvec_src_VectorOpsComplex.cpp (+18 lines)
	1	--- bqvec/src/VectorOpsComplex.cpp.orig 2019-02-24 19:47:00.932155000 +0100
	2	+++ bqvec/src/VectorOpsComplex.cpp 2019-02-24 19:47:27.692142000 +0100
	3	@@ -45,15 +45,6 @@
	4	#endif
	5	#endif
	6
	7	-#if defined(_MSC_VER) \|\| defined(WIN32)
	8	-#include <malloc.h>
	9	-#ifndef alloca
	10	-#define alloca _alloca
	11	-#endif
	12	-#else
	13	-#include <alloca.h>
	14	-#endif
	15	-
	16	#include <iostream>
	17
	18	using namespace std;

Line 0 Link Here

(-)files/patch-rubberband_src_StretcherImpl.cpp (+13 lines)
	1	--- rubberband/src/StretcherImpl.cpp.orig 2019-02-24 20:03:17.214195000 +0100
	2	+++ rubberband/src/StretcherImpl.cpp 2019-02-24 20:03:23.369920000 +0100
	3	@@ -37,10 +37,6 @@
	4
	5	#include "base/Profiler.h"
	6
	7	-#ifndef _WIN32
	8	-#include <alloca.h>
	9	-#endif
	10	-
	11	#include <cassert>
	12	#include <cmath>
	13	#include <set>

Line 0 Link Here

(-)files/patch-rubberband_src_StretcherProcess.cpp (+13 lines)
	1	--- rubberband/src/StretcherProcess.cpp.orig 2019-02-24 20:01:56.974984000 +0100
	2	+++ rubberband/src/StretcherProcess.cpp 2019-02-24 20:02:05.506472000 +0100
	3	@@ -34,10 +34,6 @@
	4	#include "base/Profiler.h"
	5	#include "system/VectorOps.h"
	6
	7	-#ifndef _WIN32
	8	-#include <alloca.h>
	9	-#endif
	10	-
	11	#include <cassert>
	12	#include <cmath>
	13	#include <set>

Line 0 Link Here

(-)files/patch-rubberband_src_kissfft_kiss__fft.h (+12 lines)
	1	--- rubberband/src/kissfft/kiss_fft.h.orig 2019-02-24 20:09:18.566723000 +0100
	2	+++ rubberband/src/kissfft/kiss_fft.h 2019-02-24 20:09:30.503363000 +0100
	3	@@ -5,9 +5,6 @@
	4	#include <stdio.h>
	5	#include <math.h>
	6	#include <memory.h>
	7	-#ifndef __APPLE__
	8	-#include <malloc.h>
	9	-#endif
	10
	11	#ifdef __cplusplus
	12	extern "C" {