fix compile probs on gcc-4.3; bug 229377 ; Thanks to M.Brakemeier

Package-Manager: portage-2.1.4.4

4 files changed, 51 insertions, 7 deletions

diff --git a/media-video/vdr2jpeg/ChangeLog b/media-video/vdr2jpeg/ChangeLog
index 0ced7793a3f6..39b5fde774da 100644
--- a/media-video/vdr2jpeg/ChangeLog
+++ b/media-video/vdr2jpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vdr2jpeg
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr2jpeg/ChangeLog,v 1.16 2008/06/15 21:20:17 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr2jpeg/ChangeLog,v 1.17 2008/06/25 16:28:15 hd_brummy Exp $
+
+  25 Jun 2008; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +files/vdr2jpeg-0.1.0-gcc43.patch, vdr2jpeg-0.1.0.ebuild:
+  fix compile probs on gcc-4.3; bug 229377 ; Thanks to M.Brakemeier
 
   15 Jun 2008; Joerg Bornkessel <hd_brummy@gentoo.org>
   +files/vdr2jpeg-0.0.12-gcc43.patch, vdr2jpeg-0.0.12.ebuild:
diff --git a/media-video/vdr2jpeg/Manifest b/media-video/vdr2jpeg/Manifest
index 1b4f570ddccb..078000e788d3 100644
--- a/media-video/vdr2jpeg/Manifest
+++ b/media-video/vdr2jpeg/Manifest
@@ -3,17 +3,18 @@ Hash: SHA1
 
 AUX ffmpeg-0.4.9_p20080326-new_header.diff 526 RMD160 bb17e934760e294ec97f0415a87aa7e074a91cb7 SHA1 e99f22b528f798faae88a80d67d85e3f2dd9f7ec SHA256 8aff378769b57649063d653438a0df1256ad7d0d8ee7de062855a27e33f0749a
 AUX vdr2jpeg-0.0.12-gcc43.patch 425 RMD160 c42223d3e07f8b421d3f49fac8bc493d9a4e9c17 SHA1 6f6830048316529003a3a681e2bbc448760ac7c3 SHA256 01c2544d805b80e74425be5cd458c4db11f4ce36ad8e982b9d66617b62a618f5
+AUX vdr2jpeg-0.1.0-gcc43.patch 1252 RMD160 2f0007fe688eb966b8860d5398bd49b42264d1d8 SHA1 1122a3b6bc548620c386c86d952558a756706d5a SHA256 0569cdae060c33eac4b6f9afd0e473126409d749b36db44084ded97fbfcc1c57
 DIST vdr2jpeg-0.0.12.tgz 29742 RMD160 64416fc5c472ccf3d587ff1f7d571752dfec6871 SHA1 1ee43a930f7b01addad1d01b689ec8e4d1d0f9d9 SHA256 25e9e281eaa408404777a58a3a22c09476bd4b7596f9702836d5746d8b3a0aee
 DIST vdr2jpeg-0.1.0.tgz 30607 RMD160 01a58cf39af5f7b6b961bc6f6cbacf292d76d90c SHA1 02891b90ba59752de5467b19a5d48490da0fb057 SHA256 7ceeaadd302880dc26c129d383ab6d4dca2b7cb7c78bd5ea2d792e3463efc752
 EBUILD vdr2jpeg-0.0.12.ebuild 780 RMD160 4ebb9c2cfb6713ea0cb4ca91daa2db792c402c4c SHA1 6fbc1620c99d988ba5d1a0fdf17f11764ea12073 SHA256 fe060bab9fb58836bed54e4bf7b594ec63ef7a142b9709977239cc91f220a2fe
