diff options
| author | jmmv <jmmv@pkgsrc.org> | 2004-04-17 15:04:31 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2004-04-17 15:04:31 +0000 |
| commit | 2890ccb1e66fb8060b278c32163aa61e202ee3c5 (patch) | |
| tree | 071bcef48ef59709a0d78cb4aa9b5b3b98ad69a6 /multimedia/gnome2-media | |
| parent | 24889eefa5afdbad7ad0bc1571d8829c5cb67f53 (diff) | |
| download | pkgsrc-2890ccb1e66fb8060b278c32163aa61e202ee3c5.tar.gz | |
Fix build in NetBSD. I don't know how the previous change was supposed to
fix it under FreeBSD, because it only modified code inside conditionals for
NetBSD only.
Diffstat (limited to 'multimedia/gnome2-media')
| -rw-r--r-- | multimedia/gnome2-media/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/gnome2-media/patches/patch-ag | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/multimedia/gnome2-media/distinfo b/multimedia/gnome2-media/distinfo index 6ba18def2ed..1c5366adbeb 100644 --- a/multimedia/gnome2-media/distinfo +++ b/multimedia/gnome2-media/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2004/04/15 13:16:35 xtraeme Exp $ +$NetBSD: distinfo,v 1.4 2004/04/17 15:04:31 jmmv Exp $ SHA1 (gnome-media-2.6.0.tar.bz2) = 41f64e9c800df461133a1eac8853954c1bdb5da2 Size (gnome-media-2.6.0.tar.bz2) = 2943852 bytes SHA1 (patch-aa) = 8ba862f280caec8295b95f84b7f53c0fbd2f04a7 -SHA1 (patch-ag) = 29ba5f797b0c4457bb76297b0465d67939eaef14 +SHA1 (patch-ag) = 114ddd8d95bf4b2e471d3bc13308aa03cef7dd1a SHA1 (patch-ai) = 5eb11da18015ac4d4c3a85bc38b75e59f1890a7e diff --git a/multimedia/gnome2-media/patches/patch-ag b/multimedia/gnome2-media/patches/patch-ag index 453872b87aa..531f7cda0c1 100644 --- a/multimedia/gnome2-media/patches/patch-ag +++ b/multimedia/gnome2-media/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.3 2004/04/15 13:16:35 xtraeme Exp $ +$NetBSD: patch-ag,v 1.4 2004/04/17 15:04:31 jmmv Exp $ --- gnome-cd/freebsd-cdrom.c.orig Thu Apr 15 15:03:50 2004 +++ gnome-cd/freebsd-cdrom.c Thu Apr 15 15:11:36 2004 @@ -34,7 +34,7 @@ $NetBSD: patch-ag,v 1.3 2004/04/15 13:16:35 xtraeme Exp $ +#ifdef __FreeBSD__ if (ioctl (cdrom->fd, CDIOREADTOCENTRY, &tocentry) < 0) { +#else -+ if (ioctl (cdrom->fd, CDIOREADTOCENTRY, &tocentries) < 0) { ++ if (ioctl (cdrom->fd, CDIOREADTOCENTRYS, &tocentries) < 0) { +#endif g_warning ("IOCtl failed"); continue; @@ -68,7 +68,7 @@ $NetBSD: patch-ag,v 1.3 2004/04/15 13:16:35 xtraeme Exp $ +#ifdef __FreeBSD__ ASSIGN_MSF (priv->track_info[priv->number_tracks].address, tocentry.entry.addr.msf); +#else -+ ASSIGN_MSF (priv->track_info[priv->number_tracks].address, tocentries.addr.msf); ++ ASSIGN_MSF (priv->track_info[priv->number_tracks].address, tocentry.addr.msf); +#endif calculate_track_lengths (lcd); |