summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/tunesbrowser/Makefile14
-rw-r--r--audio/tunesbrowser/PLIST7
-rw-r--r--audio/tunesbrowser/distinfo14
-rw-r--r--audio/tunesbrowser/patches/patch-aa78
-rw-r--r--audio/tunesbrowser/patches/patch-ab29
-rw-r--r--audio/tunesbrowser/patches/patch-ac34
-rw-r--r--audio/tunesbrowser/patches/patch-ad8
7 files changed, 53 insertions, 131 deletions
diff --git a/audio/tunesbrowser/Makefile b/audio/tunesbrowser/Makefile
index f3d57caa5a8..c82b3ee81b1 100644
--- a/audio/tunesbrowser/Makefile
+++ b/audio/tunesbrowser/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2004/10/03 00:13:10 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/03/20 11:09:47 jmmv Exp $
#
-DISTNAME= tunesbrowser-0.1.5
-PKGREVISION= 1
+DISTNAME= tunesbrowser-0.2.0
CATEGORIES= audio
MASTER_SITES= http://crazney.net/programs/itunes/files/
EXTRACT_SUFX= .tar.bz2
@@ -16,14 +15,17 @@ USE_BUILDLINK3= yes
USE_LIBTOOL= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-DEPENDS+= mad>=0.15.0b:../../audio/mad
+BUILDLINK_DEPENDS.libopendaap+= libopendaap>=0.3.0
-.include "../../audio/gst-plugins-artsd/buildlink3.mk"
-.include "../../audio/gst-plugins-esound/buildlink3.mk"
.include "../../audio/gst-plugins-mad/buildlink3.mk"
+# XXX Enable this dependency after the package is created (couldn't be done at
+# XXX the moment because we were preparing the pkgsrc-2005Q1 branch).
+#.include "../../audio/gst-plugins-spider/buildlink3.mk"
.include "../../audio/libopendaap/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/pkgconfig/buildlink3.mk"
.include "../../multimedia/gstreamer/buildlink3.mk"
+.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../sysutils/gst-plugins-gnomevfs/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/tunesbrowser/PLIST b/audio/tunesbrowser/PLIST
index 7cb188eed4b..eb43d68d2ae 100644
--- a/audio/tunesbrowser/PLIST
+++ b/audio/tunesbrowser/PLIST
@@ -1,3 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/06/20 20:41:22 agc Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/03/20 11:09:47 jmmv Exp $
bin/tunesbrowser
+man/man1/tunesbrowser.1
+share/comp.blue.png
+share/comp.red.png
+share/sound1.png
+share/sound2.png
share/tunesbrowser.glade
diff --git a/audio/tunesbrowser/distinfo b/audio/tunesbrowser/distinfo
index 2d4729bb199..b306b3507b8 100644
--- a/audio/tunesbrowser/distinfo
+++ b/audio/tunesbrowser/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:53 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/03/20 11:09:47 jmmv Exp $
-SHA1 (tunesbrowser-0.1.5.tar.bz2) = 31feff440625d2dad664b7e9fb8ec4055aa151ef
-RMD160 (tunesbrowser-0.1.5.tar.bz2) = baba93b8c66ddbd39811c2e69b9186fce7f6fdfa
-Size (tunesbrowser-0.1.5.tar.bz2) = 190729 bytes
-SHA1 (patch-aa) = 39d837625a837d4c927bd220d3f3e030b4b122bd
-SHA1 (patch-ab) = d9da00f2daf4cdb33ea69f51ffb294f7130765d7
-SHA1 (patch-ac) = c0bad452914fb27e73713c2026f33aa3a4bb74d5
-SHA1 (patch-ad) = 99d5bcac138e5b7e936c288e7531f2b3c5458c83
+SHA1 (tunesbrowser-0.2.0.tar.bz2) = 79195c25d6f6bfdeebe9b1e8eb34b5ca0e185764
+RMD160 (tunesbrowser-0.2.0.tar.bz2) = 365aee4d25f4a77efb751b268874bcf0ec64db70
+Size (tunesbrowser-0.2.0.tar.bz2) = 208472 bytes
+SHA1 (patch-aa) = f2bea1f2afcd9b04ca20eb8eee6d859da08eeec5
+SHA1 (patch-ad) = 4929d3c46ece66b5546edcfcc119cb0730c25396
diff --git a/audio/tunesbrowser/patches/patch-aa b/audio/tunesbrowser/patches/patch-aa
index 7b8a5b0d2f3..cbfe08f7fdc 100644
--- a/audio/tunesbrowser/patches/patch-aa
+++ b/audio/tunesbrowser/patches/patch-aa
@@ -1,53 +1,33 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/06/20 20:41:22 agc Exp $
+$NetBSD: patch-aa,v 1.2 2005/03/20 11:09:47 jmmv Exp $
---- 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
+--- main.c.orig 2005-01-04 03:58:29.000000000 +0100
++++ main.c
+@@ -38,7 +38,7 @@ static void sighandler_sigsegv(__UNUSED_
+ {
+ fprintf(stderr, "Oops! TunesBrowser has crashed. Sorry about that!\n");
+ fprintf(stderr, "This probably won't be of any use unless you feel like debugging,\n");
+- fprintf(stderr, "but the crash occured because of %p being bad.\n", siginfo->si_ptr);
++ fprintf(stderr, "but the crash occured because of a pointer being bad.\n");
+ #if 0
+ fprintf(stderr, "\n\nRaised SIGSTOP. You can now attach a debugger.\n");
+ fprintf(stderr, "Attach to PID %i\n", getpid());
+@@ -66,11 +66,19 @@ static void install_sighandlers()
+ int ret;
-- 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
+ sa.sa_handler = (void*)sighandler_sigsegv;
++#ifdef SA_NOMASK
+ sa.sa_flags = SA_NOMASK | SA_SIGINFO;
++#else
++ sa.sa_flags = SA_SIGINFO;
++#endif
+ ret = sigaction(SIGSEGV, &sa, NULL);
- 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
+ sa.sa_handler = (void*)sighandler_sigpipe;
++#ifdef SA_NOMASK
+ sa.sa_flags = SA_NOMASK | SA_SIGINFO;
++#else
++ sa.sa_flags = SA_SIGINFO;
++#endif
+ ret = sigaction(SIGPIPE, &sa, NULL);
+ }
diff --git a/audio/tunesbrowser/patches/patch-ab b/audio/tunesbrowser/patches/patch-ab
deleted file mode 100644
index 25fc66d130f..00000000000
--- a/audio/tunesbrowser/patches/patch-ab
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/08/14 11:43:53 kristerw Exp $
-
---- audioplayer.c.orig Thu Apr 29 13:31:57 2004
-+++ audioplayer.c Sat Aug 14 13:30:09 2004
-@@ -80,8 +80,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 +138,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/patches/patch-ac b/audio/tunesbrowser/patches/patch-ac
deleted file mode 100644
index 456ce20a566..00000000000
--- a/audio/tunesbrowser/patches/patch-ac
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2004/08/14 11:43:53 kristerw Exp $
-
---- daap.c.orig Sat Aug 14 13:30:46 2004
-+++ daap.c Sat Aug 14 13:34:37 2004
-@@ -453,6 +453,7 @@
-
- for (i = 0; i < currentSongItemCount; i++)
- {
-+ int minutes, seconds;
- char time[11] = {0};
- char track[11] = {0};
- char year[11] = {0};
-@@ -464,8 +465,6 @@
- strcasecmp(selected_album, currentSongItems[i].songalbum) != 0)
- continue;
-
-- int minutes, seconds;
--
- seconds = (currentSongItems[i].songtime) / 1000;
- minutes = seconds / 60;
- seconds -= minutes * 60;
-@@ -562,11 +561,11 @@
-
- char *get_song_display_str_withalloc(int id)
- {
-+ char *buf;
- int songindex = findSongByID(id);
-
- if (!songindex) return NULL;
-
-- char *buf;
- buf = malloc(strlen(currentSongItems[songindex].songartist) + strlen(" - ")
- + strlen(currentSongItems[songindex].itemname) + 1);
-
diff --git a/audio/tunesbrowser/patches/patch-ad b/audio/tunesbrowser/patches/patch-ad
index 77d50e0313e..abdcb3b40ff 100644
--- a/audio/tunesbrowser/patches/patch-ad
+++ b/audio/tunesbrowser/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2004/08/14 11:43:53 kristerw Exp $
+$NetBSD: patch-ad,v 1.2 2005/03/20 11:09:47 jmmv Exp $
---- misc_ui.c.orig Sat Aug 14 13:32:13 2004
-+++ misc_ui.c Sat Aug 14 13:35:31 2004
-@@ -138,9 +138,9 @@
+--- misc_ui.c.orig 2005-01-02 02:53:52.000000000 +0100
++++ misc_ui.c
+@@ -202,9 +202,9 @@ static void cb_update_songpos(int second
if (seconds >= 0)
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-16 12:57:37 +0000