Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 10 Dec 2012 11:06:14 +0000 (UTC)
From:      Tilman Keskinoz <arved@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r308599 - in head/audio/last.fm: . files
Message-ID:  <201212101106.qBAB6Eib096276@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: arved
Date: Mon Dec 10 11:06:14 2012
New Revision: 308599
URL: http://svnweb.freebsd.org/changeset/ports/308599

Log:
  Update to 1.5.4.26862
  
  Tested by:	Rainer Hurling <rhurlin@gwdg.de>,
  		ajtiM <lumiwa@gmail.com>

Added:
  head/audio/last.fm/files/patch-LastFM.pro   (contents, props changed)
  head/audio/last.fm/files/patch-src-output-alsa-playback-xconvert.c   (contents, props changed)
  head/audio/last.fm/files/patch-src-updatewizard.h   (contents, props changed)
  head/audio/last.fm/files/patch-src-wizardselectupdatespage.h   (contents, props changed)
Deleted:
  head/audio/last.fm/files/patch-src-Helper-mediadevicewather.cpp
  head/audio/last.fm/files/patch-src-mediadevice-itunes-itunesdevice.cpp
  head/audio/last.fm/files/patch-src_LastFMHelper-controlinterface.h
Modified:
  head/audio/last.fm/Makefile
  head/audio/last.fm/distinfo
  head/audio/last.fm/pkg-plist

Modified: head/audio/last.fm/Makefile
==============================================================================
--- head/audio/last.fm/Makefile	Mon Dec 10 10:14:05 2012	(r308598)
+++ head/audio/last.fm/Makefile	Mon Dec 10 11:06:14 2012	(r308599)
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	last.fm
-PORTVERSION=	1.4.2.58240
-PORTREVISION=	6
+PORTVERSION=	1.5.4.26862
 CATEGORIES=	audio net
 MASTER_SITES=	http://cdn.last.fm/client/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
@@ -32,7 +31,7 @@ USE_QT4=	gui imageformats_run moc_build 
 		sql uic_build xml
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USE_DOS2UNIX=	yes
+USE_DOS2UNIX=	*.h
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
@@ -43,6 +42,7 @@ USE_GCC=4.2+
 .endif
 
 post-patch:
