Include bunch of missing headers semi-related to libpng16 upgrade wrt #465478 by Martin von Gagern

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

4 files changed, 105 insertions, 13 deletions

diff --git a/media-video/cinelerra/ChangeLog b/media-video/cinelerra/ChangeLog
index 3ad020f90520..d57e6ec7a64a 100644
--- a/media-video/cinelerra/ChangeLog
+++ b/media-video/cinelerra/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/cinelerra
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.60 2012/10/17 03:25:31 phajdan.jr Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.61 2013/04/11 09:10:43 ssuominen Exp $
+
+  11 Apr 2013; Samuli Suominen <ssuominen@gentoo.org>
+  cinelerra-20120707.ebuild, +files/cinelerra-std_and_str_h.patch:
+  Include bunch of missing headers semi-related to libpng16 upgrade wrt #465478
+  by Martin von Gagern
 
   17 Oct 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   cinelerra-20120707.ebuild:
diff --git a/media-video/cinelerra/Manifest b/media-video/cinelerra/Manifest
index d1a13a55825b..05d0e71438db 100644
--- a/media-video/cinelerra/Manifest
+++ b/media-video/cinelerra/Manifest
@@ -4,17 +4,22 @@ Hash: SHA256
 AUX cinelerra-entry.patch 307 SHA256 58b95865a77fc2805e2e171f9380283b0d6f62130330029eb8afd866cb2c89d3 SHA512 af9cdbefc7dfaadbbda94a0d2bacef041ff32637e8b1c0cac7ffdf19b8d56686e98d6224d3ac1520461e8b384720304ea2f9a064b9cb1157c7d730e1ecb7d854 WHIRLPOOL c6b9bdb5536221b71c9f82310d46d449dc20742bd351fcb4e5372f5d823ddfacaa4b387b4d47b00bbb18ee8dc7365ef2feccaeecb2f8a36e114b738f5eb7d24a
 AUX cinelerra-ffmpeg-0.11.patch 5605 SHA256 f7b72f9e9ba4a84be0cba85db108a138b6b0f2ca1cd511028869c491b34a3525 SHA512 72fd5d276a6e934e328d778702baf217e77c264c55a641edd32cb12e833acc42ff89acc1f7ab37b66a4327c14aaae1ad7b6b70b49d4637b659346854dd50d358 WHIRLPOOL 1ef2cd8aacff3fae63be93bee1bc80aa7c1e82280f7f8e738ff5d3bdf42d8ebf2c3889da57aafd11d727c89688478d900d4f34c0d840827fca0f9fc97aecdcb3
 AUX cinelerra-ffmpeg.patch 2472 SHA256 d97aac356406258d064a28879c0550ef8e69eaffa247fdb2ebd44b6d858ed3a2 SHA512 59299661832f5631d9a07a0eab0685f897a39acf6c9e8a3f79730f9479c942775005f59abb29f40c9df7446882ccac332fd97bb6387807f41c35e67301022196 WHIRLPOOL 59eaafb82c666bfcf0796a12d4c3c28fa266564001f5bef59a632b08a8c70ac0558b6f52516f1210d527aff343bd59789f7e0498662aaa26ffa937b41ea01477
+AUX cinelerra-std_and_str_h.patch 1647 SHA256 9774bca0b28559f85bcc2beb9f2c690899d4b7b41cc7f627e8b7cfd6d5881f0c SHA512 b8f439b03ebe3fe13eab393a467bd5098631e2861412c067309963cbc95df6fdcd063236c9c71d1af9669a4902ff71ff55da989205fa65a2451ba1b18b3042a2 WHIRLPOOL f0d8fb2428f66cd53aac7f4e3839b2910fecf418d220ebce169864d7fdcf46bab306607bcd249b25ac393cdeb65dd185bef57b03734005cfb10a56fbd8031de2
 AUX cinelerra-underlinking.patch 287 SHA256 58aaec1cee53498c9fa16f1e565e4cc98a9cfcb93ca652c3c1919b0606bb802d SHA512 f29a4f770ea137a2609d2eb90a813b0e933800c57754a999d314c8278671d41d85e87b2d962386cf7505fd99a73522014ff6c3b086b2d7c7586c16d6b12150d8 WHIRLPOOL 55e2e1c25e3a4ed9152bc347faf41996baa36ce8159fdedcd3a47f144b045bb4b74a4a77be84501dbc18fe45db9e993e889f444224fa72ec4021de8d0e7d9fdf
 DIST cinelerra-20111223.tar.xz 22543128 SHA256 f125a6d2b16acedb379351eff1e91f8571f18993f13187959bc3cf8f8217053b SHA512 b488ecb81d7a1ba621af3bc4c47b412f5210a233cace2a174917464d1db241d198fe815b8b552643d64e991b87f527064380f56017e75cd562e728b1b50e6189 WHIRLPOOL d65dbfcba0efaf0266b9b5eb3ddde667b34d95d0ce931f2f51731c1ac1a9ce56f3d359fc96c751406bbd24a1297284fae745741a931d93b43acecdc4ba2badad
 DIST cinelerra-20120707.tar.xz 22542220 SHA256 b909531fd1f5a11b85463ea06a62f703f2be67cbe79cd90c035d569a3019f5ad SHA512 af5ed92c223c1e0658ea3320aeefb568b94299ec14947e422f845b72bb271e7592142ac3d119daa9ce2a1b15e708d5ae2214a051f6d4ba67bd3ec733fc607171 WHIRLPOOL add200da410aafb3ad8bd6113061ba055a57978b4f9b717275b0c22375968e7aaa6c5c5a1d0f1ce2c4da3a630b9218fe2e5ae795b30bdfbfb532a3d793fd6065
 EBUILD cinelerra-20111223.ebuild 2315 SHA256 2f46f1dcd909121daf48badaf0a30432d81690534b7e20e01dbdecfbc40512e4 SHA512 6cfd6e188180069d22113a2e33173a5f28f4305aa87aef8e156d91caf9aab4512c9ab09ebd5c802f0afeabf2612616f27bee4325fcd064ce9b83838352000961 WHIRLPOOL b67c406c832b41fa9bcaa17559cab2962fd2ccbeb105407e8244ca0cc9784ef9eb6f0793500772c2b1d3343a903a5e82859c4c87b0aed09accbe188327c9a08e
