Attachment #222430 for bug #253502

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

Lines 200-206 Link Here

(-)b/audio/Makefile (-1 lines)
200	SUBDIR += fpc-modplug	200	SUBDIR += fpc-modplug
201	SUBDIR += fpc-oggvorbis	201	SUBDIR += fpc-oggvorbis
202	SUBDIR += fpc-openal	202	SUBDIR += fpc-openal
203	SUBDIR += fplib
204	SUBDIR += freealut	203	SUBDIR += freealut
205	SUBDIR += freedesktop-sound-theme	204	SUBDIR += freedesktop-sound-theme
206	SUBDIR += freepats	205	SUBDIR += freepats




# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
# $FreeBSD$

PORTNAME=	fplib
PORTVERSION=	20121001
PORTREVISION=	4
CATEGORIES=	audio

MAINTAINER=	sunpoet@FreeBSD.org
COMMENT=	Last.fm fingerprint library

LICENSE=	GPLv3+

LIB_DEPENDS=	libcurl.so:ftp/curl \
		libfftw3.so:math/fftw3 \
		libfftw3f.so:math/fftw3-float \
		libmad.so:audio/libmad \
		libsamplerate.so:audio/libsamplerate \
		libtag.so:audio/taglib

USES=		cmake compiler:c++11-lang localbase:ldflags

MAKE_JOBS_UNSAFE=	yes
USE_LDCONFIG=	yes

GH_ACCOUNT=	lastfm
GH_PROJECT=	Fingerprinter
GH_TAGNAME=	b728727
USE_GITHUB=	yes

.include <bsd.port.mk>

Removed Link Here

(-)a/audio/fplib/distinfo (-3 lines)
1	TIMESTAMP = 1482063349
2	SHA256 (lastfm-Fingerprinter-20121001-b728727_GH0.tar.gz) = fd15b645658f3f1d9c9c4edf5a0ac35a703925f41048f185768073b7bf174b62
3	SIZE (lastfm-Fingerprinter-20121001-b728727_GH0.tar.gz) = 65462




Link against an actual target name, not the generated library name.

If we link against the latter, there is no dependency between lastfm-fpclient
and fplib, which can break parallel builds starting with CMake 3.5.0.
--- CMakeLists.txt.orig	2013-10-23 16:45:46 UTC
+++ CMakeLists.txt
@@ -139,7 +139,7 @@ ADD_EXECUTABLE(lastfm-fpclient
 
 # Link the executable
 TARGET_LINK_LIBRARIES(lastfm-fpclient
-   fplib
+   fplib_shared
    fftw3f
    mad
    tag




The last.fm fingerprint library

The fingerprinting process works in two steps:
1. Get PCM data and pass it to *fplib* which will return byte string to be
   submitted to the last.fm HTTP fingerprint service. This will return a number
   (fingerprintID).
2. Query the last.fm API with the fingerprintID and obtain the metadata in xml
   format.

The lastfmfpclient directory contains an example of application that uses fplib
and queries both services.

WWW: https://github.com/lastfm/Fingerprinter

Removed Link Here

(-)a/audio/fplib/pkg-plist (-10 lines)
1	bin/lastfm-fpclient
2	include/fplib/CircularArray.h
3	include/fplib/Filter.h
4	include/fplib/FingerprintExtractor.h
5	include/fplib/FloatingAverage.h
6	include/fplib/OptFFT.h
7	include/fplib/fp_helper_fun.h
8	include/fplib/version.h
9	lib/libfplib.a
10	lib/libfplib.so

Return to bug 253502

Removed Link Here

(-)a/audio/fplib/Makefile (-31 lines)
1	# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
2	# $FreeBSD$
3
4	PORTNAME= fplib
5	PORTVERSION= 20121001
6	PORTREVISION= 4
7	CATEGORIES= audio
8
9	MAINTAINER= sunpoet@FreeBSD.org
10	COMMENT= Last.fm fingerprint library
11
12	LICENSE= GPLv3+
13
14	LIB_DEPENDS= libcurl.so:ftp/curl \
15	libfftw3.so:math/fftw3 \
16	libfftw3f.so:math/fftw3-float \
17	libmad.so:audio/libmad \
18	libsamplerate.so:audio/libsamplerate \
19	libtag.so:audio/taglib
20
21	USES= cmake compiler:c++11-lang localbase:ldflags
22
23	MAKE_JOBS_UNSAFE= yes
24	USE_LDCONFIG= yes
25
26	GH_ACCOUNT= lastfm
27	GH_PROJECT= Fingerprinter
28	GH_TAGNAME= b728727
29	USE_GITHUB= yes
30
31	.include <bsd.port.mk>

Removed Link Here

(-)a/audio/fplib/files/patch-CMakeLists.txt (-15 lines)
1	Link against an actual target name, not the generated library name.
2
3	If we link against the latter, there is no dependency between lastfm-fpclient
4	and fplib, which can break parallel builds starting with CMake 3.5.0.
5	--- CMakeLists.txt.orig 2013-10-23 16:45:46 UTC
6	+++ CMakeLists.txt
7	@@ -139,7 +139,7 @@ ADD_EXECUTABLE(lastfm-fpclient
8
9	# Link the executable
10	TARGET_LINK_LIBRARIES(lastfm-fpclient
11	- fplib
12	+ fplib_shared
13	fftw3f
14	mad
15	tag

Removed Link Here

(-)a/audio/fplib/pkg-descr (-13 lines)
1	The last.fm fingerprint library
2
3	The fingerprinting process works in two steps:
4	1. Get PCM data and pass it to fplib which will return byte string to be
5	submitted to the last.fm HTTP fingerprint service. This will return a number
6	(fingerprintID).
7	2. Query the last.fm API with the fingerprintID and obtain the metadata in xml
8	format.
9
10	The lastfmfpclient directory contains an example of application that uses fplib
11	and queries both services.
12
13	WWW: https://github.com/lastfm/Fingerprinter