Update to 2.27.4.

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

8 files changed, 139 insertions, 11 deletions

diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index 67f0e99c9..eab04f105 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -3,10 +3,10 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/sysutils/brasero/Makefile,v 1.47 2009/06/16 02:44:29 avl Exp $
+#    $MCom: ports/sysutils/brasero/Makefile,v 1.48 2009/07/10 14:01:59 avl Exp $
 
 PORTNAME=	brasero
-PORTVERSION=	2.27.3
+PORTVERSION=	2.27.4
 CATEGORIES=	sysutils audio multimedia gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -26,6 +26,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_XORG=	sm
 USE_GNOME=	intlhack gnomeprefix gnomehack
+USE_LDCONFIG=	yes
 USE_GSTREAMER=	gconf core
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
diff --git a/sysutils/brasero/distinfo b/sysutils/brasero/distinfo
index e0e882304..4f1146ef1 100644
--- a/sysutils/brasero/distinfo
+++ b/sysutils/brasero/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/brasero-2.27.3.tar.bz2) = 5e7f288caa76cfe10949f1213b6f3f7a
-SHA256 (gnome2/brasero-2.27.3.tar.bz2) = 461548ce48640ac8df87e2bfe9e0ab36919c81a3cfcd097563434773d2da7f93
-SIZE (gnome2/brasero-2.27.3.tar.bz2) = 3537465
+MD5 (gnome2/brasero-2.27.4.tar.bz2) = 825e3b34232cf9dc2d6100a6bf6b80f6
+SHA256 (gnome2/brasero-2.27.4.tar.bz2) = e2057254b0933d9f55689396b60a175195ba9f01260a924d44803c9af80261b9
+SIZE (gnome2/brasero-2.27.4.tar.bz2) = 3555930
diff --git a/sysutils/brasero/files/patch-libbrasero-burn_burn-job.c b/sysutils/brasero/files/patch-libbrasero-burn_burn-job.c
new file mode 100644
index 000000000..ea09a5c63
--- /dev/null
+++ b/sysutils/brasero/files/patch-libbrasero-burn_burn-job.c
@@ -0,0 +1,29 @@
+--- libbrasero-burn/burn-job.c.orig	2009-07-19 00:53:38.000000000 -0400
++++ libbrasero-burn/burn-job.c	2009-07-19 00:55:41.000000000 -0400
+@@ -1469,6 +1469,26 @@ brasero_job_get_action (BraseroJob *self
+ }
+ 
+ BraseroBurnResult
++brasero_job_get_bus_target_lun (BraseroJob *self, gchar **BTL)
++{
++	BraseroBurnSession *session;
++	BraseroJobPrivate *priv;
++	BraseroDrive *drive;
++
++	BRASERO_JOB_DEBUG (self);
++
++	g_return_val_if_fail (BTL != NULL, BRASERO_BURN_ERR);
++
++	priv = BRASERO_JOB_PRIVATE (self);
++	session = brasero_task_ctx_get_session (priv->ctx);
++
++	drive = brasero_burn_session_get_burner (session);
++	*BTL = brasero_drive_get_bus_target_lun_string (drive);
++
++	return BRASERO_BURN_OK;
++}
++
++BraseroBurnResult
+ brasero_job_get_device (BraseroJob *self, gchar **device)
+ {
+ 	BraseroBurnSession *session;
diff --git a/sysutils/brasero/files/patch-libbrasero-burn_burn-job.h b/sysutils/brasero/files/patch-libbrasero-burn_burn-job.h
new file mode 100644
index 000000000..b0752d0eb
--- /dev/null
+++ b/sysutils/brasero/files/patch-libbrasero-burn_burn-job.h
@@ -0,0 +1,12 @@
+--- libbrasero-burn/burn-job.h.orig	2009-07-19 00:56:11.000000000 -0400
++++ libbrasero-burn/burn-job.h	2009-07-19 00:56:41.000000000 -0400
+@@ -155,6 +155,9 @@ BraseroBurnResult
+ brasero_job_get_medium (BraseroJob *job, BraseroMedium **medium);
+ 
+ BraseroBurnResult
++brasero_job_get_bus_target_lun (BraseroJob *job, gchar **BTL);
++
++BraseroBurnResult
+ brasero_job_get_device (BraseroJob *job, gchar **device);
+ 
+ BraseroBurnResult
diff --git a/sysutils/brasero/files/patch-libbrasero-media_brasero-drive.c b/sysutils/brasero/files/patch-libbrasero-media_brasero-drive.c
new file mode 100644
index 000000000..6031a5f49
--- /dev/null
+++ b/sysutils/brasero/files/patch-libbrasero-media_brasero-drive.c
@@ -0,0 +1,48 @@
+--- libbrasero-media/brasero-drive.c.orig	2009-07-13 21:34:34.000000000 -0400
++++ libbrasero-media/brasero-drive.c	2009-07-19 00:59:26.000000000 -0400
+@@ -35,6 +35,13 @@
+ #include <unistd.h>
+ #include <string.h>
+ 
++#ifdef HAVE_CAM_LIB_H
++#include <errno.h>
++#include <stdio.h>
++#include <fcntl.h>
++#include <camlib.h>
++#endif
++
+ #include <glib.h>
+ #include <glib-object.h>
+ #include <glib/gi18n-lib.h>
+@@ -228,10 +235,31 @@ brasero_drive_eject (BraseroDrive *drive
+ gchar *
+ brasero_drive_get_bus_target_lun_string (BraseroDrive *drive)
+ {
++#ifdef HAVE_CAM_LIB_H
++	struct cam_device *cam_dev;
++	char *addr;
++#endif
++
+ 	g_return_val_if_fail (drive != NULL, NULL);
+ 	g_return_val_if_fail (BRASERO_IS_DRIVE (drive), NULL);
+ 
++#ifdef HAVE_CAM_LIB_H
++	cam_dev = cam_open_device (brasero_drive_get_device (drive), O_RDWR);
++
++	if (cam_dev == NULL) {
++		BRASERO_MEDIA_LOG ("CAM: Failed to open %s: %s", brasero_drive_get_device (drive), g_strerror (errno));
++		return NULL;
++	}
++
++	addr = g_strdup_printf ("%i,%i,%i", cam_dev->path_id, cam_dev->target_id, cam_dev->target_lun);
++
++	cam_close_device (cam_dev);
++
++	return addr;
++#else
++
+ 	return NULL;
++#endif
+ }
+ 
+ /**
diff --git a/sysutils/brasero/files/patch-plugins_cdrdao_burn-cdrdao.c b/sysutils/brasero/files/patch-plugins_cdrdao_burn-cdrdao.c
new file mode 100644
index 000000000..c6d05de1f
--- /dev/null
+++ b/sysutils/brasero/files/patch-plugins_cdrdao_burn-cdrdao.c
@@ -0,0 +1,26 @@
+--- plugins/cdrdao/burn-cdrdao.c.orig	2009-07-19 00:48:09.000000000 -0400
++++ plugins/cdrdao/burn-cdrdao.c	2009-07-19 00:49:59.000000000 -0400
+@@ -346,7 +346,11 @@ brasero_cdrdao_set_argv_record (BraseroC
+ 		brasero_job_get_current_track (BRASERO_JOB (cdrdao), &track);
+ 		drive = brasero_track_disc_get_drive (BRASERO_TRACK_DISC (track));
+ 
++#ifdef HAVE_CAM_LIB_H
++		g_ptr_array_add (argv, brasero_drive_get_bus_target_lun_string (drive));
++#else
+ 		g_ptr_array_add (argv, g_strdup (brasero_drive_get_device (drive)));
++#endif
+ 	}
+ 	else if (brasero_track_type_get_has_image (type)) {
+ 		gchar *cuepath;
+@@ -442,7 +446,11 @@ brasero_cdrdao_set_argv_image (BraseroCd
+ 	brasero_job_get_current_track (BRASERO_JOB (cdrdao), &track);
+ 	drive = brasero_track_disc_get_drive (BRASERO_TRACK_DISC (track));
+ 
++#ifdef HAVE_CAM_LIB_H
++	g_ptr_array_add (argv, brasero_drive_get_bus_target_lun_string (drive));
++#else
+ 	g_ptr_array_add (argv, g_strdup (brasero_drive_get_device (drive)));
++#endif
+ 	g_ptr_array_add (argv, g_strdup ("--read-raw"));
+ 
+ 	/* This is done so that if a cue file is required we first generate
diff --git a/sysutils/brasero/files/patch-plugins_cdrtools_burn-readcd.c b/sysutils/brasero/files/patch-plugins_cdrtools_burn-readcd.c
new file mode 100644
index 000000000..0c6d03861
--- /dev/null
+++ b/sysutils/brasero/files/patch-plugins_cdrtools_burn-readcd.c
@@ -0,0 +1,14 @@
+--- plugins/cdrtools/burn-readcd.c.orig	2009-07-19 00:50:30.000000000 -0400
++++ plugins/cdrtools/burn-readcd.c	2009-07-19 00:51:10.000000000 -0400
+@@ -344,7 +344,11 @@ brasero_readcd_set_argv (BraseroProcess 
+ 	brasero_job_get_current_track (BRASERO_JOB (readcd), &track);
+ 	drive = brasero_track_disc_get_drive (BRASERO_TRACK_DISC (track));
+ 
++#ifdef HAVE_CAM_LIB_H
++	device = brasero_drive_get_bus_target_lun_string (drive);
++#else
+ 	device = g_strdup (brasero_drive_get_device (drive));
++#endif
+ 
+ 	if (!device)
+ 		return BRASERO_BURN_ERR;
diff --git a/sysutils/brasero/pkg-plist b/sysutils/brasero/pkg-plist
index 376128b38..b044e68c6 100644
--- a/sysutils/brasero/pkg-plist
+++ b/sysutils/brasero/pkg-plist
@@ -76,22 +76,20 @@ lib/brasero/plugins/libbrasero-wodim.la
 lib/brasero/plugins/libbrasero-wodim.so
 lib/libbrasero-burn.la
 lib/libbrasero-burn.so
-lib/libbrasero-burn.so.1
+lib/libbrasero-burn.so.2
 lib/libbrasero-media.la
 lib/libbrasero-media.so
-lib/libbrasero-media.so.1
+lib/libbrasero-media.so.2
 lib/libbrasero-utils.la
 lib/libbrasero-utils.so
-lib/libbrasero-utils.so.1
+lib/libbrasero-utils.so.2
 %%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-brasero-extension.la
 %%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-brasero-extension.so
+libdata/pkgconfig/libbrasero-burn.pc
 libdata/pkgconfig/libbrasero-media.pc
 share/applications/brasero.desktop
 share/applications/brasero-copy-medium.desktop
 %%NAUTILUS%%share/applications/brasero-nautilus.desktop
-share/applications/brasero-open-image.desktop
-share/applications/brasero-open-playlist.desktop
-share/applications/brasero-open-project.desktop
 %%DATADIR%%/icons/hicolor/16x16/actions/insert-pause.png
 %%DATADIR%%/icons/hicolor/16x16/actions/iso-image-burn.png
 %%DATADIR%%/icons/hicolor/16x16/actions/iso-image-new.png