-EBUILD cinelerra-20120707.ebuild 2294 SHA256 85c4cfb4e2748326db6a3de4c635dc52e2ae54d3e5a3ed0ade1d91e9c7eec671 SHA512 d57a1bf263ee8b3bedf791626e1567fe77ae2f5fb5ba8686f6e130f514bcea1170b0af7a6360d38efc3b70bdf53b0ddf5534c190d94255f7d28a02308e47da42 WHIRLPOOL 7c6c71c32579de1767f22595cd14e146a0dddac47d1d1e29d8a98991975b47ad7cffec9cdcee60da4802f935c25283de6dc8a28f61e931cfe5ca5e7019c534f3
-MISC ChangeLog 13355 SHA256 c4a54f3fb36f5c598b089b32d84bc45b3e6909831ae366cd3f3c3bd329d69b73 SHA512 394c81b99f6c2f9c650635a8dd830005eb00cf7321663aaedd1a6a826ac81bad11c531fd5f8d167733d1cc24ea72835f31906945f764054132bc401ee037a3d3 WHIRLPOOL 9649fa53f0c21aece9017408bcfc494b476d81e388d0a26b9fa7ae2bb5e14c045990a028c617cdfbdf7fe3addd29281c85531efa8e4aed3c8d970864ea607280
+EBUILD cinelerra-20120707.ebuild 2321 SHA256 fc678d9bdce41d1af1adae3e82923bac51752377322ba788d875a269c547ff48 SHA512 0ab27548be3f3a10bffe762b18a1a5b82442d4f47edad65251aaf4f6891bd7e1f2dd085de8e587b0fcceca84b1e35aa89d4436d4710ae4d09d0e1d71a6bce6a6 WHIRLPOOL 6239e57fdd980c3c6c6587261f0137e07353a6ff9740b9c77cd0213e9623cc2a89b6679599aaf27e496e6349b9f52aedb6c818261270278369debdc8d0f3a459
+MISC ChangeLog 13579 SHA256 879e97c7f1c4ff3ac42628de9a2a6aa0524a489b5bf7dbb2f5155a3428ceb2e3 SHA512 fa6d9520c581883f9773028c93c7003a57a7222a29489d0afb78e778d07a017a0678bafb47321a5c434d676b90457a260f0849359facc6f7c3e0f3c4385a0e79 WHIRLPOOL 97554706416dcb8f3d94f3a2f430785bab2c091197f768fce4988c8f6061dccbbccc1153b1c64bb582e8b697487755dfc79e4d0e51a1d5d7ee65e1421727c920
 MISC metadata.xml 159 SHA256 38df217d3a650829cd34e6c74bd2710a01751ccd5511b5be296e3f48dd4d81cb SHA512 63ef497824a91cae0ce7ca0b384ac72ac8564b9996f0f9e64a1ba2cbb943c90ebade5a8dc6345ba281d907b8c4ff0b5941bdda95e10e9c507846a9dabbc3cfcc WHIRLPOOL 22ad7e39360e181eab700c06170690a79057d328ae61793ff195104bdce14dab0dc6ff7ec8e10d8f177ee5f1aa9ea2362f579404cb3fc4fa961562c985e0ce12
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlB+JS8ACgkQuUQtlDBCeQKBFwCeO57AqHNcBAz9iqeSr97ollwq
-xr8An2Em9JqdxpFEjJgYLnAy+HieuKK2
-=NMqq
+iQEcBAEBCAAGBQJRZn4KAAoJEEdUh39IaPFNg/UH/1AibIGE2qeyxK/MxWGUo3fn
+CjuRnj0iYQ7auFp4XEv24Ik2QA9hoi3bmUWNuuCAIzozU/WUIGo0BzKcRB+GaMJ7
+6yuzFGmqfWsqZiPlvxp2avXjcJU3aJANeed1LuRQ2MyveAgdRSiXVpQ8pK0FNeH6
+BkPYE25u76X8NTROlsJseXoAF4ILGMAkxHFzifVjqwAOmbaY9NLyI1SJeUOiG1ui
+P7BbOeUHOtcoDrD2nv7B1bxmPIjVec23uV8UaO31sQ+qK0b/v4xcU2T7vfwI8fh3
+zit4JjUO5h/uuYuYedKEdnzvk1eHDTF7+0J5IB9rVMWTXmrNwSSsvqDoTi3XtWg=
+=MLY0
 -----END PGP SIGNATURE-----
