Attachment #131651 for bug #175779

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




# Created by: Matt Tosto <datahead4@gmail.com>
# $FreeBSD$
# Whom:					Matt Tosto <datahead4@gmail.com>
#
# $FreeBSD: ports/audio/liblastfm/Makefile,v 1.16 2012/11/17 05:54:36 svnexp Exp $
#

PORTNAME=	liblastfm
PORTVERSION=	1.0.5
PORTREVISION=	4
CATEGORIES=	audio
MASTER_SITES=	http://cdn.last.fm/client/Linux/
DISTNAME=	Last.fm-2.1.30
DISTNAME=	mxcl-${PORTNAME}-${PORTVERSION}-0-gf0b3239

MAINTAINER=	datahead4@gmail.com
COMMENT=	Collection of libraries to help integrate Last.fm services

LIB_DEPENDS=	samplerate:${PORTSDIR}/audio/libsamplerate \
		fftw3:${PORTSDIR}/math/fftw3 \
		fftw3f:${PORTSDIR}/math/fftw3-float

USE_BZIP2=	yes
USE_CMAKE=	yes
USE_QT4=	corelib xml network sql gui qtestlib dbus \
USE_QT4=	corelib xml network sql gui qtestlib \
		qmake_build moc_build rcc_build uic_build
HAS_CONFIGURE=	yes
CONFIGURE_ARGS+=	-release --prefix ${PREFIX}
MAKE_JOBS_UNSAFE=	yes

USE_LDCONFIG=	yes

OPTIONS_DEFINE=		FINGERPRINT TESTS
FINGERPRINT_DESC=	Build the lastfm-fingerprint library
TESTS_DESC=		Build liblastfm tests

OPTIONS_DEFAULT=	FINGERPRINT

WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MFINGERPRINT}
CMAKE_ARGS+=	-DBUILD_FINGERPRINT=ON
PLIST_SUB+=	FINGERPRINT=""
.else
CMAKE_ARGS+=	-DBUILD_FINGERPRINT=OFF
PLIST_SUB+=	FINGERPRINT="@comment "
.endif

.if ${PORT_OPTIONS:MTESTS}
CMAKE_ARGS+=	-DBUILD_TESTS=ON
.else
CMAKE_ARGS+=	-DBUILD_TESTS=OFF
.endif

.include <bsd.port.mk>
post-extract:
	${REINPLACE_CMD} -e 's|#!/usr/bin/ruby|#!${RUBY_WITH_SUFFIX}|' ${WRKSRC}/configure
	${REINPLACE_CMD} -e 's|\`ruby |`${RUBY_WITH_SUFFIX} |' ${WRKSRC}/configure
	${REINPLACE_CMD} -e 's|__demos __tests||' ${WRKSRC}/admin/Makefile.rb
	${REINPLACE_CMD} -e '/QMAKE_CXXFLAGS_RELEASE.*/d' \
		-e 's|linux:|unix:|'  ${WRKSRC}/.qmake.cache
	${FIND} ${WRKSRC}/admin -type f | ${XARGS} \
		 ${REINPLACE_CMD} -e 's|#!/usr/bin/ruby|#!${RUBY_WITH_SUFFIX}|'

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)liblastfm/distinfo (-2 / +2 lines)
1	SHA256 (mxcl-liblastfm-0.3.3-0-gf0b3239.tar.gz) = 2607ba6c1495bae8c0f93df1e6271ba5c4503ee53e5657d815fdd584e4df636c	1	SHA256 (Last.fm-2.1.30.tar.bz2) = a8591930af2c76100840fa94082e831d5aeb2893c264528a15ec5151bf0cc2a4
2	SIZE (mxcl-liblastfm-0.3.3-0-gf0b3239.tar.gz) = 111700	2	SIZE (Last.fm-2.1.30.tar.bz2) = 5970748




--- admin/findsrc.rb.orig	2010-09-19 10:35:34.783333338 +0200
+++ admin/findsrc.rb	2010-09-19 10:35:57.730000003 +0200
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby
 require 'find'
