Sun Nov 11 18:32:24 2012 UTC ()
Additional patches to build with ffmpeg-1.0.  Bump PKGREVISION.


(markd)
diff -r1.52 -r1.53 pkgsrc/sysutils/k3b/Makefile
diff -r1.19 -r1.20 pkgsrc/sysutils/k3b/distinfo
diff -r1.1 -r1.2 pkgsrc/sysutils/k3b/patches/patch-plugins_decoder_ffmpeg_k3bffmpegwrapper.cpp
cvs diff -r1.52 -r1.53 pkgsrc/sysutils/k3b/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/k3b/Makefile 2012/10/23 19:51:09 1.52
+++ pkgsrc/sysutils/k3b/Makefile 2012/11/11 18:32:23 1.53
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.52 2012/10/23 19:51:09 asau Exp $ 1# $NetBSD: Makefile,v 1.53 2012/11/11 18:32:23 markd Exp $
2# 2#
3 3
4DISTNAME= k3b-2.0.2 4DISTNAME= k3b-2.0.2
5PKGREVISION= 9 5PKGREVISION= 10
6CATEGORIES= sysutils 6CATEGORIES= sysutils
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=k3b/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=k3b/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= markd@NetBSD.org 10MAINTAINER= markd@NetBSD.org
11HOMEPAGE= http://www.k3b.org/ 11HOMEPAGE= http://www.k3b.org/
12COMMENT= DVD and CD authoring program 12COMMENT= DVD and CD authoring program
13 13
14BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4 14BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4
15DEPENDS+= cdrdao-[0-9]*:../../sysutils/cdrdao 15DEPENDS+= cdrdao-[0-9]*:../../sysutils/cdrdao
16DEPENDS+= {cdrtools,cdrtools-ossdvd}-[0-9]*:../../sysutils/cdrtools 16DEPENDS+= {cdrtools,cdrtools-ossdvd}-[0-9]*:../../sysutils/cdrtools
17 17
18USE_TOOLS+= perl pkg-config gmake msgfmt 18USE_TOOLS+= perl pkg-config gmake msgfmt
cvs diff -r1.19 -r1.20 pkgsrc/sysutils/k3b/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/k3b/distinfo 2012/10/23 08:24:34 1.19
+++ pkgsrc/sysutils/k3b/distinfo 2012/11/11 18:32:23 1.20
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.19 2012/10/23 08:24:34 markd Exp $ 1$NetBSD: distinfo,v 1.20 2012/11/11 18:32:23 markd Exp $
2 2
3SHA1 (k3b-2.0.2.tar.bz2) = 8b30a4d07942e82559b01bc07dea6bcf2defd532 3SHA1 (k3b-2.0.2.tar.bz2) = 8b30a4d07942e82559b01bc07dea6bcf2defd532
4RMD160 (k3b-2.0.2.tar.bz2) = a0289eb9ccec9607c2bdac3fc7c69102eec5ee40 4RMD160 (k3b-2.0.2.tar.bz2) = a0289eb9ccec9607c2bdac3fc7c69102eec5ee40
5Size (k3b-2.0.2.tar.bz2) = 12833321 bytes 5Size (k3b-2.0.2.tar.bz2) = 12833321 bytes
6SHA1 (patch-libk3b_jobs_k3bdatatrackreader.cpp) = 124d5ba1a3384d012a8b471f55fd624ffe9df5d4 6SHA1 (patch-libk3b_jobs_k3bdatatrackreader.cpp) = 124d5ba1a3384d012a8b471f55fd624ffe9df5d4
7SHA1 (patch-libk3bdevice_k3bdevice.cpp) = 8533f0c08551ef9b8429792f607a52675f79e419 7SHA1 (patch-libk3bdevice_k3bdevice.cpp) = 8533f0c08551ef9b8429792f607a52675f79e419
8SHA1 (patch-libk3bdevice_k3bdevicemanager.cpp) = fe07915854808758ab9d989d11b61fdc3b4b95bd 8SHA1 (patch-libk3bdevice_k3bdevicemanager.cpp) = fe07915854808758ab9d989d11b61fdc3b4b95bd
9SHA1 (patch-libk3bdevice_k3bscsicommand_netbsd.cpp) = f2326f21219178443535fc4a80b8bdd46479b1ad 9SHA1 (patch-libk3bdevice_k3bscsicommand_netbsd.cpp) = f2326f21219178443535fc4a80b8bdd46479b1ad
10SHA1 (patch-plugins_decoder_ffmpeg_k3bffmpegwrapper.cpp) = ac2d1834013ab6845dcf9dc14c100618cc8c7027 10SHA1 (patch-plugins_decoder_ffmpeg_k3bffmpegwrapper.cpp) = 941f59b0764db37d0356279ffc2e01fe610b04ce
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/k3b/patches/Attic/patch-plugins_decoder_ffmpeg_k3bffmpegwrapper.cpp (expand / switch to unified diff)

