Backport patch from upstream to fix build with libav-9, wrt bug #443260.

Package-Manager: portage-2.1.11.38/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

4 files changed, 103 insertions, 8 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/Manifest b/kde-base/ffmpegthumbs/Manifest
index b4afd667c661..25839efa22ed 100644
--- a/kde-base/ffmpegthumbs/Manifest
+++ b/kde-base/ffmpegthumbs/Manifest
@@ -2,18 +2,23 @@
 Hash: SHA256
 
 AUX ffmpegthumbs-4.8.1-ffmpeg.patch 1293 SHA256 e27eb291b0eb2927ee303487b7c319443e56de9dafa1395be390ca863f87250a SHA512 055e169918400890a60a22ce49bf3e9fe20b0c7314e822e927b81042f7ba1e82136ff12137911d7c51e30305ddce31e750b1c56c86930969d207acdc3bddc47b WHIRLPOOL 97de329bef5c864c57eeff2f5ab91d30a1198326901d940158df85e3b94d7a9fde080d6c70c9ef4fea9909c30847eb6c5f37d9beb768af1cdd81bd483ce2888c
+AUX ffmpegthumbs-4.9.5-ffmpeg.patch 2706 SHA256 37e817a4560f26d4b4b2cfe09296648b36729c3dc50572962904dd3b536e18a3 SHA512 ac9c1af8a01158cca355cc9da89bd3b1a34d2b7f322a65e325be6fd4ea30c7f0798da5ec428eaf17bd54f6b3a41efb0f7a9db89469780ef6f36b0bed7bd78639 WHIRLPOOL 5e1bdcbdad699fe659a02a5517b960ef6490f754c8deae5f5289a1c36b88b1b03d4fafd65a9d7aa1f64e9cf28e242c1dd3d11075ffc1aa40b53227c79d7e88c1
 DIST ffmpegthumbs-4.9.3.tar.xz 20184 SHA256 2163ccdabac7c50c324d7e1f75241955a84c760319d1669f2b681d14aa67f8fc SHA512 825385a436ac35d166bfbb025545f093c4d354069815683fa9c5e2bb8c658761ee055bc72fc368ddad675d8417f3a4f9d8296fd88d6dc8b111512ee4a7ca113b WHIRLPOOL c19d2b2ffebfd97aab82b88946115abc60cdaddc750a73cba3f63b44bb47408af7cd756bb3637528952b60a8ac9bc656b4ee2968cc8babacebc226a806c62b2c
 DIST ffmpegthumbs-4.9.4.tar.xz 20744 SHA256 4569fe4c7375736e89ecc6d1a031c09826c2b61730206910c0ef6f33fe8c4c3f SHA512 d511f2855f40740bf16380f3bab310490357770dd597e7e936204cd0a98eb018d76ef1ca5e3d4f98348f0479ae317fdb324b1900f6afeed39a03c852083801a9 WHIRLPOOL b5f18b50bf64a255c547f401454bd354acdaf4f6212fd05cf068cb662a4f5b57349c2e6a4b86e70181ff4591b534c92b1420b53e10cb91212ecbf392e65f98e0
 DIST ffmpegthumbs-4.9.5.tar.xz 20788 SHA256 32efd9b83c569aafaae64cb9f5cc78943adf54fb4061a131749cb921a5ac0e46 SHA512 e1f150adfc77b955c4e6083044e410b284efcfa6a08183a5e56befeec908dfcbd6e7ed98f225238aa0d0e0fee3af60d4f54169f9bfc0a264af6d44d19511777d WHIRLPOOL 1cb72168c0bbd730b8f455f2c9871bc44e63e26a434c5e0c4e299ad6d27b00a7a1f6e00236c42738db501a266529864681e067f843fdf8c5f5718701500b662b
 EBUILD ffmpegthumbs-4.9.3.ebuild 430 SHA256 75fed85becae21573a37f9a3a401f4bc4a7720f8141bc9017df0041a65527dd0 SHA512 5e9f5a6d61f3ca6c64d6da20f5a30a38afd39773aa37c4e8a5d3f657bce76bed439ee78db03dfcae9075c71ea41ec574c4a2c45da8c01b5a13c2e8688776d8c1 WHIRLPOOL ca19b1969f855798e43693404e798abb745b66d4a7dd85056f000ebbaf414220a5edd3283ab7d668c8589f789a85d3ec229acafe8308e609351bf95c85b4d7ec
 EBUILD ffmpegthumbs-4.9.4.ebuild 441 SHA256 b4724b2ec62f321bc1d03a7553ba187f7d47feb8d14242ba031f66daa0597030 SHA512 b45f25a8b6ebd2ec95a0af941100bf137a0656f4d2a34cd28af7ab2baf2e76debb65e9b4804f21707232917558af2d27cc05d2cc3c4f4c3b8ae2ef591152dcee WHIRLPOOL 6ef5b0e9a9a0fe59ec5452950a60c7d5965363edd0258f3581e5be19ad083e90edea0a017b3f92f89f40e2cadc60cd9f2e2b6eaac98413847c55db40c599b6d7
