diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2005-03-12 10:39:38 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2005-03-12 10:39:38 +0000 |
commit | 190418a078b1eb7ea3c5d38a08bdab3cbd422086 (patch) | |
tree | bb336ccecde7052d26d3d8d8c97238744a373aad /audio/sound-juicer/files/patch-src::sj-util.c | |
parent | Update to 6300d. (diff) |
Presenting GNOME 2.10 for FreeBSD!
The release notes can be found at
http://www.gnome.org/start/2.10/notes/rnwhatsnew.html, and will give you a
good idea of what has gone into this release overall. However, a lot of
FreeBSD specific additions and fixes have been made. For example, this
release offers fixed ACPI support as well as new CPU freqeuncy monitoring
support. See the FreeBSD GNOME 2.10 upgrade page at
http://www.FreeBSD.org/gnome/docs/faq210.html for the entire list as well
as a list of known issues and upgrade instructions.
GNOME 2.10, as well as all of our releases, would not be possible without
the great team that goes into porting and testign each and every component.
Thanks definitely goes out to ahze, adamw, bland, kwm, mezz, and pav for all
their work. We would also like to thank our adventurous users that chose to
ride the walrus. We'd especially like to thank the following users that
provided patches for GNOME 2.10:
ade
Yasuda Keisuke
Franz Klammer
Khairil Yusof
Radek Kozlowsk
And anyone else I may have accidentally omitted.
As with GNOME 2.8, 2.10 comes with a brand-spankin' new splashscreen
courtesy of Franz Klammer. However, unlike GNOME 2.8, we've included all
of the FreeBSD GNOME splashscreen entries with gnomesession. You can
use the deskutils/splashsetter port to choose the one you like best.
As always, GNOME users should _not_ use portupgrade alone to upgrade to
2.10. Instead, get the gnome_upgrade.sh script from
http://www.FreeBSD.org/gnome/gnome_upgrade.sh.
Enjoy!
Diffstat (limited to 'audio/sound-juicer/files/patch-src::sj-util.c')
-rw-r--r-- | audio/sound-juicer/files/patch-src::sj-util.c | 76 |
1 files changed, 24 insertions, 52 deletions
diff --git a/audio/sound-juicer/files/patch-src::sj-util.c b/audio/sound-juicer/files/patch-src::sj-util.c index feea811fcebb..b29d97bbd4f9 100644 --- a/audio/sound-juicer/files/patch-src::sj-util.c +++ b/audio/sound-juicer/files/patch-src::sj-util.c @@ -1,71 +1,43 @@ ---- src/sj-util.c.orig Tue Jun 15 19:14:09 2004 -+++ src/sj-util.c Tue Jun 15 19:29:16 2004 -@@ -122,6 +122,9 @@ - gtk_widget_destroy (dialog); - goto done; - } -+#ifdef __FreeBSD__ -+ ioctl (fd, CDIOCALLOW); -+#endif - result = ioctl (fd, CDROMEJECT); - if (result == -1) { - GtkWidget *dialog; -@@ -151,20 +154,32 @@ - { - int fd, status; - -+#if defined(__linux__) - fd = open (device, O_RDONLY | O_NONBLOCK | O_EXCL); +--- src/sj-util.c.orig Tue Feb 8 14:06:57 2005 ++++ src/sj-util.c Tue Feb 8 14:25:03 2005 +@@ -157,6 +157,15 @@ if (fd < 0) { return FALSE; } ++#if defined(__FreeBSD__) ++ status = FALSE; ++ ++ ioctl (fd, CDIOCCLOSE); ++ ++ close (fd); ++ ++ return status; ++#else status = ioctl (fd, CDROM_DRIVE_STATUS, CDSL_CURRENT); -+ close (fd); if (status < 0) { -- close (fd); - return FALSE; - } +@@ -167,6 +176,7 @@ + close (fd); -- close (fd); -- return status == CDS_TRAY_OPEN; -+#elif defined(__FreeBSD__) -+ struct ioc_toc_header h; -+ -+ fd = open (device, O_RDONLY | O_NONBLOCK | O_EXCL); -+ if (fd < 0) { -+ return FALSE; -+ } -+ -+ status = ioctl (fd, CDIOREADTOCHEADER, &h); -+ close (fd); -+ -+ return status < 0; +#endif } gboolean is_audio_cd (const char *device) -@@ -191,15 +210,19 @@ - return FALSE; +@@ -191,7 +201,7 @@ + default: + return FALSE; } - -+#if defined(__linux__) - status = ioctl (fd, CDROM_DISC_STATUS, CDSL_CURRENT); -+ close (fd); - if (status < 0) { -- close (fd); +- ++/* + fd = open (device, O_RDONLY | O_NONBLOCK | O_EXCL); + if (fd <0) { return FALSE; - } +@@ -206,6 +216,7 @@ + close (fd); -- close (fd); -- return status == CDS_AUDIO; -+#elif defined (__FreeBSD__) -+ return TRUE; -+#else -+ return TRUE; -+#endif ++ */ } /* Pass NULL to use g_free */ |