summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-06-04 12:51:28 +0000
committerJustin Lecher <jlec@gentoo.org>2012-06-04 12:51:28 +0000
commit7c3de9889ffdd94503d84ad62c40670ac7604b34 (patch)
tree4bccb3bfc1bb18f0e22f7ecc2b2af411397a649b /media-libs/libofa
parentStable for x86, wrt bug #419609 (diff)
downloadgentoo-2-7c3de9889ffdd94503d84ad62c40670ac7604b34.tar.gz
gentoo-2-7c3de9889ffdd94503d84ad62c40670ac7604b34.tar.bz2
gentoo-2-7c3de9889ffdd94503d84ad62c40670ac7604b34.zip
Add gcc-4.7 compatibility patch from fedora, #414141
(Portage version: 2.2.0_alpha109/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/libofa')
-rw-r--r--media-libs/libofa/ChangeLog6
-rw-r--r--media-libs/libofa/files/libofa-0.9.3-gcc-4.7.patch22
-rw-r--r--media-libs/libofa/libofa-0.9.3.ebuild3
3 files changed, 29 insertions, 2 deletions
diff --git a/media-libs/libofa/ChangeLog b/media-libs/libofa/ChangeLog
index d9b08347d4da..fed4afe5b4f4 100644
--- a/media-libs/libofa/ChangeLog
+++ b/media-libs/libofa/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/libofa
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libofa/ChangeLog,v 1.23 2012/05/05 08:02:44 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libofa/ChangeLog,v 1.24 2012/06/04 12:51:28 jlec Exp $
+
+ 04 Jun 2012; Justin Lecher <jlec@gentoo.org> libofa-0.9.3.ebuild,
+ +files/libofa-0.9.3-gcc-4.7.patch:
+ Add gcc-4.7 compatibility patch from fedora, #414141
05 May 2012; Jeff Horelick <jdhore@gentoo.org> libofa-0.9.3.ebuild:
dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/media-libs/libofa/files/libofa-0.9.3-gcc-4.7.patch b/media-libs/libofa/files/libofa-0.9.3-gcc-4.7.patch
new file mode 100644
index 000000000000..c5ab098767dd
--- /dev/null
+++ b/media-libs/libofa/files/libofa-0.9.3-gcc-4.7.patch
@@ -0,0 +1,22 @@
+diff -up libofa-0.9.3/examples/uselame.cpp.gcc47 libofa-0.9.3/examples/uselame.cpp
+--- libofa-0.9.3/examples/uselame.cpp.gcc47 2012-01-14 09:35:24.343146853 -0600
++++ libofa-0.9.3/examples/uselame.cpp 2012-01-14 09:35:49.956826634 -0600
+@@ -12,6 +12,7 @@
+ #else
+ #include <sys/wait.h>
+ #endif
++#include <unistd.h>
+
+ AudioData *loadWaveFile(char *file);
+
+diff -up libofa-0.9.3/examples/wavefile.cpp.gcc47 libofa-0.9.3/examples/wavefile.cpp
+--- libofa-0.9.3/examples/wavefile.cpp.gcc47 2012-01-14 09:35:24.344146841 -0600
++++ libofa-0.9.3/examples/wavefile.cpp 2012-01-14 16:00:54.414981160 -0600
+@@ -11,6 +11,7 @@
+ #include "io.h"
+ #endif
+ #include <fcntl.h>
++#include <unistd.h>
+
+ static bool readBytes(int fd, unsigned char *buf, int size) {
+ int ct = 0;
diff --git a/media-libs/libofa/libofa-0.9.3.ebuild b/media-libs/libofa/libofa-0.9.3.ebuild
index 9b28af32a034..dd2cee3185f3 100644
--- a/media-libs/libofa/libofa-0.9.3.ebuild
+++ b/media-libs/libofa/libofa-0.9.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 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.24 2012/05/05 08:02:44 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libofa/libofa-0.9.3.ebuild,v 1.25 2012/06/04 12:51:28 jlec Exp $
EAPI=2
@@ -25,6 +25,7 @@ PATCHES=(
"${FILESDIR}"/${P}-gcc-4.patch
"${FILESDIR}"/${P}-gcc-4.3.patch
"${FILESDIR}"/${P}-gcc-4.4.patch
+ "${FILESDIR}"/${P}-gcc-4.7.patch
"${FILESDIR}"/${P}-curl-7.21.patch
)