From 64cc6af5c87815a6b10a7b623943c6039127063c Mon Sep 17 00:00:00 2001 From: marcus Date: Tue, 14 Sep 2004 04:06:32 +0000 Subject: Update to 2.8.0. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2837 df743ca5-7f9a-e211-a948-0013205c9059 --- audio/gnome-media/Makefile | 4 +- audio/gnome-media/distinfo | 4 +- audio/gnome-media/files/patch-gnome-cd_bsd-cdrom.c | 47 -- .../files/patch-gnome-cd_gst-cdparanoia-cdrom.c | 481 --------------------- 4 files changed, 4 insertions(+), 532 deletions(-) delete mode 100644 audio/gnome-media/files/patch-gnome-cd_bsd-cdrom.c delete mode 100644 audio/gnome-media/files/patch-gnome-cd_gst-cdparanoia-cdrom.c (limited to 'audio/gnome-media') diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile index 616c18db7..d32b2c82c 100644 --- a/audio/gnome-media/Makefile +++ b/audio/gnome-media/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomemedia2 -PORTVERSION= 2.7.92 +PORTVERSION= 2.8.0 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-media/2.7 +MASTER_SITE_SUBDIR= sources/gnome-media/2.8 DISTNAME= gnome-media-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo index 7097438fe..57f2938ee 100644 --- a/audio/gnome-media/distinfo +++ b/audio/gnome-media/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-media-2.7.92.tar.bz2) = 6c0419a22f395e8655511d190422cb3e -SIZE (gnome2/gnome-media-2.7.92.tar.bz2) = 3170310 +MD5 (gnome2/gnome-media-2.8.0.tar.bz2) = c200cb577be1adb6bedb8c6528d738a1 +SIZE (gnome2/gnome-media-2.8.0.tar.bz2) = 3171171 diff --git a/audio/gnome-media/files/patch-gnome-cd_bsd-cdrom.c b/audio/gnome-media/files/patch-gnome-cd_bsd-cdrom.c deleted file mode 100644 index 2a97ef07b..000000000 --- a/audio/gnome-media/files/patch-gnome-cd_bsd-cdrom.c +++ /dev/null @@ -1,47 +0,0 @@ ---- gnome-cd/bsd-cdrom.c.orig Mon Jan 5 23:12:49 2004 -+++ gnome-cd/bsd-cdrom.c Sun Aug 22 01:06:01 2004 -@@ -896,6 +896,8 @@ - - ASSIGN_MSF (realstatus->relative, blank_msf); - ASSIGN_MSF (realstatus->absolute, blank_msf); -+ ASSIGN_MSF (realstatus->length, blank_msf); -+ - realstatus->track = 1; - switch (subchnl.data->header.audio_status) { - case CD_AS_PLAY_IN_PROGRESS: -@@ -903,6 +905,11 @@ - ASSIGN_MSF (realstatus->relative, subchnl.data->what.position.reladdr.msf); - ASSIGN_MSF (realstatus->absolute, subchnl.data->what.position.absaddr.msf); - realstatus->track = subchnl.data->what.position.track_number; -+ if(priv && realstatus->track>0 && -+ realstatus->track<=priv->number_tracks){ -+ /* track_info may not be initialized */ -+ ASSIGN_MSF (realstatus->length, priv->track_info[realstatus->track-1].length); -+ } - break; - - case CD_AS_PLAY_PAUSED: -@@ -910,6 +917,11 @@ - ASSIGN_MSF (realstatus->relative, subchnl.data->what.position.reladdr.msf); - ASSIGN_MSF (realstatus->absolute, subchnl.data->what.position.absaddr.msf); - realstatus->track = subchnl.data->what.position.track_number; -+ if(priv && realstatus->track>0 && -+ realstatus->track<=priv->number_tracks){ -+ /* track_info may not be initialized */ -+ ASSIGN_MSF (realstatus->length, priv->track_info[realstatus->track-1].length); -+ } - break; - - case CD_AS_PLAY_COMPLETED: -@@ -917,6 +929,11 @@ - ASSIGN_MSF (realstatus->relative, subchnl.data->what.position.reladdr.msf); - ASSIGN_MSF (realstatus->absolute, subchnl.data->what.position.absaddr.msf); - realstatus->track = subchnl.data->what.position.track_number; -+ if(priv && realstatus->track>0 && -+ realstatus->track<=priv->number_tracks){ -+ /* track_info may not be initialized */ -+ ASSIGN_MSF (realstatus->length, priv->track_info[realstatus->track-1].length); -+ } - break; - - case CD_AS_AUDIO_INVALID: diff --git a/audio/gnome-media/files/patch-gnome-cd_gst-cdparanoia-cdrom.c b/audio/gnome-media/files/patch-gnome-cd_gst-cdparanoia-cdrom.c deleted file mode 100644 index aa98a1e7e..000000000 --- a/audio/gnome-media/files/patch-gnome-cd_gst-cdparanoia-cdrom.c +++ /dev/null @@ -1,481 +0,0 @@ ---- gnome-cd/gst-cdparanoia-cdrom.c.orig Tue Aug 31 23:36:17 2004 -+++ gnome-cd/gst-cdparanoia-cdrom.c Tue Aug 31 23:36:19 2004 -@@ -25,7 +25,16 @@ - - #include - #include -+#ifdef __linux__ - #include -+#elif defined(__FreeBSD__) -+#include -+#include -+#define CD_FRAMES 75 -+#define CD_MSF_OFFSET 150 -+#define CDROM_DATA_TRACK 0x04 -+#define CDROM_LEADOUT 0xAA -+#endif - - static GnomeCDRomClass *parent_class = NULL; - -@@ -40,7 +49,11 @@ - struct _GstCdparanoiaCDRomPrivate { - GnomeCDRomUpdate update; - -+#ifdef __FreeBSD__ -+ struct ioc_toc_header *tochdr; -+#else - struct cdrom_tochdr *tochdr; -+#endif - int number_tracks; - unsigned char track0, track1; - char *cd_device; -@@ -89,6 +102,23 @@ - - static GnomeCDRomMSF blank_msf = { 0, 0, 0 }; - -+#ifdef __FreeBSD__ -+static guint64 -+msf_struct_to_frames (struct ioc_play_msf *msf, int entry) -+{ -+ guint64 frames; -+ if (entry == 0) { -+ frames = -+ (msf->start_m * 60 * CD_FRAMES) + -+ (msf->start_s * CD_FRAMES) + msf->start_f; -+ } else { -+ frames = -+ (msf->end_m * 60 * CD_FRAMES) + -+ (msf->end_s * CD_FRAMES) + msf->end_f; -+ } -+ return (frames - CD_MSF_OFFSET); -+} -+#else - static guint64 - msf_struct_to_frames (struct cdrom_msf *msf, int entry) - { -@@ -104,6 +134,7 @@ - } - return (frames - CD_MSF_OFFSET); - } -+#endif - - static int - msf_to_frames (GnomeCDRomMSF * msf) -@@ -124,6 +155,19 @@ - msf->frame = frames; - } - -+#ifdef __FreeBSD__ -+static void -+frames_to_msf_struct (union msf_lba *msflba, int frames) -+{ -+ /* Now convert the difference in frame lengths back into MSF -+ format */ -+ msflba->msf.minute = frames / (60 * CD_FRAMES); -+ frames -= (msflba->msf.minute * 60 * CD_FRAMES); -+ msflba->msf.second = frames / CD_FRAMES; -+ frames -= (msflba->msf.second * CD_FRAMES); -+ msflba->msf.frame = frames; -+} -+#else - static void - frames_to_msf_struct (struct cdrom_msf0 *msf, int frames) - { -@@ -135,6 +179,7 @@ - frames -= (msf->second * CD_FRAMES); - msf->frame = frames; - } -+#endif - - static void - add_msf (GnomeCDRomMSF * msf1, GnomeCDRomMSF * msf2, GnomeCDRomMSF * dest) -@@ -311,7 +356,11 @@ - { - GstCdparanoiaCDRom *lcd = GST_CDPARANOIA_CDROM (cdrom); - GstCdparanoiaCDRomPrivate *priv; -+#ifdef __FreeBSD__ -+ struct ioc_read_toc_single_entry tocentry; -+#else - struct cdrom_tocentry tocentry; -+#endif - int i, j; - GError *error; - -@@ -322,15 +371,24 @@ - return; - } - -+#ifdef __FreeBSD__ -+ if (ioctl (cdrom->fd, CDIOREADTOCHEADER, priv->tochdr) < 0) { -+#else - if (ioctl (cdrom->fd, CDROMREADTOCHDR, priv->tochdr) < 0) { -+#endif - g_warning ("Error reading CD header"); - gst_cdparanoia_cdrom_close (lcd); - - return; - } - -+#ifdef __FreeBSD__ -+ priv->track0 = priv->tochdr->starting_track; -+ priv->track1 = priv->tochdr->ending_track; -+#else - priv->track0 = priv->tochdr->cdth_trk0; - priv->track1 = priv->tochdr->cdth_trk1; -+#endif - priv->number_tracks = priv->track1 - priv->track0 + 1; - - gst_cdparanoia_cdrom_invalidate (lcd); -@@ -338,6 +396,21 @@ - g_malloc ((priv->number_tracks + - 1) * sizeof (GstCdparanoiaCDRomTrackInfo)); - for (i = 0, j = priv->track0; i < priv->number_tracks; i++, j++) { -+#ifdef __FreeBSD__ -+ tocentry.track = j; -+ tocentry.address_format = CD_MSF_FORMAT; -+ -+ if (ioctl (cdrom->fd, CDIOREADTOCENTRY, &tocentry) < 0) { -+ g_warning ("IOCtl failed"); -+ continue; -+ } -+ -+ priv->track_info[i].track = j; -+ priv->track_info[i].audio_track = -+ tocentry.entry.control != CDROM_DATA_TRACK ? 1 : 0; -+ ASSIGN_MSF (priv->track_info[i].address, -+ tocentry.entry.addr.msf); -+#else - tocentry.cdte_track = j; - tocentry.cdte_format = CDROM_MSF; - -@@ -351,7 +424,19 @@ - tocentry.cdte_ctrl != CDROM_DATA_TRACK ? 1 : 0; - ASSIGN_MSF (priv->track_info[i].address, - tocentry.cdte_addr.msf); -+#endif - } -+#ifdef __FreeBSD__ -+ tocentry.track = CDROM_LEADOUT; -+ tocentry.address_format = CD_MSF_FORMAT; -+ if (ioctl (cdrom->fd, CDIOREADTOCENTRY, &tocentry) < 0) { -+ g_warning ("Error getting leadout"); -+ gst_cdparanoia_cdrom_invalidate (lcd); -+ return; -+ } -+ ASSIGN_MSF (priv->track_info[priv->number_tracks].address, -+ tocentry.entry.addr.msf); -+#else - - tocentry.cdte_track = CDROM_LEADOUT; - tocentry.cdte_format = CDROM_MSF; -@@ -362,6 +447,7 @@ - } - ASSIGN_MSF (priv->track_info[priv->number_tracks].address, - tocentry.cdte_addr.msf); -+#endif - calculate_track_lengths (lcd); - - gst_cdparanoia_cdrom_close (lcd); -@@ -387,7 +473,11 @@ - } - - if (status->cd != GNOME_CDROM_STATUS_TRAY_OPEN) { -+#ifdef __FreeBSD__ -+ if (ioctl (cdrom->fd, CDIOCEJECT, 0) < 0) { -+#else - if (ioctl (cdrom->fd, CDROMEJECT, 0) < 0) { -+#endif - if (error) { - *error = g_error_new (GNOME_CDROM_ERROR, - GNOME_CDROM_ERROR_SYSTEM_ERROR, -@@ -555,7 +645,11 @@ - GstCdparanoiaCDRom *lcd; - GstCdparanoiaCDRomPrivate *priv; - GnomeCDRomStatus *status; -+#ifdef __FreeBSD__ -+ struct ioc_play_msf msf; -+#else - struct cdrom_msf msf; -+#endif - gboolean ret; - guint64 frames; - -@@ -630,9 +724,15 @@ - default: - /* Start playing */ - if (start == NULL) { -+#ifdef __FreeBSD__ -+ msf.start_m = status->absolute.minute; -+ msf.start_s = status->absolute.second; -+ msf.start_f = status->absolute.frame; -+#else - msf.cdmsf_min0 = status->absolute.minute; - msf.cdmsf_sec0 = status->absolute.second; - msf.cdmsf_frame0 = status->absolute.frame; -+#endif - } else { - if (start_track > 0 && - priv && priv->track_info && -@@ -642,19 +742,43 @@ - track_info[start_track - - 1].address, start, - &tmpmsf); -+#ifdef __FreeBSD__ -+ -+ msf.start_m = tmpmsf.minute; -+ msf.start_s = tmpmsf.second; -+ msf.start_f = tmpmsf.frame; -+#else - msf.cdmsf_min0 = tmpmsf.minute; - msf.cdmsf_sec0 = tmpmsf.second; - msf.cdmsf_frame0 = tmpmsf.frame; -+#endif - } else { -+#ifdef __FreeBSD__ -+ msf.start_m = start->minute; -+ msf.start_s = start->second; -+ msf.start_f = start->frame; -+#else - msf.cdmsf_min0 = start->minute; - msf.cdmsf_sec0 = start->second; - msf.cdmsf_frame0 = start->frame; -+#endif - } - } - - if (finish == NULL) { - if (priv && priv->track_info && - priv->number_tracks > 0) { -+#ifdef __FreeBSD__ -+ msf.end_m = -+ priv->track_info[priv->number_tracks]. -+ address.minute; -+ msf.end_s = -+ priv->track_info[priv->number_tracks]. -+ address.second; -+ msf.end_f = -+ priv->track_info[priv->number_tracks]. -+ address.frame; -+#else - msf.cdmsf_min1 = - priv->track_info[priv->number_tracks]. - address.minute; -@@ -664,10 +788,17 @@ - msf.cdmsf_frame1 = - priv->track_info[priv->number_tracks]. - address.frame; -+#endif - } else { -+#ifdef __FreeBSD__ -+ msf.end_m = 0; -+ msf.end_s = 0; -+ msf.end_f = 0; -+#else - msf.cdmsf_min1 = 0; - msf.cdmsf_sec1 = 0; - msf.cdmsf_frame1 = 0; -+#endif - } - } else { - if (finish_track > 0 && -@@ -679,13 +810,25 @@ - track_info[finish_track - - 1].address, finish, - &tmpmsf); -+#ifdef __FreeBSD__ -+ msf.end_m = tmpmsf.minute; -+ msf.end_s = tmpmsf.second; -+ msf.end_f = tmpmsf.frame; -+#else - msf.cdmsf_min1 = tmpmsf.minute; - msf.cdmsf_sec1 = tmpmsf.second; - msf.cdmsf_frame1 = tmpmsf.frame; -+#endif - } else { -+#ifdef __FreeBSD__ -+ msf.end_m = finish->minute; -+ msf.end_s = finish->second; -+ msf.end_f = finish->frame; -+#else - msf.cdmsf_min1 = finish->minute; - msf.cdmsf_sec1 = finish->second; - msf.cdmsf_frame1 = finish->frame; -+#endif - } - } - -@@ -944,7 +1087,11 @@ - GstCdparanoiaCDRom *lcd; - GstCdparanoiaCDRomPrivate *priv; - GnomeCDRomStatus *realstatus; -+#ifdef __FreeBSD__ -+ struct cd_sub_channel_position_data subchnl; -+#else - struct cdrom_subchnl subchnl; -+#endif - int cur_gst_status; - int cd_status; - guint64 value = 0; -@@ -966,6 +1113,7 @@ - return FALSE; - } - -+#ifndef __FreeBSD__ - cd_status = ioctl (cdrom->fd, CDROM_DRIVE_STATUS, CDSL_CURRENT); - if (cd_status != -1) { - switch (cd_status) { -@@ -1019,6 +1167,7 @@ - *status = NULL; - return FALSE; - } -+#endif - - /* Get the volume */ - /* TODO: get the mixer volume */ -@@ -1058,21 +1207,37 @@ - msf_to_frames (&priv->track_info[priv->cur_track - 1]. - address) + CD_MSF_OFFSET; - } -+#ifdef __FreeBSD__ -+ subchnl.track_number = priv->cur_track; -+ frames_to_msf_struct (&subchnl.reladdr, -+ priv->cur_rel_frame); -+ frames_to_msf_struct (&subchnl.absaddr, -+ priv->cur_abs_frame); -+#else - subchnl.cdsc_trk = priv->cur_track; - frames_to_msf_struct (&subchnl.cdsc_reladdr.msf, - priv->cur_rel_frame); - frames_to_msf_struct (&subchnl.cdsc_absaddr.msf, - priv->cur_abs_frame); -+#endif - - realstatus->track = 1; - switch (cur_gst_status) { - case GST_STATE_PLAYING: - realstatus->audio = GNOME_CDROM_AUDIO_PLAY; -+#ifdef __FreeBSD__ -+ ASSIGN_MSF (realstatus->relative, -+ subchnl.reladdr.msf); -+ ASSIGN_MSF (realstatus->absolute, -+ subchnl.absaddr.msf); -+ realstatus->track = subchnl.track_number; -+#else - ASSIGN_MSF (realstatus->relative, - subchnl.cdsc_reladdr.msf); - ASSIGN_MSF (realstatus->absolute, - subchnl.cdsc_absaddr.msf); - realstatus->track = subchnl.cdsc_trk; -+#endif - if (priv && realstatus->track > 0 && - realstatus->track <= priv->number_tracks) { - /* track_info may not be initialized */ -@@ -1084,11 +1249,19 @@ - - case GST_STATE_PAUSED: - realstatus->audio = GNOME_CDROM_AUDIO_PAUSE; -+#ifdef __FreeBSD__ -+ ASSIGN_MSF (realstatus->relative, -+ subchnl.reladdr.msf); -+ ASSIGN_MSF (realstatus->absolute, -+ subchnl.absaddr.msf); -+ realstatus->track = subchnl.track_number; -+#else - ASSIGN_MSF (realstatus->relative, - subchnl.cdsc_reladdr.msf); - ASSIGN_MSF (realstatus->absolute, - subchnl.cdsc_absaddr.msf); - realstatus->track = subchnl.cdsc_trk; -+#endif - if (priv && realstatus->track > 0 && - realstatus->track <= priv->number_tracks) { - /* track_info may not be initialized */ -@@ -1101,11 +1274,20 @@ - case GST_STATE_NULL: - case GST_STATE_READY: - realstatus->audio = GNOME_CDROM_AUDIO_COMPLETE; -+#ifdef __FreeBSD__ -+ ASSIGN_MSF (realstatus->relative, -+ subchnl.reladdr.msf); -+ -+ ASSIGN_MSF (realstatus->absolute, -+ subchnl.absaddr.msf); -+ realstatus->track = subchnl.track_number; -+#else - ASSIGN_MSF (realstatus->relative, - subchnl.cdsc_reladdr.msf); - ASSIGN_MSF (realstatus->absolute, - subchnl.cdsc_absaddr.msf); - realstatus->track = subchnl.cdsc_trk; -+#endif - if (priv && realstatus->track > 0 && - realstatus->track <= priv->number_tracks) { - /* track_info may not be initialized */ -@@ -1133,7 +1315,11 @@ - return FALSE; - } - -+#ifdef __FreeBSD__ -+ if (ioctl (cdrom->fd, CDIOCCLOSE) < 0) { -+#else - if (ioctl (cdrom->fd, CDROMCLOSETRAY) < 0) { -+#endif - if (error) { - *error = g_error_new (GNOME_CDROM_ERROR, - GNOME_CDROM_ERROR_SYSTEM_ERROR, -@@ -1155,7 +1341,11 @@ - { - GstCdparanoiaCDRom *lcd; - GstCdparanoiaCDRomPrivate *priv; -+#ifdef __FreeBSD__ -+ struct ioc_vol vol; -+#else - struct cdrom_volctrl vol; -+#endif - - lcd = GST_CDPARANOIA_CDROM (cdrom); - priv = lcd->priv; -@@ -1164,10 +1354,19 @@ - return FALSE; - } - -+#ifdef __FreeBSD__ -+ vol.vol[0] = volume; -+ vol.vol[1] = vol.vol[2] = vol.vol[3] = volume; -+#else - vol.channel0 = volume; - vol.channel1 = vol.channel2 = vol.channel3 = volume; -+#endif - -+#ifdef __FreeBSD__ -+ if (ioctl (cdrom->fd, CDIOCSETVOL, &vol) < 0) { -+#else - if (ioctl (cdrom->fd, CDROMVOLCTRL, &vol) < 0) { -+#endif - if (error) { - *error = g_error_new (GNOME_CDROM_ERROR, - GNOME_CDROM_ERROR_SYSTEM_ERROR, -@@ -1204,7 +1403,11 @@ - } - - /* Fire a harmless ioctl at the device. */ -+#ifdef __FreeBSD__ -+ if (ioctl (fd, CDIOCCAPABILITY, 0) < 0) { -+#else - if (ioctl (fd, CDROM_GET_CAPABILITY, 0) < 0) { -+#endif - /* Failed, it's not a CDROM drive */ - close (fd); - -@@ -1302,7 +1505,11 @@ - gst_cdparanoia_cdrom_init (GstCdparanoiaCDRom * cdrom) - { - cdrom->priv = g_new0 (GstCdparanoiaCDRomPrivate, 1); -+#ifdef __FreeBSD__ -+ cdrom->priv->tochdr = g_new0 (struct ioc_toc_header, 1); -+#else - cdrom->priv->tochdr = g_new0 (struct cdrom_tochdr, 1); -+#endif - cdrom->priv->track_info = NULL; - cdrom->priv->cd_device = NULL; - cdrom->priv->cur_track = 1; -- cgit v1.2.3