Fix building with GLIBC 2.10+ wrt #273979.

Package-Manager: portage-2.2_rc36/cvs/Linux x86_64

4 files changed, 91 insertions, 17 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/Manifest b/media-plugins/vdr-music/Manifest
index 6656e77f2385..9469828434f1 100644
--- a/media-plugins/vdr-music/Manifest
+++ b/media-plugins/vdr-music/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX vdr-music-0.2.0-gcc4.3.diff 352 RMD160 7dfea065cee471b08603d67ba043063ec7947a76 SHA1 d6152d0b5b00ceb002dd15e8b55d1aff2f8961de SHA256 25afec3855c59156e9e4e069e844fb2799e79a074b8d4a70aec2d8e981e097ed
 AUX vdr-music-0.2.0-gentoo.diff 8984 RMD160 ebf9a5e069609d6c328675fe8c4a45b31018ced6 SHA1 20704a658ce816963f5d3821d7dcdc45dc09df2e SHA256 24e86049c3fe7d8f08b3b1f07e9d8da33d12bfb7aae3169eae939773372acadb
+AUX vdr-music-0.2.0-glibc-2.10.patch 3136 RMD160 fe3e98c337117cab97c843bb70389211c0d3f5c2 SHA1 be19cb9ce3d9c7e73faecb4ec61f9a03433fb0f5 SHA256 8a81ba9d30af6090fee17ad3232f0e223c3d0a4838123639059efc2c9a8ac481
 AUX vdr-music-0.2.0-graphtftcoverfix.diff 7418 RMD160 c38b89db49ce9ed07a8b8a08bdf3ea39cd6ff5e3 SHA1 50bb45c2c9507637dfac6a2644bbe624e241c722 SHA256 0a0d120292092f9bbc998f2b37d3518cf93cd4999b0039f109829e70998076b6
 AUX vdr-music-0.2.0-lyrics.diff 650 RMD160 8355089f1c70542f894659014c910452dc084310 SHA1 7c0c826806e3f3c29c9bbb6b121f1239e5fa8914 SHA256 854319d92e5d4a6840be922d4c891dbb01813fadb2377236379b75e50fdcf12f
 AUX vdr-music-0.2.0-vdr-1.5.x.diff 742 RMD160 a7719705515819f5c991f85f8bb7bc71d0f2b9fa SHA1 18a0b48224b241d4f8333a5dbf12874df913ff76 SHA256 5db123db44bad1309fd478e1ad46f86d01de02f5f1655d766868f569e0c293c9
 DIST vdr-music-0.2.0.tar.gz 507411 RMD160 131aebca586d26d65d4616c5fa2e58a6fa109d11 SHA1 f1bf23c12580299643194278553cf71b901773f1 SHA256 f01149d0d32cc32dabbf8868f2ef0c45540205a102d69138ccedc57976740b20
-EBUILD vdr-music-0.2.0.ebuild 2586 RMD160 851a3db10d547c892ed14279a899ffcd7b5d27e6 SHA1 e6b4dab58e49fbe1d868b3373d4c69a53c7f168c SHA256 e4bed6dc98e9dde95577e6f1064d029bce5bce133ce010472fbf3d847e1fdc40
-MISC ChangeLog 1552 RMD160 bb1e87c32305e43e3c644ee48c489a23380050f2 SHA1 755116c0a1e7a254566de9ce87cb87442e865583 SHA256 cc2b6333729908d86b3212e3bbacca5fdc03e47026154962bdcd93d898a12713
+EBUILD vdr-music-0.2.0.ebuild 2630 RMD160 20492f1b0082851a4b77db8c271beb2ad44a26b8 SHA1 9be03b01183bd36ed00a4172b3c492d6c3d64e49 SHA256 fb82d8027393956b7d534edb4ad8ed4726e6c90650d6b02f7a013b9c376dfb20
+MISC ChangeLog 1724 RMD160 cd7edb16c8f4e5780e111a321f8914cbcf499e47 SHA1 586dd5e2737a5713a7dfb387451a911c11d34862 SHA256 8e9ce7e67d70516aefb2fdf1340a22ebaf7d959f1dd4eb3d138c6dc3fda78dfc
 MISC metadata.xml 504 RMD160 325523ec2d5aeb7302a5b75bf11e8186cf46836a SHA1 2ec61cdc0fc73dc183699d23cb88dd3202927be7 SHA256 ba58537a2d75f5bd8d3237d79f2dbb6cfb2e5fb58426a2be4f20961eb3591b37
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAkmjQiYACgkQt2vP6XvVdOds9QCeOZRKr434qNFRnOidYCGR0zgG
-SzkAoJsgj6MS1bfi68ag1T72Gp5aVNSZ
-=nVAZ
------END PGP SIGNATURE-----
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