diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2012-03-16 00:05:50 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2012-03-16 00:05:50 +0000 |
| commit | 4d1f56046ff0e95183634e91514a8bf8c2df10d6 (patch) | |
| tree | 15cf47f8500c0f8c028ecbe5ca73c4324b9e6aac /kde-base | |
| parent | whitespace (diff) | |
| download | historical-4d1f56046ff0e95183634e91514a8bf8c2df10d6.tar.gz historical-4d1f56046ff0e95183634e91514a8bf8c2df10d6.tar.bz2 historical-4d1f56046ff0e95183634e91514a8bf8c2df10d6.zip | |
add some more ifdefery to the patch, by Fabian Kislat, bug #407607
Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/ffmpegthumbs/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/ffmpegthumbs/Manifest | 10 | ||||
| -rw-r--r-- | kde-base/ffmpegthumbs/files/ffmpegthumbs-4.8.1-ffmpeg.patch | 7 |
3 files changed, 15 insertions, 8 deletions
diff --git a/kde-base/ffmpegthumbs/ChangeLog b/kde-base/ffmpegthumbs/ChangeLog index d712f3807c70..d8d6a714d581 100644 --- a/kde-base/ffmpegthumbs/ChangeLog +++ b/kde-base/ffmpegthumbs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/ffmpegthumbs # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/ffmpegthumbs/ChangeLog,v 1.46 2012/03/09 09:55:08 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/ffmpegthumbs/ChangeLog,v 1.47 2012/03/16 00:05:50 aballier Exp $ + + 16 Mar 2012; Alexis Ballier <aballier@gentoo.org> + files/ffmpegthumbs-4.8.1-ffmpeg.patch: + add some more ifdefery to the patch, by Fabian Kislat, bug #407607 09 Mar 2012; Alexis Ballier <aballier@gentoo.org> ffmpegthumbs-4.8.1.ebuild, +files/ffmpegthumbs-4.8.1-ffmpeg.patch: diff --git a/kde-base/ffmpegthumbs/Manifest b/kde-base/ffmpegthumbs/Manifest index 4c214936cdbd..467b32c72536 100644 --- a/kde-base/ffmpegthumbs/Manifest +++ b/kde-base/ffmpegthumbs/Manifest @@ -1,19 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX ffmpegthumbs-4.8.1-ffmpeg.patch 1224 RMD160 a2edf4027ab18cfb6c0232fdd4c3bec1a2ffd277 SHA1 0d962ff67606027c7bb2b01eeeee054b0baa60f5 SHA256 7c800d7591962c5b53502e11ff7086c48c1b6fdf5f8e0a37aed30219db7b1733 +AUX ffmpegthumbs-4.8.1-ffmpeg.patch 1293 RMD160 76b09b2d43e5d0daac5fdefdeede6a0e0228e5bc SHA1 519c90b7d926a3d916dcb31d4e2eb345c12ce5e2 SHA256 e27eb291b0eb2927ee303487b7c319443e56de9dafa1395be390ca863f87250a DIST kdemultimedia-4.7.4.tar.bz2 1644450 RMD160 c180dfed17735bfef4303802dd8065ed308cdd6a SHA1 e0001afac38e35e3ab7b919d79f74cd57e3c18dd SHA256 c1236ed17f575ff793869e5ade024f892ae36aba27a00edafb3495806fb81b28 DIST kdemultimedia-4.8.0.tar.bz2 1629089 RMD160 c53599e48a513d6806bff71bf36d56be6cfbd88a SHA1 210bfd435c8e6f52aa78ab46f9487a159ab2ac83 SHA256 6b9a22e50c7b4b1b024acdb4e46f80be8202ac5f59639ed0f7c7aa259743c790 DIST kdemultimedia-4.8.1.tar.xz 1472892 RMD160 15662d3fbce6f3220c84c655a6307199cbc80f7f SHA1 9de14f08c7f1649201be029b8e683a296cc75f52 SHA256 d8c52583f3b3f3d4ba6b67424af31d987d8dbfa98b9cc46092a90deccb08a618 EBUILD ffmpegthumbs-4.7.4.ebuild 463 RMD160 07b7fa32a9ce904b8490b835004458f27d945348 SHA1 6d8b0986bf3bc778023f14cb8dd433f2d4359920 SHA256 9ca435e70bc4334924c61caa10315a9f57c075f00240330b2afb2c91d9dacef8 EBUILD ffmpegthumbs-4.8.0.ebuild 452 RMD160 8976703d6c13dffbdfff80ca2c3b0311f116a3b6 SHA1 000497880b09dec571141469d6d1b8a634c48479 SHA256 8073957175c8dfa469a5c41b2efeb22da41b1fbc35701723666e2920c413f767 EBUILD ffmpegthumbs-4.8.1.ebuild 508 RMD160 4b445a5c077e7aaa51cec789386f84f01dd82038 SHA1 e25a7a7d4c5553c0f65be4f2f5306dc0eb8f4e3c SHA256 48ba4b63d637faf609cf9a6040ed405fbf8226295a7d1e7b05ed05ed0f9ec94e -MISC ChangeLog 6164 RMD160 5f7650558fae656645e243e77ada533d30e19ba8 SHA1 814d3f354b1253bb50015ad0b53fa7df097e7dcc SHA256 dbce2b02c238066ef88b3c650f9ce0c144fb0b751886f029dafed63526de59b8 +MISC ChangeLog 6327 RMD160 a8bd8a4a65cc642514c3a2272bb190d7e62c0a17 SHA1 dc5e22ebd0e59825b7c46f2f3a2e58b0dac97227 SHA256 717369707ab77408aa15e66737ef4d2089d3a592d86aff9905068313bcc350c4 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk9Z04IACgkQvFcC4BYPU0pcmQCePmCHuk6TVN/CJDKJt4jhVIoZ -KjYAn32PurG9ltNlzb7Wr06lmCrnbA/x -=kcJq +iEYEARECAAYFAk9ig+MACgkQvFcC4BYPU0pSIwCffoD59kb9PR6+MsMwDCRsLH4K +/VYAnAnvHh5UuE4K3RzLyG2DJluOh+H+ +=YraJ -----END PGP SIGNATURE----- diff --git a/kde-base/ffmpegthumbs/files/ffmpegthumbs-4.8.1-ffmpeg.patch b/kde-base/ffmpegthumbs/files/ffmpegthumbs-4.8.1-ffmpeg.patch index afbb8a66f5af..bee819ddda4e 100644 --- a/kde-base/ffmpegthumbs/files/ffmpegthumbs-4.8.1-ffmpeg.patch +++ b/kde-base/ffmpegthumbs/files/ffmpegthumbs-4.8.1-ffmpeg.patch @@ -18,12 +18,15 @@ Index: ffmpegthumbs-4.8.1/ffmpegthumbs/ffmpegthumbnailer/moviedecoder.cpp kDebug() << "Could not open input file: " << fileInfo.absoluteFilePath(); return; } -@@ -89,7 +91,7 @@ void MovieDecoder::destroy() +@@ -89,7 +91,11 @@ void MovieDecoder::destroy() } if ((!m_FormatContextWasGiven) && m_pFormatContext) { -- av_close_input_file(m_pFormatContext); ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54,0,0) + av_close_input_file(m_pFormatContext); ++#else + avformat_close_input(&m_pFormatContext); ++#endif m_pFormatContext = NULL; } |