Include <cstring> for memcpy() because it's no longer implicitly pulled in by libpng since 1.6.0.

Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 33 insertions, 9 deletions

diff --git a/media-video/ffmpegthumbnailer/ChangeLog b/media-video/ffmpegthumbnailer/ChangeLog
index d8b67dee5c94..934130f6f992 100644
--- a/media-video/ffmpegthumbnailer/ChangeLog
+++ b/media-video/ffmpegthumbnailer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/ffmpegthumbnailer
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ChangeLog,v 1.148 2012/12/01 19:36:00 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ChangeLog,v 1.149 2013/04/05 18:14:09 ssuominen Exp $
+
+  05 Apr 2013; Samuli Suominen <ssuominen@gentoo.org>
+  ffmpegthumbnailer-2.0.8.ebuild, +files/ffmpegthumbnailer-2.0.8-memcpy.patch:
+  Include <cstring> for memcpy() because it's no longer implicitly pulled in by
+  libpng since 1.6.0.
 
   01 Dec 2012; Raúl Porcel <armin76@gentoo.org>
   ffmpegthumbnailer-2.0.8.ebuild:
diff --git a/media-video/ffmpegthumbnailer/Manifest b/media-video/ffmpegthumbnailer/Manifest
index 15718f523952..e457fe924fe5 100644
--- a/media-video/ffmpegthumbnailer/Manifest
+++ b/media-video/ffmpegthumbnailer/Manifest
@@ -2,16 +2,21 @@
 Hash: SHA256
 
 AUX ffmpegthumbnailer-2.0.7-r238-r241.patch 2219 SHA256 0637500a9562c337c2158884bc8a6dd04fa88760f2c75ae4c98f9fa0ee52615f SHA512 cc74d7d97e43587af2dc89232763957c4fc2e915cd5e1ab37e75c9cc559e6a3068ca11f87c706a1ea40715b542a267065a566192ce1c3d1654e5bbae27ef22f2 WHIRLPOOL 83dc8b05b640667e18e7231a5472edee5b68a81762284e62237845e25477797af55c667b814fd7e70d26fda62b20fa37d3389cf939a6281db69b1347eaeebd38
+AUX ffmpegthumbnailer-2.0.8-memcpy.patch 428 SHA256 6fb975f6f927930a896a2adadbb0051b556cc6c3b8cdeac030a29d374311ac13 SHA512 61625691d1a1595b25a7962b734387c234c78ab4910c94dbf2527d5b74763529cb04e1e0bc2fbcdae2ac56327e5548a9758b7ae1e95a1aa16eb8cf436eefa188 WHIRLPOOL 85a3cd61a1eff1c6d2469b79aeddf661a8677c8a3f2ab906e50120e6e94af0b79f6abc36886b955b33987baaaf7ba5e000482429362fab8b559d2cb5f6b12ba7
 DIST ffmpegthumbnailer-2.0.7.tar.gz 359864 SHA256 a71155339d17201a13fc3ebb649b0d00c7ab2d5a8880da071c8157a69c6f612b SHA512 f8bdcdb9227baf849a8db94e83c325666bf05e13f30d2c78b0f8e3536cd3e4463c9d83da68d1398f446682afd81a306332b90e246b17047f910ab509d30ebdc8 WHIRLPOOL 526bbe94d4caf625340ed24e98bfe9c9b5d44e6b3137c9a40f4e0737617a766e33fa3671ea82b742fe331bb99d2e3c7774b4dcea155c4523f6ca0bcc68aaa983
 DIST ffmpegthumbnailer-2.0.8.tar.gz 367186 SHA256 2c8bbefa838d38ea42fc8ac78258cda36865d974c991624b14cffdb92a3bc68b SHA512 6062d4b8f5326bde96c8c6dceaac52e1fabcec93f0a0ee4be19e203050e6c80426a006076a27e4a12582e05daceebd37beef008154fdd92a87f365fdff68ca83 WHIRLPOOL 6b0bd942777515f690f212df5616dffc4fc1c6e0e0e5be67128b376347b18d75eb144d25e9f8ac841b41099703092af5784edc31f34d7dbf81b742d678233e79
 EBUILD ffmpegthumbnailer-2.0.7-r1.ebuild 1062 SHA256 9f929d2dca0188b311ba7251471e18fc38ce990cfb0df885f30ae4f6ddb8a9e8 SHA512 7744d14d6f5e624acd7ae11f61166f4f9c1ac55e8c15d0cfe887aa2cd0b50dd91a3aa630919d985651443a3646bcdaf713bc82f57dd37114095a7cc077b0e678 WHIRLPOOL 46f9f7f45dcb9218456249a61d5688044037ff76fd2a838ad8744239036cda089b090cfc7847757abd6d4e4debd2f63fe31308189174c0c4df6e0c2224bea4fb
