Drop unused patch.

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

3 files changed, 20 insertions, 102 deletions

diff --git a/kde-base/ffmpegthumbs/ChangeLog b/kde-base/ffmpegthumbs/ChangeLog
index 3cefde91ce33..b929ef9dd8df 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.93 2013/04/01 16:03:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ffmpegthumbs/ChangeLog,v 1.94 2013/04/01 17:52:49 scarabeus Exp $
+
+  01 Apr 2013; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/ffmpegthumbs-4.9.5-ffmpeg.patch:
+  Drop unused patch.
 
   01 Apr 2013; Agostino Sarubbo <ago@gentoo.org> -ffmpegthumbs-4.10.0.ebuild,
   -ffmpegthumbs-4.9.5.ebuild:
diff --git a/kde-base/ffmpegthumbs/Manifest b/kde-base/ffmpegthumbs/Manifest
index 39b1fc5f4999..945430b88b0e 100644
--- a/kde-base/ffmpegthumbs/Manifest
+++ b/kde-base/ffmpegthumbs/Manifest
@@ -1,25 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX ffmpegthumbs-4.9.5-ffmpeg.patch 2706 SHA256 37e817a4560f26d4b4b2cfe09296648b36729c3dc50572962904dd3b536e18a3 SHA512 ac9c1af8a01158cca355cc9da89bd3b1a34d2b7f322a65e325be6fd4ea30c7f0798da5ec428eaf17bd54f6b3a41efb0f7a9db89469780ef6f36b0bed7bd78639 WHIRLPOOL 5e1bdcbdad699fe659a02a5517b960ef6490f754c8deae5f5289a1c36b88b1b03d4fafd65a9d7aa1f64e9cf28e242c1dd3d11075ffc1aa40b53227c79d7e88c1
 DIST ffmpegthumbs-4.10.1.tar.xz 20824 SHA256 d1ee276056de2d197460cb664b20db6d56a6bf7e2ab8e477316a01d67afd6144 SHA512 9c17b17c12e8154f845618f2fd5ca0e01592ae96a5caf3ef476382fbac0bb1814e288b1c056f7cfaeec802f32362977cccd561969c74bf2efb8dd68354941cf0 WHIRLPOOL 85126929bdea0570e440d7d48334fb7ecc262903f62013768f17e4dc299392700a779c66adfb4da1b3b8eb3669761a12da414b1456b3c4cd7a67a37dd83a8600
 EBUILD ffmpegthumbs-4.10.1.ebuild 443 SHA256 a714942f7c8d3548079f6a293c0cc3e2c710da99e1c306a55d1b0b49bdc43c16 SHA512 ee067098396544ccfc2c2bbe1326849dee9020a074bc29c6546db454d7b16ed9e2989be49af87defd003ed710f2cbc690c634eba1ff581ad76459b588c482119 WHIRLPOOL d48b6febe5b2c36b05de67405591ba4763864c3e0fc6e1e5cd99f0b2689696350cc87c8f6946b97852072acf40110ddaa6f157551fc1a8d2e7bf91e059b5afcc
