head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.12 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.10 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.8 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.6 pkgsrc-2011Q2-base:1.5 pkgsrc-2009Q4:1.5.0.4 pkgsrc-2009Q4-base:1.5 pkgsrc-2008Q4:1.5.0.2 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.3.0.14 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.12 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.10 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.8 pkgsrc-2008Q1:1.3.0.6 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.4 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.2 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.2.0.18 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.16 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.14 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.12 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.10 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.8 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.6 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.4 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.2 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.1.0.20 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.18 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.16 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.14 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.12 pkgsrc-2004Q1-base:1.1 pkgsrc-2003Q4:1.1.0.10 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.0.6 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2:1.1.0.2 buildlink2-base:1.1 netbsd-1-5-PATCH003:1.1 netbsd-1-5-PATCH001:1.1 netbsd-1-5-RELEASE:1.1 netbsd-1-4-PATCH003:1.1; locks; strict; comment @# @; 1.5 date 2008.10.27.04.23.01; author wiz; state dead; branches; next 1.4; 1.4 date 2008.10.16.15.28.13; author drochner; state Exp; branches; next 1.3; 1.3 date 2007.09.20.00.00.02; author wiz; state Exp; branches; next 1.2; 1.2 date 2005.05.18.22.02.21; author wiz; state dead; branches; next 1.1; 1.1 date 2000.07.30.08.08.13; author jlam; state Exp; branches; next ; desc @@ 1.5 log @Update to 2.24.1: Changes in GNOME-Applets 2.24.1 =============================== Battery Applet, Mini-Commander, Stickynotes - Fix up the page_size attribute on the adjustments to get around potential problems with a GTK+ change. Drivemount - Support drives that require authentication (Matthias Clasen). Invest Applet - Avoid crashes on bad data. Battery Applet, CPU Frequency Applet, Invest Applet, Keyboard Applet, Mini Commander, Modem Lights, Stickynotes, Trash Applet - Ensure dialogs generated with GtkBuilder are traslated Translations: - gl, sv, cs, sl, ar, pt_BR, ca, th, fr, es, it, hu, ko, zh_HK, zh_TW, et Documentations Translations: - el, zh_HK, zh_TW @ text @$NetBSD: patch-ac,v 1.4 2008/10/16 15:28:13 drochner Exp $ --- configure.orig 2008-09-24 18:45:40.000000000 +0200 +++ configure @@@@ -26245,7 +26245,7 @@@@ _ACEOF test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - ac_define_dir=`eval echo $"${datadir}/locale"` + ac_define_dir=`eval echo "${datadir}/locale"` ac_define_dir=`eval echo $ac_define_dir` GNOMELOCALEDIR="$ac_define_dir" @@@@ -29784,7 +29784,7 @@@@ builderdir="${pkgdatadir}/builder" test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - ac_define_dir=`eval echo $"${iconsdir}"` + ac_define_dir=`eval echo "${iconsdir}"` ac_define_dir=`eval echo $ac_define_dir` GNOME_ICONDIR="$ac_define_dir" @@@@ -29797,7 +29797,7 @@@@ _ACEOF test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - ac_define_dir=`eval echo $"${pixmapsdir}"` + ac_define_dir=`eval echo "${pixmapsdir}"` ac_define_dir=`eval echo $ac_define_dir` GNOME_PIXMAPSDIR="$ac_define_dir" @@@@ -29823,7 +29823,7 @@@@ _ACEOF test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - ac_define_dir=`eval echo $"${datadir}"` + ac_define_dir=`eval echo "${datadir}"` ac_define_dir=`eval echo $ac_define_dir` DATADIR="$ac_define_dir" @@@@ -29836,7 +29836,7 @@@@ _ACEOF test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - ac_define_dir=`eval echo $"${sysconfdir}"` + ac_define_dir=`eval echo "${sysconfdir}"` ac_define_dir=`eval echo $ac_define_dir` SYSCONFDIR="$ac_define_dir" @@@@ -29849,7 +29849,7 @@@@ _ACEOF test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - ac_define_dir=`eval echo $"${libdir}"` + ac_define_dir=`eval echo "${libdir}"` ac_define_dir=`eval echo $ac_define_dir` LIBDIR="$ac_define_dir" @@@@ -29862,7 +29862,7 @@@@ _ACEOF test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - ac_define_dir=`eval echo $"$prefix"` + ac_define_dir=`eval echo "$prefix"` ac_define_dir=`eval echo $ac_define_dir` PREFIX="$ac_define_dir" @ 1.4 log @update to 2.24.0.1 This switches to the gnome-2.24 release branch. @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @Move gnome2-applets to gnome-applets to make directory name match PKGNAME. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.5 2006/09/15 15:14:38 jmmv Exp $ d3 1 a3 1 --- configure.orig 2006-09-04 16:08:23.000000000 +0200 d5 1 a5 1 @@@@ -24862,7 +24862,7 @@@@ _ACEOF d14 1 a14 1 @@@@ -28780,7 +28780,7 @@@@ gladedir="${pkgdatadir}/glade" d23 1 a23 1 @@@@ -28793,7 +28793,7 @@@@ _ACEOF d32 1 a32 10 @@@@ -28806,7 +28806,7 @@@@ _ACEOF test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - ac_define_dir=`eval echo $"${gladedir}"` + ac_define_dir=`eval echo "${gladedir}"` ac_define_dir=`eval echo $ac_define_dir` GNOME_GLADEDIR="$ac_define_dir" @@@@ -28819,7 +28819,7 @@@@ _ACEOF d41 1 a41 1 @@@@ -28832,7 +28832,7 @@@@ _ACEOF d50 1 a50 1 @@@@ -28845,7 +28845,7 @@@@ _ACEOF d59 1 a59 1 @@@@ -28858,7 +28858,7 @@@@ _ACEOF @ 1.2 log @Remove gnome1 packages except as needed for gnucash. Ok'd by jmmv@@ and rh@@ (gnome 1 maintainers). @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.1 2000/07/30 08:08:13 jlam Exp $ d3 74 a76 405 --- /dev/null Sat Jun 10 06:33:35 2000 +++ cdplayer/cdrom-netbsd.c Fri Jun 23 00:37:07 2000 @@@@ -0,0 +1,402 @@@@ + +/* + * Hacked up from cdrom-solaris.c + * + * jgw 24/02/2000 + * + */ + + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include "cdrom-interface.h" + + +#define ASSIGN_MSF(dest, src) \ +{ \ + (dest).minute = (src).minute; \ + (dest).second = (src).second; \ + (dest).frame = (src).frame; \ +} + + +int +cdrom_play(cdrom_device_t cdp, int start, int stop) +{ + struct ioc_play_track ipt; + + ipt.start_track = start; + ipt.start_index = 1; + ipt.end_track = stop; + ipt.end_index = 1; + if (ioctl(cdp->device, CDIOCPLAYTRACKS, &ipt) == -1) { + cdp->my_errno = errno; + return DISC_IO_ERROR; + } + return DISC_NO_ERROR; +} + +int +cdrom_play_msf(cdrom_device_t cdp, cdrom_msf_t * start) +{ + struct ioc_play_msf msf; + + if (cdrom_read_track_info(cdp) == DISC_IO_ERROR) + return DISC_IO_ERROR; + msf.start_m = start->minute; + msf.start_s = start->second; + msf.start_f = start->frame; + + msf.end_m = cdp->track_info[cdp->nr_track].address.minute; + msf.end_s = cdp->track_info[cdp->nr_track].address.second; + msf.end_f = cdp->track_info[cdp->nr_track].address.frame; + + if (ioctl(cdp->device, CDIOCPLAYMSF, &msf) == -1) { + cdp->my_errno = errno; + return DISC_IO_ERROR; + } + return DISC_NO_ERROR; +} + +int +cdrom_pause(cdrom_device_t cdp) +{ + if (ioctl(cdp->device, CDIOCPAUSE, 0) == -1) { + return DISC_IO_ERROR; + cdp->my_errno = errno; + } + return DISC_IO_ERROR; +} + +int +cdrom_resume(cdrom_device_t cdp) +{ + if (ioctl(cdp->device, CDIOCRESUME, 0) == -1) { + cdp->my_errno = errno; + return DISC_IO_ERROR; + } + return DISC_NO_ERROR; +} + + +int +cdrom_stop(cdrom_device_t cdp) +{ + if (ioctl(cdp->device, CDIOCSTOP, 0) == -1) { + cdp->my_errno = errno; + return DISC_IO_ERROR; + } + return DISC_NO_ERROR; +} + +int +cdrom_read_track_info(cdrom_device_t cdp) +{ + struct ioc_toc_header toc; + struct ioc_read_toc_entry tocentry; + + int i, j, nr_track; + + if (ioctl(cdp->device, CDIOREADTOCHEADER, &toc) == -1) { + cdp->my_errno = errno; + return DISC_IO_ERROR; + } + cdp->track0 = toc.starting_track; + cdp->track1 = toc.ending_track; + nr_track = toc.ending_track - toc.starting_track + 1; + if (nr_track <= 0) + return DISC_IO_ERROR; + + if (nr_track != cdp->nr_track) { + if (cdp->track_info) + g_free(cdp->track_info); + cdp->nr_track = nr_track; + cdp->track_info = g_malloc((cdp->nr_track + 1) * sizeof(track_info_t)); + } + for (i = 0, j = cdp->track0; i < cdp->nr_track; i++, j++) { + tocentry.starting_track = j; + tocentry.address_format = CD_MSF_FORMAT; + tocentry.data_len = sizeof(struct cd_toc_entry); + tocentry.data = malloc(sizeof(struct cd_toc_entry)); + + if (ioctl(cdp->device, CDIOREADTOCENTRIES, &tocentry) == -1) { + cdp->my_errno = errno; + free(tocentry.data); + return DISC_IO_ERROR; + } + /* fill the trackinfo field */ + cdp->track_info[i].track = j; + + /* XXX these should also be in */ +#define CD_TYPE_AUDIO 1 /* Audio track */ +#define CD_TYPE_DATA 2 /* Data track */ + + cdp->track_info[i].audio_track = tocentry.data->control != CD_TYPE_DATA ? 1 : 0; + cdp->track_info[i].audio_track = 0; + ASSIGN_MSF(cdp->track_info[i].address, tocentry.data->addr.msf); + free(tocentry.data); + } +#define CD_LEADOUT 0xaa /* XXX this should be in (?) */ + + tocentry.starting_track = CD_LEADOUT; + tocentry.address_format = CD_MSF_FORMAT; + if (ioctl(cdp->device, CDIOREADTOCENTRIES, &tocentry) == -1) { + cdp->my_errno = errno; + return DISC_IO_ERROR; + } + cdp->track_info[i].track = j; + cdp->track_info[i].audio_track = 0; + ASSIGN_MSF(cdp->track_info[i].address, tocentry.data->addr.msf); + + return DISC_NO_ERROR; +} + +int +cdrom_reset(cdrom_device_t cdp) +{ + if (ioctl(cdp->device, CDIOCRESET, 0) == -1) { + cdp->my_errno = errno; + /* perror("cdrom_reset"); */ /* XXX don't spam the user with errors. */ + return DISC_IO_ERROR; + } + return DISC_NO_ERROR; +} + +int +cdrom_get_status(cdrom_device_t cdp, cdrom_device_status_t * stat) +{ + struct ioc_read_subchannel subchnl; + int errcode; + + memset(&subchnl, 0, sizeof(struct ioc_read_subchannel)); + + subchnl.address_format = CD_MSF_FORMAT; + subchnl.data_format = CD_CURRENT_POSITION; + + subchnl.data_len = sizeof(struct cd_sub_channel_info); + subchnl.data = malloc(sizeof(struct cd_sub_channel_info)); + + if (ioctl(cdp->device, CDIOCREADSUBCHANNEL, &subchnl) == -1) { + cdp->my_errno = errno; + free(subchnl.data); + if (cdrom_reset(cdp) == DISC_NO_ERROR) + { + /* XXX ICK, if the user has ejected a cdrom, and then loaded new one, + we need to close/open the device before we can play cd's again. + + Unfortunalty we gets loads of errors spammed to syslog as we wait for the drive to + spin up. + + we need a CDIOCDRIVESTATUS ioctl which will tell us: + + drive empty + drive open + drive becoming ready + drive ready + + */ + cdrom_close(cdp); + errcode = 0; + cdp = cdrom_open(NULL,&errcode); + if (errcode == 0) + return(cdrom_get_status(cdp, stat)); + } + /* unfortunatly we spam the user with errors here */ + perror("You may ignore these errors if your in the process of changing a cd : "); + printf("\n"); + return DISC_IO_ERROR; + } + switch (subchnl.data->header.audio_status) { + case CD_AS_PLAY_IN_PROGRESS: + stat->audio_status = DISC_PLAY; + break; + case CD_AS_PLAY_PAUSED: + stat->audio_status = DISC_PAUSED; + break; + case CD_AS_PLAY_COMPLETED: + stat->audio_status = DISC_COMPLETED; + break; + case CD_AS_AUDIO_INVALID: + case CD_AS_NO_STATUS: + case CD_AS_PLAY_ERROR: + stat->audio_status = DISC_STOP; + break; + default: + stat->audio_status = DISC_ERROR; + } + stat->track = subchnl.data->what.position.track_number; + ASSIGN_MSF(stat->relative_address, subchnl.data->what.position.reladdr.msf); + ASSIGN_MSF(stat->absolute_address, subchnl.data->what.position.absaddr.msf); + free(subchnl.data); + return DISC_NO_ERROR; +} + +cdrom_device_t +cdrom_open(char *device, int *errcode) +{ + cdrom_device_t cdp; + static char * cddev = NULL; + + if (cddev == NULL && device != NULL) + { + cddev = device; + } + + cdp = g_malloc(sizeof(struct cdrom_device)); + + if (device == NULL) + device = cddev; /* remember which device to use */ + + cdp->device = open(device, O_RDONLY); + if (cdp->device == -1) { + *errcode = errno; + perror("cdrom_open"); + g_free(cdp); + return NULL; + } + cdp->nr_track = 0; + cdp->track_info = NULL; + return cdp; +} + +void +cdrom_close(cdrom_device_t cdp) +{ + if (cdp->nr_track) + g_free(cdp->track_info); + close(cdp->device); + g_free(cdp); +} + +int +cdrom_load(cdrom_device_t cdp) +{ + if (ioctl(cdp->device, CDIOCCLOSE, 0) == -1) { + cdp->my_errno = errno; + return DISC_IO_ERROR; + } + return DISC_NO_ERROR; +} + +int +cdrom_eject(cdrom_device_t cdp) +{ + cdrom_device_status_t stat; + + printf("cdrom_eject: %d", cdrom_get_status(cdp, &stat)); + + if (stat.audio_status == DISC_PLAY) + { + /* stop before we eject */ + cdrom_stop(cdp); + } + + if (ioctl(cdp->device, CDIOCALLOW, 0) == -1) { + cdp->my_errno = errno; + perror("cdrom_eject: allow"); + } + + if (ioctl(cdp->device, CDIOCEJECT, 0) == -1) { + cdp->my_errno = errno; + perror("cdrom_eject"); + return DISC_IO_ERROR; + } + return DISC_NO_ERROR; +} + + +int +cdrom_next(cdrom_device_t cdp) +{ + cdrom_device_status_t stat; + int track; + + if ((cdrom_read_track_info(cdp) == DISC_IO_ERROR) || + (cdrom_get_status(cdp, &stat) == DISC_IO_ERROR)) + return DISC_IO_ERROR; + track = stat.track + 1; + return cdrom_play(cdp, stat.track + 1, cdp->track1); +} + +int +cdrom_prev(cdrom_device_t cdp) +{ + cdrom_device_status_t stat; + int track; + + if ((cdrom_read_track_info(cdp) == DISC_IO_ERROR) || + (cdrom_get_status(cdp, &stat) == DISC_IO_ERROR)) + return DISC_IO_ERROR; + track = stat.track - 1; + return cdrom_play(cdp, stat.track - 1, cdp->track1); +} + +int +cdrom_rewind(cdrom_device_t cdp) +{ + cdrom_device_status_t stat; + int track; + + if ((cdrom_read_track_info(cdp) == DISC_IO_ERROR) || + (cdrom_get_status(cdp, &stat) == DISC_IO_ERROR)) + return DISC_IO_ERROR; + if (stat.absolute_address.second != 0) + stat.absolute_address.second--; + else { + stat.absolute_address.second = 0; + if (stat.absolute_address.minute > 0) + stat.absolute_address.minute--; + } + stat.absolute_address.frame = 0; + return cdrom_play_msf(cdp, &stat.absolute_address); +} + +int +cdrom_ff(cdrom_device_t cdp) +{ + cdrom_device_status_t stat; + int track; + + if ((cdrom_read_track_info(cdp) == DISC_IO_ERROR) || + (cdrom_get_status(cdp, &stat) == DISC_IO_ERROR)) + return DISC_IO_ERROR; + stat.absolute_address.second++; + if (stat.absolute_address.second >= 60) { + stat.absolute_address.minute++; + stat.absolute_address.second = 0; + } + stat.absolute_address.frame = 0; + return cdrom_play_msf(cdp, &stat.absolute_address); +} + +int +cdrom_track_length(cdrom_device_t cdp, int track, cdrom_msf_t * length) +{ + int index, s1, s2, i; + + if ((track < cdp->track0) || (track > cdp->track1)) + return DISC_INDEX_OUT_OF_RANGE; + index = track - cdp->track0; + + s1 = cdp->track_info[index + 1].address.second; + s2 = cdp->track_info[index].address.second; + length->second = s1 = s1 - s2; + if (s1 < 0) { + i = 1; + length->second = s1 + 60; + } else + i = 0; + + length->minute = cdp->track_info[index + 1].address.minute - + cdp->track_info[index].address.minute - i; + + return 0; +} @ 1.1 log @Rework how NetBSD APM is detected; get cdplayer to build; and get battery working again. Addresses the following PRs by Jasper Wallace : 10420, 10421, 10422. @ text @d1 1 a1 1 $NetBSD$ @