Update to 2.9.7. marcus will commit a patch to fix the hang.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3751 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 43 insertions, 42 deletions

diff --git a/sysutils/nautilus-cd-burner/files/patch-make-iso.c b/sysutils/nautilus-cd-burner/files/patch-make-iso.c
index 515cc0104..7596a0ec6 100644
--- a/sysutils/nautilus-cd-burner/files/patch-make-iso.c
+++ b/sysutils/nautilus-cd-burner/files/patch-make-iso.c
@@ -1,18 +1,18 @@
---- make-iso.c.orig	Sun Jan  9 06:49:01 2005
-+++ make-iso.c	Wed Jan 12 03:11:15 2005
-@@ -631,6 +631,7 @@
+--- make-iso.c.orig	Mon Feb 28 19:34:57 2005
++++ make-iso.c	Mon Feb 28 19:36:39 2005
+@@ -719,6 +719,7 @@
  	argv [i++] = "-r";
  	if (use_joliet) {
  		argv [i++] = "-J";
 +		argv[i++] = "-joliet-long";
  	}
- 	/* Undocumented -input-charset option */
- 	argv [i++] = "-input-charset";
-@@ -722,6 +723,7 @@
+ 	if (has_utf8_support) {
+ 		argv [i++] = "-input-charset";
+@@ -806,6 +807,7 @@
  	argv [i++] = "-r";
  	if (use_joliet) {
  		argv [i++] = "-J";
 +		argv[i++] = "-joliet-long";
  	}
- 	argv [i++] = "-input-charset";
- 	argv [i++] = "utf8";
+ 	if (has_utf8_support) {
+ 		argv [i++] = "-input-charset";
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 c7b5a2651..3910c90f4 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	Wed Jan 26 17:42:58 2005
-+++ nautilus-burn-drive.c	Thu Feb 10 16:59:01 2005
+--- nautilus-burn-drive.c.orig	Mon Feb 28 19:51:06 2005
++++ nautilus-burn-drive.c	Mon Feb 28 20:01:09 2005
 @@ -62,6 +62,13 @@
  
  #define CD_ROM_SPEED 176
@@ -46,8 +46,8 @@
 +	fd = cam->fd;
 +#else
 +
- 	fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK);
- 	if (fd < 0) {
+ 	if ((fd = open (device, O_RDWR | O_EXCL | O_NONBLOCK)) < 0
+ 	    && (fd = open (device, O_RDONLY | O_EXCL | O_NONBLOCK)) < 0) {
  		if (errno == EBUSY) {
 @@ -293,6 +312,7 @@
  		}
@@ -57,7 +57,7 @@
  
  	mmc_profile = get_mmc_profile (fd);
  
-@@ -333,7 +353,11 @@
+@@ -330,7 +350,11 @@
  		}
  	}
  
@@ -67,9 +67,9 @@
  	close (fd);
 +#endif
  
- 	switch (mmc_profile) {
- 	case -1:
-@@ -563,10 +587,21 @@
+ 	if (is_blank)
+ 		*is_blank = mmc_profile & 0x10000;
+@@ -569,11 +593,21 @@
  	int    secs;
  	int    mmc_profile;
  	gint64 size;
@@ -85,13 +85,13 @@
 +	if (cam == NULL) {
 +		return NAUTILUS_BURN_MEDIA_SIZE_UNKNOWN;
 +	}
-+
+ 
 +	fd = cam->fd;
 +#else
- 
- 	fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK);
- 	if (fd < 0) {
-@@ -575,6 +610,7 @@
+ 	if ((fd = open (device, O_RDWR | O_EXCL | O_NONBLOCK)) < 0
+ 	    && (fd = open (device, O_RDONLY | O_EXCL | O_NONBLOCK)) < 0) {
+ 		if (errno == EBUSY) {
+@@ -581,6 +615,7 @@
  		}
  		return NAUTILUS_BURN_MEDIA_SIZE_UNKNOWN;
  	}
@@ -99,7 +99,7 @@
  
  	mmc_profile = get_mmc_profile (fd);
  
-@@ -597,7 +633,11 @@
+@@ -603,7 +638,11 @@
  		size = NAUTILUS_BURN_MEDIA_SIZE_NA;
  	}
  
@@ -111,7 +111,7 @@
  
  	return size;
  }
