Fix building with GCC 4.3, thanks to Mikko C. in bug 215563.

(Portage version: 2.1.5_rc3)

3 files changed, 44 insertions, 8 deletions

diff --git a/media-libs/libofa/ChangeLog b/media-libs/libofa/ChangeLog
index 957c99550bde..fc4f09743665 100644
--- a/media-libs/libofa/ChangeLog
+++ b/media-libs/libofa/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libofa
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libofa/ChangeLog,v 1.14 2008/02/06 19:44:19 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libofa/ChangeLog,v 1.15 2008/04/16 12:57:29 drac Exp $
+
+  16 Apr 2008; Samuli Suominen <drac@gentoo.org>
+  +files/libofa-0.9.3-gcc-4.3.patch, libofa-0.9.3.ebuild:
+  Fix building with GCC 4.3, thanks to Mikko C. in bug 215563.
 
   06 Feb 2008; Santiago M. Mola <coldwind@gentoo.org> libofa-0.9.3.ebuild:
   HOMEPAGE and SRC_URI updated, quoting fixed.
diff --git a/media-libs/libofa/files/libofa-0.9.3-gcc-4.3.patch b/media-libs/libofa/files/libofa-0.9.3-gcc-4.3.patch
new file mode 100644
index 000000000000..f68f42bfb129
--- /dev/null
+++ b/media-libs/libofa/files/libofa-0.9.3-gcc-4.3.patch
@@ -0,0 +1,35 @@
+diff -ur libofa-0.9.3.orig/examples/example.cpp libofa-0.9.3/examples/example.cpp
+--- libofa-0.9.3.orig/examples/example.cpp	2006-05-10 21:05:37.000000000 +0300
++++ libofa-0.9.3/examples/example.cpp	2008-04-16 15:51:49.000000000 +0300
+@@ -9,6 +9,8 @@
+ 
+ #include "protocol.h"
+ 
++#include <string.h>
++ 
+ AudioData* loadWaveFile(char *file);
+ AudioData* loadDataUsingLAME(char *file);
+ 
+Vain hakemistossa libofa-0.9.3/examples: example.cpp.orig
+diff -ur libofa-0.9.3.orig/examples/protocol.cpp libofa-0.9.3/examples/protocol.cpp
+--- libofa-0.9.3.orig/examples/protocol.cpp	2006-05-10 21:05:42.000000000 +0300
++++ libofa-0.9.3/examples/protocol.cpp	2008-04-16 15:51:49.000000000 +0300
+@@ -8,6 +8,7 @@
+ -------------------------------------------------------------------*/
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <cstring>
+ #include <string>
+ #include <map>
+ #include <expat.h>
+diff -ur libofa-0.9.3.orig/lib/signal_op.cpp libofa-0.9.3/lib/signal_op.cpp
+--- libofa-0.9.3.orig/lib/signal_op.cpp	2006-05-10 21:01:12.000000000 +0300
++++ libofa-0.9.3/lib/signal_op.cpp	2008-04-16 15:51:49.000000000 +0300
+@@ -12,6 +12,7 @@
+ // DATE CREATED: 1/12/06
+ 
+ 
++#include <cstdlib>
+ #include <math.h>
+ #include "signal_op.h"
+ #include "AFLIB/aflibConverter.h"
diff --git a/media-libs/libofa/libofa-0.9.3.ebuild b/media-libs/libofa/libofa-0.9.3.ebuild
index d55f77f099b7..0873447f38fb 100644
--- a/media-libs/libofa/libofa-0.9.3.ebuild
+++ b/media-libs/libofa/libofa-0.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2006-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libofa/libofa-0.9.3.ebuild,v 1.14 2008/02/06 19:44:19 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libofa/libofa-0.9.3.ebuild,v 1.15 2008/04/16 12:57:29 drac Exp $
 
 inherit eutils
 
@@ -27,14 +27,11 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/libofa-0.9.3-gcc-4.patch
+	epatch "${FILESDIR}"/libofa-0.9.3-gcc-4.patch \
+		"${FILESDIR}"/libofa-0.9.3-gcc-4.3.patch
 }
 
-src_compile() {
-	econf || die "configure failed"
-	emake || die "emake failed"
-}
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed."
 	dodoc AUTHORS README
 }