Fix building with media-libs/libpng >= 1.5.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

4 files changed, 33 insertions, 6 deletions

diff --git a/media-video/ffmpegthumbnailer/ChangeLog b/media-video/ffmpegthumbnailer/ChangeLog
index 9aedb39ed80e..4473034f43eb 100644
--- a/media-video/ffmpegthumbnailer/ChangeLog
+++ b/media-video/ffmpegthumbnailer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/ffmpegthumbnailer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ChangeLog,v 1.118 2011/04/02 14:25:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ChangeLog,v 1.119 2011/04/04 18:36:30 ssuominen Exp $
+
+  04 Apr 2011; Samuli Suominen <ssuominen@gentoo.org>
+  ffmpegthumbnailer-2.0.6.ebuild,
+  +files/ffmpegthumbnailer-2.0.6-libpng15.patch:
+  Fix building with media-libs/libpng >= 1.5.
 
   02 Apr 2011; Raúl Porcel <armin76@gentoo.org>
   ffmpegthumbnailer-2.0.6.ebuild:
diff --git a/media-video/ffmpegthumbnailer/Manifest b/media-video/ffmpegthumbnailer/Manifest
index 16770ea3e48b..b67eab1d1704 100644
--- a/media-video/ffmpegthumbnailer/Manifest
+++ b/media-video/ffmpegthumbnailer/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX ffmpegthumbnailer-2.0.6-asneeded.patch 763 RMD160 602d8a289b5da40e65d27f17fbe5781f5f601088 SHA1 e81d9f7b63b71c45a14f5b25c4397f4c37991ff1 SHA256 355341d389b90c31d0a80ba6ff92f6cbbcc3da397878f4b50b05500a8ac9a2e7
 AUX ffmpegthumbnailer-2.0.6-flags.patch 797 RMD160 58371ffbda3b458c202883e31b36697c826470a7 SHA1 4705bca7e0836782875117eff57883016ba09e0a SHA256 1f8bfe8a1cafdda386fbe2d19920874a001c64d58e5e1ca86aee7762755c4db4
 AUX ffmpegthumbnailer-2.0.6-gcc46.patch 439 RMD160 2a76f670a6488419f3f82c5ec3f19d7506d78637 SHA1 035f01e78d634f0c7568a1cb7b89dba6b31e2186 SHA256 2c6bf46fefdf89e1e6c79306ec34ccc4a8b7b2d1c7009f0c4d6d52008c06547e
+AUX ffmpegthumbnailer-2.0.6-libpng15.patch 327 RMD160 6165b09dceea11e9f2980491e27bb17aee01e85e SHA1 cfc4159ad0f83b4a36bc06e8b2f79361f798c1ac SHA256 15af47713aaa679f4c0aee7ca03cdfe0fd17e3e4f74c95a2e200beeaca977d3d
 DIST ffmpegthumbnailer-2.0.4.tar.gz 343282 RMD160 a7a9af78f316d181a678ed85098c233aaa0808aa SHA1 ce1e55d9a207ec4eacc963e054ac5a08b9e051df SHA256 05871ee318c6a4afa1fc88503e51680390e4730c76ae0acf5b3791f3ea955d5e
 DIST ffmpegthumbnailer-2.0.6.tar.gz 340052 RMD160 8c635c6d35b699ea9d2ef753fc70aa23827c0a57 SHA1 c565eb31910ea03801045e19230870c7e772b1a6 SHA256 e9752c0fd3c9bbe20382b527a11d5d4abf2386d0a18ae77fc0e6b1eeb00b7dcd
 EBUILD ffmpegthumbnailer-2.0.4.ebuild 1101 RMD160 5b5d93a83af5d0c6a6816e1106de63a7e44d19ef SHA1 d2a6179cc41733de616eacc82a5affb57e7b1c3f SHA256 cb4e9a391187f816a3a66ccd372392be9c1b3ecb9d75730bffd222d91b03f87b
-EBUILD ffmpegthumbnailer-2.0.6.ebuild 1151 RMD160 bce5038512363fd56e0970dace10214d82d12c0f SHA1 ef2e3cd6fddd47a0c28844393f62478a3f095766 SHA256 2c7b22ca650a1d57b7bf1c9df50fcd9bba0d0e19183aae77660656991e49b38b
-MISC ChangeLog 16972 RMD160 aca1a8eabca5216820b1208fd8de528566cf2e2e SHA1 aa4d62db8bafc2f89b670215d743fce5c39fd92e SHA256 8666332f38bfe47004043b9d5654aee234415d76cfba0568f3971a4ffb78672c
+EBUILD ffmpegthumbnailer-2.0.6.ebuild 1171 RMD160 17e1a2220f248e308eb76727ef2aa76570259da1 SHA1 50838a469ffd85f8b2073d8e75ae97187e57089a SHA256 098074afdf366610ff7a83e993100123611fff14e7dbf76f692e5395f7597694
+MISC ChangeLog 17158 RMD160 313b95289c8488f25233fa951e073eab25e733c0 SHA1 adbe9df3e97d6a9fc0e973ddc2c7c509ab6872ad SHA256 3bfc980f573d6fc30752d16978900d6363e565e4725df2dfa0f5fc4fd45a9eb2
 MISC metadata.xml 233 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 SHA1 25063adc119eb9992ced7996faa60e0cb45ad60f SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk2aEAkACgkQXkR9YqOcLPH1hgD/brLDdljt25Zsow23Kisgq8QC
+OoWjYgPbQT3u4hIhFJkA/jXf1F3dgcqRNYm86M17br7p4Ci9w+ny4/wii/8a8crk
+=uFVh
+-----END PGP SIGNATURE-----
diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.6.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.6.ebuild
index 2e2e3ad40510..6ce151eb259d 100644
--- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.6.ebuild
+++ b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.6.ebuild,v 1.7 2011/04/02 14:25:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.6.ebuild,v 1.8 2011/04/04 18:36:30 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils
@@ -23,7 +23,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/pkgconfig"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-{asneeded,flags,gcc46}.patch
+	epatch "${FILESDIR}"/${P}-{asneeded,flags,gcc46,libpng15}.patch
 	eautoreconf
 }
 
@@ -39,5 +39,5 @@ src_configure() {
 src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog README
-	find "${D}" -name '*.la' -delete
+	find "${D}" -name '*.la' -exec rm -f {} +
 }
diff --git a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.6-libpng15.patch b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.6-libpng15.patch
new file mode 100644
index 000000000000..893f2277951b
--- /dev/null
+++ b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.6-libpng15.patch
@@ -0,0 +1,11 @@
+--- libffmpegthumbnailer/pngwriter.cpp
++++ libffmpegthumbnailer/pngwriter.cpp
+@@ -49,7 +49,7 @@
+ , m_InfoPtr(NULL)
+ {
+     init();
+-    png_set_write_fn(m_PngPtr, (voidp) &outputBuffer, writeDataCallback, NULL);
++    png_set_write_fn(m_PngPtr, (png_voidp) &outputBuffer, writeDataCallback, NULL);
+ }
+ 
+ PngWriter::~PngWriter()