summaryrefslogtreecommitdiffstats
path: root/sysutils/brasero/files
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2009-08-11 07:10:15 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2009-08-11 07:10:15 +0800
commite42c6fdefdbe3a9926317199eeacf42b57f923f5 (patch)
tree8706351d2b5e2aac120b9faefbe7bfda9254ee2f /sysutils/brasero/files
parentc4cd03d91c3507c686e7b0436bc4e5b4ef0d5efe (diff)
downloadmarcuscom-ports-e42c6fdefdbe3a9926317199eeacf42b57f923f5.tar
marcuscom-ports-e42c6fdefdbe3a9926317199eeacf42b57f923f5.tar.gz
marcuscom-ports-e42c6fdefdbe3a9926317199eeacf42b57f923f5.tar.bz2
marcuscom-ports-e42c6fdefdbe3a9926317199eeacf42b57f923f5.tar.lz
marcuscom-ports-e42c6fdefdbe3a9926317199eeacf42b57f923f5.tar.xz
marcuscom-ports-e42c6fdefdbe3a9926317199eeacf42b57f923f5.tar.zst
marcuscom-ports-e42c6fdefdbe3a9926317199eeacf42b57f923f5.zip
Update to 2.27.90.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@12602 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils/brasero/files')
-rw-r--r--sysutils/brasero/files/patch-libbrasero-burn_burn-job.c29
-rw-r--r--sysutils/brasero/files/patch-libbrasero-burn_burn-job.h12
-rw-r--r--sysutils/brasero/files/patch-libbrasero-media_brasero-drive.c48
-rw-r--r--sysutils/brasero/files/patch-plugins_cdrdao_burn-cdrdao.c26
-rw-r--r--sysutils/brasero/files/patch-plugins_cdrtools_burn-readcd.c14
5 files changed, 0 insertions, 129 deletions
diff --git a/sysutils/brasero/files/patch-libbrasero-burn_burn-job.c b/sysutils/brasero/files/patch-libbrasero-burn_burn-job.c
deleted file mode 100644
index ea09a5c63..000000000
--- a/sysutils/brasero/files/patch-libbrasero-burn_burn-job.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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
deleted file mode 100644
index b0752d0eb..000000000
--- a/sysutils/brasero/files/patch-libbrasero-burn_burn-job.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
deleted file mode 100644
index 6031a5f49..000000000
--- a/sysutils/brasero/files/patch-libbrasero-media_brasero-drive.c
+++ /dev/null
@@ -1,48 +0,0 @@
---- 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
deleted file mode 100644
index c6d05de1f..000000000
--- a/sysutils/brasero/files/patch-plugins_cdrdao_burn-cdrdao.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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
deleted file mode 100644
index 0c6d03861..000000000
--- a/sysutils/brasero/files/patch-plugins_cdrtools_burn-readcd.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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;