Fix building with GLIBC 2.10+ wrt #273979.

(Portage version: 2.2_rc36/cvs/Linux x86_64)

3 files changed, 88 insertions, 5 deletions

diff --git a/media-plugins/vdr-music/ChangeLog b/media-plugins/vdr-music/ChangeLog
index 31b5d035cb12..5f9987c821e6 100644
--- a/media-plugins/vdr-music/ChangeLog
+++ b/media-plugins/vdr-music/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-music
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-music/ChangeLog,v 1.7 2009/02/24 00:41:04 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-music/ChangeLog,v 1.8 2009/08/09 19:49:16 ssuominen Exp $
+
+  09 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  vdr-music-0.2.0.ebuild, +files/vdr-music-0.2.0-glibc-2.10.patch:
+  Fix building with GLIBC 2.10+ wrt #273979.
 
   24 Feb 2009; Matthias Schwarzott <zzam@gentoo.org> vdr-music-0.2.0.ebuild:
   Switch to eapi2 so the built_with_use can be replaced by a proper
diff --git a/media-plugins/vdr-music/files/vdr-music-0.2.0-glibc-2.10.patch b/media-plugins/vdr-music/files/vdr-music-0.2.0-glibc-2.10.patch
new file mode 100644
index 000000000000..7ace820dd2e4
--- /dev/null
+++ b/media-plugins/vdr-music/files/vdr-music-0.2.0-glibc-2.10.patch
@@ -0,0 +1,78 @@
+diff -ur music-0.2.0.orig/data.c music-0.2.0/data.c
+--- music-0.2.0.orig/data.c	2007-05-08 22:50:56.000000000 +0300
++++ music-0.2.0/data.c	2009-08-09 22:43:50.000000000 +0300
+@@ -479,7 +479,7 @@
+   description=strdup(Description);
+   if(Include) {
+     do {
+-      char *s=index(Include,'/');
++      char *s=const_cast<char*> (index(Include,'/'));
+       int l=s ? s-Include : strlen(Include);
+       if(l) {
+         char **s=(char **)realloc(include,(incCount+2)*sizeof(char *));
+diff -ur music-0.2.0.orig/decoder.c music-0.2.0/decoder.c
+--- music-0.2.0.orig/decoder.c	2007-05-15 03:59:15.000000000 +0300
++++ music-0.2.0/decoder.c	2009-08-09 22:47:23.000000000 +0300
+@@ -111,7 +111,7 @@
+ {
+   // if no title, try to build a reasonable from the filename
+   if(!Title && filename)  {
+-    char *s=rindex(filename,'/');
++    char *s=const_cast<char*> (rindex(filename,'/'));
+     if(s && *s=='/') {
+       s++;
+       Title=strdup(s);
+diff -ur music-0.2.0.orig/decoder-ogg.c music-0.2.0/decoder-ogg.c
+--- music-0.2.0.orig/decoder-ogg.c	2007-04-08 22:50:36.000000000 +0300
++++ music-0.2.0/decoder-ogg.c	2009-08-09 22:50:43.000000000 +0300
+@@ -161,7 +161,7 @@
+     for(int i=0 ; i<vc->comments ; i++) {
+       const char *cc=vc->user_comments[i];
+       d(printf("music: decoder-ogg: comment%d='%s'\n",i,cc))
+-      char *p=strchr(cc,'=');
++      const char *p=strchr(cc,'=');
+       if(p) {
+         const int len=p-cc;
+         p++;
+diff -ur music-0.2.0.orig/decoder-snd.c music-0.2.0/decoder-snd.c
+--- music-0.2.0.orig/decoder-snd.c	2007-04-08 22:50:36.000000000 +0300
++++ music-0.2.0/decoder-snd.c	2009-08-09 22:49:57.000000000 +0300
+@@ -581,7 +581,7 @@
+ bool cCDDBDisc::Split(const char *source, char div, char * &first, char * &second, bool only3)
+ {
+   int pos=-1, n=0;
+-  char *p, l[4]={ ' ',div,' ',0 };
++  const char *p, l[4]={ ' ',div,' ',0 };
+   if ((p=strstr(source,l))) { pos=p-source; n=3; }
+   else if(!only3 && (p=strchr(source,div)))  { pos=p-source; n=1; }
+   if(pos>=0) {
+@@ -861,7 +861,7 @@
+ {
+   if(id->Get()) {
+     int tr;
+-    char *s=strstr(filename,CDFS_TRACK);
++    char *s=const_cast<char*> (strstr(filename,CDFS_TRACK));
+     if(s && sscanf(s+strlen(CDFS_TRACK),"%d",&tr)==1) {
+       d(printf("music: decoder-snd: looking up disc id %08x track %d\n",id->discid,tr))
+       return cddb.Lookup(id,tr-1,this);
+diff -ur music-0.2.0.orig/stream.c music-0.2.0/stream.c
+--- music-0.2.0.orig/stream.c	2007-04-08 22:50:36.000000000 +0300
++++ music-0.2.0/stream.c	2009-08-09 22:48:32.000000000 +0300
+@@ -408,7 +408,7 @@
+ 
+ bool cNetStream::ParseHeader(const char *buff, const char *name, char **value)
+ {
+-  char *s=index(buff,':');
++  char *s=const_cast<char*> (index(buff,':'));
+   if(s && !strncasecmp(buff,name,s-buff)) {
+     s=skipspace(s+1);
+     d(printf("music: netstream: found header '%s' contents '%s'\n",name,s))
+@@ -532,7 +532,7 @@
+ 
+ char *cNetStream::ParseMetaString(const char *buff, const char *name, char **value)
+ {
+-  char *s=index(buff,'=');
++  char *s=const_cast<char*> (index(buff,'='));
+   if(s && !strncasecmp(buff,name,s-buff)) {
+     char *end=index(s+2,'\'');
+     if(s[1]=='\'' && end) {
diff --git a/media-plugins/vdr-music/vdr-music-0.2.0.ebuild b/media-plugins/vdr-music/vdr-music-0.2.0.ebuild
index 3282a4e94cdc..7de41af28a43 100644
--- a/media-plugins/vdr-music/vdr-music-0.2.0.ebuild
+++ b/media-plugins/vdr-music/vdr-music-0.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 2003-2009 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-music/vdr-music-0.2.0.ebuild,v 1.5 2009/02/24 00:41:04 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-music/vdr-music-0.2.0.ebuild,v 1.6 2009/08/09 19:49:16 ssuominen Exp $
 
 EAPI="2"
 
@@ -15,10 +15,11 @@ LICENSE="GPL-2"
 KEYWORDS="~x86 ~amd64"
 IUSE="imagemagick debug vorbis oss ff-card graphtft 4mb-mod sndfile"
 
-PATCHES=("${FILESDIR}/${P}-gentoo.diff"
+PATCHES=( "${FILESDIR}/${P}-gentoo.diff"
 	"${FILESDIR}/${P}-vdr-1.5.x.diff"
 	"${FILESDIR}/${P}-lyrics.diff"
-	"${FILESDIR}/${P}-gcc4.3.diff")
+	"${FILESDIR}/${P}-gcc4.3.diff"
+	"${FILESDIR}/${P}-glibc-2.10.patch" )
 
 DEPEND=">=media-video/vdr-1.3.30
 	media-libs/libmad