summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Goller <morfic@gentoo.org>2004-06-28 20:03:32 +0000
committerDaniel Goller <morfic@gentoo.org>2004-06-28 20:03:32 +0000
commitd54129f43a11396c9329ac6f9c6740667e038598 (patch)
treecbd27da9aa160b3421ba5bdd3242584b2e5e49f2 /media-libs
parentdont depend on {text,file,sh-}utils (diff)
downloadhistorical-d54129f43a11396c9329ac6f9c6740667e038598.tar.gz
historical-d54129f43a11396c9329ac6f9c6740667e038598.tar.bz2
historical-d54129f43a11396c9329ac6f9c6740667e038598.zip
Fixed problem with locale of source, compiles now with gcc-3.4
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/libmatroska/ChangeLog6
-rw-r--r--media-libs/libmatroska/Manifest4
-rw-r--r--media-libs/libmatroska/libmatroska-0.7.0.ebuild11
3 files changed, 16 insertions, 5 deletions
diff --git a/media-libs/libmatroska/ChangeLog b/media-libs/libmatroska/ChangeLog
index bea7e94962c7..e8f2d0185ea0 100644
--- a/media-libs/libmatroska/ChangeLog
+++ b/media-libs/libmatroska/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/libmatroska
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/ChangeLog,v 1.25 2004/06/24 23:11:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/ChangeLog,v 1.26 2004/06/28 20:03:32 morfic Exp $
+
+ 28 Jun 2004; Daniel Goller <morfic@gentoo.org> libmatroska-0.7.0.ebuild:
+ Added conditional CFLAGS to fix problem with locale of source on gcc-3.4
+ Fixes Bug #52385
09 Jun 2004; Luca Barbato <lu_zero@gentoo.org> libmatroska-0.7.0.ebuild:
Same fix from amd64
diff --git a/media-libs/libmatroska/Manifest b/media-libs/libmatroska/Manifest
index 3aefefe34890..66fd8ccf74fb 100644
--- a/media-libs/libmatroska/Manifest
+++ b/media-libs/libmatroska/Manifest
@@ -1,8 +1,8 @@
MD5 7498ab2d3b52c38e50a3b61b800fbdd0 libmatroska-0.6.3.ebuild 1073
MD5 4c0be5a2967f0ff57e3b72ec14549c93 libmatroska-0.5.2.ebuild 800
MD5 2866cf7bcec7abab7a1e84a4273d456d libmatroska-0.6.2.ebuild 864
-MD5 c5841b3edcd338262f3573f1d0736304 libmatroska-0.7.0.ebuild 1116
-MD5 c791ffe4f3852435f7f21d95aec260ed ChangeLog 3023
+MD5 75b5b96490a73a545a6b4c671f95f7dd libmatroska-0.7.0.ebuild 1290
+MD5 319c47f20d36cf1b0106236a58d6bc30 ChangeLog 3191
MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
MD5 a517d15638be5ee91357b70059040e06 files/digest-libmatroska-0.5.2 68
MD5 a37de967f24a547a9f51018af01ccd30 files/digest-libmatroska-0.6.2 68
diff --git a/media-libs/libmatroska/libmatroska-0.7.0.ebuild b/media-libs/libmatroska/libmatroska-0.7.0.ebuild
index 7a3e115729df..faea7611f025 100644
--- a/media-libs/libmatroska/libmatroska-0.7.0.ebuild
+++ b/media-libs/libmatroska/libmatroska-0.7.0.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.0.ebuild,v 1.5 2004/06/24 23:11:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.0.ebuild,v 1.6 2004/06/28 20:03:32 morfic Exp $
-inherit flag-o-matic
+inherit flag-o-matic gcc
IUSE=""
@@ -29,6 +29,13 @@ src_compile() {
use ppc && append-flags -fPIC
sed -i -e 's/CXXFLAGS=/CXXFLAGS+=/g' Makefile
+
+ #fixes locale for gcc3.4.0 to close bug 52385
+ if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
+ then
+ append-flags -finput-charset=ISO8859-15
+ fi
+
make PREFIX=/usr \
LIBEBML_INCLUDE_DIR=/usr/include/ebml \
LIBEBML_LIB_DIR=/usr/lib || die "make failed"