-require "#{File.dirname __FILE__}/platform"
+require "#{Dir.getwd}/admin/platform.rb"
 
 def findsrc dir='.'
   excludes = ['.svn','.git','_include','tests','_build']
--- admin/qpp.orig	2010-09-19 10:36:09.276666670 +0200
+++ admin/qpp	2010-09-19 10:36:16.926666670 +0200
@@ -2,9 +2,8 @@
 # Creates a qmake .pro file for all valid SOURCES, HEADERS, FORMS and
 #Â RESOURCES under each argument to ARGV as directories
 
-cwd=File.dirname __FILE__
 require 'find'
-require "#{cwd}/findsrc"
+require "#{Dir.getwd}/admin/findsrc.rb"
 
 sources = Array.new
 headers = Array.new
--- admin/Makefile.rb.orig	2010-09-19 10:35:38.086666671 +0200
+++ admin/Makefile.rb	2010-09-19 10:36:05.816666671 +0200
@@ -4,9 +4,8 @@
 # and then creates the directory _include and creates files named after the 
 # class names in there which #include the file that contains the class
 
-cwd = File.dirname( __FILE__ )
 require 'find'
-require "#{cwd}/platform.rb"
+require "#{Dir.getwd}/admin/platform.rb"
 
 
 ######################################################################### defs




--- src/fingerprint/fingerprint.pro.orig        2011-03-06 17:36:13.070963361 -0500
+++ src/fingerprint/fingerprint.pro     2011-03-06 17:36:32.901964223 -0500
@@ -23,6 +23,6 @@
         # the difference with win32 is that windows doesn't have the f suffix
         # but I think this may be because doug didn't compile it with single
         # precision, and I'm not sure if that matters or not
-        PKGCONFIG += fftw3f
+        LIBS += -lsamplerate -lfftw3f
     }
-}
\ No newline at end of file
+}




$NetBSD: patch-src_fingerprint_fplib_FloatingAverage.h,v 1.1 2012/04/17 17:39:47 joerg Exp $

--- src/fingerprint/fplib/FloatingAverage.h.orig	2012-04-17 15:10:50.000000000 +0000
+++ src/fingerprint/fplib/FloatingAverage.h
@@ -76,7 +76,7 @@ public:
    {
       T real_sum = 0;
       const T* pCircularBuffer = m_values.get_buffer();
-      for ( int i = 0; i < size; ++i )
+      for ( int i = 0; i < size(); ++i )
          real_sum += pCircularBuffer[i];
       return abs(real_sum - m_sum) / this->size();
    }




%%FINGERPRINT%%include/lastfm/Fingerprint.h
%%FINGERPRINT%%include/lastfm/FingerprintableSource.h
%%FINGERPRINT%%lib/liblastfm_fingerprint.so
%%FINGERPRINT%%lib/liblastfm_fingerprint.so.1
%%FINGERPRINT%%lib/liblastfm_fingerprint.so.1.0.5
include/lastfm/AbstractType.h
include/lastfm/Album.h
include/lastfm/Artist.h
include/lastfm/Audioscrobbler.h
include/lastfm/Auth.h
include/lastfm/Chart.h
include/lastfm/FingerprintId.h
include/lastfm/InternetConnectionMonitor.h
include/lastfm/Library.h
include/lastfm/Mbid.h
include/lastfm/NetworkAccessManager.h
include/lastfm/NetworkConnectionMonitor.h
include/lastfm/Playlist.h
include/lastfm/RadioStation.h
include/lastfm/RadioTuner.h
include/lastfm/ScrobbleCache.h
include/lastfm/ScrobblePoint.h
include/lastfm/Tag.h
include/lastfm/Tasteometer.h
include/lastfm/Track.h
include/lastfm/UrlBuilder.h
include/lastfm/User.h
include/lastfm/XmlQuery.h
include/lastfm/Xspf.h
include/lastfm/global.h
include/lastfm/misc.h
include/lastfm/ws.h
include/lastfm.h
lib/liblastfm.so
lib/liblastfm.so.1
lib/liblastfm.so.1.0.5
lib/liblastfm.so.0.3.3
lib/liblastfm_fingerprint.so
lib/liblastfm_fingerprint.so.0
lib/liblastfm_fingerprint.so.0.3
lib/liblastfm_fingerprint.so.0.3.3
@dirrm include/lastfm

