Fix building with GCC 4.4 wrt #274261.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 23 insertions, 5 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 4d663fb41bff..5302c9ee4119 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/opencv
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.12 2009/03/02 18:48:03 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.13 2009/07/25 20:16:33 ssuominen Exp $
+
+  25 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  opencv-1.0.0-r1.ebuild, +files/opencv-1.0.0-gcc44.patch:
+  Fix building with GCC 4.4 wrt #274261.
 
   02 Mar 2009; Thomas Anderson <gentoofan23@gentoo.org>
   opencv-1.0.0-r1.ebuild:
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index a5ec84b5bf70..6404eec68976 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,4 +1,3 @@
-MISC ChangeLog 2586 RMD160 d829f41c4a920e3ecc7b0f4643be3d25294ae49c SHA1 f54936ad60a429f8e6ac8dc965c3e84ac4fafdd3 SHA256 8f981579c7e65d2c452810d36905ff3ad5c7eeaba5ca229adaba3b94912aecfa
 AUX opencv-1.0.0-addoptionalsamples.patch 1070 RMD160 6e2bb79f18bab6cb2beeb2aac5428434e049891c SHA1 1d0e51a26fd4d50d1bff4f2da44beca844946586 SHA256 e25e1236188e943a8e707f852ff25fc97d646f698bf6805e2cd8a2a8628bb540
 AUX opencv-1.0.0-automagicdependencies.patch 19265 RMD160 7d9685568f47b8efd494e1b5a08ea1efe791f9a0 SHA1 e92d613747707f7701bb5ba0b9b484b7315e1748 SHA256 862596926e8cd25ff019a5e232fc03522be0103ff084dbfbd36340bfab99d547
 AUX opencv-1.0.0-cvcapffmpegundefinedsymbols.patch 2762 RMD160 cd6d3624205ecc69e5513d0e7424d85c3ea4d932 SHA1 c31d0fe278e1e7f005c668255214ec204a1d70d8 SHA256 90fc7035d3084f71319eea5a33f8440522e93dd5ec090a89fdd36a4bd84cb8ee
@@ -6,8 +5,10 @@ AUX opencv-1.0.0-enableuseflags.patch 5107 RMD160 fb23cfe9ff83be4196f85448d46240
 AUX opencv-1.0.0-ffmpeg-0.4.9_p20080326.patch 3076 RMD160 321211a9bfbe98875ced91c79f1744c7d9dd76d8 SHA1 9672cc37ba5bd6de0fcfc2b24e58d3d9347d1437 SHA256 844fd579d2379dc57b0e9d7ce97a36c6a6efafbae4e146c2a6d44c88b7e76222
 AUX opencv-1.0.0-fix-swig.patch 346 RMD160 fad8dd51c06b4d83573ea1837d94d9ae086b758a SHA1 996e61969f32f66450dd1fe7886b7d79dfb9e660 SHA256 48bf6512b91d634886e64c41b93aae35b85c40e67387cb92b356e153b297e8a8
 AUX opencv-1.0.0-fixpythonmultilib.patch 423 RMD160 a3cdb0c1a25b4f8ab8447ac6e4776ade2daad458 SHA1 f3d43b10b5cdfd77ce50cfea7cf9c1431479c5de SHA256 317750f75417b5e2434c09f8244d347c7340eebe721579c7f39639b526af61fb
+AUX opencv-1.0.0-gcc44.patch 380 RMD160 b28e09f2ea758b36b4d958d3d0785569ff738e48 SHA1 cd99d62ce623589c6ca12ca97b4fc0cb305f73a4 SHA256 80301e4854400dfe007432ff8b323222327a26b07dbedf4689c2db9b61bd0a3c
 AUX opencv-1.0.0-havepngexrdefs.patch 1869 RMD160 477e487f34c9ebdc8e7666d2d6c7369a44bde7ed SHA1 9c7df4269887a5d5d3e2a4b17840f168098224f2 SHA256 5b077c9958d1699ec8b1d1c952f90d2830d4a4f9b0fe7a01a21747a6280f12d6
 AUX opencv-1.0.0-swiginvalidlinkingoptions.patch 1366 RMD160 7e8c981b2e68fb7d44e40f635ea5c9f0819a313b SHA1 c813390e053a8aced97958303319dd245692ed6a SHA256 7a0754ea8cfb4f1a7efafc3799fed4885a2c0fe7bf31cd3e007e64f7c411956c
