Fix building with GLIBC 2.10+ wrt #276177.

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

4 files changed, 90 insertions, 17 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/Manifest b/media-plugins/vdr-mp3ng/Manifest
index 562e46eb666a..c15286b3b78f 100644
--- a/media-plugins/vdr-mp3ng/Manifest
+++ b/media-plugins/vdr-mp3ng/Manifest
@@ -1,24 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX confd 1771 RMD160 a0948b604095eee995965e448dbe92d1936a69b7 SHA1 54230a9835852d07f8c8f94b4d45c0b8b9cc4da7 SHA256 f70818c4885927c53dc6aeb65ebd164f22cf73964065dcca65948fb0a130d07a
 AUX imagemagick-6.4.x.diff 444 RMD160 6d3300a49078d534c55ff499d73527a2be156190 SHA1 4647b975faf59b24dadd7f2d42c880ce453f7b89 SHA256 44276d7bb3e1863e0578229b1d6ce67f9dc54894047053f49c0546a961a6bb57
 AUX mp3ngsources 251 RMD160 6507ffdb9ac9e8c236625a72f2e0eb1d28c2bbc5 SHA1 097b1928e6df504e2b647fb8c79053f380170bc0 SHA256 2d25c96bc169d24d1e52395eac306a7485a8c80cf9bfac0b0eda9c440b0d30b0
 AUX vdr-mp3ng-0.0.1_pre4-1.3.37.diff 1064 RMD160 6aeeb7018b473761ab47a7b71008e0d28b7d9a3d SHA1 2aa8fc8bd5d3f4e47d653c7121cba251289fdcd6 SHA256 ec73f3f4e4d3e458c682c4cf27ac0485a6d42ef005f3ab3f07b783189f5d0244
 AUX vdr-mp3ng-0.0.1_pre4-gcc4.diff 806 RMD160 1be0b6e6ed4592da0219a91b63ade6253020dcd7 SHA1 b7a1b534110afcfb48c46d6f99820da5331a8d59 SHA256 2c15bc2eec50c0fb9b7a25656d01a35c82dd4905c550750171e70e378a15ca11
 AUX vdr-mp3ng-0.0.1_pre4-gentoo.diff 1313 RMD160 f9d839082ca30ff6b782e44281261c6483db3fee SHA1 16d5836cd21f81c825d60c0edceddec3dbe61c74 SHA256 766a0bbdffab942a4665d9e662c5bdcee33c5a587fe6f037da5e4ae9c5a4873c
+AUX vdr-mp3ng-0.0.1_pre4-glibc-2.10.patch 3319 RMD160 a3cfd114626b0a33738298752172885b53d763c9 SHA1 b06fc04f6389e7c830b1e67457230e4da2b8b93d SHA256 0166a3cf874f985859d2a9c8c335187153f726468ab613135f89c4715c6e18b4
 AUX vdr-mp3ng-0.0.1_pre4-vdr-1.5.1.diff 1768 RMD160 230017967e046787af0e2abcebd20f9de674551e SHA1 621e28f55669060c7725a97978dda224f3158595 SHA256 91ce3f8a789d756681851ecfb3a1ec296816ac3cef55b1c948397ea2f9a868c9
 DIST vdr-mp3ng-0.0.1_pre4-span-0.0.3.diff.tar.gz 6726 RMD160 df4b3beacc5c30dee6c940cd5665143784b2b8d9 SHA1 04125a578ba9ffb19b6140596d6b9cfabdb47713 SHA256 f4f947f7fa38c261c39af0cffb30a69bb641884b9efd26f5d73742170c3a6628
 DIST vdr-mp3ng-0.9.13-MKIV-pre3.tar.gz 128289 RMD160 8ba70bc7054017e2fc6e7738f34604a444b4b5c1 SHA1 8eb74807308c8dfcb2df140bf8aabfbf224951c2 SHA256 c92b220b878c98001bc6293aaa72d3247368a4d8c785e883f8fb24c4e4a09f12
 DIST vdr-mp3ng-pictures-0.0.1.tar.gz 170089 RMD160 8a509f90dce9102ee5b39d1536aad0e31060a9c6 SHA1 ccea02aad849131ef44bb84dce57a306ad2fa22a SHA256 962d3e85b3e19e7ef1bfdd4b66947b3c5327f5691c42454b4840fdb7ec5b2288
-EBUILD vdr-mp3ng-0.0.1_pre4.ebuild 1943 RMD160 d2c3b4414161b045831687d754b3c5434c0c75bb SHA1 46b20193ee3a282cd4ae476940891b58412875f8 SHA256 80cc799e220e42cccc4b7bd8869dfdd57fd9ea204f65350f266d46ba3d525290
-MISC ChangeLog 3196 RMD160 d89463c9ce261e9d0665a2e52df83525b064410b SHA1 ea60dd0c27188d5dc3d87501afb56831cd60ab1b SHA256 ea8ca4d4c365d9a9457b343a5780f19af159d9d746165ce5ba2fe4d88d346e23
+EBUILD vdr-mp3ng-0.0.1_pre4.ebuild 1987 RMD160 45468a45585870bc3aff6aa9bfcea975a95ad268 SHA1 91bd314f54d2ed18da68dcb15f62ce97981b1aca SHA256 5f41db6316e7dcfddce4fd0b602d52e0b14b6f2f808ed664eccd9154b5e7c665
+MISC ChangeLog 3373 RMD160 512e557384908bc848de7cdff52cc38884758a69 SHA1 70a6003e7f4bc0594cb3bb110970d5a13e916a36 SHA256 75507ab502b2cd347e5a0d7815a628e13f67a761850de7b81ee92e9fa9803d30
 MISC metadata.xml 507 RMD160 7425b2372eae01b047b9a174b3e2e0a2634a7212 SHA1 8eb0440d967faa5b391695b0b495a0c701a9e95c SHA256 ffb3ea14c929caeb6a595b599f09fe286a2885eed968844a5e1eeb702a331118
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-Comment: added by hd_brummy@gentoo.org
-
-iD8DBQFJAwEndn07HTTCgIoRAspGAJ4+2dQqtKg9x+XQCe6VdAsj2rLZ1wCfRiHE
-Tp5EtLlHPIRRU4qiD/TwzmY=
-=0O9A
------END PGP SIGNATURE-----
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