Return to bug 175779

Lines 1-46 Link Here

(-)liblastfm/Makefile (-30 / +33 lines)
1	# New ports collection makefile for: liblastfm	1	# Created by: Matt Tosto <datahead4@gmail.com>
2	# Date created: Jun 7 2009	2	# $FreeBSD$
3	# Whom: Matt Tosto <datahead4@gmail.com>
4	#
5	# $FreeBSD: ports/audio/liblastfm/Makefile,v 1.16 2012/11/17 05:54:36 svnexp Exp $
6	#
7		3
8	PORTNAME= liblastfm	4	PORTNAME= liblastfm
9	PORTVERSION= 0.3.3	5	PORTVERSION= 1.0.5
10	PORTREVISION= 4
11	CATEGORIES= audio	6	CATEGORIES= audio
12	MASTER_SITES= ${MASTER_SITE_LOCAL}	7	MASTER_SITES= http://cdn.last.fm/client/Linux/
13	MASTER_SITE_SUBDIR= swills	8	DISTNAME= Last.fm-2.1.30
14	DISTNAME= mxcl-${PORTNAME}-${PORTVERSION}-0-gf0b3239
15		9
16	MAINTAINER= datahead4@gmail.com	10	MAINTAINER= datahead4@gmail.com
17	COMMENT= Collection of libraries to help integrate Last.fm services	11	COMMENT= Collection of libraries to help integrate Last.fm services
18		12
19	LIB_DEPENDS= samplerate.1:${PORTSDIR}/audio/libsamplerate \	13	LIB_DEPENDS= samplerate:${PORTSDIR}/audio/libsamplerate \
20	fftw3:${PORTSDIR}/math/fftw3 \	14	fftw3:${PORTSDIR}/math/fftw3 \
21	fftw3f:${PORTSDIR}/math/fftw3-float	15	fftw3f:${PORTSDIR}/math/fftw3-float
22		16
23	USE_CSTD= gnu89	17	USE_BZIP2= yes
24	USE_RUBY= yes	18	USE_CMAKE= yes
25	USE_GMAKE= yes	19	USE_QT4= corelib xml network sql gui qtestlib dbus \
26	USE_QT4= corelib xml network sql gui qtestlib \
27	qmake_build moc_build rcc_build uic_build	20	qmake_build moc_build rcc_build uic_build
28	HAS_CONFIGURE= yes
29	CONFIGURE_ARGS+= -release --prefix ${PREFIX}
30	MAKE_JOBS_UNSAFE= yes	21	MAKE_JOBS_UNSAFE= yes
31		22
32	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
33		24
34	WRKSRC= ${WRKDIR}/mxcl-liblastfm-1c739eb	25	OPTIONS_DEFINE= FINGERPRINT TESTS
		26	FINGERPRINT_DESC= Build the lastfm-fingerprint library
		27	TESTS_DESC= Build liblastfm tests
		28
		29	OPTIONS_DEFAULT= FINGERPRINT
		30
		31	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
		32
		33	.include <bsd.port.options.mk>
		34
		35	.if ${PORT_OPTIONS:MFINGERPRINT}
		36	CMAKE_ARGS+= -DBUILD_FINGERPRINT=ON
		37	PLIST_SUB+= FINGERPRINT=""
		38	.else
		39	CMAKE_ARGS+= -DBUILD_FINGERPRINT=OFF
		40	PLIST_SUB+= FINGERPRINT="@comment "
		41	.endif
		42
		43	.if ${PORT_OPTIONS:MTESTS}
		44	CMAKE_ARGS+= -DBUILD_TESTS=ON
		45	.else
		46	CMAKE_ARGS+= -DBUILD_TESTS=OFF
		47	.endif
