Switch to ffmpeg3

3 files changed, 75 insertions, 4 deletions

diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 6dad9d949a5..1983a1a5ff7 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.167 2017/01/16 23:45:10 wiz Exp $
+# $NetBSD: Makefile,v 1.168 2017/01/19 08:48:13 markd Exp $
 
 DISTNAME=	amarok-${VERS}
 VERS=		2.8.0
-PKGREVISION=	26
+PKGREVISION=	27
 CATEGORIES=	audio multimedia
 MASTER_SITES=	${MASTER_SITE_KDE:=amarok/${VERS}/src/}
 EXTRACT_SUFX=	.tar.bz2
@@ -63,7 +63,7 @@ BUILDLINK_API_DEPENDS.taglib+=	taglib>=1.6nb1
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../meta-pkgs/kde4/kde4.mk"
 #.include "../../misc/nepomuk-core/buildlink3.mk"
-.include "../../multimedia/ffmpeg1/buildlink3.mk"
+.include "../../multimedia/ffmpeg3/buildlink3.mk"
 .include "../../multimedia/libkcompactdisc/buildlink3.mk"
 .include "../../security/qca2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/audio/amarok/distinfo b/audio/amarok/distinfo
index 65addcb321e..742b4f80c3b 100644
--- a/audio/amarok/distinfo
+++ b/audio/amarok/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.52 2015/11/03 01:12:24 agc Exp $
+$NetBSD: distinfo,v 1.53 2017/01/19 08:48:13 markd Exp $
 
 SHA1 (amarok-2.8.0.tar.bz2) = e76ccd53c05d57f9457d74cd08c2c41383c00937
 RMD160 (amarok-2.8.0.tar.bz2) = 06dd81447ed85e211ed741c06f189a2a355e824d
@@ -6,3 +6,4 @@ SHA512 (amarok-2.8.0.tar.bz2) = 09f7f675f1223d36fb9df2f8c88923c6616524e022ad83b1
 Size (amarok-2.8.0.tar.bz2) = 39950028 bytes
 SHA1 (patch-ab) = dc89394f02639c27bbcef2954aa199032c6a9ca1
 SHA1 (patch-cmake_modules_FindTagLib.cmake) = 95e195ea376746dbbc16c3fdc88b934cf711199f
+SHA1 (patch-src_musicbrainz_MusicDNSAudioDecoder.cpp) = 54add942e350a98172ecea6ad3f8d040d34dca1e
diff --git a/audio/amarok/patches/patch-src_musicbrainz_MusicDNSAudioDecoder.cpp b/audio/amarok/patches/patch-src_musicbrainz_MusicDNSAudioDecoder.cpp
new file mode 100644
index 00000000000..a804570f30a
--- /dev/null
+++ b/audio/amarok/patches/patch-src_musicbrainz_MusicDNSAudioDecoder.cpp
@@ -0,0 +1,70 @@
+$NetBSD: patch-src_musicbrainz_MusicDNSAudioDecoder.cpp,v 1.1 2017/01/19 08:48:13 markd Exp $
+
+Build with ffmpeg3
+
+--- src/musicbrainz/MusicDNSAudioDecoder.cpp.orig	2013-08-14 20:22:52.000000000 +0000
++++ src/musicbrainz/MusicDNSAudioDecoder.cpp
+@@ -23,6 +23,9 @@
+ #include "core/meta/Meta.h"
+ 
+ extern "C" {
++#if defined(__DragonFly__) || defined(__NetBSD__)
++    #include <machine/int_const.h>
++#endif /* DragonFly | NetBSD */
+     typedef quint64 UINT64_C;
+     #include <libavcodec/avcodec.h>
+     #include <libavformat/avformat.h>
+@@ -223,7 +226,7 @@ MusicDNSAudioDecoder::decode( const QStr
+             {
+                 if( !decodedFrame )
+                 {
+-                    decodedFrame = avcodec_alloc_frame();
++                    decodedFrame = av_frame_alloc();
+                     if( !decodedFrame )
+                     {
+                         warning() << "Unable to allocate enough memory to decode file.";
+@@ -231,7 +234,7 @@ MusicDNSAudioDecoder::decode( const QStr
+                         break;
+                     }
+                     else
+-                        avcodec_get_frame_defaults( decodedFrame );
++                        av_frame_unref( decodedFrame );
+                 }
+ 
+                 decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt );
+@@ -341,7 +344,7 @@ MusicDNSAudioDecoder::decode( const QStr
+             {
+                 if( !decodedFrame )
+                 {
+-                    decodedFrame = avcodec_alloc_frame();
++                    decodedFrame = av_frame_alloc();
+                     if( !decodedFrame )
+                     {
+                         warning() << "Unable to allocate enough memory to decode file.";
+@@ -349,7 +352,7 @@ MusicDNSAudioDecoder::decode( const QStr
+                         break;
+                     }
+                     else
+-                        avcodec_get_frame_defaults( decodedFrame );
++                        av_frame_unref( decodedFrame );
+                 }
+ 
+                 decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt );
+@@ -459,7 +462,7 @@ MusicDNSAudioDecoder::decode( const QStr
+             {
+                 if( !decodedFrame )
+                 {
+-                    decodedFrame = avcodec_alloc_frame();
++                    decodedFrame = av_frame_alloc();
+                     if( !decodedFrame )
+                     {
+                         warning() << "Unable to allocate enough memory to decode file.";
+@@ -467,7 +470,7 @@ MusicDNSAudioDecoder::decode( const QStr
+                         break;
+                     }
+                     else
+-                        avcodec_get_frame_defaults( decodedFrame );
++                        av_frame_unref( decodedFrame );
+                 }
+ 
+                 decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt );