Date: Friday, January 20, 2012 @ 13:50:13
Author: andyrtr
Revision: 147014
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
streamtuner/repos/staging-i686/
streamtuner/repos/staging-i686/PKGBUILD
(from rev 147013, streamtuner/trunk/PKGBUILD)
streamtuner/repos/staging-i686/shoutcast-redesign-patch.diff
(from rev 147013, streamtuner/trunk/shoutcast-redesign-patch.diff)
streamtuner/repos/staging-i686/streamtuner-0.99.99-shoutcast.diff
(from rev 147013, streamtuner/trunk/streamtuner-0.99.99-shoutcast.diff)
streamtuner/repos/staging-x86_64/
streamtuner/repos/staging-x86_64/PKGBUILD
(from rev 147013, streamtuner/trunk/PKGBUILD)
streamtuner/repos/staging-x86_64/shoutcast-redesign-patch.diff
(from rev 147013, streamtuner/trunk/shoutcast-redesign-patch.diff)
streamtuner/repos/staging-x86_64/streamtuner-0.99.99-shoutcast.diff
(from rev 147013, streamtuner/trunk/streamtuner-0.99.99-shoutcast.diff)
---------------------------------------------------+
staging-i686/PKGBUILD | 49 ++++++++++++++++++++
staging-i686/shoutcast-redesign-patch.diff | 12 ++++
staging-i686/streamtuner-0.99.99-shoutcast.diff | 41 ++++++++++++++++
staging-x86_64/PKGBUILD | 49 ++++++++++++++++++++
staging-x86_64/shoutcast-redesign-patch.diff | 12 ++++
staging-x86_64/streamtuner-0.99.99-shoutcast.diff | 41 ++++++++++++++++
6 files changed, 204 insertions(+)
Copied: streamtuner/repos/staging-i686/PKGBUILD (from rev 147013,
streamtuner/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-01-20 18:50:13 UTC (rev 147014)
@@ -0,0 +1,49 @@
+# $Id$
+# Contributor: Greg Grabinski <[email protected]>
+# Maintainer: ndreas Radke <[email protected]>
+
+pkgname=streamtuner
+pkgver=0.99.99
+pkgrel=12
+pkgdesc="A stream directory browser"
+arch=('i686' 'x86_64')
+url="http://www.nongnu.org/streamtuner/";
+license=('custom')
+depends=('taglib' 'libxml2' 'gtk2' 'curl>=7.16.2' 'pygtk>=2.13.0-2')
+conflicts=('streamtuner-live365')
+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
+ streamtuner-0.99.99-shoutcast.diff
+ shoutcast-redesign-patch.diff)
+options=('!libtool' '!emptydirs')
+md5sums=('2027b7c34e85b594524b0b4351c14362'
+ '8aa1994a849b05d2b8fffbda702b8a25'
+ '7aff45a41c60358cb2332c7ce644f661'
+ '1eab6edce130e1a1e5f208cd3ed6766a'
+ '8a3a17a1719a79353d6ad7ac8564947b')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ patch -p0 -i ${srcdir}/streamtuner-0.99.99-live365.diff
+ patch -p0 -i ${srcdir}/streamtuner-0.99.99-pygtk-2.6.diff
+ # fix http://bugs.archlinux.org/task/10308
+ patch -p0 -i ${srcdir}/streamtuner-0.99.99-shoutcast.diff
+ # fix http://bugs.archlinux.org/task/11463
+ patch -p1 -i ${srcdir}/shoutcast-redesign-patch.diff
+
+ # python2 fixes
+ sed -i "s:^for ac_prog in python:for ac_prog in python2:"
${srcdir}/${pkgname}-${pkgver}/configure
+
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make prefix=${pkgdir}/usr install
+
+ #Add license file
+ install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/COPYING
${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+}
Copied: streamtuner/repos/staging-i686/shoutcast-redesign-patch.diff (from rev
147013, streamtuner/trunk/shoutcast-redesign-patch.diff)
===================================================================
--- staging-i686/shoutcast-redesign-patch.diff (rev 0)
+++ staging-i686/shoutcast-redesign-patch.diff 2012-01-20 18:50:13 UTC (rev
147014)
@@ -0,0 +1,12 @@
+diff -uar streamtuner-0.99.99-orig/src/plugins/shoutcast/shoutcast.c
streamtuner-0.99.99-patched/src/plugins/shoutcast/shoutcast.c
+--- streamtuner-0.99.99-orig/src/plugins/shoutcast/shoutcast.c 2008-09-12
18:04:00.229785732 -0400
++++ streamtuner-0.99.99-patched/src/plugins/shoutcast/shoutcast.c
2008-09-12 18:05:56.716440720 -0400
+@@ -37,7 +37,7 @@
+
+ /*** cpp
*********************************************************************/
+
+-#define SHOUTCAST_ROOT "http://www.shoutcast.com/";
++#define SHOUTCAST_ROOT "http://classic.shoutcast.com/";
+
+ #define MAX_STREAMS_PER_PAGE 100 /* enforced by SHOUTcast */
+
Copied: streamtuner/repos/staging-i686/streamtuner-0.99.99-shoutcast.diff (from
rev 147013, streamtuner/trunk/streamtuner-0.99.99-shoutcast.diff)
===================================================================
--- staging-i686/streamtuner-0.99.99-shoutcast.diff
(rev 0)
+++ staging-i686/streamtuner-0.99.99-shoutcast.diff 2012-01-20 18:50:13 UTC
(rev 147014)
@@ -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;
+
Copied: streamtuner/repos/staging-x86_64/PKGBUILD (from rev 147013,
streamtuner/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-20 18:50:13 UTC (rev 147014)
@@ -0,0 +1,49 @@
+# $Id$
+# Contributor: Greg Grabinski <[email protected]>
+# Maintainer: ndreas Radke <[email protected]>
+
+pkgname=streamtuner
+pkgver=0.99.99
+pkgrel=12
+pkgdesc="A stream directory browser"
+arch=('i686' 'x86_64')
+url="http://www.nongnu.org/streamtuner/";
+license=('custom')
+depends=('taglib' 'libxml2' 'gtk2' 'curl>=7.16.2' 'pygtk>=2.13.0-2')
+conflicts=('streamtuner-live365')
+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
+ streamtuner-0.99.99-shoutcast.diff
+ shoutcast-redesign-patch.diff)
+options=('!libtool' '!emptydirs')
+md5sums=('2027b7c34e85b594524b0b4351c14362'
+ '8aa1994a849b05d2b8fffbda702b8a25'
+ '7aff45a41c60358cb2332c7ce644f661'
+ '1eab6edce130e1a1e5f208cd3ed6766a'
+ '8a3a17a1719a79353d6ad7ac8564947b')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ patch -p0 -i ${srcdir}/streamtuner-0.99.99-live365.diff
+ patch -p0 -i ${srcdir}/streamtuner-0.99.99-pygtk-2.6.diff
+ # fix http://bugs.archlinux.org/task/10308
+ patch -p0 -i ${srcdir}/streamtuner-0.99.99-shoutcast.diff
+ # fix http://bugs.archlinux.org/task/11463
+ patch -p1 -i ${srcdir}/shoutcast-redesign-patch.diff
+
+ # python2 fixes
+ sed -i "s:^for ac_prog in python:for ac_prog in python2:"
${srcdir}/${pkgname}-${pkgver}/configure
+
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make prefix=${pkgdir}/usr install
+
+ #Add license file
+ install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/COPYING
${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+}
Copied: streamtuner/repos/staging-x86_64/shoutcast-redesign-patch.diff (from
rev 147013, streamtuner/trunk/shoutcast-redesign-patch.diff)
===================================================================
--- staging-x86_64/shoutcast-redesign-patch.diff
(rev 0)
+++ staging-x86_64/shoutcast-redesign-patch.diff 2012-01-20 18:50:13 UTC
(rev 147014)
@@ -0,0 +1,12 @@
+diff -uar streamtuner-0.99.99-orig/src/plugins/shoutcast/shoutcast.c
streamtuner-0.99.99-patched/src/plugins/shoutcast/shoutcast.c
+--- streamtuner-0.99.99-orig/src/plugins/shoutcast/shoutcast.c 2008-09-12
18:04:00.229785732 -0400
++++ streamtuner-0.99.99-patched/src/plugins/shoutcast/shoutcast.c
2008-09-12 18:05:56.716440720 -0400
+@@ -37,7 +37,7 @@
+
+ /*** cpp
*********************************************************************/
+
+-#define SHOUTCAST_ROOT "http://www.shoutcast.com/";
++#define SHOUTCAST_ROOT "http://classic.shoutcast.com/";
+
+ #define MAX_STREAMS_PER_PAGE 100 /* enforced by SHOUTcast */
+
Copied: streamtuner/repos/staging-x86_64/streamtuner-0.99.99-shoutcast.diff
(from rev 147013, streamtuner/trunk/streamtuner-0.99.99-shoutcast.diff)
===================================================================
--- staging-x86_64/streamtuner-0.99.99-shoutcast.diff
(rev 0)
+++ staging-x86_64/streamtuner-0.99.99-shoutcast.diff 2012-01-20 18:50:13 UTC
(rev 147014)
@@ -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;
+
