Index: audio/amarok-kde4/Makefile
===================================================================
--- audio/amarok-kde4/Makefile	(revision 425318)
+++ audio/amarok-kde4/Makefile	(working copy)
@@ -10,11 +10,14 @@
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE music player
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	libtag.so:audio/taglib \
 		libtag-extras.so:audio/taglib-extras \
 		liblastfm.so:audio/liblastfm \
 		libofa.so:audio/libofa \
 		libavcodec.so:multimedia/ffmpeg \
+		libmtp.so:multimedia/libmtp \
 		libqjson.so:devel/qjson \
 		libqca.so:devel/qca \
 		libdbus-1.so:devel/dbus
@@ -22,21 +25,21 @@
 RUN_DEPENDS=	${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so.1.0.0:devel/qtscriptgenerator \
 		${KDE_PREFIX}/lib/kde4/kio_upnp_ms.so:net/kio-upnp-ms
 
-USES=		cmake kde:4 pkgconfig shared-mime-info shebangfix tar:bzip2
-USE_KDE=	kdelibs libkcddb libkcompactdisc \
-		nepomuk-core runtime automoc4 strigi
-USE_MYSQL=	embedded
+USES=		cmake execinfo kde:4 mysql:embedded pkgconfig shared-mime-info shebangfix ssl tar:bzip2
+USE_GL=		gl
+USE_KDE=	automoc4 kdelibs libkcddb libkcompactdisc \
+		nepomuk-core runtime soprano strigi
 USE_QT4=	corelib dbus designer gui network opengl \
 		phonon script sql svg webkit xml \
 		qmake_build moc_build rcc_build uic_build
-USE_XORG=	x11
+USE_XORG=	sm ice x11 xau xdmcp xext xft xpm
 SHEBANG_FILES=	src/kconf_update/amarok-2.4.1-tokens_syntax_update.pl
 USE_LDCONFIG=	yes
 
 BROKEN_sparc64=	does not build (GCC-related error)
 
-OPTIONS_DEFINE=	AMAZON IPOD MP3TUNES MTP NLS
-OPTIONS_DEFAULT=IPOD MP3TUNES MTP
+OPTIONS_DEFINE=	AMAZON IPOD MP3TUNES NLS
+OPTIONS_DEFAULT=IPOD MP3TUNES
 OPTIONS_SUB=	yes
 
 AMAZON_DESC=		Amazon MP3 store support via clamz
@@ -51,11 +54,8 @@
 MP3TUNES_LIB_DEPENDS=	libloudmouth-1.so:net-im/loudmouth \
 			libcurl.so:ftp/curl
 MP3TUNES_USE=		GNOME=glib20,libxml2
-MP3TUNES_CMAKE_OFF=	-DWITH_MP3tunes:BOOL=Off
+MP3TUNES_CMAKE_OFF=	-DWITH_MP3Tunes:BOOL=Off
 
-MTP_LIB_DEPENDS=	libmtp.so:multimedia/libmtp
-MTP_CMAKE_OFF=		-DWITH_Mtp:BOOL=Off
-
 NLS_USES=		gettext
 NLS_CMAKE_OFF=		-DBUILD_po:BOOL=Off
 
Index: audio/amarok-kde4/files/patch-kde_rb-126682
===================================================================
--- audio/amarok-kde4/files/patch-kde_rb-126682	(nonexistent)
+++ audio/amarok-kde4/files/patch-kde_rb-126682	(working copy)
@@ -0,0 +1,85 @@
+diff --git a/src/musicbrainz/MusicDNSAudioDecoder.cpp b/src/musicbrainz/MusicDNSAudioDecoder.cpp
+index 6216e5ce26cc3461b89aea560943ad7a79101af9..65a92fb43811d0cbdde5e2442880496b3417da68 100644
+--- src/musicbrainz/MusicDNSAudioDecoder.cpp
++++ src/musicbrainz/MusicDNSAudioDecoder.cpp
+@@ -243,7 +243,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c
+             {
+                 if( !decodedFrame )
+                 {
+-                    decodedFrame = avcodec_alloc_frame();
++                    decodedFrame = av_frame_alloc();
+                     if( !decodedFrame )
+                     {
+                         warning() << "Unable to allocate enough memory to decode file.";
+@@ -251,7 +251,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c
+                         break;
+                     }
+                     else
+-                        avcodec_get_frame_defaults( decodedFrame );
++                        av_frame_unref( decodedFrame );
+                 }
+ 
+                 decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt );
+@@ -287,7 +287,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c
+ 
+     avcodec_close( pCodecCtx );
+     avformat_close_input( &pFormatCtx );
+-    av_free( decodedFrame );
++    av_frame_free( &decodedFrame );
+ 
+     return data->duration();
+ }
+@@ -361,7 +361,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c
+             {
+                 if( !decodedFrame )
+                 {
+-                    decodedFrame = avcodec_alloc_frame();
++                    decodedFrame = av_frame_alloc();
+                     if( !decodedFrame )
+                     {
+                         warning() << "Unable to allocate enough memory to decode file.";
+@@ -369,7 +369,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c
+                         break;
+                     }
+                     else
+-                        avcodec_get_frame_defaults( decodedFrame );
++                        av_frame_unref( decodedFrame );
+                 }
+ 
+                 decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt );
+@@ -405,7 +405,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c
+ 
+     avcodec_close( pCodecCtx );
+     avformat_close_input( &pFormatCtx );
+-    av_free( decodedFrame );
++    av_frame_free( &decodedFrame );
+ 
+     return data->duration();
+ }
+@@ -479,7 +479,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c
+             {
+                 if( !decodedFrame )
+                 {
+-                    decodedFrame = avcodec_alloc_frame();
++                    decodedFrame = av_frame_alloc();
+                     if( !decodedFrame )
+                     {
+                         warning() << "Unable to allocate enough memory to decode file.";
+@@ -487,7 +487,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c
+                         break;
+                     }
+                     else
+-                        avcodec_get_frame_defaults( decodedFrame );
++                        av_frame_unref( decodedFrame );
+                 }
+ 
+                 decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt );
+@@ -523,7 +523,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c
+ 
+     avcodec_close( pCodecCtx );
+     av_close_input_file( pFormatCtx );
+-    av_free( decodedFrame );
++    av_frame_free( &decodedFrame );
+ 
+     return data->duration();
+ }

Property changes on: audio/amarok-kde4/files/patch-kde_rb-126682
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property