[arch-commits] Commit in streamtuner/repos (3 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Sun May 4 18:02:41 UTC 2008
Date: Sunday, May 4, 2008 @ 14:02:39
Author: andyrtr
Revision: 1303
Merged revisions 2-1302 via svnmerge from
svn+ssh://svn.archlinux.org/home/svn-packages/streamtuner/trunk
........
r356 | aaron | 2008-04-18 22:56:27 +0000 (Fr, 18 Apr 2008) | 1 line
Added svn:keywords to all PKGBUILDs
........
r1300 | andyrtr | 2008-05-04 17:51:10 +0000 (So, 04 Mai 2008) | 2 lines
upgpkg: streamtuner 0.99.99-8
fix FS#10308
........
r1302 | andyrtr | 2008-05-04 17:55:54 +0000 (So, 04 Mai 2008) | 1 line
add missing patch
........
Added:
streamtuner/repos/extra-i686/streamtuner-0.99.99-shoutcast.diff
(from rev 1302, streamtuner/trunk/streamtuner-0.99.99-shoutcast.diff)
Modified:
streamtuner/repos/extra-i686/ (properties)
streamtuner/repos/extra-i686/PKGBUILD
------------------------------------+
PKGBUILD | 16 ++++++++-----
streamtuner-0.99.99-shoutcast.diff | 41 +++++++++++++++++++++++++++++++++++
2 files changed, 51 insertions(+), 6 deletions(-)
Property changes on: streamtuner/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
- /streamtuner/trunk:1
+ /streamtuner/trunk:1-1302
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2008-05-04 17:55:54 UTC (rev 1302)
+++ extra-i686/PKGBUILD 2008-05-04 18:02:39 UTC (rev 1303)
@@ -4,7 +4,7 @@
pkgname=streamtuner
pkgver=0.99.99
-pkgrel=7
+pkgrel=8
pkgdesc="A stream directory browser"
arch=('i686' 'x86_64')
url="http://www.nongnu.org/streamtuner/"
@@ -14,19 +14,23 @@
replaces=('streamtuner-live365')
source=(http://savannah.nongnu.org/download/streamtuner/$pkgname-$pkgver.tar.gz \
http://savannah.nongnu.org/download/streamtuner/streamtuner-0.99.99-live365.diff \
- http://savannah.nongnu.org/download/streamtuner/streamtuner-0.99.99-pygtk-2.6.diff)
-md5sums=('2027b7c34e85b594524b0b4351c14362' '8aa1994a849b05d2b8fffbda702b8a25'\
- '7aff45a41c60358cb2332c7ce644f661')
-options=('!libtool')
+ http://savannah.nongnu.org/download/streamtuner/streamtuner-0.99.99-pygtk-2.6.diff
+ streamtuner-0.99.99-shoutcast.diff)
+options=('!libtool' '!emptydirs')
+md5sums=('2027b7c34e85b594524b0b4351c14362'
+ '8aa1994a849b05d2b8fffbda702b8a25'
+ '7aff45a41c60358cb2332c7ce644f661'
+ '1eab6edce130e1a1e5f208cd3ed6766a')
build() {
cd $startdir/src/$pkgname-$pkgver
patch -p0 -i $startdir/src/streamtuner-0.99.99-live365.diff || return 1
patch -p0 -i $startdir/src/streamtuner-0.99.99-pygtk-2.6.diff || return 1
+ # fix http://bugs.archlinux.org/task/10308
+ patch -p0 -i $startdir/src/streamtuner-0.99.99-shoutcast.diff || return 1
./configure --prefix=/usr
make || return 1
make prefix=$startdir/pkg/usr install
- rm -r $startdir/pkg/usr/var
#Add license file
install -Dm0644 $startdir/src/$pkgname-$pkgver/COPYING \
Copied: streamtuner/repos/extra-i686/streamtuner-0.99.99-shoutcast.diff (from rev 1302, streamtuner/trunk/streamtuner-0.99.99-shoutcast.diff)
===================================================================
--- extra-i686/streamtuner-0.99.99-shoutcast.diff (rev 0)
+++ extra-i686/streamtuner-0.99.99-shoutcast.diff 2008-05-04 18:02:39 UTC (rev 1303)
@@ -0,0 +1,41 @@
+--- 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;
+
More information about the arch-commits
mailing list