From 817e053e7a0b602117210a043c8e1dafa80ff302 Mon Sep 17 00:00:00 2001 From: Pav Lucistnik Date: Thu, 29 Jul 2004 23:41:10 +0000 Subject: Add tunesbrowser, a simple music player, capable of playing music found on iTunes(R) shares. PR: ports/69692 Submitted by: Michael Johnson --- audio/Makefile | 1 + audio/tunesbrowser/Makefile | 40 ++++++++++++++++++++++ audio/tunesbrowser/distinfo | 2 ++ audio/tunesbrowser/files/patch-audioplayer.c | 40 ++++++++++++++++++++++ audio/tunesbrowser/files/patch-configure | 51 ++++++++++++++++++++++++++++ audio/tunesbrowser/files/patch-daap.c | 30 ++++++++++++++++ audio/tunesbrowser/files/patch-main.c | 11 ++++++ audio/tunesbrowser/files/patch-misc_ui.c | 12 +++++++ audio/tunesbrowser/pkg-descr | 4 +++ 9 files changed, 191 insertions(+) create mode 100644 audio/tunesbrowser/Makefile create mode 100644 audio/tunesbrowser/distinfo create mode 100644 audio/tunesbrowser/files/patch-audioplayer.c create mode 100644 audio/tunesbrowser/files/patch-configure create mode 100644 audio/tunesbrowser/files/patch-daap.c create mode 100644 audio/tunesbrowser/files/patch-main.c create mode 100644 audio/tunesbrowser/files/patch-misc_ui.c create mode 100644 audio/tunesbrowser/pkg-descr (limited to 'audio') diff --git a/audio/Makefile b/audio/Makefile index 903bb4db27e5..144946998c2b 100644 --- a/audio/Makefile +++ b/audio/Makefile @@ -383,6 +383,7 @@ SUBDIR += trommler SUBDIR += tse3 SUBDIR += tuneradio + SUBDIR += tunesbrowser SUBDIR += ufmcontrol-i18n SUBDIR += umix SUBDIR += vorbis-tools diff --git a/audio/tunesbrowser/Makefile b/audio/tunesbrowser/Makefile new file mode 100644 index 000000000000..b8482f567d88 --- /dev/null +++ b/audio/tunesbrowser/Makefile @@ -0,0 +1,40 @@ +# New ports collection makefile for: tunesbrowser +# Date created: 2004-07-27 +# Whom: Michael Johnson +# +# $FreeBSD$ +# + +PORTNAME= tunesbrowser +PORTVERSION= 0.1.5 +CATEGORIES= audio +MASTER_SITES= http://crazney.net/programs/itunes/files/ + +MAINTAINER= ahze@ahze.net +COMMENT= Gnome frontend DAAP client + +LIB_DEPENDS= opendaap.0:${PORTSDIR}/devel/libopendaap + +USE_BZIP2= yes +USE_LIBTOOL_VER=15 +USE_X_PREFIX= yes +USE_GNOME= libglade2 gstreamerplugins gnometarget gnomehack + +DATADIR= ${PREFIX}/share/gnome/${PORTNAME} + +PLIST_FILES= bin/tunesbrowser \ + %%DATADIR%%/tunesbrowser.glade +PLIST_DIRS= %%DATADIR%% + +pre-everything:: + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Warning: ${PORTNAME} is extremelly buggy, especially' + @${ECHO_MSG} '===> on the FreeBSD 4.x branch, and may not run at all' + @${ECHO_MSG} '===>' + +do-install: + @${INSTALL_PROGRAM} ${WRKSRC}/tunesbrowser ${PREFIX}/bin + @${MKDIR} ${DATADIR} + @${INSTALL_DATA} ${WRKSRC}/tunesbrowser.glade ${DATADIR} + +.include diff --git a/audio/tunesbrowser/distinfo b/audio/tunesbrowser/distinfo new file mode 100644 index 000000000000..4d8956d931f9 --- /dev/null +++ b/audio/tunesbrowser/distinfo @@ -0,0 +1,2 @@ +MD5 (tunesbrowser-0.1.5.tar.bz2) = 9ac02107486c8d8242cbdb96873a93f0 +SIZE (tunesbrowser-0.1.5.tar.bz2) = 190729 diff --git a/audio/tunesbrowser/files/patch-audioplayer.c b/audio/tunesbrowser/files/patch-audioplayer.c new file mode 100644 index 000000000000..f1f0e84efa1f --- /dev/null +++ b/audio/tunesbrowser/files/patch-audioplayer.c @@ -0,0 +1,40 @@ +--- audioplayer.c.orig Thu Apr 29 11:31:57 2004 ++++ audioplayer.c Wed Jul 28 06:38:45 2004 +@@ -62,8 +62,10 @@ + + static void cb_iterate(GstBin *bin, gpointer data) + { +- GstClock *clock = gst_bin_get_clock(bin); +- int seconds = gst_clock_get_time(clock) / GST_SECOND; ++ GstClock *clock; ++ int seconds; ++ clock = gst_bin_get_clock(bin); ++ seconds = gst_clock_get_time(clock) / GST_SECOND; + + seconds = seconds - songstarted; + +@@ -80,8 +82,10 @@ + gst_init(0, NULL); + + pipeline_thread = gst_thread_new ("pipeline"); ++#if 0 + gst_bin_set_post_iterate_function(GST_BIN(pipeline_thread), + cb_iterate, NULL); ++#endif + pipesrc = gst_element_factory_make ("fdsrc", "pipe_source"); + if (!pipesrc) + { +@@ -136,11 +140,12 @@ + + void audioplayer_playpipe(int fd) + { ++ GstClock *clock; + playing = 1; + audioplayer_loadpipe(fd); + + gst_element_set_state (GST_ELEMENT (pipeline_thread), GST_STATE_PLAYING); +- GstClock *clock = gst_bin_get_clock(GST_BIN(pipeline_thread)); ++ clock = gst_bin_get_clock(GST_BIN(pipeline_thread)); + songstarted = gst_clock_get_time(clock) / GST_SECOND; + } + diff --git a/audio/tunesbrowser/files/patch-configure b/audio/tunesbrowser/files/patch-configure new file mode 100644 index 000000000000..dbbc4e8a387f --- /dev/null +++ b/audio/tunesbrowser/files/patch-configure @@ -0,0 +1,51 @@ +--- configure 2004/06/05 22:49:11 1.1 ++++ configure 2004/06/05 22:49:43 +@@ -19625,23 +19625,23 @@ + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then +- echo "$as_me:$LINENO: checking for opendaap libglade-2.0 gstreamer-0.6" >&5 +-echo $ECHO_N "checking for opendaap libglade-2.0 gstreamer-0.6... $ECHO_C" >&6 ++ echo "$as_me:$LINENO: checking for opendaap libglade-2.0 gstreamer-0.8" >&5 ++echo $ECHO_N "checking for opendaap libglade-2.0 gstreamer-0.8... $ECHO_C" >&6 + +- if $PKG_CONFIG --exists "opendaap libglade-2.0 gstreamer-0.6" ; then ++ if $PKG_CONFIG --exists "opendaap libglade-2.0 gstreamer-0.8" ; then + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + succeeded=yes + + echo "$as_me:$LINENO: checking TB_CFLAGS" >&5 + echo $ECHO_N "checking TB_CFLAGS... $ECHO_C" >&6 +- TB_CFLAGS=`$PKG_CONFIG --cflags "opendaap libglade-2.0 gstreamer-0.6"` ++ TB_CFLAGS=`$PKG_CONFIG --cflags "opendaap libglade-2.0 gstreamer-0.8"` + echo "$as_me:$LINENO: result: $TB_CFLAGS" >&5 + echo "${ECHO_T}$TB_CFLAGS" >&6 + + echo "$as_me:$LINENO: checking TB_LIBS" >&5 + echo $ECHO_N "checking TB_LIBS... $ECHO_C" >&6 +- TB_LIBS=`$PKG_CONFIG --libs "opendaap libglade-2.0 gstreamer-0.6"` ++ TB_LIBS=`$PKG_CONFIG --libs "opendaap libglade-2.0 gstreamer-0.8"` + echo "$as_me:$LINENO: result: $TB_LIBS" >&5 + echo "${ECHO_T}$TB_LIBS" >&6 + else +@@ -19649,7 +19649,7 @@ + TB_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. +- TB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "opendaap libglade-2.0 gstreamer-0.6"` ++ TB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "opendaap libglade-2.0 gstreamer-0.8"` + echo $TB_PKG_ERRORS + fi + +@@ -19664,8 +19664,8 @@ + if test $succeeded = yes; then + : + else +- { { echo "$as_me:$LINENO: error: Library requirements (opendaap libglade-2.0 gstreamer-0.6) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +-echo "$as_me: error: Library requirements (opendaap libglade-2.0 gstreamer-0.6) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} ++ { { echo "$as_me:$LINENO: error: Library requirements (opendaap libglade-2.0 gstreamer-0.8) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 ++echo "$as_me: error: Library requirements (opendaap libglade-2.0 gstreamer-0.8) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { (exit 1); exit 1; }; } + fi + diff --git a/audio/tunesbrowser/files/patch-daap.c b/audio/tunesbrowser/files/patch-daap.c new file mode 100644 index 000000000000..3132a0c36f97 --- /dev/null +++ b/audio/tunesbrowser/files/patch-daap.c @@ -0,0 +1,30 @@ +--- daap.c.orig Wed Jul 28 06:39:51 2004 ++++ daap.c Wed Jul 28 06:41:27 2004 +@@ -456,6 +456,7 @@ + char time[11] = {0}; + char track[11] = {0}; + char year[11] = {0}; ++ int minutes, seconds; + + if (selected_artist && + strcasecmp(selected_artist, currentSongItems[i].songartist) != 0) +@@ -464,7 +465,6 @@ + strcasecmp(selected_album, currentSongItems[i].songalbum) != 0) + continue; + +- int minutes, seconds; + + seconds = (currentSongItems[i].songtime) / 1000; + minutes = seconds / 60; +@@ -563,10 +563,10 @@ + char *get_song_display_str_withalloc(int id) + { + int songindex = findSongByID(id); ++ char *buf; + + if (!songindex) return NULL; + +- char *buf; + buf = malloc(strlen(currentSongItems[songindex].songartist) + strlen(" - ") + + strlen(currentSongItems[songindex].itemname) + 1); + diff --git a/audio/tunesbrowser/files/patch-main.c b/audio/tunesbrowser/files/patch-main.c new file mode 100644 index 000000000000..09c1a26ff603 --- /dev/null +++ b/audio/tunesbrowser/files/patch-main.c @@ -0,0 +1,11 @@ +--- main.c.orig Tue Jul 27 17:40:25 2004 ++++ main.c Tue Jul 27 17:40:49 2004 +@@ -46,7 +46,7 @@ + + gtk_init(&argc, &argv); + +- xml = glade_xml_new(XSTR(UIDIR) "/tunesbrowser.glade", NULL, NULL); ++ xml = glade_xml_new(XSTR(UIDIR) "/tunesbrowser/tunesbrowser.glade", NULL, NULL); + + glade_xml_signal_autoconnect(xml); + diff --git a/audio/tunesbrowser/files/patch-misc_ui.c b/audio/tunesbrowser/files/patch-misc_ui.c new file mode 100644 index 000000000000..897db51810a8 --- /dev/null +++ b/audio/tunesbrowser/files/patch-misc_ui.c @@ -0,0 +1,12 @@ +--- misc_ui.c.orig Wed Jul 28 06:41:58 2004 ++++ misc_ui.c Wed Jul 28 06:43:37 2004 +@@ -139,8 +139,8 @@ + if (seconds >= 0) + { + int minutes = seconds / 60; ++ char bufstr[11]; + seconds -= minutes * 60; +- char bufstr[11] = {0}; + + snprintf(bufstr, 10, "%i:%02i", + minutes, seconds); diff --git a/audio/tunesbrowser/pkg-descr b/audio/tunesbrowser/pkg-descr new file mode 100644 index 000000000000..931f8f2789b4 --- /dev/null +++ b/audio/tunesbrowser/pkg-descr @@ -0,0 +1,4 @@ +TunesBrowser is a simple music player, capable of playing music found on +iTunes(R) shares. + +WWW: http://crazney.net/programs/itunes/tunesbrowser.html -- cgit v1.2.3