[pkgsrc/trunk]: pkgsrc/multimedia/gnome2-media Make this build in FreeBSD.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/34062621e5d4
branches:  trunk
changeset: 473033:34062621e5d4
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Thu Apr 15 13:16:35 2004 +0000

description:
Make this build in FreeBSD.

diffstat:

 multimedia/gnome2-media/distinfo         |   4 ++--
 multimedia/gnome2-media/patches/patch-ag |  27 ++++++++++++++-------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diffs (87 lines):

diff -r d3dfcd9a2ff1 -r 34062621e5d4 multimedia/gnome2-media/distinfo
--- a/multimedia/gnome2-media/distinfo  Thu Apr 15 13:07:55 2004 +0000
+++ b/multimedia/gnome2-media/distinfo  Thu Apr 15 13:16:35 2004 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2004/04/02 05:51:03 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2004/04/15 13:16:35 xtraeme 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) = 0d847b2721a58c40767dcf2963c54cc2ec09000f
+SHA1 (patch-ag) = 29ba5f797b0c4457bb76297b0465d67939eaef14
 SHA1 (patch-ai) = 5eb11da18015ac4d4c3a85bc38b75e59f1890a7e
diff -r d3dfcd9a2ff1 -r 34062621e5d4 multimedia/gnome2-media/patches/patch-ag
--- a/multimedia/gnome2-media/patches/patch-ag  Thu Apr 15 13:07:55 2004 +0000
+++ b/multimedia/gnome2-media/patches/patch-ag  Thu Apr 15 13:16:35 2004 +0000
@@ -1,10 +1,8 @@
-$NetBSD: patch-ag,v 1.2 2004/04/02 05:51:03 jmmv Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=135139
+$NetBSD: patch-ag,v 1.3 2004/04/15 13:16:35 xtraeme Exp $
 
---- gnome-cd/freebsd-cdrom.c.orig      2003-01-11 06:23:03.000000000 -0600
-+++ gnome-cd/freebsd-cdrom.c
-@@ -166,7 +166,12 @@ freebsd_cdrom_update_cd (GnomeCDRom *cdr
+--- 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
+@@ -166,7 +166,12 @@
  {
        FreeBSDCDRom *lcd = FREEBSD_CDROM (cdrom);
        FreeBSDCDRomPrivate *priv;
@@ -17,7 +15,7 @@
        int i, j;
        GError *error;
  
-@@ -190,29 +195,53 @@ freebsd_cdrom_update_cd (GnomeCDRom *cdr
+@@ -190,29 +195,56 @@
  
        freebsd_cdrom_invalidate (lcd);
        priv->track_info = g_malloc ((priv->number_tracks + 1) * sizeof (FreeBSDCDRomTrackInfo));
@@ -25,6 +23,7 @@
        for (i = 0, j = priv->track0; i < priv->number_tracks; i++, j++) {
                tocentry.track = j;
                tocentry.address_format = CD_MSF_FORMAT;
+-
 +#else
 +      tocentries.data_len = sizeof(tocentry);
 +      tocentries.data = &tocentry;
@@ -32,9 +31,11 @@
 +              tocentries.starting_track = j;
 +              tocentries.address_format = CD_MSF_FORMAT;
 +#endif
- 
--              if (ioctl (cdrom->fd, CDIOREADTOCENTRY, &tocentry) < 0) {
-+              if (ioctl (cdrom->fd, CDIOREADTOCENTRYS, &tocentries) < 0) {
++#ifdef __FreeBSD__
+               if (ioctl (cdrom->fd, CDIOREADTOCENTRY, &tocentry) < 0) {
++#else
++              if (ioctl (cdrom->fd, CDIOREADTOCENTRY, &tocentries) < 0) {
++#endif
                        g_warning ("IOCtl failed");
                        continue;
                }
@@ -67,12 +68,12 @@
 +#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, tocentry.addr.msf);
++      ASSIGN_MSF (priv->track_info[priv->number_tracks].address, tocentries.addr.msf);
 +#endif
        calculate_track_lengths (lcd);
  
        freebsd_cdrom_close (lcd);
-@@ -232,11 +261,18 @@ freebsd_cdrom_eject (GnomeCDRom *cdrom,
+@@ -232,11 +264,18 @@
                return FALSE;
        }
  
@@ -91,7 +92,7 @@
  
        if (status->cd != GNOME_CDROM_STATUS_TRAY_OPEN) {
                if (ioctl (cdrom->fd, CDIOCEJECT, 0) < 0) {
-@@ -862,7 +898,19 @@ freebsd_cdrom_get_status (GnomeCDRom *cd
+@@ -862,7 +901,19 @@
                return FALSE;
        }
  #endif