summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2007-11-18 19:31:35 +0000
committerAlexis Ballier <aballier@gentoo.org>2007-11-18 19:31:35 +0000
commit939dd57a463e002f481d9264b3a60fb116547e1a (patch)
treeab69dbbdd059fece78c7df34af476ce5db5f6ea5
parentppc stable (bug #199571) (diff)
downloadgentoo-2-939dd57a463e002f481d9264b3a60fb116547e1a.tar.gz
gentoo-2-939dd57a463e002f481d9264b3a60fb116547e1a.tar.bz2
gentoo-2-939dd57a463e002f481d9264b3a60fb116547e1a.zip
fix building with gcc 4.3, thanks to Ryan Hill <dirtyepic@gentoo.org>, bug #199579
(Portage version: 2.1.3.19)
-rw-r--r--media-libs/flac/ChangeLog7
-rw-r--r--media-libs/flac/files/flac-1.2.1-gcc-4.3-includes.patch11
-rw-r--r--media-libs/flac/flac-1.2.1-r2.ebuild5
3 files changed, 21 insertions, 2 deletions
diff --git a/media-libs/flac/ChangeLog b/media-libs/flac/ChangeLog
index bdcaab2608e5..6380658d67df 100644
--- a/media-libs/flac/ChangeLog
+++ b/media-libs/flac/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-libs/flac
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.133 2007/11/18 19:22:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.134 2007/11/18 19:31:35 aballier Exp $
+
+ 18 Nov 2007; Alexis Ballier <aballier@gentoo.org>
+ +files/flac-1.2.1-gcc-4.3-includes.patch, flac-1.2.1-r2.ebuild:
+ fix building with gcc 4.3, thanks to Ryan Hill <dirtyepic@gentoo.org>, bug
+ #199579
*flac-1.2.1-r2 (18 Nov 2007)
diff --git a/media-libs/flac/files/flac-1.2.1-gcc-4.3-includes.patch b/media-libs/flac/files/flac-1.2.1-gcc-4.3-includes.patch
new file mode 100644
index 000000000000..52fec8be5706
--- /dev/null
+++ b/media-libs/flac/files/flac-1.2.1-gcc-4.3-includes.patch
@@ -0,0 +1,11 @@
+diff -Naur flac-1.2.1-orig/examples/cpp/encode/file/main.cpp flac-1.2.1/examples/cpp/encode/file/main.cpp
+--- flac-1.2.1-orig/examples/cpp/encode/file/main.cpp 2007-09-13 09:58:03.000000000 -0600
++++ flac-1.2.1/examples/cpp/encode/file/main.cpp 2007-11-18 12:59:45.000000000 -0600
+@@ -30,6 +30,7 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <cstring>
+ #include "FLAC++/metadata.h"
+ #include "FLAC++/encoder.h"
+
diff --git a/media-libs/flac/flac-1.2.1-r2.ebuild b/media-libs/flac/flac-1.2.1-r2.ebuild
index 7bff4e7a0a34..13d01ce20070 100644
--- a/media-libs/flac/flac-1.2.1-r2.ebuild
+++ b/media-libs/flac/flac-1.2.1-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.2.1-r2.ebuild,v 1.1 2007/11/18 19:22:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.2.1-r2.ebuild,v 1.2 2007/11/18 19:31:35 aballier Exp $
EAPI="1"
@@ -33,6 +33,9 @@ src_unpack() {
epatch "${FILESDIR}"/${P}-cflags.patch
epatch "${FILESDIR}"/${P}-asm.patch
+ # Fix build with gcc 4.3, bug #199579
+ epatch "${FILESDIR}/${P}-gcc-4.3-includes.patch"
+
AT_M4DIR="m4" eautoreconf
}