diff options
| author | markd <markd@pkgsrc.org> | 2012-11-11 18:32:23 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2012-11-11 18:32:23 +0000 |
| commit | 1900bc5b404501bd0ace11ab9d7a09389fee6077 (patch) | |
| tree | e94c11b782d6f7eba23eee35d9c750475f7240b4 /sysutils/k3b | |
| parent | ff84041a940b223c892115c906c2c18154094a58 (diff) | |
| download | pkgsrc-1900bc5b404501bd0ace11ab9d7a09389fee6077.tar.gz | |
Additional patches to build with ffmpeg-1.0. Bump PKGREVISION.
Diffstat (limited to 'sysutils/k3b')
| -rw-r--r-- | sysutils/k3b/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/k3b/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/k3b/patches/patch-plugins_decoder_ffmpeg_k3bffmpegwrapper.cpp | 20 |
3 files changed, 23 insertions, 5 deletions
diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile index 71c701e2750..6c9dd3bc8b2 100644 --- a/sysutils/k3b/Makefile +++ b/sysutils/k3b/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.52 2012/10/23 19:51:09 asau Exp $ +# $NetBSD: Makefile,v 1.53 2012/11/11 18:32:23 markd Exp $ # DISTNAME= k3b-2.0.2 -PKGREVISION= 9 +PKGREVISION= 10 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=k3b/} EXTRACT_SUFX= .tar.bz2 diff --git a/sysutils/k3b/distinfo b/sysutils/k3b/distinfo index 8c22f54f098..86f3a793862 100644 --- a/sysutils/k3b/distinfo +++ b/sysutils/k3b/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.19 2012/10/23 08:24:34 markd Exp $ +$NetBSD: distinfo,v 1.20 2012/11/11 18:32:23 markd Exp $ SHA1 (k3b-2.0.2.tar.bz2) = 8b30a4d07942e82559b01bc07dea6bcf2defd532 RMD160 (k3b-2.0.2.tar.bz2) = a0289eb9ccec9607c2bdac3fc7c69102eec5ee40 @@ -7,4 +7,4 @@ SHA1 (patch-libk3b_jobs_k3bdatatrackreader.cpp) = 124d5ba1a3384d012a8b471f55fd62 SHA1 (patch-libk3bdevice_k3bdevice.cpp) = 8533f0c08551ef9b8429792f607a52675f79e419 SHA1 (patch-libk3bdevice_k3bdevicemanager.cpp) = fe07915854808758ab9d989d11b61fdc3b4b95bd SHA1 (patch-libk3bdevice_k3bscsicommand_netbsd.cpp) = f2326f21219178443535fc4a80b8bdd46479b1ad -SHA1 (patch-plugins_decoder_ffmpeg_k3bffmpegwrapper.cpp) = ac2d1834013ab6845dcf9dc14c100618cc8c7027 +SHA1 (patch-plugins_decoder_ffmpeg_k3bffmpegwrapper.cpp) = 941f59b0764db37d0356279ffc2e01fe610b04ce diff --git a/sysutils/k3b/patches/patch-plugins_decoder_ffmpeg_k3bffmpegwrapper.cpp b/sysutils/k3b/patches/patch-plugins_decoder_ffmpeg_k3bffmpegwrapper.cpp index 6f1ab65e1c7..8cfac587d7b 100644 --- a/sysutils/k3b/patches/patch-plugins_decoder_ffmpeg_k3bffmpegwrapper.cpp +++ b/sysutils/k3b/patches/patch-plugins_decoder_ffmpeg_k3bffmpegwrapper.cpp @@ -1,4 +1,4 @@ -$NetBSD: patch-plugins_decoder_ffmpeg_k3bffmpegwrapper.cpp,v 1.1 2012/10/23 08:24:34 markd Exp $ +$NetBSD: patch-plugins_decoder_ffmpeg_k3bffmpegwrapper.cpp,v 1.2 2012/11/11 18:32:24 markd Exp $ commit 61ca30beb978f68e72257408777c6433f33129bd Author: Michal Malek <michalm@jabster.pl> @@ -13,6 +13,15 @@ diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpe index 0ad59fc..0c5f366 100644 --- plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +++ plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +@@ -88,7 +88,7 @@ + close(); + + // open the file +- int err = ::av_open_input_file( &d->formatContext, m_filename.toLocal8Bit(), 0, 0, 0 ); ++ int err = ::avformat_open_input( &d->formatContext, m_filename.toLocal8Bit(), 0, NULL); + if( err < 0 ) { + kDebug() << "(K3bFFMpegFile) unable to open " << m_filename << " with error " << err; + return false; @@ -109,7 +109,13 @@ bool K3bFFMpegFile::open() #else ::AVCodecContext* codecContext = d->formatContext->streams[0]->codec; @@ -28,6 +37,15 @@ index 0ad59fc..0c5f366 100644 kDebug() << "(K3bFFMpegFile) not a simple audio stream: " << m_filename; return false; } +@@ -137,7 +143,7 @@ + } + + // dump some debugging info +- ::dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 ); ++ ::av_dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 ); + + return true; + } @@ -225,8 +231,11 @@ QString K3bFFMpegFile::typeComment() const QString K3bFFMpegFile::title() const { |