pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: pkg/29644: libopendaap bug and tunesbrowser



The following reply was made to PR pkg/29644; it has been noted by GNATS.

From: Antoine Reilles <Antoine.Reilles%loria.fr@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: pkg/29644: libopendaap bug and tunesbrowser
Date: Thu, 10 Mar 2005 21:06:10 +0100

 --/9DWx/yDrRhgMJTb
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 I've found the reason of the /dev/audio acess problem, thanks to the
 #gstreamer guys, which where very helpful. I include a diff for the new
 version (really working fine now). The only change to the first
 porposition is that it inclue the patch-ab, making error reporting in
 case of gstreamer failure better and ensures gstreamer closes
 /dev/audio when it needs to reopen it. 
 
 
 
 --/9DWx/yDrRhgMJTb
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="tunesbrowser.diff"
 
 Index: Makefile
 ===================================================================
 RCS file: /cvsroot/pkgsrc/audio/tunesbrowser/Makefile,v
 retrieving revision 1.2
 diff -u -r1.2 Makefile
 --- Makefile   3 Oct 2004 00:13:10 -0000       1.2
 +++ Makefile   10 Mar 2005 20:01:18 -0000
 @@ -1,8 +1,7 @@
  # $NetBSD: Makefile,v 1.2 2004/10/03 00:13:10 tv 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,6 +15,8 @@
  USE_LIBTOOL=          yes
  LIBTOOL_OVERRIDE=     ${WRKSRC}/libtool
  
 +CONFIGURE_ARGS+= --datadir=${PREFIX}/share/tunesbrowser
 +
  DEPENDS+=             mad>=0.15.0b:../../audio/mad
  
  .include "../../audio/gst-plugins-artsd/buildlink3.mk"
 @@ -25,5 +26,6 @@
  .include "../../devel/libglade2/buildlink3.mk"
  .include "../../devel/pkgconfig/buildlink3.mk"
  .include "../../multimedia/gstreamer/buildlink3.mk"
 +.include "../../mk/pthread.buildlink3.mk"
  
  .include "../../mk/bsd.pkg.mk"
 Index: PLIST
 ===================================================================
 RCS file: /cvsroot/pkgsrc/audio/tunesbrowser/PLIST,v
 retrieving revision 1.1.1.1
 diff -u -r1.1.1.1 PLIST
 --- PLIST      20 Jun 2004 20:41:22 -0000      1.1.1.1
 +++ PLIST      10 Mar 2005 20:01:18 -0000
 @@ -1,3 +1,9 @@
 -@comment $NetBSD: PLIST,v 1.1.1.1 2004/06/20 20:41:22 agc Exp $
 +@comment $NetBSD$
  bin/tunesbrowser
 -share/tunesbrowser.glade
 +man/man1/tunesbrowser.1
 +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
 Index: distinfo
 ===================================================================
 RCS file: /cvsroot/pkgsrc/audio/tunesbrowser/distinfo,v
 retrieving revision 1.3
 diff -u -r1.3 distinfo
 --- distinfo   23 Feb 2005 20:39:53 -0000      1.3
 +++ distinfo   10 Mar 2005 20:01:18 -0000
 @@ -1,9 +1,7 @@
  $NetBSD: distinfo,v 1.3 2005/02/23 20:39:53 agc 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) = b437f835f3c1614c3bdc73f3eb99e51395bfacf5
 +SHA1 (patch-ab) = f82fd4eeeaf870b1df25e12a3362ab64e1bfcf6a
 Index: patches/patch-aa
 ===================================================================
 RCS file: /cvsroot/pkgsrc/audio/tunesbrowser/patches/patch-aa,v
 retrieving revision 1.1.1.1
 diff -u -r1.1.1.1 patch-aa
 --- patches/patch-aa   20 Jun 2004 20:41:22 -0000      1.1.1.1
 +++ patches/patch-aa   10 Mar 2005 20:01:18 -0000
 @@ -1,53 +1,25 @@
 -$NetBSD: patch-aa,v 1.1.1.1 2004/06/20 20:41:22 agc 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-03-09 16:08:32.000000000 +0100
 ++++ main.c    2005-03-09 16:09:04.000000000 +0100
 +@@ -38,7 +38,7 @@
 + {
 +     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 %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());
 +@@ -66,11 +66,11 @@
 +     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;
 +-    sa.sa_flags = SA_NOMASK | SA_SIGINFO;
 ++    sa.sa_flags = SA_NODEFER | SA_SIGINFO;
 +     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;
 +-    sa.sa_flags = SA_NOMASK | SA_SIGINFO;
 ++    sa.sa_flags = SA_NODEFER | SA_SIGINFO;
 +     ret = sigaction(SIGPIPE, &sa, NULL);
 + }
   
 Index: patches/patch-ab
 ===================================================================
 RCS file: /cvsroot/pkgsrc/audio/tunesbrowser/patches/patch-ab,v
 retrieving revision 1.2
 diff -u -r1.2 patch-ab
 --- patches/patch-ab   14 Aug 2004 11:43:53 -0000      1.2
 +++ patches/patch-ab   10 Mar 2005 20:01:18 -0000
 @@ -1,29 +1,25 @@
 -$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);
 +--- audioplayer.c.orig        2004-12-20 09:03:55.000000000 +0100
 ++++ audioplayer.c     2005-03-10 20:47:55.000000000 +0100
 +@@ -148,11 +148,11 @@
   
 -     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)
 + static void cb_error (__UNUSED__ GstElement *gstelement,
 +                       __UNUSED__ GstElement *arg1,
 +-                      __UNUSED__ gpointer arg2,
 +-                      gchar *arg3,
 ++                      GError *err,
 ++                      gchar *dbg_msg,
 +                       __UNUSED__ gpointer user_data)
   {
 -+    GstClock *clock;
 -     playing = 1;
 -     audioplayer_loadpipe(fd);
 +-    fprintf(stderr, "an error occured:\n%s\n\n", arg3);
 ++    fprintf(stderr, "an error occured:\n%s (%s)\n", err->message, dbg_msg);
 + }
 + 
 + static void cb_iterate(GstBin *bin, __UNUSED__ gpointer data)
 +@@ -176,6 +176,7 @@
 +     /* remove the source and decoder from the pipeline */
 +     gst_bin_remove_many (GST_BIN (pipeline_thread), srcelem, decoder, NULL);
   
 -     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;
 ++    gst_element_set_state(GST_OBJECT(pipeline_thread), GST_STATE_NULL);
 +     gst_object_unref(GST_OBJECT(pipeline_thread));
   }
   
 
 --/9DWx/yDrRhgMJTb--
 



Home | Main Index | Thread Index | Old Index