-@@ -890,9 +930,81 @@
+@@ -896,9 +935,81 @@
  #endif /* USE_HAL */
  
  #if defined(__linux__) || defined(__FreeBSD__)
@@ -134,7 +134,7 @@
 +
 +	fd = cam->fd;
 +#else
-+
+ 
 +	fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK);
 +	if (fd < 0) {
 +		return -1;
@@ -148,7 +148,7 @@
 +	close (fd);
 +#endif
 +	max_speed = (int)floor  (write_speed) / CD_ROM_SPEED;
-+
+ 
 +	return max_speed;
 +}
 +
@@ -169,16 +169,16 @@
 +	if (cam == NULL) {
 +		return -1;
 +	}
- 
++ 
 +	fd = cam->fd;
 +#else
- 
++ 
 +	fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK);
 +	if (fd < 0) {
 +		return -1;
 +	}
 +#endif
-+
+ 
 +	get_read_write_speed (fd, &read_speed, &write_speed);
 +#ifdef __FreeBSD__
 +	cam_close_device (cam);
@@ -186,17 +186,19 @@
 +	close (fd);
 +#endif
 +	max_speed = (int)floor  (read_speed) / CD_ROM_SPEED;
- 
++ 
 +	return max_speed;
 +}
 +#endif
  #endif /* __linux__ || __FreeBSD__ */
  
  #if defined (__linux__)
-@@ -1104,49 +1216,7 @@
+@@ -1111,50 +1222,6 @@
+ 		}
+ 	}
  	return NULL;
- }
- 
+-}
+-
 -#if !defined(__linux)
 -static int
 -get_device_max_read_speed (char *device)
@@ -207,8 +209,8 @@
 -
 -	max_speed = -1;
 -
--	fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK);
--	if (fd < 0) {
+-	if ((fd = open (device, O_RDWR | O_EXCL | O_NONBLOCK)) < 0
+-	    && (fd = open (device, O_RDONLY | O_EXCL | O_NONBLOCK)) < 0) {
 -		return -1;
 -	}
 -
@@ -228,9 +230,9 @@
 -	int read_speed, write_speed;
 -
 -	max_speed = -1;
- 
--	fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK);
--	if (fd < 0) {
+-
+-	if ((fd = open (device, O_RDWR | O_EXCL | O_NONBLOCK)) < 0
+-	    && (fd = open (device, O_RDONLY | O_EXCL | O_NONBLOCK)) < 0) {
 -		return -1;
 -	}
 -
@@ -239,7 +241,6 @@
 -	max_speed = (int)floor  (write_speed) / CD_ROM_SPEED;
 -
 -	return max_speed;
--}
+ }
  
  static char *
- get_scsi_cd_name (int               bus,
diff --git a/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c b/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c
index ed8ab1366..c545be7d5 100644
--- a/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c
+++ b/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c
@@ -1,5 +1,5 @@
---- nautilus-cd-burner.c.orig	Mon Jan 10 16:38:54 2005
-+++ nautilus-cd-burner.c	Wed Jan 12 03:20:29 2005
+--- nautilus-cd-burner.c.orig	Mon Feb 28 19:40:05 2005
++++ nautilus-cd-burner.c	Mon Feb 28 20:05:56 2005
 @@ -23,6 +23,8 @@
   *          Bastien Nocera <hadess@hadess.net>
   */
@@ -9,7 +9,7 @@
  #include <gtk/gtk.h>
  #include <gtk/gtkfilesel.h>
  #include <gtk/gtkseparatormenuitem.h>
-@@ -720,8 +722,19 @@
+@@ -843,8 +845,19 @@
  		}
  
  		if (res == NAUTILUS_BURN_RECORDER_RESULT_RETRY) {