summaryrefslogtreecommitdiffstats
path: root/sysutils/brasero
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
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')
-rw-r--r--sysutils/brasero/Makefile4
-rw-r--r--sysutils/brasero/distinfo6
-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
-rw-r--r--sysutils/brasero/pkg-plist107
8 files changed, 68 insertions, 178 deletions
diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index 1e11f9303..c7da07a4b 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.49 2009/07/19 06:10:20 marcus Exp $
+# $MCom: ports/sysutils/brasero/Makefile,v 1.50 2009/07/27 21:48:12 kwm Exp $
PORTNAME= brasero
-PORTVERSION= 2.27.5
+PORTVERSION= 2.27.90
CATEGORIES= sysutils audio multimedia gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/sysutils/brasero/distinfo b/sysutils/brasero/distinfo
index f5ab8f4c5..aeb83b639 100644
--- a/sysutils/brasero/distinfo
+++ b/sysutils/brasero/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/brasero-2.27.5.tar.bz2) = f995c48b2826e7ed83623889d8914799
-SHA256 (gnome2/brasero-2.27.5.tar.bz2) = 402fd08112e19558be291887207b7631157b576a66a65c3e12311b000615e06e
-SIZE (gnome2/brasero-2.27.5.tar.bz2) = 3627960
+MD5 (gnome2/brasero-2.27.90.tar.bz2) = e4fa8381d3fbbc869ac4fb5da853fda2
+SHA256 (gnome2/brasero-2.27.90.tar.bz2) = bb0b0242e7f99192830ad0154cbaccc7fdc44dbdbc3e4994b5d3a7e875f1734a
+SIZE (gnome2/brasero-2.27.90.tar.bz2) = 3722793
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;
diff --git a/sysutils/brasero/pkg-plist b/sysutils/brasero/pkg-plist
index fb65ae089..7fe154729 100644
--- a/sysutils/brasero/pkg-plist
+++ b/sysutils/brasero/pkg-plist
@@ -90,6 +90,61 @@ libdata/pkgconfig/libbrasero-media.pc
share/applications/brasero.desktop
share/applications/brasero-copy-medium.desktop
%%NAUTILUS%%share/applications/brasero-nautilus.desktop
+share/doc/libbrasero-burn/api-index-full.html
+share/doc/libbrasero-burn/ch01.html
+share/doc/libbrasero-burn/home.png
+share/doc/libbrasero-burn/index.html
+share/doc/libbrasero-burn/index.sgml
+share/doc/libbrasero-burn/left.png
+share/doc/libbrasero-burn/libbrasero-burn-BraseroBlankDialog.html
+share/doc/libbrasero-burn/libbrasero-burn-BraseroBurn.html
+share/doc/libbrasero-burn/libbrasero-burn-BraseroBurnDialog.html
+share/doc/libbrasero-burn/libbrasero-burn-BraseroBurnOptions.html
+share/doc/libbrasero-burn/libbrasero-burn-BraseroBurnSession.html
+share/doc/libbrasero-burn/libbrasero-burn-BraseroSessionCfg.html
+share/doc/libbrasero-burn/libbrasero-burn-BraseroSessionSpan.html
+share/doc/libbrasero-burn/libbrasero-burn-BraseroSumDialog.html
+share/doc/libbrasero-burn/libbrasero-burn-BraseroToolDialog.html
+share/doc/libbrasero-burn/libbrasero-burn-BraseroTrack.html
+share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackData.html
+share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackDataCfg.html
+share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackDisc.html
+share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackImage.html
+share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackImageCfg.html
+share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackStream.html
+share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackStreamCfg.html
+share/doc/libbrasero-burn/libbrasero-burn-brasero-burn-lib.html
+share/doc/libbrasero-burn/libbrasero-burn-brasero-enums.html
+share/doc/libbrasero-burn/libbrasero-burn-brasero-error.html
+share/doc/libbrasero-burn/libbrasero-burn-brasero-status.html
+share/doc/libbrasero-burn/libbrasero-burn-brasero-tags.html
+share/doc/libbrasero-burn/libbrasero-burn-brasero-track-type.html
+share/doc/libbrasero-burn/libbrasero-burn.devhelp
+share/doc/libbrasero-burn/libbrasero-burn.devhelp2
+share/doc/libbrasero-burn/object-tree.html
+share/doc/libbrasero-burn/right.png
+share/doc/libbrasero-burn/style.css
+share/doc/libbrasero-burn/up.png
+share/doc/libbrasero-media/BraseroDrive.html
+share/doc/libbrasero-media/BraseroDriveSelection.html
+share/doc/libbrasero-media/BraseroMedium.html
+share/doc/libbrasero-media/BraseroMediumMonitor.html
+share/doc/libbrasero-media/BraseroMediumSelection.html
+share/doc/libbrasero-media/BraseroVolume.html
+share/doc/libbrasero-media/api-index-full.html
+share/doc/libbrasero-media/ch01.html
+share/doc/libbrasero-media/home.png
+share/doc/libbrasero-media/index.html
+share/doc/libbrasero-media/index.sgml
+share/doc/libbrasero-media/left.png
+share/doc/libbrasero-media/libbrasero-media-brasero-media.html
+share/doc/libbrasero-media/libbrasero-media-brasero-units.html
+share/doc/libbrasero-media/libbrasero-media.devhelp
+share/doc/libbrasero-media/libbrasero-media.devhelp2
+share/doc/libbrasero-media/object-tree.html
+share/doc/libbrasero-media/right.png
+share/doc/libbrasero-media/style.css
+share/doc/libbrasero-media/up.png
%%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
@@ -245,49 +300,6 @@ share/applications/brasero-copy-medium.desktop
%%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-90.svg
%%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-95.svg
%%DATADIR%%/logo.png
-%%DOCSDIR%%/BraseroDrive.html
-%%DOCSDIR%%/BraseroDriveSelection.html
-%%DOCSDIR%%/BraseroMedium.html
-%%DOCSDIR%%/BraseroMediumMonitor.html
-%%DOCSDIR%%/BraseroMediumSelection.html
-%%DOCSDIR%%/BraseroVolume.html
-%%DOCSDIR%%/api-index-full.html
-%%DOCSDIR%%/brasero-BraseroBlankDialog.html
-%%DOCSDIR%%/brasero-BraseroBurn.html
-%%DOCSDIR%%/brasero-BraseroBurnDialog.html
-%%DOCSDIR%%/brasero-BraseroBurnOptions.html
-%%DOCSDIR%%/brasero-BraseroBurnSession.html
-%%DOCSDIR%%/brasero-BraseroSessionCfg.html
-%%DOCSDIR%%/brasero-BraseroSessionSpan.html
-%%DOCSDIR%%/brasero-BraseroSumDialog.html
-%%DOCSDIR%%/brasero-BraseroToolDialog.html
-%%DOCSDIR%%/brasero-BraseroTrack.html
-%%DOCSDIR%%/brasero-BraseroTrackData.html
-%%DOCSDIR%%/brasero-BraseroTrackDataCfg.html
-%%DOCSDIR%%/brasero-BraseroTrackDisc.html
-%%DOCSDIR%%/brasero-BraseroTrackImage.html
-%%DOCSDIR%%/brasero-BraseroTrackImageCfg.html
-%%DOCSDIR%%/brasero-BraseroTrackStream.html
-%%DOCSDIR%%/brasero-BraseroTrackStreamCfg.html
-%%DOCSDIR%%/brasero-brasero-burn-lib.html
-%%DOCSDIR%%/brasero-brasero-error.html
-%%DOCSDIR%%/brasero-brasero-media.html
-%%DOCSDIR%%/brasero-brasero-status.html
-%%DOCSDIR%%/brasero-brasero-tags.html
-%%DOCSDIR%%/brasero-brasero-track-type.html
-%%DOCSDIR%%/brasero-brasero-units.html
-%%DOCSDIR%%/brasero.devhelp
-%%DOCSDIR%%/brasero.devhelp2
-%%DOCSDIR%%/ch01.html
-%%DOCSDIR%%/ch02.html
-%%DOCSDIR%%/home.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/left.png
-%%DOCSDIR%%/object-tree.html
-%%DOCSDIR%%/right.png
-%%DOCSDIR%%/style.css
-%%DOCSDIR%%/up.png
share/gnome/help/brasero/C/brasero.xml
share/gnome/help/brasero/C/figures/brasero_main.png
share/gnome/help/brasero/C/legal.xml
@@ -321,8 +333,11 @@ share/icons/hicolor/48x48/apps/brasero.png
share/icons/hicolor/scalable/apps/brasero.svg
share/locale/ar/LC_MESSAGES/brasero.mo
share/locale/bg/LC_MESSAGES/brasero.mo
+share/locale/bn/LC_MESSAGES/brasero.mo
share/locale/bn_IN/LC_MESSAGES/brasero.mo
+share/locale/br/LC_MESSAGES/brasero.mo
share/locale/ca/LC_MESSAGES/brasero.mo
+share/locale/ca@valencia/LC_MESSAGES/brasero.mo
share/locale/cs/LC_MESSAGES/brasero.mo
share/locale/da/LC_MESSAGES/brasero.mo
share/locale/de/LC_MESSAGES/brasero.mo
@@ -334,6 +349,7 @@ share/locale/et/LC_MESSAGES/brasero.mo
share/locale/eu/LC_MESSAGES/brasero.mo
share/locale/fi/LC_MESSAGES/brasero.mo
share/locale/fr/LC_MESSAGES/brasero.mo
+share/locale/ga/LC_MESSAGES/brasero.mo
share/locale/gl/LC_MESSAGES/brasero.mo
share/locale/gu/LC_MESSAGES/brasero.mo
share/locale/he/LC_MESSAGES/brasero.mo
@@ -411,7 +427,6 @@ share/omf/brasero/brasero-sv.omf
@dirrm share/gnome/help/brasero/C/figures
@dirrm share/gnome/help/brasero/C
@dirrm share/gnome/help/brasero
-@dirrm %%DOCSDIR%%
@dirrm %%DATADIR%%/icons/hicolor/16x16/status
@dirrm %%DATADIR%%/icons/hicolor/16x16/actions
@dirrm %%DATADIR%%/icons/hicolor/16x16
@@ -432,6 +447,8 @@ share/omf/brasero/brasero-sv.omf
@dirrm %%DATADIR%%/icons/hicolor
@dirrm %%DATADIR%%/icons
@dirrm %%DATADIR%%
+@dirrm share/doc/libbrasero-media
+@dirrm share/doc/libbrasero-burn
@dirrmtry share/applications
@dirrm lib/brasero/plugins
@dirrm lib/brasero
@@ -458,5 +475,7 @@ share/omf/brasero/brasero-sv.omf
@dirrmtry share/locale/ku
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN