diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-09-11 08:35:18 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-09-11 08:35:18 +0800 |
| commit | 437e83cea50b759a3654ffee8ecceccbcd8d6712 (patch) | |
| tree | be62edc33368106fe68508e7f42aee8356f423e8 /sysutils | |
| parent | 922f2f0a6e1e5da9cb8ea9963734b42cf79ffbce (diff) | |
| download | marcuscom-ports-437e83cea50b759a3654ffee8ecceccbcd8d6712.tar marcuscom-ports-437e83cea50b759a3654ffee8ecceccbcd8d6712.tar.gz marcuscom-ports-437e83cea50b759a3654ffee8ecceccbcd8d6712.tar.bz2 marcuscom-ports-437e83cea50b759a3654ffee8ecceccbcd8d6712.tar.lz marcuscom-ports-437e83cea50b759a3654ffee8ecceccbcd8d6712.tar.xz marcuscom-ports-437e83cea50b759a3654ffee8ecceccbcd8d6712.tar.zst marcuscom-ports-437e83cea50b759a3654ffee8ecceccbcd8d6712.zip | |
Attmept to better detect blank media.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4819 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/nautilus-cd-burner/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c | 22 |
2 files changed, 23 insertions, 2 deletions
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile index c36592e78..caf1df1bf 100644 --- a/sysutils/nautilus-cd-burner/Makefile +++ b/sysutils/nautilus-cd-burner/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.74 2005/08/31 20:10:54 marcus Exp $ +# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.75 2005/09/05 19:11:36 marcus Exp $ # PORTNAME= nautilus-cd-burner PORTVERSION= 2.12.0 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 diff --git a/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c b/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c index 0e34aa7f2..e836eb982 100644 --- a/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c +++ b/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c @@ -1,5 +1,5 @@ --- nautilus-burn-drive.c.orig Tue Aug 23 11:55:56 2005 -+++ nautilus-burn-drive.c Mon Sep 5 15:04:22 2005 ++++ nautilus-burn-drive.c Sat Sep 10 20:32:26 2005 @@ -471,7 +471,6 @@ get_disc_type (const char *dev_path) struct cd_toc_entry entry; int i; @@ -8,3 +8,23 @@ #ifndef CDROM_DATA_TRACK #define CDROM_DATA_TRACK 4 #endif +@@ -483,6 +482,10 @@ get_disc_type (const char *dev_path) + + if (ioctl (fd, CDIOREADTOCHEADER, &header) < 0) { + close (fd); ++ if (errno == EINVAL) ++ /* If you try to read the TOC header of a blank disc ++ * on FreeBSD, you get EINVAL. */ ++ return CDS_NO_INFO; + return -1; + } + +@@ -649,7 +652,7 @@ nautilus_burn_drive_get_media_type_from_ + *is_blank = mmc_profile & 0x10000; + + disc_type = get_disc_type (device); +- disc_type_get_info (disc_type, is_blank, has_data, has_audio); ++ disc_type_get_info (disc_type, NULL, has_data, has_audio); + + switch (mmc_profile & 0xFFFF) { + case -1: |