+	${CP} ${WRKSRC}/dist/tarball_files/configure ${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's|/bin/bash|/${LOCALBASE}/bin/bash|g' \
 			-E -e 's|(.*"CONFIG-=debug")|\1 ${QMAKEFLAGS}|g' \
 			-e 's|function header|header()|g' \
@@ -55,7 +55,9 @@ post-patch:
 		${WRKSRC}/src/mediadevices/ipod/ipod.pro
 	${REINPLACE_CMD} -e 's|^RUNDIR.*|RUNDIR=${DATADIR}|' ${WRKSRC}/bin/last.fm.sh
 	${RM} ${WRKSRC}/bin/libmad.1.dylib ${WRKSRC}/bin/libmad.dylib \
-		${WRKSRC}/bin/last.fm.sh.bak
+		${WRKSRC}/bin/last.fm.sh.bak \
+		${WRKSRC}/bin/*.dll ${WRKSRC}/bin/LastFM.exe.config
+	${RM} -rf ${WRKSRC}/bin/Microsoft* ${WRKSRC}/bin/sqldrivers
 
 post-build:
 	cd ${WRKSRC}/src/output/RtAudio && \

Modified: head/audio/last.fm/distinfo
==============================================================================
--- head/audio/last.fm/distinfo	Mon Dec 10 10:14:05 2012	(r308598)
+++ head/audio/last.fm/distinfo	Mon Dec 10 11:06:14 2012	(r308599)
@@ -1,2 +1,2 @@
-SHA256 (last.fm-1.4.2.58240.src.tar.bz2) = 6e66f3408021b3ea512224451599e81bd0fb9ede464575d9acae2cc16d5b6429
-SIZE (last.fm-1.4.2.58240.src.tar.bz2) = 7302117
+SHA256 (last.fm-1.5.4.26862.src.tar.bz2) = 5c110ab6e7a4c4ec950fb65912bc5ddfd106ce969c4b7376a7603cf7b3720e2a
+SIZE (last.fm-1.5.4.26862.src.tar.bz2) = 11415025

Added: head/audio/last.fm/files/patch-LastFM.pro
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/last.fm/files/patch-LastFM.pro	Mon Dec 10 11:06:14 2012	(r308599)
@@ -0,0 +1,11 @@
+--- LastFM.pro.orig	2012-12-02 14:23:24.000000000 +0100
++++ LastFM.pro	2012-12-02 14:23:37.000000000 +0100
+@@ -37,7 +37,7 @@
+     SUBDIRS -= src/mediadevices/ipod
+ }
+ 
+-linux* {
++unix:!mac* {
+     SUBDIRS -= src/Twiddly \
+                src/Bootstrapper/ITunesDevice
+ 

Added: head/audio/last.fm/files/patch-src-output-alsa-playback-xconvert.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/last.fm/files/patch-src-output-alsa-playback-xconvert.c	Mon Dec 10 11:06:14 2012	(r308599)
@@ -0,0 +1,10 @@
+--- src/output/alsa-playback/xconvert.c.orig	2012-12-02 14:30:50.000000000 +0100
++++ src/output/alsa-playback/xconvert.c	2012-12-02 14:33:58.000000000 +0100
+@@ -57,6 +57,7 @@
+ 
+ #endif
+ 
++#define uint size_t
+ 
+ struct buffer {
+     void *buffer;

Added: head/audio/last.fm/files/patch-src-updatewizard.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/last.fm/files/patch-src-updatewizard.h	Mon Dec 10 11:06:14 2012	(r308599)
@@ -0,0 +1,11 @@
+--- src/updatewizard.h.orig	2012-12-02 14:01:31.000000000 +0100
++++ src/updatewizard.h	2012-12-02 14:01:42.000000000 +0100
+@@ -50,7 +50,7 @@
+         CAutoUpdater& updater,
+         QWidget*      parent = NULL);
+ 
+-    UpdateWizard::UpdateWizard( CComponentInfo* );
++    UpdateWizard( CComponentInfo* );
+ 
+     bool shouldShow() const{ return m_showWizard; }
+ 

Added: head/audio/last.fm/files/patch-src-wizardselectupdatespage.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/last.fm/files/patch-src-wizardselectupdatespage.h	Mon Dec 10 11:06:14 2012	(r308599)
@@ -0,0 +1,11 @@
+--- src/wizardselectupdatespage.h.orig	2012-12-02 13:59:46.000000000 +0100
++++ src/wizardselectupdatespage.h	2012-12-02 14:00:17.000000000 +0100
+@@ -58,7 +58,7 @@
+     GetChecked(
+         std::vector<CComponentInfo*>& vecChecked);
+     
+-    void WizardSelectUpdatesPage::GetMajorUpdateComponent( std::vector<CComponentInfo*>& vecToUpdate );
++    void GetMajorUpdateComponent( std::vector<CComponentInfo*>& vecToUpdate );
+ 
+ public slots:
+ 

Modified: head/audio/last.fm/pkg-plist
==============================================================================
--- head/audio/last.fm/pkg-plist	Mon Dec 10 10:14:05 2012	(r308598)
+++ head/audio/last.fm/pkg-plist	Mon Dec 10 11:06:14 2012	(r308599)
@@ -1,5 +1,4 @@
 bin/last.fm
-%%DATADIR%%/LastFmHelper
 %%DATADIR%%/data/about.png
 %%DATADIR%%/data/about_generic.png
 %%DATADIR%%/data/about_mac.png
@@ -34,6 +33,7 @@ bin/last.fm
 %%DATADIR%%/data/icons/my_friends.png
 %%DATADIR%%/data/icons/my_neighbours.png
 %%DATADIR%%/data/icons/my_tags.png
+%%DATADIR%%/data/icons/mymix_radio.png
 %%DATADIR%%/data/icons/neighbour_radio.png
 %%DATADIR%%/data/icons/options_account.png
 %%DATADIR%%/data/icons/options_connection.png
@@ -105,10 +105,10 @@ bin/last.fm
 %%DATADIR%%/libfftw3f-3.lib
 %%DATADIR%%/services/libsrv_Ipod_device.so
 %%DATADIR%%/services/libsrv_httpinput.so
-%%DATADIR%%/services/libsrv_itunesdevice.so
 %%DATADIR%%/services/libsrv_madtranscode.so
 %%DATADIR%%/services/libsrv_rtaudioplayback.so
-%%DATADIR%%/updater-autorestart.sh
+%%DATADIR%%/services/libsrv_output_alsa.so
+%%DATADIR%%/services/libsrv_output_portaudio.so
 %%DATADIR%%/zlibwapi.lib
 share/applications/last.fm.desktop
 share/services/lastfm.protocol



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212101106.qBAB6Eib096276>