Fix bug 265750, failure with gcc-4.4. Thanks to Andreas Sturmlechner <andreas.sturmlechner@gmail.com> for the patch.

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

4 files changed, 32 insertions, 16 deletions

diff --git a/media-libs/libofa/ChangeLog b/media-libs/libofa/ChangeLog
index fc4f09743665..e91bd828fc62 100644
--- a/media-libs/libofa/ChangeLog
+++ b/media-libs/libofa/ChangeLog
@@ -1,6 +1,11 @@
 # 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.15 2008/04/16 12:57:29 drac Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libofa/ChangeLog,v 1.16 2009/04/11 16:28:25 loki_val Exp $
+
+  11 Apr 2009; Peter Alfredsen <loki_val@gentoo.org>
+  +files/libofa-0.9.3-gcc-4.4.patch, libofa-0.9.3.ebuild:
+  Fix bug 265750, failure with gcc-4.4. Thanks to Andreas Sturmlechner
+  <andreas.sturmlechner@gmail.com> for the patch.
 
   16 Apr 2008; Samuli Suominen <drac@gentoo.org>
   +files/libofa-0.9.3-gcc-4.3.patch, libofa-0.9.3.ebuild:
diff --git a/media-libs/libofa/Manifest b/media-libs/libofa/Manifest
index b796d1700cac..82d55c67dbbe 100644
--- a/media-libs/libofa/Manifest
+++ b/media-libs/libofa/Manifest
@@ -1,6 +1,7 @@
 AUX libofa-0.9.3-gcc-4.3.patch 1254 RMD160 a435c893b3594d3c622588f87bac5a2a6cfbf69d SHA1 cae08bdc12de923d5e032696702a0530ae6eafc1 SHA256 99fb50907d98640b21a42d00fccee1fa33a02dfabf94a40374766fcc823f5dd3
+AUX libofa-0.9.3-gcc-4.4.patch 281 RMD160 eb0637ea02892ae9faa165114048f8ebe4d6672a SHA1 5f5d8fe172a2f3aaece09aa486a3bd787b916db3 SHA256 f8c5f3ab8e5a62cc5524a527555be7108e27e020193c70e47df5330a9164631a
 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 955 RMD160 215e8e07dc3cef762d72429658144742136b6279 SHA1 105af8dcd0c1970e2b32734b1baa516e6c11233a SHA256 6f970bd76ae855908bda7d114956c285ad1e17185efabc4a674ef43aff39f1d9
-MISC ChangeLog 1959 RMD160 54b04eca4d9d30e6d864407c9ef3b0dbdf5f500b SHA1 2583418c814a9e05d6f3c37b5ebe3024cd136592 SHA256 cbbe30f3ca4b076625306d48dabf885c72b0c5ac283492678d9f05529a4986ec
+EBUILD libofa-0.9.3.ebuild 896 RMD160 f0971172ea12c7ec361b8881359b09ad369877b7 SHA1 4ed1f47b61e556d22aeb9f05ac6cf62620d5de52 SHA256 dbb8168234cdb04d86c904ad6360100172ff7a2b03b7e817b31ccaef92387d3f
+MISC ChangeLog 2196 RMD160 0ce087cc284d73902cb4a03ccde0fd5c59f3b763 SHA1 1e7892e9e223f2d01feef0d742834c132eeef494 SHA256 ec9dd82b2dd2d6baa35543955cfb6badfdad937d988a59605da7c7d3f3a6caae
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
diff --git a/media-libs/libofa/files/libofa-0.9.3-gcc-4.4.patch b/media-libs/libofa/files/libofa-0.9.3-gcc-4.4.patch
new file mode 100644
index 000000000000..25cab143d23f
--- /dev/null
+++ b/media-libs/libofa/files/libofa-0.9.3-gcc-4.4.patch
@@ -0,0 +1,10 @@
+--- orig-libofa-0.9.3/examples/example.cpp      2009-04-11 12:22:55.397455430 +0200
++++ libofa-0.9.3/examples/example.cpp   2009-04-11 12:25:21.466456955 +0200
+@@ -9,6 +9,7 @@
+
+ #include "protocol.h"
+
++#include <stdio.h>
+ #include <string.h>
+
+ AudioData* loadWaveFile(char *file);
diff --git a/media-libs/libofa/libofa-0.9.3.ebuild b/media-libs/libofa/libofa-0.9.3.ebuild
index 8cc60ff6435c..273acd965b52 100644
--- a/media-libs/libofa/libofa-0.9.3.ebuild
+++ b/media-libs/libofa/libofa-0.9.3.ebuild
@@ -1,8 +1,10 @@
-# Copyright 2006-2008 Gentoo Foundation
+# Copyright 2006-2009 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.16 2008/04/16 12:59:00 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libofa/libofa-0.9.3.ebuild,v 1.17 2009/04/11 16:28:25 loki_val Exp $
 
-inherit eutils
+EAPI=2
+
+inherit base eutils flag-o-matic
 
 DESCRIPTION="Open Fingerprint Architecture"
 HOMEPAGE="http://code.google.com/p/musicip-libofa/"
@@ -19,16 +21,14 @@ RDEPEND="dev-libs/expat
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-pkg_setup() {
-	[[ "${CXXFLAGS}" != "${CXXFLAGS/-ffast-math/}" ]] && \
-		die "Correct your C[XX]FLAGS. Using -ffast-math is unsafe and not supported."
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc-4.patch
+	"${FILESDIR}"/${P}-gcc-4.3.patch
+	"${FILESDIR}"/${P}-gcc-4.4.patch
+)
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc-4.patch \
-		"${FILESDIR}"/${P}-gcc-4.3.patch
+pkg_setup() {
+	is-flag -ffast-math && append-flags -fno-fast-math
 }
 
 src_install() {