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

Package-Manager: portage-2.1.5_rc3

4 files changed, 47 insertions, 10 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/Manifest b/media-libs/libofa/Manifest
index 75a8ed0a2a08..e94ab09bbf9e 100644
--- a/media-libs/libofa/Manifest
+++ b/media-libs/libofa/Manifest
@@ -1,5 +1,6 @@
+AUX libofa-0.9.3-gcc-4.3.patch 1254 RMD160 a435c893b3594d3c622588f87bac5a2a6cfbf69d SHA1 cae08bdc12de923d5e032696702a0530ae6eafc1 SHA256 99fb50907d98640b21a42d00fccee1fa33a02dfabf94a40374766fcc823f5dd3
 AUX libofa-0.9.3-gcc-4.patch 819 RMD160 438764c9c9ab5a1a9ede64c505c140cc53aabf9b SHA1 cb19377d0634c03d2a49cfc61915cec918c341f7 SHA256 29955fe97cdb3cc2eb72b7b05f1ae38cc5c98b1740a0db96d61f51a13d380cd8
 DIST libofa-0.9.3.tar.gz 384043 RMD160 77f393570bb5356026c4b9c7195236bd96cb9143 SHA1 3dec8e1dcea937f74b4165e9ffd4d4f355e4594a SHA256 0216466153e92058c5202dea03390ddc7601d916b983f71ce4f4d034405590a0
-EBUILD libofa-0.9.3.ebuild 1007 RMD160 3199bb8b3e10a75d3bd0beff88db052b320c8464 SHA1 21e1b33d48e39152dad0d0b03138907ff9b48418 SHA256 0e4ee4826ddf33c464b5a6119fd7172067edc7f46de257c06167c8c4195bfb49
-MISC ChangeLog 1792 RMD160 93cf9f908945efcc2899ecab5686db85fd42ca18 SHA1 04f6b7b2a28ac3b092caf4742046963499daf9ab SHA256 665d46adb4758a62756b01325ebda0a29564a2094d3418355e32fd2bec9d94c1
+EBUILD libofa-0.9.3.ebuild 971 RMD160 7532ffa54e6ce37035f89ff78d51f2e3148e1e3a SHA1 0aa42ce9157695ebc4e7e9665c16f38a2ebb1a17 SHA256 6f9e9ab2db8d7cde11f4d18708691a022d503153ab37dac73ab9401907a6607a
+MISC ChangeLog 1959 RMD160 54b04eca4d9d30e6d864407c9ef3b0dbdf5f500b SHA1 2583418c814a9e05d6f3c37b5ebe3024cd136592 SHA256 cbbe30f3ca4b076625306d48dabf885c72b0c5ac283492678d9f05529a4986ec
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
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
 }