summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-07-19 21:22:38 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-07-19 21:22:38 +0000
commit6f0402b188162ddf834c71f9594636e29fa51d54 (patch)
tree89dc735c46b9319cb2dfbfa78d911bd24a350ae2 /media-sound/alsaplayer
parents/sound/maintainer-needed/ (diff)
downloadgentoo-2-6f0402b188162ddf834c71f9594636e29fa51d54.tar.gz
gentoo-2-6f0402b188162ddf834c71f9594636e29fa51d54.tar.bz2
gentoo-2-6f0402b188162ddf834c71f9594636e29fa51d54.zip
Fix building with glibc 2.10+ wrt #271782.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/alsaplayer')
-rw-r--r--media-sound/alsaplayer/ChangeLog6
-rw-r--r--media-sound/alsaplayer/alsaplayer-0.99.80-r1.ebuild5
-rw-r--r--media-sound/alsaplayer/files/alsaplayer-0.99.80-glibc-2.10.patch21
3 files changed, 29 insertions, 3 deletions
diff --git a/media-sound/alsaplayer/ChangeLog b/media-sound/alsaplayer/ChangeLog
index 3b6533943271..6b4b8d2f02c7 100644
--- a/media-sound/alsaplayer/ChangeLog
+++ b/media-sound/alsaplayer/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-sound/alsaplayer
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/ChangeLog,v 1.69 2009/05/29 15:18:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/ChangeLog,v 1.70 2009/07/19 21:22:38 ssuominen Exp $
+
+ 19 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+ alsaplayer-0.99.80-r1.ebuild, +files/alsaplayer-0.99.80-glibc-2.10.patch:
+ Fix building with glibc 2.10+ wrt #271782.
29 May 2009; Samuli Suominen <ssuominen@gentoo.org>
alsaplayer-0.99.80-r1.ebuild:
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.80-r1.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.80-r1.ebuild
index b6aa772e5470..7a9ce2643ea8 100644
--- a/media-sound/alsaplayer/alsaplayer-0.99.80-r1.ebuild
+++ b/media-sound/alsaplayer/alsaplayer-0.99.80-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/alsaplayer-0.99.80-r1.ebuild,v 1.2 2009/05/29 15:18:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/alsaplayer-0.99.80-r1.ebuild,v 1.3 2009/07/19 21:22:38 ssuominen Exp $
EAPI=2
inherit autotools eutils
@@ -37,7 +37,8 @@ DEPEND="${RDEPEND}
src_prepare() {
epatch "${FILESDIR}"/${P}_rc3-flags.patch \
"${FILESDIR}"/${P}-missing_limits_h.patch \
- "${FILESDIR}"/${P}-enable-libid3tag.patch
+ "${FILESDIR}"/${P}-enable-libid3tag.patch \
+ "${FILESDIR}"/${P}-glibc-2.10.patch
eautoreconf
}
diff --git a/media-sound/alsaplayer/files/alsaplayer-0.99.80-glibc-2.10.patch b/media-sound/alsaplayer/files/alsaplayer-0.99.80-glibc-2.10.patch
new file mode 100644
index 000000000000..5887cbf850e2
--- /dev/null
+++ b/media-sound/alsaplayer/files/alsaplayer-0.99.80-glibc-2.10.patch
@@ -0,0 +1,21 @@
+diff -ur alsaplayer-0.99.80.orig/input/flac/FlacPlugin.cpp alsaplayer-0.99.80/input/flac/FlacPlugin.cpp
+--- alsaplayer-0.99.80.orig/input/flac/FlacPlugin.cpp 2007-10-29 23:00:16.000000000 +0200
++++ alsaplayer-0.99.80/input/flac/FlacPlugin.cpp 2009-07-20 00:19:07.000000000 +0300
+@@ -239,7 +239,7 @@
+ else
+ {
+ // use stream name
+- char * fname = strrchr (f->name ().c_str (), '/');
++ const char * fname = strrchr (f->name ().c_str (), '/');
+ if (fname)
+ {
+ fname++;
+@@ -270,7 +270,7 @@
+ if (strncmp(name, "http://", 7) == 0) {
+ return 0.0;
+ }
+- char *ext = strrchr(name, '.');
++ const char *ext = strrchr(name, '.');
+ if (!ext)
+ return 0.0;
+ ext++;