35		48
36	.include <bsd.port.pre.mk>	49	.include <bsd.port.mk>
37	post-extract:
38	${REINPLACE_CMD} -e 's\|#!/usr/bin/ruby\|#!${RUBY_WITH_SUFFIX}\|' ${WRKSRC}/configure
39	${REINPLACE_CMD} -e 's\|\`ruby \|`${RUBY_WITH_SUFFIX} \|' ${WRKSRC}/configure
40	${REINPLACE_CMD} -e 's\|__demos __tests\|\|' ${WRKSRC}/admin/Makefile.rb
41	${REINPLACE_CMD} -e '/QMAKE_CXXFLAGS_RELEASE.*/d' \
42	-e 's\|linux:\|unix:\|' ${WRKSRC}/.qmake.cache
43	${FIND} ${WRKSRC}/admin -type f \| ${XARGS} \
44	${REINPLACE_CMD} -e 's\|#!/usr/bin/ruby\|#!${RUBY_WITH_SUFFIX}\|'
45
46	.include <bsd.port.post.mk>

Lines 1-36 Link Here

(-)liblastfm/files/patch-no-ftools (-36 lines)
1	--- admin/findsrc.rb.orig 2010-09-19 10:35:34.783333338 +0200
2	+++ admin/findsrc.rb 2010-09-19 10:35:57.730000003 +0200
3	@@ -1,6 +1,6 @@
4	#!/usr/bin/ruby
5	require 'find'
6	-require "#{File.dirname __FILE__}/platform"
7	+require "#{Dir.getwd}/admin/platform.rb"
8
9	def findsrc dir='.'
10	excludes = ['.svn','.git','_include','tests','_build']
11	--- admin/qpp.orig 2010-09-19 10:36:09.276666670 +0200
12	+++ admin/qpp 2010-09-19 10:36:16.926666670 +0200
13	@@ -2,9 +2,8 @@
14	# Creates a qmake .pro file for all valid SOURCES, HEADERS, FORMS and
15	#Â RESOURCES under each argument to ARGV as directories
16
17	-cwd=File.dirname __FILE__
18	require 'find'
19	-require "#{cwd}/findsrc"
20	+require "#{Dir.getwd}/admin/findsrc.rb"
21
22	sources = Array.new
23	headers = Array.new
24	--- admin/Makefile.rb.orig 2010-09-19 10:35:38.086666671 +0200
25	+++ admin/Makefile.rb 2010-09-19 10:36:05.816666671 +0200
26	@@ -4,9 +4,8 @@
27	# and then creates the directory _include and creates files named after the
28	# class names in there which #include the file that contains the class
29
30	-cwd = File.dirname( __FILE__ )
31	require 'find'
32	-require "#{cwd}/platform.rb"
33	+require "#{Dir.getwd}/admin/platform.rb"
34
35
36	######################################################################### defs

Lines 1-12 Link Here

(-)liblastfm/files/patch-src_fingerprint_fingerprint.pro (-12 lines)
1	--- src/fingerprint/fingerprint.pro.orig 2011-03-06 17:36:13.070963361 -0500
2	+++ src/fingerprint/fingerprint.pro 2011-03-06 17:36:32.901964223 -0500
3	@@ -23,6 +23,6 @@
4	# the difference with win32 is that windows doesn't have the f suffix
5	# but I think this may be because doug didn't compile it with single
6	# precision, and I'm not sure if that matters or not
7	- PKGCONFIG += fftw3f
8	+ LIBS += -lsamplerate -lfftw3f
9	}
10	-}
11	\ No newline at end of file
12	+}

Lines 1-13 Link Here

