Attachment 131651 Details for Bug 175779 – file.diff

[patch] file.diff

file.diff (text/plain), 8.27 KB, created by Veniamin on 2013-02-02 10:50:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Veniamin

Created: 2013-02-02 10:50:00 UTC

Size: 8.27 KB

patch

obsolete

>diff -ruN liblastfm.orig/Makefile liblastfm/Makefile
>--- liblastfm.orig/Makefile	2013-02-02 14:38:58.863388994 +0400
>+++ liblastfm/Makefile	2013-02-02 01:00:58.523524571 +0400
>@@ -1,46 +1,49 @@
>-# New ports collection makefile for:	liblastfm
>-# Date created:				Jun 7 2009
>-# Whom:					Matt Tosto <datahead4@gmail.com>
>-#
>-# $FreeBSD: ports/audio/liblastfm/Makefile,v 1.16 2012/11/17 05:54:36 svnexp Exp $
>-#
>+# Created by: Matt Tosto <datahead4@gmail.com>
>+# $FreeBSD$
> 
> PORTNAME=	liblastfm
>-PORTVERSION=	0.3.3
>-PORTREVISION=	4
>+PORTVERSION=	1.0.5
> CATEGORIES=	audio
>-MASTER_SITES=	${MASTER_SITE_LOCAL}
>-MASTER_SITE_SUBDIR=	swills
>-DISTNAME=	mxcl-${PORTNAME}-${PORTVERSION}-0-gf0b3239
>+MASTER_SITES=	http://cdn.last.fm/client/Linux/
>+DISTNAME=	Last.fm-2.1.30
> 
> MAINTAINER=	datahead4@gmail.com
> COMMENT=	Collection of libraries to help integrate Last.fm services
> 
>-LIB_DEPENDS=	samplerate.1:${PORTSDIR}/audio/libsamplerate \
>+LIB_DEPENDS=	samplerate:${PORTSDIR}/audio/libsamplerate \
> 		fftw3:${PORTSDIR}/math/fftw3 \
> 		fftw3f:${PORTSDIR}/math/fftw3-float
> 
>-USE_CSTD=	gnu89
>-USE_RUBY=	yes
>-USE_GMAKE=	yes
>-USE_QT4=	corelib xml network sql gui qtestlib \
>+USE_BZIP2=	yes
>+USE_CMAKE=	yes
>+USE_QT4=	corelib xml network sql gui qtestlib dbus \
> 		qmake_build moc_build rcc_build uic_build
>-HAS_CONFIGURE=	yes
>-CONFIGURE_ARGS+=	-release --prefix ${PREFIX}
> MAKE_JOBS_UNSAFE=	yes
> 
> USE_LDCONFIG=	yes
> 
>-WRKSRC=		${WRKDIR}/mxcl-liblastfm-1c739eb
>+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.pre.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>
>+.include <bsd.port.mk>
>diff -ruN liblastfm.orig/distinfo liblastfm/distinfo
>--- liblastfm.orig/distinfo	2013-02-02 14:38:58.876492894 +0400
>+++ liblastfm/distinfo	2013-02-01 18:30:44.872039258 +0400
>@@ -1,2 +1,2 @@
>-SHA256 (mxcl-liblastfm-0.3.3-0-gf0b3239.tar.gz) = 2607ba6c1495bae8c0f93df1e6271ba5c4503ee53e5657d815fdd584e4df636c
>-SIZE (mxcl-liblastfm-0.3.3-0-gf0b3239.tar.gz) = 111700
>+SHA256 (Last.fm-2.1.30.tar.bz2) = a8591930af2c76100840fa94082e831d5aeb2893c264528a15ec5151bf0cc2a4
>+SIZE (Last.fm-2.1.30.tar.bz2) = 5970748
>diff -ruN liblastfm.orig/files/patch-no-ftools liblastfm/files/patch-no-ftools
>--- liblastfm.orig/files/patch-no-ftools	2013-02-02 14:38:58.802908402 +0400
>+++ liblastfm/files/patch-no-ftools	1970-01-01 03:00:00.000000000 +0300
>@@ -1,36 +0,0 @@
>---- 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
>diff -ruN liblastfm.orig/files/patch-src_fingerprint_fingerprint.pro liblastfm/files/patch-src_fingerprint_fingerprint.pro
>--- liblastfm.orig/files/patch-src_fingerprint_fingerprint.pro	2013-02-02 14:38:58.842220660 +0400
>+++ liblastfm/files/patch-src_fingerprint_fingerprint.pro	1970-01-01 03:00:00.000000000 +0300
>@@ -1,12 +0,0 @@
>---- 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
>-+}
>diff -ruN liblastfm.orig/files/patch-src_fingerprint_fplib_FloatingAverage.h liblastfm/files/patch-src_fingerprint_fplib_FloatingAverage.h
>--- liblastfm.orig/files/patch-src_fingerprint_fplib_FloatingAverage.h	2013-02-02 14:38:58.823069065 +0400
>+++ liblastfm/files/patch-src_fingerprint_fplib_FloatingAverage.h	1970-01-01 03:00:00.000000000 +0300
>@@ -1,13 +0,0 @@
>-$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();
>-    }
>diff -ruN liblastfm.orig/pkg-plist liblastfm/pkg-plist
>--- liblastfm.orig/pkg-plist	2013-02-02 14:38:58.869437248 +0400
>+++ liblastfm/pkg-plist	2013-02-02 00:36:26.436964129 +0400
>@@ -1,37 +1,36 @@
>-include/lastfm/Album
>-include/lastfm/Artist
>-include/lastfm/Audioscrobbler
>-include/lastfm/AuthenticatedUser
>-include/lastfm/Fingerprint
>-include/lastfm/FingerprintId
>-include/lastfm/FingerprintableSource
>-include/lastfm/InternetConnectionMonitor
>-include/lastfm/Mbid
>-include/lastfm/MutableTrack
>-include/lastfm/NetworkAccessManager
>-include/lastfm/ParseError
>-include/lastfm/Playlist
>-include/lastfm/RadioStation
>-include/lastfm/RadioTuner
>-include/lastfm/Scrobble
>-include/lastfm/ScrobbleCache
>-include/lastfm/ScrobblePoint
>-include/lastfm/Tag
>-include/lastfm/Track
>-include/lastfm/UrlBuilder
>-include/lastfm/User
>-include/lastfm/XmlQuery
>-include/lastfm/Xspf
>+%%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.0
>-lib/liblastfm.so.0.3
>-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
>+lib/liblastfm.so.1
>+lib/liblastfm.so.1.0.5
> @dirrm include/lastfm

Actions: View | Diff

Attachments on bug 175779: 131651