-EBUILD ffmpegthumbnailer-2.0.8.ebuild 1087 SHA256 23e3cd549b64b39083caa6ee913824823832a6e9b3e18f1e559a501c942b3ef2 SHA512 9dbb8cd5ea2c93152b19d3cf1731f5bae7ae8206dbc21cf4358ae589fbcfe2b86b39363c812bbb003dacc411ad2746c28871a6fcb35fef3a951088ea5e2069a4 WHIRLPOOL b1e5f849d95d7a85f5b4cfb04af0ba65c2c632d0dc4b079790b4a12cc5f726f99328491751e9d431de68f07a19632ad63e1d6a7bbe6dfba500bc49bbe51f07e7
-MISC ChangeLog 21093 SHA256 78f9911116df4ff375f1213be53cbe5ff542142dbf4d1a7c052930f06efcace7 SHA512 3a1f991e484ae3f49a05643fcb146e4f926b9617a865311ee1bbf3cc42fe29ebaced2db1f090820cbe74cf3874c2c22d524dcdf36d113bb15a9ebe320694efe2 WHIRLPOOL 9d5ecc1dc388d305298a0557566721e0be656bdfca99abc5f0fb7a252ee33ff4010cac6ad544a76c0956c7db514e1c99a2443bc0651a8836e933583637d35077
+EBUILD ffmpegthumbnailer-2.0.8.ebuild 1129 SHA256 e6b5ecb1f570fc956eb6eb02098f45506051c02bcaf2559d2eda844231cace45 SHA512 98d15af7bb4c15a32141a2904fe045a5678a5dbf9aa9ea6f506ae0bc36912514417bd8b696c282a38457f327e04555e62c160d930d4dc4f981520bf161fa409a WHIRLPOOL 62cccff31bf9f441eb387ff2b0115b34078d900253f0a939268039959b7c5eea38a87d3f11f34f2b31601750902fbb9b12da501cce212dcc476b9c74427088b7
+MISC ChangeLog 21331 SHA256 4dbb6f7728e87c465a22029a898674f0522845a0712c0a527f80c88241ea1d30 SHA512 cced4102b4b624fac3c6a370886e8378de35c7f2f15f05a568561b93d4c1b065d7f2084db097e38c3a93058d4e60d85266986a9b0fbd637e09f7916c0459fd8d WHIRLPOOL 00df77e20d6161f03167e16c61e7af66423daec7c2cb07110c47808a145fd3e4f62f3251b76b486788e639e6a1efec477ac3d27b4c9ba61d61ed6e6ca89302f9
 MISC metadata.xml 315 SHA256 8beca342a8dc4c2bcc2123a77446bafed1a5eb8e767cd241b405bcf0990c7584 SHA512 a8b2f932d8110c25f87fc5dc1123ce9ad7e78404b1877665ad9326afa64c2e7c7ba0c00bc42a0588c9f0e7db1fa533b7d7e1db4f2531229b2000bd8a3ae0ee1c WHIRLPOOL 950e37d30be147eb82bfe9f072e8363a17b506cacbbb7208d2a956088b0e7120311e378010d586e641b9820e7cc737d999c85840c7179eb18b70c60017f86891
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlC6XCEACgkQuQc30/atMkBm+wCfX1vMpVZuucOhxFwWjH/HK5wW
-AisAnR5+uJMYZywamO+u9APbAYe2pR8A
-=rbSg
+iQEcBAEBCAAGBQJRXxRWAAoJEEdUh39IaPFNoocH/AuHUrEG1ybZj5F3EJTHyCSJ
+s9EFK4v0Sln9T/X411X+kmKEVgOHrMV34OmN7+Tg/0KlFV9vVRHRpvQgBLYlx3OW
+0TsgBwf7mPfUo4Rx2vW58a82Z7uuniOlymTT5/V36NZ/DYi0Ym9NCmobW9FQRcOF
+nc/X1Ui9yT5zaj5/aTugc/E5Gp9V8uklBIj/WIevzHEaX/aP5iw9fz1SNb743dAi
+/faDsL2Aqi2q2TQMOzAtEkm4XVEOSSeutIK6U38MLWyZqDjeIYsNodoqG1svVyu+
+ZatvoZOFrfCua50JdrBDMEm/F7jtbjH0R/zfz7w6oxbKlzM4GJZW9isrnKXR/0g=
+=CsN4
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.8.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.8.ebuild
index da10b0e07fdc..0d151adc2112 100644
--- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.8.ebuild
+++ b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.8.ebuild,v 1.7 2012/12/01 19:36:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.8.ebuild,v 1.8 2013/04/05 18:14:09 ssuominen Exp $
 
 EAPI=4
 inherit eutils libtool
@@ -26,6 +26,7 @@ REQUIRED_USE="gnome? ( gtk )"
 DOCS="AUTHORS ChangeLog README"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-memcpy.patch
 	elibtoolize
 }
 
diff --git a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.8-memcpy.patch b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.8-memcpy.patch
new file mode 100644
index 000000000000..5b9c68613e74
--- /dev/null
+++ b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.8-memcpy.patch
@@ -0,0 +1,13 @@
+libffmpegthumbnailer/pngwriter.cpp: In function 'void ffmpegthumbnailer::writeDataCallback(png_structp, png_bytep, png_size_t)':
+libffmpegthumbnailer/pngwriter.cpp:111:52: error: 'memcpy' was not declared in this scope
+
+--- libffmpegthumbnailer/pngwriter.cpp
++++ libffmpegthumbnailer/pngwriter.cpp
+@@ -17,6 +17,7 @@
+ #include "pngwriter.h"
+ #include <stdexcept>
+ #include <cassert>
++#include <cstring>
+ 
+ using namespace std;
+