[pkgsrc/trunk]: pkgsrc/multimedia/gst-plugins cdda_device_name doesn't exit o...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a948840b41eb
branches:  trunk
changeset: 505600:a948840b41eb
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Jan 05 15:01:31 2006 +0000

description:
cdda_device_name doesn't exit on FreeBSD and DragonFly, use cam's
device_name instead.

diffstat:

 multimedia/gst-plugins/distinfo         |   3 ++-
 multimedia/gst-plugins/patches/patch-ak |  20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletions(-)

diffs (38 lines):

diff -r 04352477afc6 -r a948840b41eb multimedia/gst-plugins/distinfo
--- a/multimedia/gst-plugins/distinfo   Thu Jan 05 14:46:46 2006 +0000
+++ b/multimedia/gst-plugins/distinfo   Thu Jan 05 15:01:31 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2005/12/18 22:54:57 rillig Exp $
+$NetBSD: distinfo,v 1.31 2006/01/05 15:01:31 joerg Exp $
 
 SHA1 (gst-plugins-0.8.11.tar.bz2) = 4a9be6b62dd0e8a73616e8e93f7a3ace8aec8c59
 RMD160 (gst-plugins-0.8.11.tar.bz2) = 833aec123a52cd0f36ec883c349cc8d69090d749
@@ -11,3 +11,4 @@
 SHA1 (patch-ah) = 9df4c75c56f7fe29279f270ffc1cfa716fae1a98
 SHA1 (patch-ai) = fbee2828dfda28f1e017552e0e2e273cf5d2670b
 SHA1 (patch-aj) = b0af98ac299f1b52387de14c5f3a0173efd7ca8f
+SHA1 (patch-ak) = 9907506f1d7bab87d6857fc159bbe58b82b1b585
diff -r 04352477afc6 -r a948840b41eb multimedia/gst-plugins/patches/patch-ak
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/gst-plugins/patches/patch-ak   Thu Jan 05 15:01:31 2006 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-ak,v 1.1 2006/01/05 15:01:31 joerg Exp $
+
+--- ext/cdparanoia/gstcdparanoia.c.orig        2006-01-05 14:39:04.000000000 +0000
++++ ext/cdparanoia/gstcdparanoia.c
+@@ -815,9 +815,15 @@ cdparanoia_open (CDParanoia * src)
+ 
+   /* open the disc */
+   if (cdda_open (src->d)) {
++#if defined(__FreeBSD__) || defined(__DragonFly__)
++    GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ,
++        (_("Could not open CD device %s for reading."),
++            src->d->dev->device_name), ("cdda_open failed"));
++#else
+     GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ,
+         (_("Could not open CD device %s for reading."),
+             src->d->cdda_device_name), ("cdda_open failed"));
++#endif
+     cdda_close (src->d);
+     src->d = NULL;
+     return FALSE;