-MISC ChangeLog 11801 SHA256 8c26c7fd9d73c29003d1e3196c28434a6108cafd61c10430bba160e6e433dd77 SHA512 11b9eaa8a5414575b31725859c53db7bef31c9a120df12a970049b1950e5cd66c667703a14ff914246ed678082aa5268433191f6fd59072d4d1da2e6a8129e5b WHIRLPOOL 4f2f4a553cec34aec15de6b302cbad7309667485f346acb119e5368ccbe4c54523e8497d2bdc96fe657ccaadc01115b7d4f18c14a9f0a033168d64d34bc9bd27
+MISC ChangeLog 11926 SHA256 155b0c5d615eb18135b5e4a97f13ddbddb033530ee390883ca23355ca7afb981 SHA512 b645e8f8e010abc7797664fc36b7cbc945588519d7cb0c7e055f7b71c655fcf0e1e0ef6a345ff90c72cf945698f8548a61cc99d8c06851825d92624797b01c1e WHIRLPOOL 6405fdfc2022619f740c4a7e3eed57f8f424c53d1ce5fccdf4c9d1bc056966a6507a5c2c6d3302bef7b19cbe60afc7e5f9209cf6d9c8a84044429b7a4b65fc11
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRWa9uAAoJELp701BxlEWfJsIQAKj+jDCGXcjN7gAmEU7ABAb+
-3ypul1dzQ7wQJb94NbhbJBrUWNvDID5C2CYFB0xWbn2M00RZ/2BQLiqi5Q9sUpon
-r+/B6KhgfCiaF6+GGXahgXVqrIiyX2Zencm4qdvocTVtonLjeCU61ewUnSmdCT1r
-3yjWPbJuqR4V2TqijEvPGUHbsX+HCWGzuVwihtqL4TPTuPRns75soqCnMIJfcEHb
-82+YgB0N+1+p/jrNTuutK9X7uFWeqxHYfdP0nMmv/JlK5GUcQS0QVFhQDgRX8TC9
-HlydKXlQ2gi+Jgr2KPNGChIumtjpNriL0Azh7AvcGkq2ZCcm2n5eTNzxdZGSHdJL
-Lu5NG3etAPFJRm1MzAl1wPWcqiSOXYEZ86yQ0671kRP2ZDWVEKiZIlwtvOmvsZmg
-P4ysMZczSzvZ1CqbAfOy0aAi04toJywjJf5MQAiFoVFyJmNF4Xj4WK7veaJ3txPb
-98f1goWhY0ZBEdHXzLMli9jhmwgNOsUtj2FhFs+9+Y6PAjjRnmV3KtMkDh22xDOS
-UBVHa3GLypDddCJ+YWyGe99zJ/tCohcvZeZ/HIXdPTaS3+EKFfVQAUI7EmQlI34A
-FWgQfd2RnlZ5PAF613f4v52SyQQvMdxIvRcuTSj779o4lvp+LOxCUuydq0DVxCJr
-zjE+UC/0EqA4HeHGZuJM
-=QQsl
+iQIcBAEBCAAGBQJRWcl7AAoJEOSiRoyO7jvoZTIP/10wWcC16V2Y0ZYAe3okRuAE
+fNQkadwoMXZbulDX1Pp6WT8PGC/z2G0qYS9V0YS5oWtxED+5RSPdVY7O2JEEolsW
+KKNj33MDkQqyzInbQvcL3KPK0yc1uuAPgoovtJq9CtWCNoVUN7Qv5YLFVtkRx5FO
+M/yauqdPBT8KSjZdHlDR9GvkQIuydA91MFQFgVY8SNnijjuYSQYRzuidQPg0caxe
+qAS5PfpAqmWnXDFZg9ha46uIsHthAVOzqT3RfTAL3dl8AsBIMLFV1tbhlwkNbre8
+ArcjS7S7RAJ4EZ+PZg2hWmRvfYf7p1IA87dejkQlJ2EvKzMqEfe9m0Cna9I8AR0u
+ixchupd+GyUEMr7USVc+wkLWrhVcweDrLu4fK32P5d+jTZZ90Hkk3XKJc3Fg9jT9
+/Cl99/dR4r0iPHuFioflEHlxLP6H7oeHa36klGQ0xr1uP/uGMBFC2ZiBKxPQr35u
+Z+OJiz8TqvpEmG1CvDvbmKQCPJNr9KZdNwOLaBOdLhbfw4I+qRJrT7FKdMYfv2Ow
+2nChOF2Y71PNL8yLZYwS8y46YqijVvYsrpXE9bjQSMhFv6Xwht6KGw/E3WC179v+
+X/YgJUSYAE9JuRh2fPsurOxtmlTy15lzOkxd/1kcu0QR+WaQkHfUCyp2Kbd6Cc97
+8QX/cgLikrSVxTq9dhBi
+=BYfK
 -----END PGP SIGNATURE-----
diff --git a/kde-base/ffmpegthumbs/files/ffmpegthumbs-4.9.5-ffmpeg.patch b/kde-base/ffmpegthumbs/files/ffmpegthumbs-4.9.5-ffmpeg.patch
deleted file mode 100644
index 47ce5671ddf2..000000000000
--- a/kde-base/ffmpegthumbs/files/ffmpegthumbs-4.9.5-ffmpeg.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-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]];
-