(-)liblastfm/files/patch-src_fingerprint_fplib_FloatingAverage.h (-13 lines)
1	$NetBSD: patch-src_fingerprint_fplib_FloatingAverage.h,v 1.1 2012/04/17 17:39:47 joerg Exp $
2
3	--- src/fingerprint/fplib/FloatingAverage.h.orig 2012-04-17 15:10:50.000000000 +0000
4	+++ src/fingerprint/fplib/FloatingAverage.h
5	@@ -76,7 +76,7 @@ public:
6	{
7	T real_sum = 0;
8	const T* pCircularBuffer = m_values.get_buffer();
9	- for ( int i = 0; i < size; ++i )
10	+ for ( int i = 0; i < size(); ++i )
11	real_sum += pCircularBuffer[i];
12	return abs(real_sum - m_sum) / this->size();
13	}

Lines 1-37 Link Here

(-)liblastfm/pkg-plist (-32 / +31 lines)
1	include/lastfm/Album	1	%%FINGERPRINT%%include/lastfm/Fingerprint.h
2	include/lastfm/Artist	2	%%FINGERPRINT%%include/lastfm/FingerprintableSource.h
3	include/lastfm/Audioscrobbler	3	%%FINGERPRINT%%lib/liblastfm_fingerprint.so
4	include/lastfm/AuthenticatedUser	4	%%FINGERPRINT%%lib/liblastfm_fingerprint.so.1
5	include/lastfm/Fingerprint	5	%%FINGERPRINT%%lib/liblastfm_fingerprint.so.1.0.5
6	include/lastfm/FingerprintId	6	include/lastfm/AbstractType.h
7	include/lastfm/FingerprintableSource	7	include/lastfm/Album.h
8	include/lastfm/InternetConnectionMonitor	8	include/lastfm/Artist.h
9	include/lastfm/Mbid	9	include/lastfm/Audioscrobbler.h
10	include/lastfm/MutableTrack	10	include/lastfm/Auth.h
11	include/lastfm/NetworkAccessManager	11	include/lastfm/Chart.h
12	include/lastfm/ParseError	12	include/lastfm/FingerprintId.h
13	include/lastfm/Playlist	13	include/lastfm/InternetConnectionMonitor.h
14	include/lastfm/RadioStation	14	include/lastfm/Library.h
15	include/lastfm/RadioTuner	15	include/lastfm/Mbid.h
16	include/lastfm/Scrobble	16	include/lastfm/NetworkAccessManager.h
17	include/lastfm/ScrobbleCache	17	include/lastfm/NetworkConnectionMonitor.h
18	include/lastfm/ScrobblePoint	18	include/lastfm/Playlist.h
19	include/lastfm/Tag	19	include/lastfm/RadioStation.h
20	include/lastfm/Track	20	include/lastfm/RadioTuner.h
21	include/lastfm/UrlBuilder	21	include/lastfm/ScrobbleCache.h
22	include/lastfm/User	22	include/lastfm/ScrobblePoint.h
23	include/lastfm/XmlQuery	23	include/lastfm/Tag.h
24	include/lastfm/Xspf	24	include/lastfm/Tasteometer.h
		25	include/lastfm/Track.h
		26	include/lastfm/UrlBuilder.h
		27	include/lastfm/User.h
		28	include/lastfm/XmlQuery.h
		29	include/lastfm/Xspf.h
25	include/lastfm/global.h	30	include/lastfm/global.h
26	include/lastfm/misc.h	31	include/lastfm/misc.h
27	include/lastfm/ws.h	32	include/lastfm/ws.h
28	include/lastfm.h
29	lib/liblastfm.so	33	lib/liblastfm.so
30	lib/liblastfm.so.0	34	lib/liblastfm.so.1
31	lib/liblastfm.so.0.3	35	lib/liblastfm.so.1.0.5
32	lib/liblastfm.so.0.3.3
33	lib/liblastfm_fingerprint.so
34	lib/liblastfm_fingerprint.so.0
35	lib/liblastfm_fingerprint.so.0.3
36	lib/liblastfm_fingerprint.so.0.3.3
37	@dirrm include/lastfm	36	@dirrm include/lastfm