-EBUILD ffmpegthumbs-4.9.5.ebuild 443 SHA256 33ad23497c27ef089acc9791b79b54582b29ca06daaa3bbcd14e301fd77f97ca SHA512 9c9ec0392d133b635aad74cf58275c25c26fbc21e3c43d7ea67f230d5271dda6a5d70ea68473b313f1308a0ea2dd86ef77627515e12bcbd530f477d2998e5659 WHIRLPOOL 8acb876ae9b0bae7b32d6a28bdb91a12da57c00d18799254508dcef3d09ea4dee62e31b05c7d0587029f3e83e961bbbf33dc1dcceb1887f435f70154532d862e
-MISC ChangeLog 10126 SHA256 33be1a9041d1d15e5af15d24100d1ef1c410e8ffcb51946b0b438862f4fa5b23 SHA512 6a9e3b846292fec67184e96289642ae53e475fe1ef306fcd63cb3ffd651538a8541fa59ab55162f0e54ee9f62543d15c99a9c9dcbbe913b9ae2ebf5400bbb973 WHIRLPOOL c72cfc78c49970d72a7c911ed699c5446ae939c6a0fcac65d130dce8c8457c722f23c939fed11b17f7702576a2cd21d10cf0e8296a819f27d243b2219dd679d9
+EBUILD ffmpegthumbs-4.9.5.ebuild 490 SHA256 cf7ce1995d4c905331b95ff8b5351d7e5139ea60b0f057af2170eac125f715a7 SHA512 56d8961849a96c3a258bb5186292dce163df4f7d47f8d65a91ce20458139e5d82190a0e9bae9005d225cbc8453ba4c9f8b03d182f431351e502a71b097530b68 WHIRLPOOL e2f339c63ee6d4559fbd13d276d33baa5823e5aefe525190315d685e2f3db99e4e9804385f2e6c075c34947c021671d745a957d3992b1f8a977667d69b642b85
+MISC ChangeLog 10328 SHA256 509001c98d080bfad5b3070c82197dfc1b41a88db17b01c85c6d6c4d33e219bf SHA512 717b88ee5f59adc33379b7dbdbcd3a0fd80eac106cea9bb3d0b51acb9ffcecd3067e2f360937617dcd4f1e061aa0004c41e9efb31f18d43c145f2c00397b6bdd WHIRLPOOL e059c3fe659dc3fc30aa4be55511181861c07e028b53fdf07aa8948a90bc87d3c74194ecc3b4ce69404365bc1ad5de47cd460a495ed6c0e398119ea157528226
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDoi0oACgkQ23laikJhg1QZ2wCdENkbpPACpdjF8fLv3m+jATCC
-T/kAoKv1yrm094LaKCS7+OsEXDtDJ3aY
-=zWJF
+iQEcBAEBCAAGBQJQ7APuAAoJEMbwO6tnXQ0sqEIIAIdBnArW5HfmkxKSDWK8181W
+KZKvPo39k9pAgPo/se31DAAyk0uUOitzHUrEsn9PBxSlj4AKqzIb+Mnp4bdVnif1
+YiHEtJJEVFkUjciHTq31QOzsQQy1Ffbaf1ATuaT9+/lOAeqZWzqFiiUI9wJmXCSJ
+0pZMIQWOndaH7hpj83eEs4OYy5LCYftt3emTesuigYtqGEztRXiC+xZ/yAe9RByC
+mk32dPXGY6yFezjAW/daWJdrh+3Amzg8/gBfnZqmEFGMylNOJ58M3X/Tpr9/Fs6Q
+ZdWz6J65glIT1esuo+56xmDE1/EsBw95dAW1LTRIoqZpLXxzz9vAG+Tb4Hc/W/w=
+=Eo4G
 -----END PGP SIGNATURE-----
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]];
+