-EBUILD vdr2jpeg-0.1.0.ebuild 824 RMD160 54b1258623d0556206ccf21e4d3c9bccf7cd5fd6 SHA1 1c96eabd265197ce2701a700dd8b6cdbfe2a9a4f SHA256 26726f293e072fd855dc7e323843ff7b508bc18de5322c6eabe3334f3261df17
-MISC ChangeLog 3064 RMD160 b07acfcc14104b3ae7277894ec7b911742a7564c SHA1 3ecf7240166fea9b0281fcf3dff292e186d186a7 SHA256 7103c73058238d886c119aba124e5aed75af45ca6ce17d9bd0f7995dc627f46b
+EBUILD vdr2jpeg-0.1.0.ebuild 863 RMD160 7971161725d2ba5971526fa229d913c4b891559e SHA1 30345bb75b8593929dc1275edf34223996a6da8c SHA256 ca669e58964025a104b550fd421aa2134d69230fa09e20e0ef6af5a46376a2cd
+MISC ChangeLog 3248 RMD160 eb1b058b8e2dcb8fa6ebaefb393be5821bfb879f SHA1 002614b665fd813f91fe3fcf68220e431141b783 SHA256 763cbf0ed3197bd9dba45d56093307b55f02b312546eec94bcc630d56ceafc68
 MISC metadata.xml 419 RMD160 bd2a9a036df1d8bca95a8a85af2f099919526ff6 SHA1 531deb1056f4eb7cb3190c551d78156a20b564c4 SHA256 da5fe630b58a0c3d2bc786901eda3cb8c875db655389a608438a6af30fa7a306
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFIVYeadn07HTTCgIoRAuVQAKC6ZARTGa2dJbUdpBl/ion31GbI6QCfRQ2y
-c7sIQzm1dRqeKg1WOE4TKx4=
-=mfXt
+iD8DBQFIYnIpdn07HTTCgIoRArR2AKCwOImLhon/tXOwYRFOESaVh50+HgCfYxT8
+uWH7AhVU3J0B2wUKyK2o/JA=
+=+pHe
 -----END PGP SIGNATURE-----
diff --git a/media-video/vdr2jpeg/files/vdr2jpeg-0.1.0-gcc43.patch b/media-video/vdr2jpeg/files/vdr2jpeg-0.1.0-gcc43.patch
new file mode 100644
index 000000000000..975587610692
--- /dev/null
+++ b/media-video/vdr2jpeg/files/vdr2jpeg-0.1.0-gcc43.patch
@@ -0,0 +1,38 @@
+add missing inludes for gcc-4.3.x
+http://bugs.gentoo.org/show_bug.cgi?id=229377
+diff -uBbwNr vdr2jpeg-0.1.0_orig/gop.cpp vdr2jpeg-0.1.0/gop.cpp
+--- vdr2jpeg-0.1.0_orig/gop.cpp	2008-02-17 07:14:46.000000000 +0100
++++ vdr2jpeg-0.1.0/gop.cpp	2008-06-25 13:48:19.000000000 +0200
+@@ -29,6 +29,7 @@
+ #include <stdlib.h>
+ #include <errno.h>
+ #include <time.h>
++#include <string.h>
+ #include <iostream>
+ #include <fstream>
+ #include <sstream>
+diff -uBbwNr vdr2jpeg-0.1.0_orig/tools.cpp vdr2jpeg-0.1.0/tools.cpp
+--- vdr2jpeg-0.1.0_orig/tools.cpp	2008-02-17 07:15:22.000000000 +0100
++++ vdr2jpeg-0.1.0/tools.cpp	2008-06-25 13:47:40.000000000 +0200
+@@ -19,6 +19,8 @@
+  * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
+  */
+ 
++#include <string.h>
++
+ #include "tools.h"
+ 
+ int option(int argc, char *argv[], const char opt, bool bParam,
+diff -uBbwNr vdr2jpeg-0.1.0_orig/vdr2jpeg.cpp vdr2jpeg-0.1.0/vdr2jpeg.cpp
+--- vdr2jpeg-0.1.0_orig/vdr2jpeg.cpp	2008-02-17 07:15:48.000000000 +0100
++++ vdr2jpeg-0.1.0/vdr2jpeg.cpp	2008-06-25 13:47:12.000000000 +0200
+@@ -22,6 +22,8 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>       
+ #include <fcntl.h>
++#include <stdlib.h>
++#include <algorithm>
+ #include <iostream>
+ #include <fstream>
+ #include <sstream>
+
diff --git a/media-video/vdr2jpeg/vdr2jpeg-0.1.0.ebuild b/media-video/vdr2jpeg/vdr2jpeg-0.1.0.ebuild
index 362e86141dab..d8588e9b0cf4 100644
--- a/media-video/vdr2jpeg/vdr2jpeg-0.1.0.ebuild
+++ b/media-video/vdr2jpeg/vdr2jpeg-0.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr2jpeg/vdr2jpeg-0.1.0.ebuild,v 1.4 2008/05/02 21:23:25 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr2jpeg/vdr2jpeg-0.1.0.ebuild,v 1.5 2008/06/25 16:28:15 hd_brummy Exp $
 
 inherit eutils
 
@@ -26,6 +26,7 @@ src_unpack() {
 	sed -i "s:usr/local:usr:" Makefile
 
 	epatch "${FILESDIR}/ffmpeg-0.4.9_p20080326-new_header.diff"
+	epatch "${FILESDIR}/${P}-gcc43.patch"
 }
 
 src_compile() {