From 5e464220a2f3e24b1f36344ad3da1e6ec2546ca7 Mon Sep 17 00:00:00 2001
From: Jörg Bornkessel <hd_brummy@gentoo.org>
Date: Wed, 23 Dec 2009 21:12:27 +0000
Subject: gcc-4.4 compile fix; thx to K.Kowalik on #297361 (Portage version:
 2.1.6.13/cvs/Linux i686)

---
 media-plugins/vdr-cdda/ChangeLog                          |  8 ++++++--
 media-plugins/vdr-cdda/files/vdr-cdda-0.1.0_gcc-4.4.patch | 15 +++++++++++++++
 media-plugins/vdr-cdda/vdr-cdda-0.1.0-r1.ebuild           |  7 ++++---
 3 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 media-plugins/vdr-cdda/files/vdr-cdda-0.1.0_gcc-4.4.patch

(limited to 'media-plugins')

diff --git a/media-plugins/vdr-cdda/ChangeLog b/media-plugins/vdr-cdda/ChangeLog
index d8744acc7e79..9a4adb49bc4d 100644
--- a/media-plugins/vdr-cdda/ChangeLog
+++ b/media-plugins/vdr-cdda/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-cdda
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-cdda/ChangeLog,v 1.8 2006/11/15 14:02:17 zzam Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-cdda/ChangeLog,v 1.9 2009/12/23 21:12:27 hd_brummy Exp $
+
+  23 Dec 2009; Joerg Bornkessel <hd_brummy@gentoo.org>
+  vdr-cdda-0.1.0-r1.ebuild, +files/vdr-cdda-0.1.0_gcc-4.4.patch:
+  gcc-4.4 compile fix; thx to K.Kowalik on #297361
 
   15 Nov 2006; Matthias Schwarzott <zzam@gentoo.org>
   vdr-cdda-0.1.0-r1.ebuild:
diff --git a/media-plugins/vdr-cdda/files/vdr-cdda-0.1.0_gcc-4.4.patch b/media-plugins/vdr-cdda/files/vdr-cdda-0.1.0_gcc-4.4.patch
new file mode 100644
index 000000000000..8bfd223da61d
--- /dev/null
+++ b/media-plugins/vdr-cdda/files/vdr-cdda-0.1.0_gcc-4.4.patch
@@ -0,0 +1,15 @@
+fix gcc-4.4 compile issues
+https://bugs.gentoo.org/show_bug.cgi?id=297361
+--- cdda-0.1.0.orig/cdda_cddb.c	2005-12-24 11:17:06.000000000 +0100
++++ cdda-0.1.0/cdda_cddb.c	2009-12-22 21:44:55.688664502 +0100
+@@ -58,7 +58,8 @@
+ 
+     sscanf(key, "%a[^\n0-9]%d", &p_key, &track);
+ 
+-    char *p_value1 = NULL, *p_value2 = NULL, *p_idx = index(value, '/');
++    char *p_value1 = NULL, *p_value2 = NULL;
++    const char *p_idx = index(value, '/');
+     if (NULL != p_idx && 0x20 == *(p_idx-1) && 0x20 == *(p_idx+1) && 0x00 != *(p_idx+2))
+       sscanf(value, "%a[^/] / %a[^/]", &p_value1, &p_value2);
+     else
+
diff --git a/media-plugins/vdr-cdda/vdr-cdda-0.1.0-r1.ebuild b/media-plugins/vdr-cdda/vdr-cdda-0.1.0-r1.ebuild
index 6b67c023b133..0a990452f777 100644
--- a/media-plugins/vdr-cdda/vdr-cdda-0.1.0-r1.ebuild
+++ b/media-plugins/vdr-cdda/vdr-cdda-0.1.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 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-cdda/vdr-cdda-0.1.0-r1.ebuild,v 1.4 2007/07/10 23:08:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-cdda/vdr-cdda-0.1.0-r1.ebuild,v 1.5 2009/12/23 21:12:27 hd_brummy Exp $
 
 inherit vdr-plugin
 
@@ -20,4 +20,5 @@ RDEPEND="${DEPEND}"
 
 PATCHES="${FILESDIR}/${P}.patch
 	${FILESDIR}/${P}-cdspeed.diff
-	${FILESDIR}/${P}-linking-order.diff"
+	${FILESDIR}/${P}-linking-order.diff
+	${FILESDIR}/${P}_gcc-4.4.patch"
-- 
cgit v1.2.3-65-gdbad