Fix building with GLIBC 2.10+ wrt #274079.

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

3 files changed, 72 insertions, 10 deletions

diff --git a/media-plugins/vdr-softplay/ChangeLog b/media-plugins/vdr-softplay/ChangeLog
index cd6beaac79cb..cbbdd22a95fb 100644
--- a/media-plugins/vdr-softplay/ChangeLog
+++ b/media-plugins/vdr-softplay/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-softplay
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softplay/ChangeLog,v 1.5 2008/04/21 10:45:33 zzam Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softplay/ChangeLog,v 1.6 2009/08/09 20:15:39 ssuominen Exp $
+
+  09 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  vdr-softplay-0.0.2.20080421.ebuild,
+  +files/vdr-softplay-0.0.2.20080421-glibc-2.10.patch:
+  Fix building with GLIBC 2.10+ wrt #274079.
 
 *vdr-softplay-0.0.2.20080421 (21 Apr 2008)
 
diff --git a/media-plugins/vdr-softplay/files/vdr-softplay-0.0.2.20080421-glibc-2.10.patch b/media-plugins/vdr-softplay/files/vdr-softplay-0.0.2.20080421-glibc-2.10.patch
new file mode 100644
index 000000000000..57f3b7f4edf9
--- /dev/null
+++ b/media-plugins/vdr-softplay/files/vdr-softplay-0.0.2.20080421-glibc-2.10.patch
@@ -0,0 +1,58 @@
+diff -ur softplay-cvs-20080421.orig/PlayList.c softplay-cvs-20080421/PlayList.c
+--- softplay-cvs-20080421.orig/PlayList.c	2008-04-21 12:57:46.000000000 +0300
++++ softplay-cvs-20080421/PlayList.c	2009-08-09 23:14:13.000000000 +0300
+@@ -625,7 +625,7 @@
+         };
+         
+         SetFilename(Filename);
+-        char *ncopy=rindex(Filename,'/');
++        char *ncopy=const_cast<char*> (rindex(Filename,'/'));
+         int count=(int) (ncopy-Filename);
+         if ( ncopy && count > STR_LENGTH) {
+                 fprintf(stderr,"Could not extract directory!\n");
+diff -ur softplay-cvs-20080421.orig/softplay.c softplay-cvs-20080421/softplay.c
+--- softplay-cvs-20080421.orig/softplay.c	2008-04-21 12:57:46.000000000 +0300
++++ softplay-cvs-20080421/softplay.c	2009-08-09 23:17:13.000000000 +0300
+@@ -49,7 +49,7 @@
+ 	      sizeof(myDir): (unsigned int)(ToPos-path+1));
+ 	  printf("MyDir '%s'\n",myDir);
+ 	  PrepareDirectory(myDir);
+-	  myToPos=index(ToPos+1,'/');
++	  myToPos=const_cast<char*> (index(ToPos+1,'/'));
+ 	  AddSubMenu(new cMenuDirectory(path,EditList,myToPos));
+   } else  {
+ 	  printf("Open only directory '%s'.\n",path);
+@@ -592,7 +592,7 @@
+  
+ bool IsM3UFile( const char * const Filename) {
+         char * pos;
+-        pos = rindex(Filename,'.');
++        pos = const_cast<char*> (rindex(Filename,'.'));
+         if ( !pos )
+                 return false;
+         if ( !strcmp(pos,".m3u") ) {
+@@ -614,10 +614,10 @@
+ 
+ void chomp(const char *const str) {
+         char *pos;
+-        pos = index(str,'\n');
++        pos = const_cast<char*> (index(str,'\n'));
+         if (pos)
+               *pos=0;
+-        pos = index(str,'\r');
++        pos = const_cast<char*> (index(str,'\r'));
+         if (pos)
+                 *pos=0;
+ };
+diff -ur softplay-cvs-20080421.orig/SoftPlayer.c softplay-cvs-20080421/SoftPlayer.c
+--- softplay-cvs-20080421.orig/SoftPlayer.c	2008-04-21 12:57:46.000000000 +0300
++++ softplay-cvs-20080421/SoftPlayer.c	2009-08-09 23:14:57.000000000 +0300
+@@ -409,7 +409,7 @@
+ };
+ 
+ bool IsStreamFile( const char * const Filename) {
+-        char * pos;
++        const char * pos;
+         pos = rindex(Filename,'.');
+ 	printf("IsStream %s\n",pos);
+         if ( !pos )
diff --git a/media-plugins/vdr-softplay/vdr-softplay-0.0.2.20080421.ebuild b/media-plugins/vdr-softplay/vdr-softplay-0.0.2.20080421.ebuild
index d1ef2e57b00b..96da37c3efd3 100644
--- a/media-plugins/vdr-softplay/vdr-softplay-0.0.2.20080421.ebuild
+++ b/media-plugins/vdr-softplay/vdr-softplay-0.0.2.20080421.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-softplay/vdr-softplay-0.0.2.20080421.ebuild,v 1.1 2008/04/21 10:45:33 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softplay/vdr-softplay-0.0.2.20080421.ebuild,v 1.2 2009/08/09 20:15:39 ssuominen Exp $
 
 inherit vdr-plugin versionator
 
@@ -13,12 +13,12 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=media-video/vdr-1.3.20
-		>=media-plugins/vdr-softdevice-0.2.3.20060814-r1
-		>=media-video/ffmpeg-0.4.9_pre1"
+	>=media-plugins/vdr-softdevice-0.2.3.20060814-r1
+	>=media-video/ffmpeg-0.4.9_p20080326"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P#vdr-}
@@ -34,7 +34,6 @@ src_unpack() {
 	sed -i Makefile -e 's#^LIBFFMPEG=.*$#LIBFFMPEG=/usr/include/ffmpeg#'
 
 	epatch "${FILESDIR}/ffmpeg-linking.diff"
-	if has_version ">=media-video/ffmpeg-0.4.9_p20080326"; then
-		epatch "${FILESDIR}/ffmpeg-0.4.9_p20080326-new_header.diff"
-	fi
+	epatch "${FILESDIR}/ffmpeg-0.4.9_p20080326-new_header.diff"
+	epatch "${FILESDIR}/${P}-glibc-2.10.patch"
 }