From 465d68bf6c834d50a3126c472d279b6170043712 Mon Sep 17 00:00:00 2001 From: marcus Date: Tue, 27 May 2003 17:03:58 +0000 Subject: Update to 0.4.3 featuring native FreeBSD support! git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@817 df743ca5-7f9a-e211-a948-0013205c9059 --- sysutils/nautilus-cd-burner/Makefile | 3 +- sysutils/nautilus-cd-burner/distinfo | 2 +- sysutils/nautilus-cd-burner/files/patch-cd-drive.c | 107 --------------------- .../nautilus-cd-burner/files/patch-cd-recorder.c | 13 +++ sysutils/nautilus-cd-burner/files/patch-make-iso.c | 15 --- 5 files changed, 15 insertions(+), 125 deletions(-) delete mode 100644 sysutils/nautilus-cd-burner/files/patch-cd-drive.c create mode 100644 sysutils/nautilus-cd-burner/files/patch-cd-recorder.c delete mode 100644 sysutils/nautilus-cd-burner/files/patch-make-iso.c diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile index ef794f7bc..3c0b466d4 100644 --- a/sysutils/nautilus-cd-burner/Makefile +++ b/sysutils/nautilus-cd-burner/Makefile @@ -6,8 +6,7 @@ # PORTNAME= nautilus-cd-burner -PORTVERSION= 0.4.2 -PORTREVISION= 4 +PORTVERSION= 0.4.3 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.4 diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo index 11ff03a4a..56b1bd363 100644 --- a/sysutils/nautilus-cd-burner/distinfo +++ b/sysutils/nautilus-cd-burner/distinfo @@ -1 +1 @@ -MD5 (gnome2/nautilus-cd-burner-0.4.2.tar.bz2) = b6624facfa59454cfe7cecb131056b85 +MD5 (gnome2/nautilus-cd-burner-0.4.3.tar.bz2) = 641bb8c3190feae2cc77993e191243d1 diff --git a/sysutils/nautilus-cd-burner/files/patch-cd-drive.c b/sysutils/nautilus-cd-burner/files/patch-cd-drive.c deleted file mode 100644 index 382c81343..000000000 --- a/sysutils/nautilus-cd-burner/files/patch-cd-drive.c +++ /dev/null @@ -1,107 +0,0 @@ ---- cd-drive.c.orig Mon May 19 06:16:13 2003 -+++ cd-drive.c Thu May 22 19:10:36 2003 -@@ -40,6 +40,12 @@ - #include - #endif /* __linux__ */ - -+#ifdef __FreeBSD__ -+#include -+#include -+#include -+#endif -+ - #include - #include - -@@ -603,6 +610,80 @@ - } - #endif /* __linux__ */ - -+#ifdef __FreeBSD__ -+static GList * -+freebsd_scan (gboolean recorder_only) -+{ -+ GList *cdroms_list = NULL; -+ const char *dev_type = "cd"; -+ int fd; -+ int speed = 16; /* XXX Set the write speed to 16. */ -+ int max_speed = CDR_MAX_SPEED; -+ int i = 0; -+ -+ while (1) { -+ CDDriveType type = CDDRIVE_TYPE_CD_RECORDER; -+ CDDrive *cdrom; -+ gchar *cam_path = g_strdup_printf ("/dev/%s%dc", dev_type, i); -+ gchar *dev; -+ struct cam_device *cam_dev; -+ -+ if (!g_file_test (cam_path, G_FILE_TEST_EXISTS)) { -+ g_free (cam_path); -+ break; -+ } -+ -+ if ((cam_dev = cam_open_spec_device (dev_type, i, O_RDWR, NULL)) == NULL) { -+ i++; -+ g_free (cam_path); -+ continue; -+ } -+ -+ /* XXX Other controllers might need to be added. */ -+ if ((strncmp (cam_dev->sim_name, "ata", 3)) == 0) { -+ dev = g_strdup_printf ("/dev/a%s%dc", dev_type, i); -+ } else { -+ dev = g_strdup (cam_path); -+ } -+ -+ g_free (cam_path); -+ -+ if ((fd = open (dev, O_RDWR, 0)) < 0) { -+ g_free (dev); -+ free (cam_dev); -+ i++; -+ continue; -+ } -+ -+ if (ioctl (fd, CDRIOCWRITESPEED, &max_speed) < 0) { -+ type = CDDRIVE_TYPE_CD_DRIVE; -+ } -+ -+ close (fd); -+ -+ if (type == CDDRIVE_TYPE_CD_RECORDER || recorder_only == FALSE) { -+ cdrom = g_new0 (CDDrive, 1); -+ cdrom->display_name = g_strdup_printf ("%s %s", cam_dev->inq_data.vendor, cam_dev->inq_data.revision); -+ cdrom->device = g_strdup (dev); -+ cdrom->max_speed_read = speed; -+ cdrom->max_speed_write = speed; -+ cdrom->cdrecord_id = g_strdup_printf ("%d,%d,%d", cam_dev->path_id, cam_dev->target_id, cam_dev->target_lun); -+ cdrom->type = type; -+ -+ cdroms_list = g_list_append (cdroms_list, cdrom); -+ } -+ -+ g_free (dev); -+ free (cam_dev); -+ -+ i++; -+ } -+ -+ return cdroms_list; -+} -+#endif /* __FreeBSD__ */ -+ -+ - GList * - scan_for_cdroms (gboolean recorder_only, gboolean add_image) - { -@@ -611,6 +692,10 @@ - - #ifdef __linux__ - cdroms = linux_scan (recorder_only); -+#endif -+ -+#ifdef __FreeBSD__ -+ cdroms = freebsd_scan (recorder_only); - #endif - - if (add_image) { diff --git a/sysutils/nautilus-cd-burner/files/patch-cd-recorder.c b/sysutils/nautilus-cd-burner/files/patch-cd-recorder.c new file mode 100644 index 000000000..b45e93e6c --- /dev/null +++ b/sysutils/nautilus-cd-burner/files/patch-cd-recorder.c @@ -0,0 +1,13 @@ +--- cd-recorder.c.orig Tue May 27 12:57:00 2003 ++++ cd-recorder.c Tue May 27 12:57:07 2003 +@@ -1,9 +1,9 @@ + #include "config.h" + ++#include + #ifdef __FreeBSD__ + #include + #endif +-#include + #include + #include + #include diff --git a/sysutils/nautilus-cd-burner/files/patch-make-iso.c b/sysutils/nautilus-cd-burner/files/patch-make-iso.c deleted file mode 100644 index 56d549004..000000000 --- a/sysutils/nautilus-cd-burner/files/patch-make-iso.c +++ /dev/null @@ -1,15 +0,0 @@ ---- make-iso.c.orig Sun Apr 13 03:24:31 2003 -+++ make-iso.c Sun Apr 13 03:25:19 2003 -@@ -21,7 +21,12 @@ - - Authors: Alexander Larsson - */ -+#ifdef __FreeBSD__ -+#include -+#include -+#else - #include -+#endif - #include - #include - #include -- cgit v1.2.3