Thu Jan 19 08:48:13 2017 UTC ()
Switch to ffmpeg3


(markd)
diff -r1.167 -r1.168 pkgsrc/audio/amarok/Makefile
diff -r1.52 -r1.53 pkgsrc/audio/amarok/distinfo
diff -r0 -r1.1 pkgsrc/audio/amarok/patches/patch-src_musicbrainz_MusicDNSAudioDecoder.cpp
cvs diff -r1.167 -r1.168 pkgsrc/audio/amarok/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/amarok/Attic/Makefile 2017/01/16 23:45:10 1.167
+++ pkgsrc/audio/amarok/Attic/Makefile 2017/01/19 08:48:13 1.168
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.167 2017/01/16 23:45:10 wiz Exp $ 1# $NetBSD: Makefile,v 1.168 2017/01/19 08:48:13 markd Exp $
2 2
3DISTNAME= amarok-${VERS} 3DISTNAME= amarok-${VERS}
4VERS= 2.8.0 4VERS= 2.8.0
5PKGREVISION= 26 5PKGREVISION= 27
6CATEGORIES= audio multimedia 6CATEGORIES= audio multimedia
7MASTER_SITES= ${MASTER_SITE_KDE:=amarok/${VERS}/src/} 7MASTER_SITES= ${MASTER_SITE_KDE:=amarok/${VERS}/src/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://amarok.kde.org/ 11HOMEPAGE= http://amarok.kde.org/
12COMMENT= KDE4 audio player 12COMMENT= KDE4 audio player
13LICENSE= gnu-gpl-v2 AND gnu-fdl-v1.2 AND gnu-lgpl-v2.1 13LICENSE= gnu-gpl-v2 AND gnu-fdl-v1.2 AND gnu-lgpl-v2.1
14 14
15BUILD_DEPENDS+= automoc4>=0.9.83:../../devel/automoc4 15BUILD_DEPENDS+= automoc4>=0.9.83:../../devel/automoc4
16DEPENDS+= moodbar-[0-9]*:../../audio/moodbar 16DEPENDS+= moodbar-[0-9]*:../../audio/moodbar
17 17
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
@@ -53,24 +53,24 @@ SUBST_SED.mysql+= -e s:@@WLR@@:${COMPILE @@ -53,24 +53,24 @@ SUBST_SED.mysql+= -e s:@@WLR@@:${COMPILE
53PKG_FAIL_REASON+= "Unknown mysql version: ${_MYSQL_VERSION}" 53PKG_FAIL_REASON+= "Unknown mysql version: ${_MYSQL_VERSION}"
54.endif 54.endif
55 55
56.include "../../audio/liblastfm/buildlink3.mk" 56.include "../../audio/liblastfm/buildlink3.mk"
57.include "../../audio/libofa/buildlink3.mk" 57.include "../../audio/libofa/buildlink3.mk"
58BUILDLINK_API_DEPENDS.taglib+= taglib>=1.6nb1 58BUILDLINK_API_DEPENDS.taglib+= taglib>=1.6nb1
59.include "../../audio/taglib/buildlink3.mk" 59.include "../../audio/taglib/buildlink3.mk"
60.include "../../audio/taglib-extras/buildlink3.mk" 60.include "../../audio/taglib-extras/buildlink3.mk"
61.include "../../devel/qjson/buildlink3.mk" 61.include "../../devel/qjson/buildlink3.mk"
62.include "../../devel/qtscriptgenerator/buildlink3.mk" 62.include "../../devel/qtscriptgenerator/buildlink3.mk"
63.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 63.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
64.include "../../meta-pkgs/kde4/kde4.mk" 64.include "../../meta-pkgs/kde4/kde4.mk"
65#.include "../../misc/nepomuk-core/buildlink3.mk" 65#.include "../../misc/nepomuk-core/buildlink3.mk"
66.include "../../multimedia/ffmpeg1/buildlink3.mk" 66.include "../../multimedia/ffmpeg3/buildlink3.mk"
67.include "../../multimedia/libkcompactdisc/buildlink3.mk" 67.include "../../multimedia/libkcompactdisc/buildlink3.mk"
68.include "../../security/qca2/buildlink3.mk" 68.include "../../security/qca2/buildlink3.mk"
69.include "../../sysutils/desktop-file-utils/desktopdb.mk" 69.include "../../sysutils/desktop-file-utils/desktopdb.mk"
70# for plasma 70# for plasma
71.include "../../x11/kde-runtime4/buildlink3.mk" 71.include "../../x11/kde-runtime4/buildlink3.mk"
72BUILDLINK_API_DEPENDS.kdelibs+= kdelibs4>=4.5.0 72BUILDLINK_API_DEPENDS.kdelibs+= kdelibs4>=4.5.0
73.include "../../x11/kdelibs4/buildlink3.mk" 73.include "../../x11/kdelibs4/buildlink3.mk"
74BUILDLINK_DEPMETHOD.qt4-tools= full 74BUILDLINK_DEPMETHOD.qt4-tools= full
75.include "../../x11/qt4-tools/buildlink3.mk" 75.include "../../x11/qt4-tools/buildlink3.mk"
76.include "../../mk/bsd.pkg.mk" 76.include "../../mk/bsd.pkg.mk"
cvs diff -r1.52 -r1.53 pkgsrc/audio/amarok/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/amarok/Attic/distinfo 2015/11/03 01:12:24 1.52
+++ pkgsrc/audio/amarok/Attic/distinfo 2017/01/19 08:48:13 1.53
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.52 2015/11/03 01:12:24 agc Exp $ 1$NetBSD: distinfo,v 1.53 2017/01/19 08:48:13 markd Exp $
2 2
3SHA1 (amarok-2.8.0.tar.bz2) = e76ccd53c05d57f9457d74cd08c2c41383c00937 3SHA1 (amarok-2.8.0.tar.bz2) = e76ccd53c05d57f9457d74cd08c2c41383c00937
4RMD160 (amarok-2.8.0.tar.bz2) = 06dd81447ed85e211ed741c06f189a2a355e824d 4RMD160 (amarok-2.8.0.tar.bz2) = 06dd81447ed85e211ed741c06f189a2a355e824d
5SHA512 (amarok-2.8.0.tar.bz2) = 09f7f675f1223d36fb9df2f8c88923c6616524e022ad83b12bcb770dfbf60cb6b191e4035633f2ea2eee5fb7b38e6d5092cf69fe222ef9c3f3c46ba8f157a62d 5SHA512 (amarok-2.8.0.tar.bz2) = 09f7f675f1223d36fb9df2f8c88923c6616524e022ad83b12bcb770dfbf60cb6b191e4035633f2ea2eee5fb7b38e6d5092cf69fe222ef9c3f3c46ba8f157a62d
6Size (amarok-2.8.0.tar.bz2) = 39950028 bytes 6Size (amarok-2.8.0.tar.bz2) = 39950028 bytes
7SHA1 (patch-ab) = dc89394f02639c27bbcef2954aa199032c6a9ca1 7SHA1 (patch-ab) = dc89394f02639c27bbcef2954aa199032c6a9ca1
8SHA1 (patch-cmake_modules_FindTagLib.cmake) = 95e195ea376746dbbc16c3fdc88b934cf711199f 8SHA1 (patch-cmake_modules_FindTagLib.cmake) = 95e195ea376746dbbc16c3fdc88b934cf711199f
 9SHA1 (patch-src_musicbrainz_MusicDNSAudioDecoder.cpp) = 54add942e350a98172ecea6ad3f8d040d34dca1e
File Added: pkgsrc/audio/amarok/patches/Attic/patch-src_musicbrainz_MusicDNSAudioDecoder.cpp
$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 );