summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-08-11 09:22:16 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-08-11 09:22:16 +0000
commit1b7ddd1de6ef0628940c44d846492befd7f18972 (patch)
tree72939d004eb23c9217ae515c410906ff5ff5f925 /media-plugins/vdr-mplayer
parentNew ebuild for cnetworkmanager - command line client for NetworkManager (diff)
downloadgentoo-2-1b7ddd1de6ef0628940c44d846492befd7f18972.tar.gz
gentoo-2-1b7ddd1de6ef0628940c44d846492befd7f18972.tar.bz2
gentoo-2-1b7ddd1de6ef0628940c44d846492befd7f18972.zip
Fix building with GLIBC 2.10+.
(Portage version: 2.2_rc36/cvs/Linux x86_64)
Diffstat (limited to 'media-plugins/vdr-mplayer')
-rw-r--r--media-plugins/vdr-mplayer/ChangeLog8
-rw-r--r--media-plugins/vdr-mplayer/files/vdr-mplayer-0.10.1-glibc-2.10.patch12
-rw-r--r--media-plugins/vdr-mplayer/vdr-mplayer-0.10.1.ebuild7
3 files changed, 22 insertions, 5 deletions
diff --git a/media-plugins/vdr-mplayer/ChangeLog b/media-plugins/vdr-mplayer/ChangeLog
index 3472ca753028..3082b17b06cc 100644
--- a/media-plugins/vdr-mplayer/ChangeLog
+++ b/media-plugins/vdr-mplayer/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-plugins/vdr-mplayer
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mplayer/ChangeLog,v 1.22 2008/04/28 08:37:50 zzam Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mplayer/ChangeLog,v 1.23 2009/08/11 09:22:16 ssuominen Exp $
+
+ 11 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+ vdr-mplayer-0.10.1.ebuild, +files/vdr-mplayer-0.10.1-glibc-2.10.patch:
+ Fix building with GLIBC 2.10+.
28 Apr 2008; Matthias Schwarzott <zzam@gentoo.org>
vdr-mplayer-0.10.0.ebuild, vdr-mplayer-0.10.1.ebuild:
diff --git a/media-plugins/vdr-mplayer/files/vdr-mplayer-0.10.1-glibc-2.10.patch b/media-plugins/vdr-mplayer/files/vdr-mplayer-0.10.1-glibc-2.10.patch
new file mode 100644
index 000000000000..a70d214b4e0b
--- /dev/null
+++ b/media-plugins/vdr-mplayer/files/vdr-mplayer-0.10.1-glibc-2.10.patch
@@ -0,0 +1,12 @@
+diff -ur mp3-0.10.1.orig/data.c mp3-0.10.1/data.c
+--- mp3-0.10.1.orig/data.c 2006-05-16 20:31:09.000000000 +0300
++++ mp3-0.10.1/data.c 2009-08-11 12:22:35.000000000 +0300
+@@ -420,7 +420,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 --git a/media-plugins/vdr-mplayer/vdr-mplayer-0.10.1.ebuild b/media-plugins/vdr-mplayer/vdr-mplayer-0.10.1.ebuild
index 746eeaaa5c60..54e5ec1e5f74 100644
--- a/media-plugins/vdr-mplayer/vdr-mplayer-0.10.1.ebuild
+++ b/media-plugins/vdr-mplayer/vdr-mplayer-0.10.1.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-mplayer/vdr-mplayer-0.10.1.ebuild,v 1.2 2008/04/28 08:37:50 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mplayer/vdr-mplayer-0.10.1.ebuild,v 1.3 2009/08/11 09:22:16 ssuominen Exp $
inherit vdr-plugin eutils
@@ -21,7 +21,8 @@ RDEPEND="${DEPEND}
S=${WORKDIR}/mp3-${PV}
-PATCHES=("${FILESDIR}/${PV}/01_gentoo.diff")
+PATCHES=( "${FILESDIR}/${PV}/01_gentoo.diff"
+ "${FILESDIR}/${P}-glibc-2.10.patch" )
VDR_RCADDON_FILE=${FILESDIR}/rc-addon-0.9.15.sh
VDR_CONFD_FILE=${FILESDIR}/confd-0.9.15.sh