rpms/streamtuner/devel streamtuner-0.99.99-defaultconfig.patch, NONE, 1.1 streamtuner-0.99.99-live365.patch, NONE, 1.1 streamtuner-0.99.99-pkgconfig.patch, NONE, 1.1 streamtuner-0.99.99-pygtk-2.6.patch, NONE, 1.1 streamtuner.png, NONE, 1.1 streamtuner.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Matthias Haase (endur)
fedora-extras-commits at redhat.com
Fri Jan 6 13:37:47 UTC 2006
Author: endur
Update of /cvs/extras/rpms/streamtuner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7023/devel
Modified Files:
.cvsignore sources
Added Files:
streamtuner-0.99.99-defaultconfig.patch
streamtuner-0.99.99-live365.patch
streamtuner-0.99.99-pkgconfig.patch
streamtuner-0.99.99-pygtk-2.6.patch streamtuner.png
streamtuner.spec
Log Message:
auto-import streamtuner-0.99.99-6.fc4 on branch devel from streamtuner-0.99.99-6.fc4.src.rpm
streamtuner-0.99.99-defaultconfig.patch:
--- NEW FILE streamtuner-0.99.99-defaultconfig.patch ---
--- src/plugins/live365/live365.c 2004-12-19 11:27:03.000000000 +0100
+++ src/plugins/live365/live365.c 2005-12-29 12:49:29.000000000 +0100
@@ -1410,8 +1410,8 @@
init_handler();
st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
- st_action_register("view-web", _("Open a web page"), "epiphany %q");
- st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
+ st_action_register("view-web", _("Open a web page"), "htmlview %q");
+ st_action_register("play-stream", _("Listen to a stream"), "beep-media-player %q");
return TRUE;
}
--- src/plugins/local/local.c 2004-12-13 08:39:29.000000000 +0100
+++ src/plugins/local/local.c 2005-12-29 12:50:21.000000000 +0100
@@ -1057,8 +1057,8 @@
init_handler();
- st_action_register("play-m3u", _("Listen to a .m3u file"), "xmms %q");
- st_action_register("view-web", _("Open a web page"), "epiphany %q");
+ st_action_register("play-m3u", _("Listen to a .m3u file"), "beep-media-player %q");
+ st_action_register("view-web", _("Open a web page"), "htmlview %q");
return TRUE;
}
--- src/plugins/shoutcast/shoutcast.c 2004-12-19 16:21:00.000000000 +0100
+++ src/plugins/shoutcast/shoutcast.c 2005-12-29 12:48:50.000000000 +0100
@@ -959,9 +959,9 @@
init_handler();
- st_action_register("play-m3u", _("Listen to a .m3u file"), "xmms %q");
+ st_action_register("play-m3u", _("Listen to a .m3u file"), "beep-media-player %q");
st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
- st_action_register("view-web", _("Open a web page"), "epiphany %q");
+ st_action_register("view-web", _("Open a web page"), "htmlview %q");
return TRUE;
}
--- src/plugins/xiph/xiph.c 2004-12-13 10:57:33.000000000 +0100
+++ src/plugins/xiph/xiph.c 2005-12-29 12:50:54.000000000 +0100
@@ -957,7 +957,7 @@
init_handler();
st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
- st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
+ st_action_register("play-stream", _("Listen to a stream"), "beep-media-player %q");
return TRUE;
}
--- src/streamtuner/st-action.c 2004-12-18 10:56:42.000000000 +0100
+++ src/streamtuner/st-action.c 2005-12-29 12:41:20.000000000 +0100
@@ -123,7 +123,7 @@
{
actions = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
- st_action_register("view-web", _("Open a web page"), "epiphany %q");
+ st_action_register("view-web", _("Open a web page"), "htmlview %q");
st_action_register("view-ghelp", _("Open a GNOME help document"), "yelp %q");
}
--- src/streamtuner/st-preselections.c 2004-12-13 10:57:52.000000000 +0100
+++ src/streamtuner/st-preselections.c 2005-12-29 12:04:04.000000000 +0100
@@ -390,9 +390,9 @@
{
st_preselections_init_handler();
- st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
+ st_action_register("play-stream", _("Listen to a stream"), "beep-media-player %q");
st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
- st_action_register("view-web", _("Open a web page"), "epiphany %q");
+ st_action_register("view-web", _("Open a web page"), "htmlview %q");
}
void
streamtuner-0.99.99-live365.patch:
--- NEW FILE streamtuner-0.99.99-live365.patch ---
--- src/plugins/live365/live365.c.orig Wed May 11 03:49:30 2005
+++ src/plugins/live365/live365.c Wed May 11 03:51:11 2005
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2003, 2004 Jean-Yves Lefort
+ * Copyright (C) 2002-2005 Jean-Yves Lefort
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -59,7 +59,9 @@
{
ACCESS_ALL,
ACCESS_VIP,
- ACCESS_SUBSCRIPTION
+ ACCESS_SUBSCRIPTION,
+ ACCESS_SOLD_OUT,
+ ACCESS_UNKNOWN
} Access;
typedef struct
@@ -94,7 +96,8 @@
{
GList **streams;
Live365Stream *stream;
- Live365Stream *finished_stream;
+ gboolean first_page;
+ gboolean looped;
gboolean has_next_page;
} ReloadStreamsInfo;
@@ -263,13 +266,16 @@
case FIELD_ACCESS_STRING:
{
- const char *str = NULL;
+ const char *str;
switch (stream->access)
{
case ACCESS_ALL: str = _("All"); break;
case ACCESS_VIP: str = _("VIP"); break;
case ACCESS_SUBSCRIPTION: str = _("Subscription"); break;
+ case ACCESS_SOLD_OUT: str = _("Sold out"); break;
+ case ACCESS_UNKNOWN: str = _("Unknown"); break;
+ default: str = NULL; break;
}
g_value_set_string(value, str);
@@ -707,14 +713,16 @@
char *s1, *s2, *s3, *s4, *s5;
if ((s1 = st_strstr_span(line, "<a href=\"/cgi-bin/directory"))
- && (s2 = st_strstr_span(s1, "&genre="))
+ && (s2 = st_strstr_span(s1, "genre="))
&& (s3 = strchr(s2, '"'))
&& (s4 = st_strchr_span(s3, '>'))
&& (s5 = strstr(s4, "</a>")))
{
category = st_category_new();
category->name = g_strndup(s2, s3 - s2);
- category->label = st_sgml_ref_expand_len(s4, s5 - s4);
+ category->label = ! strcmp(category->name, "Recommendations")
+ ? g_strdup(_("Recommendations"))
+ : st_sgml_ref_expand_len(s4, s5 - s4);
category->url_postfix = g_strconcat(DIRECTORY_PREFIX, category->name, NULL);
}
else if ((s1 = st_strstr_span(line, "<a href=\"/genres/"))
@@ -755,6 +763,8 @@
*streams = NULL;
info.streams = streams;
+ info.first_page = TRUE;
+ info.looped = FALSE;
session = st_transfer_session_new();
@@ -802,9 +812,11 @@
if (status) /* only display warning if the transfer was otherwise correct */
PARSE_ERROR;
}
+
+ info.first_page = FALSE;
}
- while (status && info.has_next_page
- && (stream_limit == -1 || received_streams < stream_limit));
+ while (status && info.has_next_page && ! info.looped
+ && (stream_limit == -1 || received_streams < stream_limit));
st_transfer_session_free(session);
@@ -818,6 +830,10 @@
char *s1, *s2, *s3, *s4, *s5, *s6, *s7;
char *word1, *word2, *word3;
+ /* if we have detected a loop, we just ignore the page */
+ if (info->looped)
+ return;
+
if ((s1 = st_str_has_prefix_span(line, "<TD CLASS=\"icon\""))
&& (s2 = st_strstr_span(s1, "DrawPlayIcon")))
{
@@ -834,15 +850,18 @@
info->stream->access = ACCESS_VIP;
else if (strstr(s2, "'SUBSCRIPTION'"))
info->stream->access = ACCESS_SUBSCRIPTION;
+ else if (strstr(s2, "'SOLD_OUT'"))
+ info->stream->access = ACCESS_SOLD_OUT;
else
- PARSE_ERROR;
-
- info->finished_stream = NULL;
+ {
+ PARSE_ERROR;
+ info->stream->access = ACCESS_UNKNOWN;
+ }
}
else if ((s1 = st_str_has_prefix_span(line, "<TD CLASS=\"title"))
- && (s2 = st_strstr_span(s1, "href='"))
- && (s3 = strstr(s2, "'>"))
- && (s4 = strstr(s3, "</a>")))
+ && (s2 = st_strstr_span(s1, "href='"))
+ && (s3 = strstr(s2, "'>"))
+ && (s4 = strstr(s3, "</a>")))
{
if (info->stream)
{
@@ -865,12 +884,19 @@
else
PARSE_ERROR;
}
- else if ((s1 = st_strstr_span(line, "&station_id="))
- && (s2 = strchr(s1, '&')))
+ else if ((s1 = st_str_has_prefix_span(line, "<TD CLASS=\"handle\""))
+ && (s2 = st_strstr_span(s1, "ReadCookie("))
+ && (s3 = st_strstr_span(s2, ", '"))
+ && (s4 = strchr(s3, '\''))
+ && (s5 = st_strstr_span(s4, "&station_id="))
+ && (s6 = strchr(s5, '&')))
{
if (info->stream)
{
- word1 = g_strndup(s1, s2 - s1);
+ g_free(info->stream->broadcaster);
+ info->stream->broadcaster = st_sgml_ref_expand_len(s3, s4 - s3);
+
+ word1 = g_strndup(s5, s6 - s5);
if (st_str_like(word1, ST_NUMERIC))
info->stream->station_id = atoi(word1);
g_free(word1);
@@ -878,34 +904,23 @@
else
PARSE_ERROR;
}
- else if ((s1 = st_strstr_span(line, "alt=\"More broadcaster info"))
- && (s2 = st_strchr_span(s1, '>'))
- && (s3 = strstr(s2, "</a>")))
- {
- if (info->stream)
- {
- g_free(info->stream->broadcaster);
- info->stream->broadcaster = st_sgml_ref_expand_len(s2, s3 - s2);
- }
- else
- PARSE_ERROR;
- }
else if ((s1 = st_str_has_prefix_span(line, "<TD CLASS=\"connection\""))
&& (s2 = st_strchr_span(s1, '>'))
- && (s3 = strstr(s2, "<br>"))
- && ((s4 = strstr(s3, "<img src='/images/mp3pro"))
- || (s4 = strstr(s3, "</TD>"))))
+ && (s3 = strchr(s2, '<')))
{
if (info->stream)
{
word1 = st_sgml_ref_expand_len(s2, s3 - s2);
- s3 += 4; word2 = st_sgml_ref_expand_len(s3, s4 - s3);
-
+
g_free(info->stream->audio);
- info->stream->audio = g_strdup_printf(g_str_has_prefix(s4, "</TD>") ? "%s %s" : "%s %s, MP3Pro", word2, word1);
- g_free(word1);
- g_free(word2);
+ if (strstr(s3, "<img src='/images/mp3pro"))
+ {
+ info->stream->audio = g_strdup_printf("%s, MP3Pro", word1);
+ g_free(word1);
+ }
+ else
+ info->stream->audio = word1;
}
else
PARSE_ERROR;
@@ -947,12 +962,17 @@
else
PARSE_ERROR;
}
- else if (strstr(line, "TD CLASS=\"tabledesc2\""))
+ else if ((s1 = st_strstr_span(line, "<TD CLASS=\"desc\"")))
{
if (info->stream)
{
if (info->stream->station_id)
{
+ if ((s2 = st_strstr_span(s1, "<a class='desc-link' href='"))
+ && (s3 = st_strchr_span(s2, '>'))
+ && (s4 = strstr(s3, "<BR>")))
+ info->stream->description = st_sgml_ref_expand_len(s3, s4 - s3);
+
((STStream *) info->stream)->name = g_strdup_printf("%i", info->stream->station_id);
*(info->streams) = g_list_append(*(info->streams), info->stream);
}
@@ -962,23 +982,23 @@
stream_free_cb(info->stream, NULL);
}
- info->finished_stream = info->stream;
info->stream = NULL;
}
else
PARSE_ERROR;
}
- else if ((s1 = st_strstr_span(line, "<a class='desc-link' href='"))
- && (s2 = st_strchr_span(s1, '>'))
- && (s3 = strstr(s2, "<BR>")))
- {
- if (info->finished_stream)
- {
- info->finished_stream->description = st_sgml_ref_expand_len(s2, s3 - s2);
- info->finished_stream = NULL;
+ else if ((s1 = st_strstr_span(line, "<TD class=\"pagination\""))
+ && (s2 = st_strstr_span(s1, ">Showing "))
+ && (s3 = strchr(s2, '-')))
+ {
+ word1 = g_strndup(s2, s3 - s2);
+ if (st_str_like(word1, ST_NUMERIC))
+ {
+ int n = atoi(word1);
+ if (n == 1 && ! info->first_page)
+ info->looped = TRUE;
}
- else
- PARSE_ERROR;
+ g_free(word1);
}
else if (strstr(line, "Next</A>"))
info->has_next_page = TRUE;
streamtuner-0.99.99-pkgconfig.patch:
--- NEW FILE streamtuner-0.99.99-pkgconfig.patch ---
diff -Nur streamtuner-0.99.99-orig/data/streamtuner.pc.in streamtuner-0.99.99/data/streamtuner.pc.in
--- streamtuner-0.99.99-orig/data/streamtuner.pc.in 2004-12-11 03:03:20.000000000 +0100
+++ streamtuner-0.99.99/data/streamtuner.pc.in 2006-01-01 01:33:39.000000000 +0100
@@ -1,9 +1,8 @@
prefix=@prefix@
includedir=@includedir@/streamtuner
-oldincludedir=@includedir@
Name: @PACKAGE@
Description: A stream directory browser
Version: @VERSION@
Requires: gmodule-2.0 gtk+-2.0
-Cflags: -I${includedir} -I${oldincludedir}
+Cflags: -I${includedir}
streamtuner-0.99.99-pygtk-2.6.patch:
--- NEW FILE streamtuner-0.99.99-pygtk-2.6.patch ---
--- src/plugins/python/pst-main.c.orig Thu Mar 24 15:52:58 2005
+++ src/plugins/python/pst-main.c Thu Mar 24 15:53:59 2005
@@ -94,6 +94,7 @@
{
gboolean status = FALSE;
PyObject *module;
+ char *argv[] = { "" };
if (! check_api_version(err))
return FALSE;
@@ -109,6 +110,7 @@
}
Py_Initialize();
+ PySys_SetArgv(G_N_ELEMENTS(argv), argv);
PyEval_InitThreads();
module = PyImport_AddModule("__main__");
--- NEW FILE streamtuner.spec ---
Summary: A stream directory browser
Name: streamtuner
Version: 0.99.99
Release: 6%{?dist}
URL: http://streamtuner.sourceforge.net
Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
Source1: %{name}.png
Patch0: %{name}-%{version}-live365.patch
Patch1: %{name}-%{version}-pygtk-2.6.patch
Patch2: %{name}-%{version}-defaultconfig.patch
Patch3: %{name}-%{version}-pkgconfig.patch
License: BSD
Group: Applications/Internet
Requires: python, pygtk2, htmlview, bmp, xterm
Requires(post): desktop-file-utils, scrollkeeper
Requires(postun): desktop-file-utils, scrollkeeper
BuildRequires: gtk2-devel, curl-devel, openssl-devel, python-devel, scrollkeeper
BuildRequires: taglib-devel, libidn-devel, pygtk2-devel, libxml2-devel
BuildRequires: gettext, desktop-file-utils
Obsoletes: streamtuner-live365, streamtuner-local, streamtuner-xiph, streamtuner-python
Provides: streamtuner-live365, streamtuner-local, streamtuner-xiph, streamtuner-python
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description
Streamtuner is a stream directory browser,
it offers an intuitive GTK+ 2.0 interface
to Internet radio directories such as SHOUTcast and Live365
%package devel
Summary: Development files for streamtuner
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: gtk2-devel, pkgconfig
%description devel
Streamtuner is a stream directory browser,
it offers an intuitive GTK+ 2.0 interface
to Internet radio directories such as SHOUTcast and Live365
This package contains the libraries and includes files necessary
to develop applications for Streamtuner
%prep
%setup -q
%patch0 -p0 -b .%{name}-%{version}-live365
%patch1 -p0 -b .%{name}-%{version}-pygtk-2.6
%patch2 -p0 -b .%{name}-%{version}-defaultconfig.patch
%patch3 -p1 -b .%{name}-%{version}-pkgconfig.patch
%build
%configure
%{__make} %{?_smp_mflags}
%install
%{__rm} -rf %{buildroot}
%makeinstall
mkdir -p %{buildroot}%{_datadir}/pixmaps
install -D -m644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/%{name}.png
%{__rm} -rf %{buildroot}%{_localstatedir}
%{__rm} -f %{buildroot}%{_datadir}/applications/%{name}.desktop
%{__rm} -f %{buildroot}%{_libdir}/%{name}/plugins/*.*a
cat > %{name}.desktop << EOF
[Desktop Entry]
Encoding=UTF-8
StartupNotify=true
Name=Streamtuner
Comment=A stream directory browser.
Exec=%{name}
Icon=%{name}.png
Terminal=false
Type=Application
EOF
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --vendor=fedora \
--dir %{buildroot}%{_datadir}/applications \
--add-category X-Fedora \
--add-category Application \
--add-category AudioVideo \
%{name}.desktop
%find_lang %{name}
%post
scrollkeeper-update -q || :
%postun
scrollkeeper-update -q || :
%clean
%{__rm} -rf %{buildroot}
%files -f %{name}.lang
%defattr(-, root, root)
%doc AUTHORS COPYING NEWS README TODO
%{_bindir}/%{name}
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/plugins
%{_libdir}/%{name}/plugins/*.so
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*
%dir %{_datadir}/omf/%{name}
%{_datadir}/omf/%{name}/*
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/gtk-doc/html/*
%dir %{_datadir}/help
%{_datadir}/help/*
%files devel
%defattr(-, root, root)
%{_includedir}/*
%{_libdir}/pkgconfig/*
%changelog
* Mon Jan 2 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-6
- redundant dependencies removed
- useless update-desktop-database call removed
- pkgconfig.patch added
* Thu Dec 29 2005 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-5
- defaultconfig patch for htmlview and beep-media-player
- htmlview, bmp and xterm added to deps
- more cleanups
* Mon Dec 19 2005 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-4
- more cleanups
- libxml2-devel and desktop-file-utils added to BuildRequires
* Sun Dec 18 2005 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-3
- cleanups
* Wed Jun 29 2005 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-2.fc4
- update-desktop-database added to post and postun
* Thu Jun 16 2005 Matthias Haase <matthias_haase at bennewitz.com> - 0.99-1
- Update to 0.99.99
- File list changed
- Patches added
- Rebuild for Fedora Core 4
* Wed Nov 10 2004 Matthias Haase <matthias_haase at bennewitz.com>
- Added libidn and libidn-devel
- Rebuild for Fedora Core 3
* Sat Oct 23 2004 Matthias Haase <matthias_haase at bennewitz.com>
- Update to 0.99
- Many changes because the plugins have been now included in the core distribution
- Taglib and taglib-devel added to deps
* Wed Aug 11 2004 Matthias Haase <matthias_haase at bennewitz.com>
- Update to 0.12.5
_ Category changed to AudioVideo for desktop link
* Tue Aug 03 2004 Matthias Haase <matthias_haase at bennewitz.com>
- Update to 0.12.4
- ChangeLog removed from the documentation
* Thu Jun 03 2004 Matthias Haase <matthias_haase at bennewitz.com>
- Rebuild for Fedora Core 2
* Tue May 12 2004 Matthias Haase <matthias_haase at bennewitz.com>
- Update to 0.12.3
* Fri Apr 02 2004 Matthias Haase <matthias_haase at bennewitz.com>
- Update to 0.12.1
- scrollkeeper and some cleanups
* Wed Feb 18 2004 Matthias Haase <matthias_haase at bennewitz.com>
- Update to 0.11.1
* Sat Jan 03 2004 Matthias Haase <matthias_haase at bennewitz.com>
- Update to 0.10.2
* Sun Nov 09 2003 Matthias Haase <matthias_haase at bennewitz.com>
- Rebuild for Fedora Core 1
* Mon Sep 29 2003 Matthias Haase <matthias_haase at bennewitz.com>
- Update to 0.10.1
- Some new translations
* Wed Jul 16 2003 Matthias Haase <matthias_haase at bennewitz.com>
- Update to 0.10.0
- Theme directorys are removed and some cleanups are done
* Sat Apr 05 2003 Matthias Haase <matthias_haase at bennewitz.com>
- Rebuild of 0.9.1 for RH9
* Tue Mar 18 2003 Matthias Haase <matthias_haase at bennewitz.com>
- Rebuild for 0.9.1
* Sun Feb 02 2003 Matthias Haase <matthias_haase at bennewitz.com>
- Changes in order to match the GNU build system
- Split into binary/devel packages
- Rebuild for 0.9.0
* Wed Dec 25 2002 Matthias Haase <matthias_haase at bennewitz.com>
- Some cleanups in order to match RH8
- smp flag added
- RPM_OPT_FLAGS added
- debugging disabled
* Sat Oct 29 2002 Rudolf Kastl
- Cosmetical changes.
* Sat Oct 05 2002 Rudolf Kastl
- Minor fixes and new version.
* Wed Aug 21 2002 Rudolf Kastl
- Initial RPM release
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 6 Jan 2006 13:36:22 -0000 1.1
+++ .cvsignore 6 Jan 2006 13:37:47 -0000 1.2
@@ -0,0 +1 @@
+streamtuner-0.99.99.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 6 Jan 2006 13:36:22 -0000 1.1
+++ sources 6 Jan 2006 13:37:47 -0000 1.2
@@ -0,0 +1 @@
+2027b7c34e85b594524b0b4351c14362 streamtuner-0.99.99.tar.gz
More information about the fedora-extras-commits
mailing list