diff --git a/media-video/cinelerra/cinelerra-20120707.ebuild b/media-video/cinelerra/cinelerra-20120707.ebuild
index 33ab3aa85a93..186c5f800771 100644
--- a/media-video/cinelerra/cinelerra-20120707.ebuild
+++ b/media-video/cinelerra/cinelerra-20120707.ebuild
@@ -1,13 +1,13 @@
-# 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/cinelerra/cinelerra-20120707.ebuild,v 1.3 2012/10/17 03:25:31 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-20120707.ebuild,v 1.4 2013/04/11 09:10:43 ssuominen Exp $
 
-EAPI=4
+EAPI=5
 inherit autotools eutils multilib flag-o-matic
 
 DESCRIPTION="The most advanced non-linear video editor and compositor"
 HOMEPAGE="http://www.cinelerra.org/"
-SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.xz"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,7 +20,7 @@ RDEPEND="media-libs/a52dec
 	>=media-libs/freetype-2
 	media-libs/libdv
 	>=media-libs/libogg-1.2
-	media-libs/libpng:0
+	media-libs/libpng:0=
 	media-libs/libsndfile
 	>=media-libs/libtheora-1.1
 	>=media-libs/libvorbis-1.3
@@ -55,7 +55,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-entry.patch \
 		"${FILESDIR}"/${PN}-ffmpeg.patch \
 		"${FILESDIR}"/${PN}-underlinking.patch \
-		"${FILESDIR}"/${PN}-ffmpeg-0.11.patch
+		"${FILESDIR}"/${PN}-ffmpeg-0.11.patch \
+		"${FILESDIR}"/${PN}-std_and_str_h.patch
 
 	eautoreconf
 }
diff --git a/media-video/cinelerra/files/cinelerra-std_and_str_h.patch b/media-video/cinelerra/files/cinelerra-std_and_str_h.patch
new file mode 100644
index 000000000000..2f8801ee087e
--- /dev/null
+++ b/media-video/cinelerra/files/cinelerra-std_and_str_h.patch
@@ -0,0 +1,81 @@
+Include required headers for free(), memcpy(), strcpy(), bcopy(), and more
+Thanks to Martin von Gagern for reporting and initial patch
+See, http://bugs.gentoo.org/show_bug.cgi?id=465478
+
+--- cinelerra/vdevicebuz.C
++++ cinelerra/vdevicebuz.C
+@@ -49,6 +49,8 @@
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
+ #include <unistd.h>
++#include <string.h>
++#include <strings.h>
+ 
+ #define BASE_VIDIOCPRIVATE	192	
+ 
+--- cinelerra/videodevice.C
++++ cinelerra/videodevice.C
+@@ -53,6 +53,7 @@
+ 
+ #include <unistd.h>
+ #include <fcntl.h>
++#include <string.h>
+ 
+ KeepaliveThread::KeepaliveThread(VideoDevice *device)
+  : Thread()
+--- libmpeg3/audio/ac3.c
++++ libmpeg3/audio/ac3.c
+@@ -1,3 +1,4 @@
++#include <stdlib.h>
+ #include <stdint.h>
+ #include <stdio.h>
+ 
+--- libmpeg3/audio/layer3.c
++++ libmpeg3/audio/layer3.c
+@@ -4,6 +4,7 @@
+ #include "tables.h"
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ 
+ struct gr_info_s 
+--- mplexlo/mplex.c
++++ mplexlo/mplex.c
+@@ -1,6 +1,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+-
++#include <string.h>
+ 
+ #include "libmpeg3.h"
+ #include "mpeg3protos.h"
+--- quicktime/graphics.c
++++ quicktime/graphics.c
+@@ -1,5 +1,6 @@
+ #include "graphics.h"
+ 
++#include <stdlib.h>
+ #include <string.h>
+ 
+ /* Graphics acceleration routines */
+--- quicktime/libmjpeg.c
++++ quicktime/libmjpeg.c
+@@ -17,6 +17,7 @@
+  
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include "colormodels.h"
+ #include "libmjpeg.h"
+ 
+--- quicktime/qtpng.c
++++ quicktime/qtpng.c
+@@ -1,6 +1,7 @@
+ #include "colormodels.h"
+ #include "funcprotos.h"
+ #include <png.h>
++#include <string.h>
+ #include "quicktime.h"
+ #include "qtpng.h"
+