Merge some patches from PR pkg/29644 by Antoine Reilles:

- Use SA_NODEFER instead of SA_NOMASK (if the later is not available).
- Use a subdirectory under ${PREFIX}/share to place the data files.
- Print the failing address on SIGSEGV.
- Make an error message more descriptive (specially helpful when using OSS).
- Fix playback of multiple songs.

5 files changed, 55 insertions, 13 deletions

diff --git a/audio/tunesbrowser/Makefile b/audio/tunesbrowser/Makefile
index c82b3ee81b1..6a2260e5a3a 100644
--- a/audio/tunesbrowser/Makefile
+++ b/audio/tunesbrowser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/03/20 11:09:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2005/03/20 15:21:04 jmmv Exp $
 #
 
 DISTNAME=		tunesbrowser-0.2.0
@@ -15,11 +15,15 @@ USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
+CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/tunesbrowser
+
 BUILDLINK_DEPENDS.libopendaap+=	libopendaap>=0.3.0
 
 .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).
+# XXX When that happens, do not depend gst-plugins-mad, and adjust patch-ab to
+# XXX not disable spider use.
 #.include "../../audio/gst-plugins-spider/buildlink3.mk"
 .include "../../audio/libopendaap/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
diff --git a/audio/tunesbrowser/PLIST b/audio/tunesbrowser/PLIST
index eb43d68d2ae..4b874c164a7 100644
--- a/audio/tunesbrowser/PLIST
+++ b/audio/tunesbrowser/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2005/03/20 11:09:47 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/03/20 15:21:04 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
+share/tunesbrowser/comp.blue.png
+share/tunesbrowser/comp.red.png
+share/tunesbrowser/sound1.png
+share/tunesbrowser/sound2.png
+share/tunesbrowser/tunesbrowser.glade
+@dirrm share/tunesbrowser
diff --git a/audio/tunesbrowser/distinfo b/audio/tunesbrowser/distinfo
index b306b3507b8..f7beb1172db 100644
--- a/audio/tunesbrowser/distinfo
+++ b/audio/tunesbrowser/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2005/03/20 11:09:47 jmmv Exp $
+$NetBSD: distinfo,v 1.5 2005/03/20 15:21:04 jmmv Exp $
 
 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-aa) = be573330eee471791d68baba1cd9a048f6a1c6b8
+SHA1 (patch-ab) = 3120984ffdf4f7e6fcae9b1f7e6d0f84cfed1c86
 SHA1 (patch-ad) = 4929d3c46ece66b5546edcfcc119cb0730c25396
diff --git a/audio/tunesbrowser/patches/patch-aa b/audio/tunesbrowser/patches/patch-aa
index cbfe08f7fdc..516b2f00ec9 100644
--- a/audio/tunesbrowser/patches/patch-aa
+++ b/audio/tunesbrowser/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2005/03/20 11:09:47 jmmv Exp $
+$NetBSD: patch-aa,v 1.3 2005/03/20 15:21:04 jmmv Exp $
 
 --- main.c.orig	2005-01-04 03:58:29.000000000 +0100
 +++ main.c
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.2 2005/03/20 11:09:47 jmmv Exp $
      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");
++    fprintf(stderr, "but the crash occured because of %p being bad.\n", siginfo->si_addr);
  #if 0
      fprintf(stderr, "\n\nRaised SIGSTOP. You can now attach a debugger.\n");
      fprintf(stderr, "Attach to PID %i\n", getpid());
@@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.2 2005/03/20 11:09:47 jmmv Exp $
 +#ifdef SA_NOMASK
      sa.sa_flags = SA_NOMASK | SA_SIGINFO;
 +#else
-+    sa.sa_flags = SA_SIGINFO;
++    sa.sa_flags = SA_NODEFER | SA_SIGINFO;
 +#endif
      ret = sigaction(SIGSEGV, &sa, NULL);
  
@@ -26,7 +26,7 @@ $NetBSD: patch-aa,v 1.2 2005/03/20 11:09:47 jmmv Exp $
 +#ifdef SA_NOMASK
      sa.sa_flags = SA_NOMASK | SA_SIGINFO;
 +#else
-+    sa.sa_flags = SA_SIGINFO;
++    sa.sa_flags = SA_NODEFER | SA_SIGINFO;
 +#endif
      ret = sigaction(SIGPIPE, &sa, NULL);
  }
diff --git a/audio/tunesbrowser/patches/patch-ab b/audio/tunesbrowser/patches/patch-ab
new file mode 100644
index 00000000000..d38261ca80b
--- /dev/null
+++ b/audio/tunesbrowser/patches/patch-ab
@@ -0,0 +1,36 @@
+$NetBSD: patch-ab,v 1.4 2005/03/20 15:21:04 jmmv Exp $
+
+--- audioplayer.c.orig	2004-12-20 09:03:55.000000000 +0100
++++ audioplayer.c
+@@ -148,11 +148,11 @@ static void cb_eos(__UNUSED__ GstElement
+ 
+ static void cb_error (__UNUSED__ GstElement *gstelement,
+                       __UNUSED__ GstElement *arg1,
+-                      __UNUSED__ gpointer arg2,
+-                      gchar *arg3,
++                      GError *err,
++                      gchar *dbg_msg,
+                       __UNUSED__ gpointer user_data)
+ {
+-    fprintf(stderr, "an error occured:\n%s\n\n", arg3);
++    fprintf(stderr, "an error occured:\n%s (%s)\n\n", err->message, dbg_msg);
+ }
+ 
+ static void cb_iterate(GstBin *bin, __UNUSED__ gpointer data)
+@@ -176,6 +176,7 @@ static void audioplayer_destroy_pipeline
+     /* remove the source and decoder from the pipeline */
+     gst_bin_remove_many (GST_BIN (pipeline_thread), srcelem, decoder, NULL);
+ 
++    gst_element_set_state(pipeline_thread, GST_STATE_NULL);
+     gst_object_unref(GST_OBJECT(pipeline_thread));
+ }
+ 
+@@ -203,7 +204,7 @@ static void audioplayer_setup_pipeline(e
+     }
+     if (!srcelem) goto gst_element_err;
+ 
+-#if (GST_VERSION_MINOR < 8)
++#if (1)
+     /* older versions of gstreamer seem to crash when I use the
+      * spider plugin
+      */