diff options
| -rw-r--r-- | media-plugins/vdr-cdda/ChangeLog | 6 | ||||
| -rw-r--r-- | media-plugins/vdr-cdda/files/vdr-cdda-0.1.0_gcc-4.4.patch | 86 |
2 files changed, 83 insertions, 9 deletions
diff --git a/media-plugins/vdr-cdda/ChangeLog b/media-plugins/vdr-cdda/ChangeLog index 9a4adb49bc4d..f8a8fa251ad7 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-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 $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-cdda/ChangeLog,v 1.10 2009/12/27 16:40:24 hd_brummy Exp $ + + 27 Dec 2009; Joerg Bornkessel <hd_brummy@gentoo.org> + files/vdr-cdda-0.1.0_gcc-4.4.patch: + new gcc-4.4 patch 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: 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 index 8bfd223da61d..aca7591c3959 100644 --- 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 @@ -1,15 +1,85 @@ -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 @@ +diff -Naur cdda-0.1.0.orig/cdda_cddb.c cdda-0.1.0/cdda_cddb.c +--- cdda-0.1.0.orig/cdda_cddb.c 2009-12-27 17:18:37.000000000 +0100 ++++ cdda-0.1.0/cdda_cddb.c 2009-12-27 17:28:09.000000000 +0100 +@@ -58,14 +58,14 @@ 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, '/'); ++ const char *p_value1 = NULL, *p_value2 = NULL, *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 - + sscanf(value, "%a[^/]", &p_value1); + +- FixString(p_value1); +- FixString(p_value2); ++ FixString((char *)p_value1); ++ FixString((char *)p_value2); + #ifdef DEBUG + printf("S key=<%s> track=%d value1=<%s> value2=<%s>\n", p_key, track, p_value1, p_value2); + #endif +@@ -74,19 +74,19 @@ + char *p_str = NULL; + if (0 == strncmp("DISCID", p_key, 6)) { + p_str = ConCatString(tag[0]->GetDiscId(), p_value1); +- free(p_value1); ++ free((char *)p_value1); + p_value1 = p_str; + tag[0]->SetDiscId(p_value1); + tag[0]->SetGenre(genre); + } else if (0 == strncmp("DTITLE", p_key, 6)) { + if (NULL != p_value1 && NULL != p_value2) { + p_str = ConCatString(tag[0]->GetPerformer(), p_value1); +- free(p_value1); ++ free((char *)p_value1); + p_value1 = p_str; + tag[0]->SetPerformer(p_value1); + + p_str = ConCatString(tag[0]->GetTitle(), p_value2); +- free(p_value2); ++ free((char *)p_value2); + p_value2 = p_str; + tag[0]->SetTitle(p_value2); + } else if (NULL != p_value1 && NULL == p_value2) { +@@ -94,7 +94,7 @@ + tag[0]->SetPerformer(p_value1); + else { + p_str = ConCatString(tag[0]->GetTitle(), p_value1); +- free(p_value1); ++ free((char *)p_value1); + p_value1 = p_str; + tag[0]->SetTitle(p_value1); + } +@@ -108,17 +108,17 @@ + tag[track+1]->SetPerformer(tag[0]->GetPerformer()); + + p_str = ConCatString(tag[track+1]->GetTitle(), p_value1); +- free(p_value1); ++ free((char *)p_value1); + p_value1 = p_str; + tag[track+1]->SetTitle(p_value1); + } else { + p_str = ConCatString(tag[track+1]->GetPerformer(), p_value1); +- free(p_value1); ++ free((char *)p_value1); + p_value1 = p_str; + tag[track+1]->SetPerformer(p_value1); + + p_str = ConCatString(tag[track+1]->GetTitle(), p_value2); +- free(p_value2); ++ free((char *)p_value2); + p_value2 = p_str; + tag[track+1]->SetTitle(p_value2); + } +@@ -137,8 +137,8 @@ + } + } + free(p_key); +- free(p_value1); +- free(p_value2); ++ free((char *)p_value1); ++ free((char *)p_value2); + } + } + |