-MISC metadata.xml 784 RMD160 15263a352754e5faa086e87c7abd6a420aa333a6 SHA1 d8f32cffd7b05ede8d586ce06d1f01d441d6ae8c SHA256 16ca7a9aa4f9cf65cbf7e304dab98e2c76cabf06e4b9ced2d9fac4ff24b01f05
-EBUILD opencv-1.0.0-r1.ebuild 2678 RMD160 150bdef8bb7af68ebe5f0cbf1eea8e2c049e75a6 SHA1 ce3e5da7601e519eb1e8c52a9d6bc5e6046b05d3 SHA256 1b5ace1ecf0e611d84b6b10c5f742b4dc23261d8e073d3b8c42c2528a7b5eadf
 DIST opencv-1.0.0.tar.gz 11146334 RMD160 f041798ea63101b90e945957e0d0ad3f7497dcd4 SHA1 c7dd500703b0060cedfa049fcb33de0846e631fb SHA256 3a6ee888e4dd4ab7f2bc80d046688c099c6a95d1267af554b7c8f1543b66f21e
+EBUILD opencv-1.0.0-r1.ebuild 2715 RMD160 8881a811e7d31ac46a1c1cc3532c6ef552ab2f66 SHA1 ef296d43b443be885a820538bec8ec1dba3c6457 SHA256 bbdd605f79685ac999da1773917376f3b96effcbfc05a6d37afea32d25d53e16
+MISC ChangeLog 2739 RMD160 bf3be46d6319ed408065ff48e0e73b0545aa7967 SHA1 a0c04d51ee6dcc5bf9a7d02a8994bc00687ce4ea SHA256 01debfa1383f9444b35251e6d246cfd6ea347127ad097e50b57bcf6da59f7291
+MISC metadata.xml 784 RMD160 15263a352754e5faa086e87c7abd6a420aa333a6 SHA1 d8f32cffd7b05ede8d586ce06d1f01d441d6ae8c SHA256 16ca7a9aa4f9cf65cbf7e304dab98e2c76cabf06e4b9ced2d9fac4ff24b01f05
diff --git a/media-libs/opencv/files/opencv-1.0.0-gcc44.patch b/media-libs/opencv/files/opencv-1.0.0-gcc44.patch
new file mode 100644
index 000000000000..be7e67916b65
--- /dev/null
+++ b/media-libs/opencv/files/opencv-1.0.0-gcc44.patch
@@ -0,0 +1,12 @@
+diff -ur opencv-1.0.0.orig/cxcore/include/cxmisc.h opencv-1.0.0/cxcore/include/cxmisc.h
+--- opencv-1.0.0.orig/cxcore/include/cxmisc.h	2006-05-04 18:55:17.000000000 +0300
++++ opencv-1.0.0/cxcore/include/cxmisc.h	2009-07-25 23:13:51.000000000 +0300
+@@ -130,7 +130,7 @@
+     #include <alloca.h>
+ #elif defined HAVE_ALLOCA
+     #include <stdlib.h>
+-#elif
++#else
+     #error
+ #endif
+ 
diff --git a/media-libs/opencv/opencv-1.0.0-r1.ebuild b/media-libs/opencv/opencv-1.0.0-r1.ebuild
index 65d912ea43b4..903601809dd5 100644
--- a/media-libs/opencv/opencv-1.0.0-r1.ebuild
+++ b/media-libs/opencv/opencv-1.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-1.0.0-r1.ebuild,v 1.7 2009/03/02 18:48:03 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-1.0.0-r1.ebuild,v 1.8 2009/07/25 20:16:33 ssuominen Exp $
 
 EAPI="1"
 inherit eutils flag-o-matic autotools
@@ -35,6 +35,7 @@ RDEPEND="${COMMON_DEPEND}"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc44.patch
 
 	# remove the install-hook that runs ldconfig.
 	sed -i '/install-hook:/,/^$/d' Makefile.am