Attachment #176638 for bug #214184




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

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 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=	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 NLS
OPTIONS_DEFAULT=IPOD MP3TUNES
OPTIONS_SUB=	yes

AMAZON_DESC=		Amazon MP3 store support via clamz

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

MTP_LIB_DEPENDS=	libmtp.so:multimedia/libmtp
MTP_CMAKE_OFF=		-DWITH_Mtp:BOOL=Off

NLS_USES=		gettext
NLS_CMAKE_OFF=		-DBUILD_po:BOOL=Off





# Fix build with FFmpeg 3.x; obtained from https://git.reviewboard.kde.org/r/126682
#
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();
 }

Return to bug 214184

Lines 10-20 Link Here

(-)audio/amarok-kde4/Makefile (-11 / +11 lines)
10	MAINTAINER= kde@FreeBSD.org	10	MAINTAINER= kde@FreeBSD.org
11	COMMENT= KDE music player	11	COMMENT= KDE music player
12		12
		13	LICENSE= GPLv2
		14
13	LIB_DEPENDS= libtag.so:audio/taglib \	15	LIB_DEPENDS= libtag.so:audio/taglib \
14	libtag-extras.so:audio/taglib-extras \	16	libtag-extras.so:audio/taglib-extras \
15	liblastfm.so:audio/liblastfm \	17	liblastfm.so:audio/liblastfm \
16	libofa.so:audio/libofa \	18	libofa.so:audio/libofa \
17	libavcodec.so:multimedia/ffmpeg \	19	libavcodec.so:multimedia/ffmpeg \
		20	libmtp.so:multimedia/libmtp \
18	libqjson.so:devel/qjson \	21	libqjson.so:devel/qjson \
19	libqca.so:devel/qca \	22	libqca.so:devel/qca \
20	libdbus-1.so:devel/dbus	23	libdbus-1.so:devel/dbus
Lines 22-42 Link Here
22	RUN_DEPENDS= ${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so.1.0.0:devel/qtscriptgenerator \	25	RUN_DEPENDS= ${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so.1.0.0:devel/qtscriptgenerator \
23	${KDE_PREFIX}/lib/kde4/kio_upnp_ms.so:net/kio-upnp-ms	26	${KDE_PREFIX}/lib/kde4/kio_upnp_ms.so:net/kio-upnp-ms
24		27
25	USES= cmake kde:4 pkgconfig shared-mime-info shebangfix tar:bzip2	28	USES= cmake execinfo kde:4 mysql:embedded pkgconfig shared-mime-info shebangfix ssl tar:bzip2
26	USE_KDE= kdelibs libkcddb libkcompactdisc \	29	USE_GL= gl
27	nepomuk-core runtime automoc4 strigi	30	USE_KDE= automoc4 kdelibs libkcddb libkcompactdisc \
28	USE_MYSQL= embedded	31	nepomuk-core runtime soprano strigi
29	USE_QT4= corelib dbus designer gui network opengl \	32	USE_QT4= corelib dbus designer gui network opengl \
30	phonon script sql svg webkit xml \	33	phonon script sql svg webkit xml \
31	qmake_build moc_build rcc_build uic_build	34	qmake_build moc_build rcc_build uic_build
32	USE_XORG= x11	35	USE_XORG= sm ice x11 xau xdmcp xext xft xpm
33	SHEBANG_FILES= src/kconf_update/amarok-2.4.1-tokens_syntax_update.pl	36	SHEBANG_FILES= src/kconf_update/amarok-2.4.1-tokens_syntax_update.pl
34	USE_LDCONFIG= yes	37	USE_LDCONFIG= yes
35		38
36	BROKEN_sparc64= does not build (GCC-related error)	39	BROKEN_sparc64= does not build (GCC-related error)
37		40
38	OPTIONS_DEFINE= AMAZON IPOD MP3TUNES MTP NLS	41	OPTIONS_DEFINE= AMAZON IPOD MP3TUNES NLS
39	OPTIONS_DEFAULT=IPOD MP3TUNES MTP	42	OPTIONS_DEFAULT=IPOD MP3TUNES
40	OPTIONS_SUB= yes	43	OPTIONS_SUB= yes
41		44
42	AMAZON_DESC= Amazon MP3 store support via clamz	45	AMAZON_DESC= Amazon MP3 store support via clamz
Lines 51-61 Link Here
51	MP3TUNES_LIB_DEPENDS= libloudmouth-1.so:net-im/loudmouth \	54	MP3TUNES_LIB_DEPENDS= libloudmouth-1.so:net-im/loudmouth \
52	libcurl.so:ftp/curl	55	libcurl.so:ftp/curl
53	MP3TUNES_USE= GNOME=glib20,libxml2	56	MP3TUNES_USE= GNOME=glib20,libxml2
54	MP3TUNES_CMAKE_OFF= -DWITH_MP3tunes:BOOL=Off	57	MP3TUNES_CMAKE_OFF= -DWITH_MP3Tunes:BOOL=Off
55		58
56	MTP_LIB_DEPENDS= libmtp.so:multimedia/libmtp
57	MTP_CMAKE_OFF= -DWITH_Mtp:BOOL=Off
58
59	NLS_USES= gettext	59	NLS_USES= gettext
60	NLS_CMAKE_OFF= -DBUILD_po:BOOL=Off	60	NLS_CMAKE_OFF= -DBUILD_po:BOOL=Off
61		61

Line 0 Link Here

(-)audio/amarok-kde4/files/patch-kde_rb-126682 (+87 lines)
		1	# Fix build with FFmpeg 3.x; obtained from https://git.reviewboard.kde.org/r/126682
		2	#
		3	diff --git a/src/musicbrainz/MusicDNSAudioDecoder.cpp b/src/musicbrainz/MusicDNSAudioDecoder.cpp
		4	index 6216e5ce26cc3461b89aea560943ad7a79101af9..65a92fb43811d0cbdde5e2442880496b3417da68 100644
		5	--- src/musicbrainz/MusicDNSAudioDecoder.cpp
		6	+++ src/musicbrainz/MusicDNSAudioDecoder.cpp
		7	@@ -243,7 +243,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c
		8	{
		9	if( !decodedFrame )
		10	{
		11	- decodedFrame = avcodec_alloc_frame();
		12	+ decodedFrame = av_frame_alloc();
		13	if( !decodedFrame )
		14	{
		15	warning() << "Unable to allocate enough memory to decode file.";
		16	@@ -251,7 +251,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c
		17	break;
		18	}
		19	else
		20	- avcodec_get_frame_defaults( decodedFrame );
		21	+ av_frame_unref( decodedFrame );
		22	}
		23
		24	decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt );
		25	@@ -287,7 +287,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c
		26
		27	avcodec_close( pCodecCtx );
		28	avformat_close_input( &pFormatCtx );
		29	- av_free( decodedFrame );
		30	+ av_frame_free( &decodedFrame );
		31
		32	return data->duration();
		33	}
		34	@@ -361,7 +361,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c
		35	{
		36	if( !decodedFrame )
		37	{
		38	- decodedFrame = avcodec_alloc_frame();
		39	+ decodedFrame = av_frame_alloc();
		40	if( !decodedFrame )
		41	{
		42	warning() << "Unable to allocate enough memory to decode file.";
		43	@@ -369,7 +369,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c
		44	break;
		45	}
		46	else
		47	- avcodec_get_frame_defaults( decodedFrame );
		48	+ av_frame_unref( decodedFrame );
		49	}
		50
		51	decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt );
		52	@@ -405,7 +405,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c
		53
		54	avcodec_close( pCodecCtx );
		55	avformat_close_input( &pFormatCtx );
		56	- av_free( decodedFrame );
		57	+ av_frame_free( &decodedFrame );
		58
		59	return data->duration();
		60	}
		61	@@ -479,7 +479,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c
		62	{
		63	if( !decodedFrame )
		64	{
65	- decodedFrame = avcodec_alloc_frame();
66	+ decodedFrame = av_frame_alloc();
67	if( !decodedFrame )
68	{
69	warning() << "Unable to allocate enough memory to decode file.";
70	@@ -487,7 +487,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c
71	break;
72	}
73	else
74	- avcodec_get_frame_defaults( decodedFrame );
75	+ av_frame_unref( decodedFrame );
76	}
77
78	decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt );
79	@@ -523,7 +523,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c
80
81	avcodec_close( pCodecCtx );
82	av_close_input_file( pFormatCtx );
83	- av_free( decodedFrame );
84	+ av_frame_free( &decodedFrame );
85
86	return data->duration();
87	}

Lines 7-13 Link Here

(-)audio/amarok-kde4/pkg-plist (-2 / +2 lines)
7	lib/kde4/amarok_collection-audiocdcollection.so	7	lib/kde4/amarok_collection-audiocdcollection.so
8	lib/kde4/amarok_collection-daapcollection.so	8	lib/kde4/amarok_collection-daapcollection.so
9	%%IPOD%%lib/kde4/amarok_collection-ipodcollection.so	9	%%IPOD%%lib/kde4/amarok_collection-ipodcollection.so
10	%%MTP%%lib/kde4/amarok_collection-mtpcollection.so	10	lib/kde4/amarok_collection-mtpcollection.so
11	lib/kde4/amarok_collection-mysqlecollection.so	11	lib/kde4/amarok_collection-mysqlecollection.so
12	lib/kde4/amarok_collection-mysqlservercollection.so	12	lib/kde4/amarok_collection-mysqlservercollection.so
13	lib/kde4/amarok_collection-nepomukcollection.so	13	lib/kde4/amarok_collection-nepomukcollection.so
Lines 1035-1041 Link Here
1035	share/kde4/services/amarok_collection-audiocdcollection.desktop	1035	share/kde4/services/amarok_collection-audiocdcollection.desktop
1036	share/kde4/services/amarok_collection-daapcollection.desktop	1036	share/kde4/services/amarok_collection-daapcollection.desktop
1037	%%IPOD%%share/kde4/services/amarok_collection-ipodcollection.desktop	1037	%%IPOD%%share/kde4/services/amarok_collection-ipodcollection.desktop
1038	%%MTP%%share/kde4/services/amarok_collection-mtpcollection.desktop	1038	share/kde4/services/amarok_collection-mtpcollection.desktop
1039	share/kde4/services/amarok_collection-mysqlecollection.desktop	1039	share/kde4/services/amarok_collection-mysqlecollection.desktop
1040	share/kde4/services/amarok_collection-mysqlservercollection.desktop	1040	share/kde4/services/amarok_collection-mysqlservercollection.desktop
1041	share/kde4/services/amarok_collection-nepomukcollection.desktop	1041	share/kde4/services/amarok_collection-nepomukcollection.desktop