[pkgsrc/trunk]: pkgsrc/multimedia/gnome2-media Add DragonFly support. From wa...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/multimedia/gnome2-media Add DragonFly support. From wa...
From: joerg <joerg%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 03:40:49 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/d4bdba87cb1e
branches:  trunk
changeset: 515273:d4bdba87cb1e
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Jun 30 03:16:38 2006 +0000

description:
Add DragonFly support. From walt on DragonFly's submit list.

diffstat:

 multimedia/gnome2-media/distinfo         |   4 +-
 multimedia/gnome2-media/patches/patch-aa |  76 ++++++++++++++++++++++++
 multimedia/gnome2-media/patches/patch-ab |  98 ++++++++++++++++++++++++++++++++
 3 files changed, 177 insertions(+), 1 deletions(-)

diffs (194 lines):

diff -r dd7220fbb1fa -r d4bdba87cb1e multimedia/gnome2-media/distinfo
--- a/multimedia/gnome2-media/distinfo  Fri Jun 30 03:13:43 2006 +0000
+++ b/multimedia/gnome2-media/distinfo  Fri Jun 30 03:16:38 2006 +0000
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.13 2006/04/08 15:12:17 jmmv Exp $
+$NetBSD: distinfo,v 1.14 2006/06/30 03:16:38 joerg Exp $
 
 SHA1 (gnome-media-2.14.0.tar.bz2) = 1739491cd659115bfe5819d6053aa8f4dbb6ea43
 RMD160 (gnome-media-2.14.0.tar.bz2) = 152cae421bdfc0a9f193e5f84b37403c6222d356
 Size (gnome-media-2.14.0.tar.bz2) = 2933013 bytes
