diff options
author | 2013-01-08 11:35:51 +0000 | |
---|---|---|
committer | 2013-01-08 11:35:51 +0000 | |
commit | 2d246c44485a9719697058dc83520d2330dda2c1 (patch) | |
tree | 6ea051078c169e2e1c8f19de8bf701ad3990fdde /kde-base/ffmpegthumbs | |
parent | bump to 27.9, remove old. (bug 450804) (diff) | |
download | gentoo-2-2d246c44485a9719697058dc83520d2330dda2c1.tar.gz gentoo-2-2d246c44485a9719697058dc83520d2330dda2c1.tar.bz2 gentoo-2-2d246c44485a9719697058dc83520d2330dda2c1.zip |
Backport patch from upstream to fix build with libav-9, wrt bug #443260.
(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)
Diffstat (limited to 'kde-base/ffmpegthumbs')
-rw-r--r-- | kde-base/ffmpegthumbs/ChangeLog | 7 | ||||
-rw-r--r-- | kde-base/ffmpegthumbs/ffmpegthumbs-4.9.5.ebuild | 4 | ||||
-rw-r--r-- | kde-base/ffmpegthumbs/files/ffmpegthumbs-4.9.5-ffmpeg.patch | 85 |
3 files changed, 93 insertions, 3 deletions
diff --git a/kde-base/ffmpegthumbs/ChangeLog b/kde-base/ffmpegthumbs/ChangeLog index 2b33a7cef147..ac1f75869c3d 100644 --- a/kde-base/ffmpegthumbs/ChangeLog +++ b/kde-base/ffmpegthumbs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/ffmpegthumbs # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/ffmpegthumbs/ChangeLog,v 1.80 2013/01/05 20:19:00 creffett Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/ffmpegthumbs/ChangeLog,v 1.81 2013/01/08 11:35:50 kensington Exp $ + + 08 Jan 2013; Michael Palimaka <kensington@gentoo.org> + +files/ffmpegthumbs-4.9.5-ffmpeg.patch, ffmpegthumbs-4.9.5.ebuild: + Backport patch from upstream to fix build with libav-9, wrt bug #443260. *ffmpegthumbs-4.9.5 (05 Jan 2013) @@ -326,4 +330,3 @@ 05 Sep 2010; Theo Chatzimichos <tampakrap@gentoo.org> +ffmpegthumbs-4.5.1.ebuild: Version bump - diff --git a/kde-base/ffmpegthumbs/ffmpegthumbs-4.9.5.ebuild b/kde-base/ffmpegthumbs/ffmpegthumbs-4.9.5.ebuild index 222c0b1c90f8..5a4a24c56e14 100644 --- a/kde-base/ffmpegthumbs/ffmpegthumbs-4.9.5.ebuild +++ b/kde-base/ffmpegthumbs/ffmpegthumbs-4.9.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/ffmpegthumbs/ffmpegthumbs-4.9.5.ebuild,v 1.1 2013/01/05 20:19:00 creffett Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/ffmpegthumbs/ffmpegthumbs-4.9.5.ebuild,v 1.2 2013/01/08 11:35:50 kensington Exp $ EAPI=4 @@ -14,3 +14,5 @@ DEPEND=" virtual/ffmpeg " RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-ffmpeg.patch" ) diff --git a/kde-base/ffmpegthumbs/files/ffmpegthumbs-4.9.5-ffmpeg.patch b/kde-base/ffmpegthumbs/files/ffmpegthumbs-4.9.5-ffmpeg.patch new file mode 100644 index 000000000000..47ce5671ddf2 --- /dev/null +++ b/kde-base/ffmpegthumbs/files/ffmpegthumbs-4.9.5-ffmpeg.patch @@ -0,0 +1,85 @@ +From: Martin Sandsmark <martin.sandsmark@kde.org> +Date: Thu, 09 Aug 2012 00:53:55 +0000 +Subject: Fix all warnings. +X-Git-Tag: v4.9.80 +X-Git-Url: http://quickgit.kde.org/?p=ffmpegthumbs.git&a=commitdiff&h=42c7bacb5b98336de07882e0b04b44ea38d081db +--- +Fix all warnings. + +Port away from deprecated ffmpeg API and normalize data types. +--- + + +--- a/ffmpegthumbnailer/imagewriter.cpp ++++ b/ffmpegthumbnailer/imagewriter.cpp +@@ -31,7 +31,7 @@ + void ImageWriter::writeFrame(VideoFrame& frame, QImage& image) + { + QImage previewImage(frame.width, frame.height, QImage::Format_RGB888); +- for (int y = 0; y < frame.height; y++) { ++ for (quint32 y = 0; y < frame.height; y++) { + // Copy each line .. + memcpy(previewImage.scanLine(y), &frame.frameData[y*frame.lineSize], frame.width*3); + } + +--- a/ffmpegthumbnailer/moviedecoder.cpp ++++ b/ffmpegthumbnailer/moviedecoder.cpp +@@ -61,7 +61,7 @@ + return; + } + +- if (av_find_stream_info(m_pFormatContext) < 0) { ++ if (avformat_find_stream_info(m_pFormatContext, 0) < 0) { + kDebug() << "Could not find stream information"; + return; + } +@@ -88,7 +88,7 @@ + } + + if ((!m_FormatContextWasGiven) && m_pFormatContext) { +- av_close_input_file(m_pFormatContext); ++ avformat_close_input(&m_pFormatContext); + m_pFormatContext = NULL; + } + +@@ -145,7 +145,7 @@ + + m_pVideoCodecContext->workaround_bugs = 1; + +- if (avcodec_open(m_pVideoCodecContext, m_pVideoCodec) < 0) { ++ if (avcodec_open2(m_pVideoCodecContext, m_pVideoCodec, 0) < 0) { + kDebug() << "Could not open video codec"; + } + } + +--- a/ffmpegthumbnailer/videoframe.h ++++ b/ffmpegthumbnailer/videoframe.h +@@ -31,9 +31,9 @@ + VideoFrame(int width, int height, int lineSize) + : width(width), height(height), lineSize(lineSize) {} + +- int width; +- int height; +- int lineSize; ++ quint32 width; ++ quint32 height; ++ quint32 lineSize; + + std::vector<quint8> frameData; + }; + +--- a/ffmpegthumbnailer/videothumbnailer.cpp ++++ b/ffmpegthumbnailer/videothumbnailer.cpp +@@ -175,9 +175,9 @@ + + void VideoThumbnailer::generateHistogram(const VideoFrame& videoFrame, Histogram<int>& histogram) + { +- for (int i = 0; i < videoFrame.height; ++i) { ++ for (quint32 i = 0; i < videoFrame.height; ++i) { + int pixelIndex = i * videoFrame.lineSize; +- for (int j = 0; j < videoFrame.width * 3; j += 3) { ++ for (quint32 j = 0; j < videoFrame.width * 3; j += 3) { + ++histogram.r[videoFrame.frameData[pixelIndex + j]]; + ++histogram.g[videoFrame.frameData[pixelIndex + j + 1]]; + ++histogram.b[videoFrame.frameData[pixelIndex + j + 2]]; + |