--- pkgsrc/sysutils/k3b/patches/Attic/patch-plugins_decoder_ffmpeg_k3bffmpegwrapper.cpp 2012/10/23 08:24:34 1.1
+++ pkgsrc/sysutils/k3b/patches/Attic/patch-plugins_decoder_ffmpeg_k3bffmpegwrapper.cpp 2012/11/11 18:32:24 1.2
@@ -1,43 +1,61 @@ @@ -1,43 +1,61 @@
1$NetBSD: patch-plugins_decoder_ffmpeg_k3bffmpegwrapper.cpp,v 1.1 2012/10/23 08:24:34 markd Exp $ 1$NetBSD: patch-plugins_decoder_ffmpeg_k3bffmpegwrapper.cpp,v 1.2 2012/11/11 18:32:24 markd Exp $
2 2
3commit 61ca30beb978f68e72257408777c6433f33129bd 3commit 61ca30beb978f68e72257408777c6433f33129bd
4Author: Michal Malek <michalm@jabster.pl> 4Author: Michal Malek <michalm@jabster.pl>
5Date: Sun Aug 28 20:18:53 2011 +0200 5Date: Sun Aug 28 20:18:53 2011 +0200
6 6
7 Fixed compilation with new FFMPEG 7 Fixed compilation with new FFMPEG
8  8
9 BUG: 274817 9 BUG: 274817
10 FIXED-IN: 2.0.3 10 FIXED-IN: 2.0.3
11 11
12diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 12diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
13index 0ad59fc..0c5f366 100644 13index 0ad59fc..0c5f366 100644
14--- plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 14--- plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
15+++ plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 15+++ plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
 16@@ -88,7 +88,7 @@
 17 close();
 18
 19 // open the file
 20- int err = ::av_open_input_file( &d->formatContext, m_filename.toLocal8Bit(), 0, 0, 0 );
 21+ int err = ::avformat_open_input( &d->formatContext, m_filename.toLocal8Bit(), 0, NULL);
 22 if( err < 0 ) {
 23 kDebug() << "(K3bFFMpegFile) unable to open " << m_filename << " with error " << err;
 24 return false;
16@@ -109,7 +109,13 @@ bool K3bFFMpegFile::open() 25@@ -109,7 +109,13 @@ bool K3bFFMpegFile::open()
17 #else 26 #else
18 ::AVCodecContext* codecContext = d->formatContext->streams[0]->codec; 27 ::AVCodecContext* codecContext = d->formatContext->streams[0]->codec;
19 #endif 28 #endif
20- if( codecContext->codec_type != CODEC_TYPE_AUDIO ) { 29- if( codecContext->codec_type != CODEC_TYPE_AUDIO ) {
21+ if( codecContext->codec_type !=  30+ if( codecContext->codec_type !=
22+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) 31+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
23+ AVMEDIA_TYPE_AUDIO) 32+ AVMEDIA_TYPE_AUDIO)
24+#else 33+#else
25+ CODEC_TYPE_AUDIO) 34+ CODEC_TYPE_AUDIO)
26+#endif 35+#endif
27+ { 36+ {
28 kDebug() << "(K3bFFMpegFile) not a simple audio stream: " << m_filename; 37 kDebug() << "(K3bFFMpegFile) not a simple audio stream: " << m_filename;
29 return false; 38 return false;
30 } 39 }
 40@@ -137,7 +143,7 @@
 41 }
 42
 43 // dump some debugging info
 44- ::dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
 45+ ::av_dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
 46
 47 return true;
 48 }
31@@ -225,8 +231,11 @@ QString K3bFFMpegFile::typeComment() const 49@@ -225,8 +231,11 @@ QString K3bFFMpegFile::typeComment() const
32 QString K3bFFMpegFile::title() const 50 QString K3bFFMpegFile::title() const
33 { 51 {
34 // FIXME: is this UTF8 or something?? 52 // FIXME: is this UTF8 or something??
35- if( d->formatContext->title[0] != '\0' ) 53- if( d->formatContext->title[0] != '\0' )
36- return QString::fromLocal8Bit( d->formatContext->title ); 54- return QString::fromLocal8Bit( d->formatContext->title );
37+ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "TITLE", NULL, 0 ); 55+ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "TITLE", NULL, 0 );
38+ if( ade == NULL ) 56+ if( ade == NULL )
39+ return QString(); 57+ return QString();
40+ if( ade->value != '\0' ) 58+ if( ade->value != '\0' )
41+ return QString::fromLocal8Bit( ade->value ); 59+ return QString::fromLocal8Bit( ade->value );
42 else 60 else
43 return QString(); 61 return QString();