+SHA1 (patch-aa) = b003369a8295bf8b87300ed5b32003674d8e159c
+SHA1 (patch-ab) = d1d813b1b419a3388e972fc2b54efa707d6d3f52
diff -r dd7220fbb1fa -r d4bdba87cb1e multimedia/gnome2-media/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/gnome2-media/patches/patch-aa  Fri Jun 30 03:16:38 2006 +0000
@@ -0,0 +1,76 @@
+$NetBSD: patch-aa,v 1.6 2006/06/30 03:16:38 joerg Exp $
+
+--- gnome-cd/bsd-cdrom.c.orig  2006-06-22 09:05:38.000000000 -0700
++++ gnome-cd/bsd-cdrom.c
+@@ -166,7 +166,7 @@ bsd_cdrom_update_cd (GnomeCDRom *cdrom)
+ {
+       BSDCDRom *lcd = BSD_CDROM (cdrom);
+       BSDCDRomPrivate *priv;
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+       struct ioc_read_toc_single_entry tocentry;
+ #else
+       struct ioc_read_toc_entry tocentries;
+@@ -195,7 +195,7 @@ bsd_cdrom_update_cd (GnomeCDRom *cdrom)
+ 
+       bsd_cdrom_invalidate (lcd);
+       priv->track_info = g_malloc ((priv->number_tracks + 1) * sizeof (BSDCDRomTrackInfo));
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+       for (i = 0, j = priv->track0; i < priv->number_tracks; i++, j++) {
+               tocentry.track = j;
+               tocentry.address_format = CD_MSF_FORMAT;
+@@ -207,7 +207,7 @@ bsd_cdrom_update_cd (GnomeCDRom *cdrom)
+               tocentries.address_format = CD_MSF_FORMAT;
+ #endif
+ 
+-#ifdef __FreeBSD__
++#ifdef __FreeBSD__) || defined(__DragonFly__)
+               if (ioctl (cdrom->fd, CDIOREADTOCENTRY, &tocentry) < 0) {
+ #else
+               if (ioctl (cdrom->fd, CDIOREADTOCENTRYS, &tocentries) < 0) {
+@@ -217,7 +217,7 @@ bsd_cdrom_update_cd (GnomeCDRom *cdrom)
+               }
+ 
+               priv->track_info[i].track = j;
+-#ifdef __FreeBSD__
++#ifdef __FreeBSD__) || defined(__DragonFly__)
+               priv->track_info[i].audio_track = tocentry.entry.control == 0 ? 1 : 0;
+               ASSIGN_MSF (priv->track_info[i].address, tocentry.entry.addr.msf);
+ #else
+@@ -226,7 +226,7 @@ bsd_cdrom_update_cd (GnomeCDRom *cdrom)
+ #endif
+       }
+ 
+-#ifdef __FreeBSD__
++#ifdef __FreeBSD__) || defined(__DragonFly__)
+       /* On BSD, the leadout track is the track LAST_TRACK + 1. */
+       tocentry.track = priv->number_tracks + 1;
+       tocentry.address_format = CD_MSF_FORMAT;
+@@ -241,7 +241,7 @@ bsd_cdrom_update_cd (GnomeCDRom *cdrom)
+               bsd_cdrom_invalidate (lcd);
+               return;
+       }
+-#ifdef __FreeBSD__
++#ifdef __FreeBSD__) || defined(__DragonFly__)
+       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);
+@@ -265,7 +265,7 @@ bsd_cdrom_eject (GnomeCDRom *cdrom,
+               return FALSE;
+       }
+ 
+-#ifdef __FreeBSD__
++#ifdef __FreeBSD__) || defined(__DragonFly__)
+       if (gnome_cdrom_get_status (cdrom, &status, error) == FALSE) {
+               bsd_cdrom_close (lcd);
+               g_free (status);
+@@ -902,7 +902,7 @@ bsd_cdrom_get_status (GnomeCDRom *cdrom,
+               return FALSE;
+       }
+ #endif
+-#ifdef __FreeBSD__
++#ifdef __FreeBSD__) || defined(__DragonFly__)
+       /* FIXME: Figure out how to do this on BSD */
+ #else
+       if (ioctl (cdrom->fd, CDIOREADTOCHEADER, priv->tochdr) < 0) {
diff -r dd7220fbb1fa -r d4bdba87cb1e multimedia/gnome2-media/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/gnome2-media/patches/patch-ab  Fri Jun 30 03:16:38 2006 +0000
@@ -0,0 +1,98 @@
+$NetBSD: patch-ab,v 1.5 2006/06/30 03:16:38 joerg Exp $
+
+--- gnome-cd/gst-cdrom.c.orig  2006-06-23 00:01:07.000000000 -0700
++++ gnome-cd/gst-cdrom.c
+@@ -33,14 +33,14 @@
+ 
+ #ifdef __linux__
+ #include <linux/cdrom.h>
+-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+ #include <sys/cdio.h>
+ #endif
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ #include <sys/cdrio.h>
+ #endif
+ 
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ # define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST  CDIOCCAPABILITY
+ # define GST_CDROM_IOCTL_EJECT_REQUEST         CDIOCEJECT
+ #elif defined(__NetBSD__) || defined(__OpenBSD__)
+@@ -844,7 +844,7 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
+ /*
+       GstCdparanoiaCDRom *lcd = GST_CDPARANOIA_CDROM (cdrom);
+       GstCdparanoiaCDRomPrivate *priv;
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+       struct ioc_read_toc_single_entry tocentry;
+ #elif defined(__NetBSD__) || defined(__OpenBSD__)
+       struct ioc_read_toc_entry tocentries;
+@@ -862,7 +862,7 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
+               return;
+       }
+ 
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+       if (ioctl (cdrom->fd, CDIOREADTOCHEADER, priv->tochdr) < 0) {
+ #else
+       if (ioctl (cdrom->fd, CDROMREADTOCHDR, priv->tochdr) < 0) {
+@@ -873,7 +873,7 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
+               return;
+       }
+ 
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+       priv->track0 = priv->tochdr->starting_track;
+       priv->track1 = priv->tochdr->ending_track;
+ #else
+@@ -886,8 +886,8 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
+       priv->track_info =
+           g_malloc ((priv->number_tracks +
+                      1) * sizeof (GstCdparanoiaCDRomTrackInfo));
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+       for (i = 0, j = priv->track0; i < priv->number_tracks; i++, j++) {
+               tocentry.track = j;
+               tocentry.address_format = CD_MSF_FORMAT;
+@@ -899,7 +899,7 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
+               tocentries.address_format = CD_MSF_FORMAT;
+ #endif
+ 
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+               if (ioctl (cdrom->fd, CDIOREADTOCENTRY, &tocentry) < 0) {
+ #else
+               if (ioctl (cdrom->fd, CDIOREADTOCENTRYS, &tocentries) < 0) {
+@@ -909,7 +909,7 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
+               }
+ 
+               priv->track_info[i].track = j;
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+               priv->track_info[i].audio_track =
+                   tocentry.entry.control != CDROM_DATA_TRACK ? 1 : 0;
+               ASSIGN_MSF (priv->track_info[i].address,
+@@ -936,8 +936,8 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
+                           tocentry.cdte_addr.msf);
+ #endif
+       }
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+       tocentry.track = CDROM_LEADOUT;
+       tocentry.address_format = CD_MSF_FORMAT;
+       if (ioctl (cdrom->fd, CDIOREADTOCENTRY, &tocentry) < 0) {
+@@ -950,7 +950,7 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
+               gst_cdparanoia_cdrom_invalidate (lcd);
+               return;
+       }
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+       ASSIGN_MSF (priv->track_info[priv->number_tracks].address,
+                   tocentry.entry.addr.msf);
+ #else
Prev by Date: [pkgsrc/trunk]: pkgsrc/misc/gok Needs msgfmt.
Next by Date: [pkgsrc/trunk]: pkgsrc/cad/tnt-mmtl Use latex2html-[0-9]* instead of latex2ht...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/misc/gok Needs msgfmt.
Next by Thread: [pkgsrc/trunk]: pkgsrc/cad/tnt-mmtl Use latex2html-[0-9]* instead of latex2ht...
Indexes:
Home | Main Index | Thread Index | Old Index