Fix building with GLIBC 2.10+ wrt #276177.

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

3 files changed, 87 insertions, 4 deletions

diff --git a/media-plugins/vdr-mp3ng/ChangeLog b/media-plugins/vdr-mp3ng/ChangeLog
index 6a731e1988b5..6a251f7c2db1 100644
--- a/media-plugins/vdr-mp3ng/ChangeLog
+++ b/media-plugins/vdr-mp3ng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-mp3ng
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mp3ng/ChangeLog,v 1.15 2008/10/25 11:21:02 hd_brummy Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mp3ng/ChangeLog,v 1.16 2009/08/09 19:29:42 ssuominen Exp $
+
+  09 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  vdr-mp3ng-0.0.1_pre4.ebuild, +files/vdr-mp3ng-0.0.1_pre4-glibc-2.10.patch:
+  Fix building with GLIBC 2.10+ wrt #276177.
 
   25 Oct 2008; Joerg Bornkessel <hd_brummy@gentoo.org>
   -files/vdr-mp3ng-0.0.1_pre3-1.3.37.diff,
diff --git a/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre4-glibc-2.10.patch b/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre4-glibc-2.10.patch
new file mode 100644
index 000000000000..7965c8212bea
--- /dev/null
+++ b/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre4-glibc-2.10.patch
@@ -0,0 +1,78 @@
+diff -ur mp3ng-0.9.13-MKIV-pre3.orig/data.c mp3ng-0.9.13-MKIV-pre3/data.c
+--- mp3ng-0.9.13-MKIV-pre3.orig/data.c	2005-08-28 19:18:06.000000000 +0300
++++ mp3ng-0.9.13-MKIV-pre3/data.c	2009-08-09 22:25:33.000000000 +0300
+@@ -408,7 +408,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 mp3ng-0.9.13-MKIV-pre3.orig/decoder.c mp3ng-0.9.13-MKIV-pre3/decoder.c
+--- mp3ng-0.9.13-MKIV-pre3.orig/decoder.c	2005-08-28 19:18:06.000000000 +0300
++++ mp3ng-0.9.13-MKIV-pre3/decoder.c	2009-08-09 22:28:03.000000000 +0300
+@@ -101,7 +101,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 mp3ng-0.9.13-MKIV-pre3.orig/decoder-ogg.c mp3ng-0.9.13-MKIV-pre3/decoder-ogg.c
+--- mp3ng-0.9.13-MKIV-pre3.orig/decoder-ogg.c	2005-05-31 19:56:24.000000000 +0300
++++ mp3ng-0.9.13-MKIV-pre3/decoder-ogg.c	2009-08-09 22:31:17.000000000 +0300
+@@ -161,7 +161,7 @@
+     for(int i=0 ; i<vc->comments ; i++) {
+       const char *cc=vc->user_comments[i];
+       d(printf("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 mp3ng-0.9.13-MKIV-pre3.orig/decoder-snd.c mp3ng-0.9.13-MKIV-pre3/decoder-snd.c
+--- mp3ng-0.9.13-MKIV-pre3.orig/decoder-snd.c	2005-05-31 19:56:11.000000000 +0300
++++ mp3ng-0.9.13-MKIV-pre3/decoder-snd.c	2009-08-09 22:30:38.000000000 +0300
+@@ -577,7 +577,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) {
+@@ -857,7 +857,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("snd: looking up disc id %08x track %d\n",id->discid,tr))
+       return cddb.Lookup(id,tr-1,this);
+diff -ur mp3ng-0.9.13-MKIV-pre3.orig/stream.c mp3ng-0.9.13-MKIV-pre3/stream.c
+--- mp3ng-0.9.13-MKIV-pre3.orig/stream.c	2005-02-06 13:14:43.000000000 +0200
++++ mp3ng-0.9.13-MKIV-pre3/stream.c	2009-08-09 22:27:20.000000000 +0300
+@@ -386,7 +386,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("netstream: found header '%s' contents '%s'\n",name,s))
+@@ -510,7 +510,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-mp3ng/vdr-mp3ng-0.0.1_pre4.ebuild b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre4.ebuild
index 63092a3248db..06516fda66cb 100644
--- a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre4.ebuild
+++ b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 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-mp3ng/vdr-mp3ng-0.0.1_pre4.ebuild,v 1.6 2008/10/25 11:18:13 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre4.ebuild,v 1.7 2009/08/09 19:29:42 ssuominen Exp $
 
 inherit vdr-plugin eutils
 
@@ -36,6 +36,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-gcc4.diff"
 	epatch "${DISTDIR}/${P}-span-0.0.3.diff.tar.gz"
 	epatch "${FILESDIR}/${P}-vdr-1.5.1.diff"
+	epatch "${FILESDIR}/${P}-glibc-2.10.patch"
 
 	use !vorbis && sed -i "s:#WITHOUT_LIBVORBISFILE:WITHOUT_LIBVORBISFILE:" Makefile
 	use oss && sed -i "s:#WITH_OSS_OUTPUT:WITH_OSS_OUTPUT:" Makefile