Fix view of shoutcast genres with a patch from Gentoo bug 220811 or Debian bug 471132. Thanks to Per-Erik Westerberg for reporting.

(Portage version: 2.1.5_rc10)

3 files changed, 99 insertions, 1 deletions

diff --git a/net-misc/streamtuner/ChangeLog b/net-misc/streamtuner/ChangeLog
index be64350be95b..f0266f40373f 100644
--- a/net-misc/streamtuner/ChangeLog
+++ b/net-misc/streamtuner/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/streamtuner
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/streamtuner/ChangeLog,v 1.32 2008/01/25 16:11:18 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/streamtuner/ChangeLog,v 1.33 2008/05/13 06:10:24 drac Exp $
+
+*streamtuner-0.99.99-r3 (13 May 2008)
+
+  13 May 2008; Samuli Suominen <drac@gentoo.org>
+  +files/streamtuner-0.99.99-shoutcast.patch,
+  +streamtuner-0.99.99-r3.ebuild:
+  Fix view of shoutcast genres with a patch from Gentoo bug 220811 or Debian
+  bug 471132. Thanks to Per-Erik Westerberg for reporting.
 
   25 Jan 2008; Samuli Suominen <drac@gentoo.org>
   streamtuner-0.99.99-r2.ebuild:
diff --git a/net-misc/streamtuner/files/streamtuner-0.99.99-shoutcast.patch b/net-misc/streamtuner/files/streamtuner-0.99.99-shoutcast.patch
new file mode 100644
index 000000000000..b7db78b20b76
--- /dev/null
+++ b/net-misc/streamtuner/files/streamtuner-0.99.99-shoutcast.patch
@@ -0,0 +1,40 @@
+--- src/plugins/shoutcast/shoutcast.c.orig	2004-12-19 15:21:00.000000000 +0000
++++ src/plugins/shoutcast/shoutcast.c	2008-03-16 10:39:24.000000000 +0000
+@@ -94,6 +94,8 @@
+ 
+   GNode			*parent_node;
+   SHOUTcastStream	*stream;
++  
++  int parse_genres;
+ } ReloadInfo;
+ 
+ /*** variable declarations ***************************************************/
+@@ -518,6 +520,7 @@
+       info.npages = 0;
+       info.parent_node = NULL;
+       info.stream = NULL;
++      info.parse_genres = 0;
+ 
+       status = st_transfer_session_get_by_line(session,
+ 					       url,
+@@ -565,10 +568,16 @@
+       info->stream = stream_new_cb(NULL);
+       info->stream->url_postfix = st_sgml_ref_expand_len(s1, s2 - s1);
+     }
+-  else if (info->page < 2
+-	   && (((s1 = st_str_has_prefix_span(line, "\t<OPTION VALUE=\""))
+-		|| (s1 = st_str_has_prefix_span(line, "\t\t<OPTION VALUE=\"")))
+-	       && (s2 = strstr(s1, "\">"))))
++  else if (info->page < 2 && (s1 = st_strstr_span(line, "<OPTION VALUE=\"TopTen\">")))
++  {
++  	info->parse_genres = 1;
++  }
++  else if (info->page < 2 && info->parse_genres == 1 && (s1 = st_strstr_span(line, "</SELECT>")))
++  {
++  	info->parse_genres = 0;
++  }
++  else if (info->page < 2 && info->parse_genres == 1
++	   && ((s1 = st_strstr_span(line, "<OPTION VALUE=\""))  && (s2 = strstr(s1, "\">"))))
+     {
+       STCategory *category;
+       GNode *node;
diff --git a/net-misc/streamtuner/streamtuner-0.99.99-r3.ebuild b/net-misc/streamtuner/streamtuner-0.99.99-r3.ebuild
new file mode 100644
index 000000000000..838360e6e86c
--- /dev/null
+++ b/net-misc/streamtuner/streamtuner-0.99.99-r3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/streamtuner/streamtuner-0.99.99-r3.ebuild,v 1.1 2008/05/13 06:10:24 drac Exp $
+
+EAPI=1
+
+GCONF_DEBUG=no
+
+inherit gnome2 eutils
+
+DESCRIPTION="Stream directory browser for browsing internet radio streams"
+HOMEPAGE="http://www.nongnu.org/streamtuner"
+SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz
+	 http://savannah.nongnu.org/download/${PN}/${P}-pygtk-2.6.diff"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="python +shout +xiph"
+
+RDEPEND=">=x11-libs/gtk+-2.4
+	net-misc/curl
+	app-text/scrollkeeper
+	xiph? ( dev-libs/libxml2 )
+	>=media-libs/taglib-1.2
+	python? ( dev-python/pygtk )
+	x11-misc/xdg-utils"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	!media-plugins/streamtuner-xiph
+	!media-plugins/streamtuner-local
+	!media-plugins/streamtuner-live365
+	!media-plugins/streamtuner-python"
+
+DOCS="AUTHORS NEWS README TODO"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-shoutcast.patch \
+		"${DISTDIR}"/${P}-pygtk-2.6.diff
+}
+
+src_compile() {
+	# live365 causes parse errors at connect time.
+	econf --disable-live365 $(use_enable python) \
+		$(use_enable shout shoutcast) $(use_enable xiph)
+	emake || die "emake failed."
+}