diff options
| author | markd <markd> | 2012-11-11 18:29:15 +0000 |
|---|---|---|
| committer | markd <markd> | 2012-11-11 18:29:15 +0000 |
| commit | b09f13436bd5d5dba4582199a85d38afacbffcc4 (patch) | |
| tree | c93a3366478820c469063a541627755c7762e3d0 | |
| parent | 71adca6983a93cd519ba14b6cfe72f74758f6cd2 (diff) | |
| download | pkgsrc-b09f13436bd5d5dba4582199a85d38afacbffcc4.tar.gz | |
Fix build with ffmpeg 1.0. Bump PKGREVISION.
(fixes PR/47176)
| -rw-r--r-- | multimedia/kdemultimedia4/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/kdemultimedia4/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/kdemultimedia4/patches/patch-ffmpegthumbs_ffmpegthumbnailer_moviedecoder.cpp | 20 |
3 files changed, 24 insertions, 3 deletions
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile index 285c0cbae1a..e216d47a92a 100644 --- a/multimedia/kdemultimedia4/Makefile +++ b/multimedia/kdemultimedia4/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.37 2012/10/08 23:02:11 adam Exp $ +# $NetBSD: Makefile,v 1.38 2012/11/11 18:29:15 markd Exp $ DISTNAME= kdemultimedia-${_KDE_VERSION} PKGNAME= ${DISTNAME:S/-4/4-4/} -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= multimedia COMMENT= Multimedia tools for the KDE integrated X11 desktop diff --git a/multimedia/kdemultimedia4/distinfo b/multimedia/kdemultimedia4/distinfo index e044c71f68b..3383f3e2fea 100644 --- a/multimedia/kdemultimedia4/distinfo +++ b/multimedia/kdemultimedia4/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2012/06/16 04:45:37 markd Exp $ +$NetBSD: distinfo,v 1.17 2012/11/11 18:29:15 markd Exp $ SHA1 (kdemultimedia-4.8.4.tar.xz) = dac721e82308a6347d578361e25da7c466a26ba7 RMD160 (kdemultimedia-4.8.4.tar.xz) = 5d2619d428f6f80cf4de11c5c2636348072e0f96 @@ -9,3 +9,4 @@ SHA1 (patch-af) = c5f9f5a41bc51a7277bb0fbf6a254aa1df75daa3 SHA1 (patch-ag) = d89cfead913fe6fa256f05e0375a053ffd3a691c SHA1 (patch-ah) = 164e571518a7a9ba31652aeabb745efe23832bc2 SHA1 (patch-al) = 0e883a2b5fab6a0ee2b087bb4868ed634fa5fae4 +SHA1 (patch-ffmpegthumbs_ffmpegthumbnailer_moviedecoder.cpp) = a81e713cbd9c9f2ea3c84113ac10a074e781020f diff --git a/multimedia/kdemultimedia4/patches/patch-ffmpegthumbs_ffmpegthumbnailer_moviedecoder.cpp b/multimedia/kdemultimedia4/patches/patch-ffmpegthumbs_ffmpegthumbnailer_moviedecoder.cpp new file mode 100644 index 00000000000..16d1f383032 --- /dev/null +++ b/multimedia/kdemultimedia4/patches/patch-ffmpegthumbs_ffmpegthumbnailer_moviedecoder.cpp @@ -0,0 +1,20 @@ +$NetBSD: patch-ffmpegthumbs_ffmpegthumbnailer_moviedecoder.cpp,v 1.1 2012/11/11 18:29:15 markd Exp $ + +Fix build with ffmpeg>=0.11. + +--- ffmpegthumbs/ffmpegthumbnailer/moviedecoder.cpp.orig 2012-06-06 09:35:29.000000000 +0000 ++++ ffmpegthumbs/ffmpegthumbnailer/moviedecoder.cpp +@@ -52,12 +52,11 @@ MovieDecoder::~MovieDecoder() + void MovieDecoder::initialize(const QString& filename) + { + av_register_all(); +- avcodec_init(); + avcodec_register_all(); + + QFileInfo fileInfo(filename); + +- if ((!m_FormatContextWasGiven) && av_open_input_file(&m_pFormatContext, fileInfo.absoluteFilePath().toUtf8().data(), NULL, 0, NULL) != 0) { ++ if ((!m_FormatContextWasGiven) && avformat_open_input(&m_pFormatContext, fileInfo.absoluteFilePath().toLocal8Bit().data(), NULL, NULL) != 0) { + kDebug() << "Could not open input file: " << fileInfo.absoluteFilePath(); + return; + } |