summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2009-07-26 18:31:22 +0000
committerdrochner <drochner@pkgsrc.org>2009-07-26 18:31:22 +0000
commit55c738099506c72fcf01ea0b9fcf0d8493d60979 (patch)
treea3db763d2732f8adaef683c1acd7f61d2d2cdd52
parent1abf34fabbd7acb6ec5ac8faffd1a5aae04cd38b (diff)
downloadpkgsrc-55c738099506c72fcf01ea0b9fcf0d8493d60979.tar.gz
-avoid crash if the disk device cannot be accessed
-g/c bl3 include which is only needed indirectly bump PKGREVISION
-rw-r--r--audio/sound-juicer/Makefile4
-rw-r--r--audio/sound-juicer/distinfo3
-rw-r--r--audio/sound-juicer/patches/patch-ab13
3 files changed, 17 insertions, 3 deletions
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 788ca7f7ede..0597511e0af 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2009/07/22 17:13:18 drochner Exp $
+# $NetBSD: Makefile,v 1.26 2009/07/26 18:31:22 drochner Exp $
#
DISTNAME= sound-juicer-2.26.1
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://www.burtonini.com/computing/ \
${MASTER_SITE_GNOME:=sources/sound-juicer/2.26/}
@@ -43,7 +44,6 @@ BUILDLINK_API_DEPENDS.gstreamer0.10+= gstreamer0.10>=0.10.15
.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
.include "../../multimedia/gnome-media/buildlink3.mk"
.include "../../sysutils/brasero/buildlink3.mk"
-.include "../../sysutils/hal/buildlink3.mk"
.include "../../sysutils/dbus-glib/buildlink3.mk"
.include "../../mk/omf-scrollkeeper.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
diff --git a/audio/sound-juicer/distinfo b/audio/sound-juicer/distinfo
index 785713c1f80..0428ff53a62 100644
--- a/audio/sound-juicer/distinfo
+++ b/audio/sound-juicer/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2009/07/22 15:16:44 wiz Exp $
+$NetBSD: distinfo,v 1.6 2009/07/26 18:31:22 drochner Exp $
SHA1 (sound-juicer-2.26.1.tar.gz) = 46c705d49ec97a4679218387533af20020c26ddb
RMD160 (sound-juicer-2.26.1.tar.gz) = 322003ffefa9c0c33afb22593af53fc5a7d6618b
Size (sound-juicer-2.26.1.tar.gz) = 2457595 bytes
SHA1 (patch-aa) = d7b6bc02f0a6abd4178639f80098c7fac21ea32b
+SHA1 (patch-ab) = 523296c20f9193c32fbc31a120b8fb90875b6cf6
diff --git a/audio/sound-juicer/patches/patch-ab b/audio/sound-juicer/patches/patch-ab
new file mode 100644
index 00000000000..d4b67b2f003
--- /dev/null
+++ b/audio/sound-juicer/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2009/07/26 18:31:22 drochner Exp $
+
+--- libjuicer/sj-metadata-musicbrainz3.c.orig 2009-04-06 18:28:51.000000000 +0200
++++ libjuicer/sj-metadata-musicbrainz3.c
+@@ -231,6 +231,8 @@ mb_list_albums (SjMetadata *metadata, ch
+ }
+
+ priv->disc = mb_read_disc (priv->cdrom);
++ if (!priv->disc)
++ return NULL;
+ if (url != NULL) {
+ mb_get_submission_url (priv->disc, NULL, 0, buffer, sizeof (buffer));
+ *url = g_strdup (buffer);