Apply upstream patches silencing some warnings, fixing a bug causing unproper sizes to be displayed in some circumstances, stop showing useless dialog warning about medium. Also handles better dvd and vcd runtime dependencies (bug #372007 by David King) and no longer installs .la files (bug #362957 by Stéphane Pagnon).

(Portage version: 2.1.10.6/cvs/Linux x86_64)

7 files changed, 298 insertions, 3 deletions

diff --git a/app-cdr/brasero/ChangeLog b/app-cdr/brasero/ChangeLog
index 063ba2bed4a2..4957a5c30766 100644
--- a/app-cdr/brasero/ChangeLog
+++ b/app-cdr/brasero/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-cdr/brasero
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/ChangeLog,v 1.129 2011/04/09 16:04:49 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/ChangeLog,v 1.130 2011/07/19 13:14:46 pacho Exp $
+
+*brasero-2.32.1-r1 (19 Jul 2011)
+
+  19 Jul 2011; Pacho Ramos <pacho@gentoo.org> +brasero-2.32.1-r1.ebuild,
+  +files/brasero-2.32.1-fix-size.patch,
+  +files/brasero-2.32.1-useless-dialog.patch,
+  +files/brasero-2.32.1-warning-silenced.patch,
+  +files/brasero-2.32.1-warning-silenced2.patch:
+  Apply upstream patches silencing some warnings, fixing a bug causing unproper
+  sizes to be displayed in some circumstances, stop showing useless dialog
+  warning about medium. Also handles better dvd and vcd runtime dependencies
+  (bug #372007 by David King) and no longer installs .la files (bug #362957 by
+  Stéphane Pagnon).
 
   09 Apr 2011; Gilles Dartiguelongue <eva@gentoo.org> -brasero-2.30.2.ebuild,
   -brasero-2.30.3.ebuild:
diff --git a/app-cdr/brasero/brasero-2.32.1-r1.ebuild b/app-cdr/brasero/brasero-2.32.1-r1.ebuild
new file mode 100644
index 000000000000..883dbaa7431c
--- /dev/null
+++ b/app-cdr/brasero/brasero-2.32.1-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-2.32.1-r1.ebuild,v 1.1 2011/07/19 13:14:46 pacho Exp $
+
+EAPI="4"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2 multilib
+
+DESCRIPTION="Brasero (aka Bonfire) is yet another application to burn CD/DVD for the gnome desktop."
+HOMEPAGE="http://projects.gnome.org/brasero/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+cdr +css doc dvd +introspection +libburn nautilus playlist test vcd"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.25.10:2
+	media-libs/libcanberra[gtk]
+	>=x11-libs/gtk+-2.21.9:2[introspection?]
+	>=gnome-base/gconf-2.31.1:2
+	>=media-libs/gstreamer-0.10.15:0.10
+	>=media-libs/gst-plugins-base-0.10:0.10
+	>=dev-libs/libxml2-2.6:2
+	>=dev-libs/libunique-1:1
+	x11-libs/libSM
+	introspection? ( >=dev-libs/gobject-introspection-0.6.3 )
+	libburn? (
+		>=dev-libs/libburn-0.4
+		>=dev-libs/libisofs-0.6.4 )
+	nautilus? ( >=gnome-base/nautilus-2.31.3 )
+	playlist? ( >=dev-libs/totem-pl-parser-2.29.1 )"
+RDEPEND="${COMMON_DEPEND}
+	app-cdr/cdrdao
+	app-cdr/dvd+rw-tools
+	>=media-plugins/gst-plugins-meta-0.10-r6:0.10[dvd?,vcd?]
+	x11-themes/hicolor-icon-theme
+	css? ( media-libs/libdvdcss:1.2 )
+	cdr? ( virtual/cdrtools )
+	dvd? ( media-video/dvdauthor )
+	vcd? ( media-video/vcdimager )
+	!libburn? ( virtual/cdrtools )"
+DEPEND="${COMMON_DEPEND}
+	app-text/gnome-doc-utils
+	dev-util/pkgconfig
+	sys-devel/gettext
+	dev-util/intltool
+	gnome-base/gnome-common:3
+	>=dev-util/gtk-doc-am-1.12
+	doc? ( >=dev-util/gtk-doc-1.12 )
+	test? ( app-text/docbook-xml-dtd:4.3 )"
+# eautoreconf deps
+#	gnome-base/gnome-common
+#	dev-util/gtk-doc-am
+PDEPEND="gnome-base/gvfs"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-scrollkeeper
+		--disable-caches
+		--disable-dependency-tracking
+		--with-gtk=2.0
+		--disable-search
+		$(use_enable cdr cdrtools)
+		$(use_enable cdr cdrkit)
+		$(use_enable introspection)
+		$(use_enable libburn libburnia)
+		$(use_enable nautilus)
+		$(use_enable playlist)"
+
+	if ! use libburn; then
+		G2CONF="${G2CONF} --enable-cdrtools --enable-cdrkit"
+	fi
+
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix link against installed libraries, bug #340767
+	epatch "${FILESDIR}/${PN}-2.32.0-build-plugins-against-local-library.patch"
+
+	# Silenced some warnings
+	epatch "${FILESDIR}/${P}-warning-silenced.patch"
+	epatch "${FILESDIR}/${P}-warning-silenced2.patch"
+
+	# Make sure that the size is displayed correctly when burning tracks internally copied with cdda2wav
+	epatch "${FILESDIR}/${P}-fix-size.patch"
+
+	# Do not show useless dialog warning about the nature of the medium when we are copying audio from a CDRW
+	epatch "${FILESDIR}/${P}-useless-dialog.patch"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	preserve_old_lib /usr/$(get_libdir)/libbrasero-burn.so.0
+	preserve_old_lib /usr/$(get_libdir)/libbrasero-media.so.0
+	preserve_old_lib /usr/$(get_libdir)/libbrasero-utils.so.0
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	preserve_old_lib_notify /usr/$(get_libdir)/libbrasero-burn.so.0
+	preserve_old_lib_notify /usr/$(get_libdir)/libbrasero-media.so.0
+	preserve_old_lib_notify /usr/$(get_libdir)/libbrasero-utils.so.0
+
+	echo
+	elog "If ${PN} doesn't handle some music or video format, please check"
+	elog "your USE flags on media-plugins/gst-plugins-meta"
+}
diff --git a/app-cdr/brasero/files/brasero-2.32.1-fix-size.patch b/app-cdr/brasero/files/brasero-2.32.1-fix-size.patch
new file mode 100644
index 000000000000..cbdcbef5d032
--- /dev/null
+++ b/app-cdr/brasero/files/brasero-2.32.1-fix-size.patch
@@ -0,0 +1,56 @@
+From 6ddf46d1477bb6e2a3e86afa699c52b643bfcef7 Mon Sep 17 00:00:00 2001
+From: Philippe Rouquier <bonfire-app@wanadoo.fr>
+Date: Wed, 24 Nov 2010 15:29:32 +0000
+Subject: Make sure that the size is displayed correctly when burning tracks internally copied with cdda2wav
+
+---
+diff --git a/libbrasero-burn/brasero-track-stream.c b/libbrasero-burn/brasero-track-stream.c
+index f041676..e3ee6df 100644
+--- a/libbrasero-burn/brasero-track-stream.c
++++ b/libbrasero-burn/brasero-track-stream.c
+@@ -243,6 +243,7 @@ brasero_track_stream_set_boundaries (BraseroTrackStream *track,
+  * This function returns the path or the URI (if @uri is TRUE)
+  * of the stream (song or video file).
+  *
++ * Note: this function resets any length previously set to 0.
+  * Return value: a #gchar.
+  **/
+ 
+@@ -347,7 +348,6 @@ brasero_track_stream_get_length (BraseroTrackStream *track,
+ 		return BRASERO_BURN_ERR;
+ 
+ 	*length = BRASERO_STREAM_LENGTH (priv->start, priv->end + priv->gap);
+-
+ 	return BRASERO_BURN_OK;
+ }
+ 
+diff --git a/plugins/cdrtools/burn-cdda2wav.c b/plugins/cdrtools/burn-cdda2wav.c
+index 16343bd..797b3f9 100644
+--- a/plugins/cdrtools/burn-cdda2wav.c
++++ b/plugins/cdrtools/burn-cdda2wav.c
+@@ -108,10 +108,6 @@ brasero_cdda2wav_post (BraseroJob *job)
+ 
+ 		brasero_medium_get_track_space (medium, i + 1, NULL, &block_num);
+ 		track_stream = brasero_track_stream_new ();
+-		brasero_track_stream_set_boundaries (track_stream,
+-		                                     0,
+-		                                     BRASERO_BYTES_TO_DURATION (block_num * 2352),
+-		                                     0);
+ 
+ 		brasero_track_stream_set_format (track_stream,
+ 		                                 BRASERO_AUDIO_FORMAT_RAW|
+@@ -147,6 +143,12 @@ brasero_cdda2wav_post (BraseroJob *job)
+ 			g_free (filename);
+ 		}
+ 
++		/* Always set the boundaries after the source as
++		 * brasero_track_stream_set_source () resets the length */
++		brasero_track_stream_set_boundaries (track_stream,
++		                                     0,
++		                                     BRASERO_BYTES_TO_DURATION (block_num * 2352),
++		                                     0);
+ 		brasero_job_add_track (job, BRASERO_TRACK (track_stream));
+ 		g_object_unref (track_stream);
+ 	}
+--
+cgit v0.9
diff --git a/app-cdr/brasero/files/brasero-2.32.1-useless-dialog.patch b/app-cdr/brasero/files/brasero-2.32.1-useless-dialog.patch
new file mode 100644
index 000000000000..c24d5d5439e5
--- /dev/null
+++ b/app-cdr/brasero/files/brasero-2.32.1-useless-dialog.patch
@@ -0,0 +1,68 @@
+From dfe0b01a5193cbb631b2afbd37042c5124259d7b Mon Sep 17 00:00:00 2001
+From: Philippe Rouquier <bonfire-app@wanadoo.fr>
+Date: Wed, 24 Nov 2010 15:48:29 +0000
+Subject: Do not show useless dialog warning about the nature of the medium when we are copying audio from a CDRW
+
+---
+diff --git a/libbrasero-burn/brasero-burn.c b/libbrasero-burn/brasero-burn.c
+index 6dcf53a..f8b64c5 100644
+--- a/libbrasero-burn/brasero-burn.c
++++ b/libbrasero-burn/brasero-burn.c
+@@ -1881,28 +1881,38 @@ brasero_burn_check_session_consistency (BraseroBurn *burn,
+ 
+ static BraseroBurnResult
+ brasero_burn_check_data_loss (BraseroBurn *burn,
++                              BraseroTrackType *temp_output,
+                               GError **error)
+ {
+ 	BraseroMedia media;
+ 	BraseroBurnFlag flags;
+ 	BraseroTrackType *input;
+ 	BraseroBurnResult result;
+-	BraseroTrackType *output;
+ 	BraseroBurnPrivate *priv = BRASERO_BURN_PRIVATE (burn);
+ 
+-	output = brasero_track_type_new ();
+-	brasero_burn_session_get_output_type (priv->session, output);
+-	if (!brasero_track_type_get_has_medium (output)) {
++	if (!temp_output) {
++		BraseroTrackType *output;
++
++		output = brasero_track_type_new ();
++		brasero_burn_session_get_output_type (priv->session, output);
++		if (!brasero_track_type_get_has_medium (output)) {
++			brasero_track_type_free (output);
++			return BRASERO_BURN_OK;
++		}
++
++		media = brasero_track_type_get_medium_type (output);
+ 		brasero_track_type_free (output);
+-		return BRASERO_BURN_OK;
+ 	}
++	else {
++		if (!brasero_track_type_get_has_medium (temp_output))
++			return BRASERO_BURN_OK;
+ 
+-	flags = brasero_burn_session_get_flags (priv->session);
+-	media = brasero_track_type_get_medium_type (output);
+-	brasero_track_type_free (output);
++		media = brasero_track_type_get_medium_type (temp_output);
++	}
+ 
+ 	input = brasero_track_type_new ();
+ 	brasero_burn_session_get_input_type (priv->session, input);
++	flags = brasero_burn_session_get_flags (priv->session);
+ 
+ 	if (media & (BRASERO_MEDIUM_HAS_DATA|BRASERO_MEDIUM_HAS_AUDIO)) {
+ 		if (flags & BRASERO_BURN_FLAG_BLANK_BEFORE_WRITE) {
+@@ -2056,7 +2066,7 @@ brasero_burn_run_tasks (BraseroBurn *burn,
+ 
+ 	/* performed some additional tests that can only be performed at this
+ 	 * point. They are mere warnings. */
+-	result = brasero_burn_check_data_loss (burn, error);
++	result = brasero_burn_check_data_loss (burn, temp_output, error);
+ 	if (result != BRASERO_BURN_OK) {
+ 		brasero_burn_session_pop_settings (priv->session);
+ 		return result;
+--
+cgit v0.9
diff --git a/app-cdr/brasero/files/brasero-2.32.1-warning-silenced.patch b/app-cdr/brasero/files/brasero-2.32.1-warning-silenced.patch
new file mode 100644
index 000000000000..2a1c131c51de
--- /dev/null
+++ b/app-cdr/brasero/files/brasero-2.32.1-warning-silenced.patch
@@ -0,0 +1,21 @@
+From 6638f341240231001f6a3aeb92faeae4e9fefa7a Mon Sep 17 00:00:00 2001
+From: Philippe Rouquier <bonfire-app@wanadoo.fr>
+Date: Wed, 24 Nov 2010 14:29:01 +0000
+Subject: Silenced a warning
+
+---
+diff --git a/libbrasero-burn/brasero-session.c b/libbrasero-burn/brasero-session.c
+index fa67cca..73d8642 100644
+--- a/libbrasero-burn/brasero-session.c
++++ b/libbrasero-burn/brasero-session.c
+@@ -2059,7 +2059,7 @@ brasero_burn_session_get_src_medium (BraseroBurnSession *self)
+ 		return NULL;
+ 
+ 	track = priv->tracks->data;
+-	if (!BRASERO_TRACK_DISC (track))
++	if (!BRASERO_IS_TRACK_DISC (track))
+ 		return NULL;
+ 
+ 	drive = brasero_track_disc_get_drive (BRASERO_TRACK_DISC (track));
+--
+cgit v0.9
diff --git a/app-cdr/brasero/files/brasero-2.32.1-warning-silenced2.patch b/app-cdr/brasero/files/brasero-2.32.1-warning-silenced2.patch
new file mode 100644
index 000000000000..bf756e4e942f
--- /dev/null
+++ b/app-cdr/brasero/files/brasero-2.32.1-warning-silenced2.patch
@@ -0,0 +1,20 @@
+From af1abd9dc9fd85074c9866195f1fb767e16a9a29 Mon Sep 17 00:00:00 2001
+From: Philippe Rouquier <bonfire-app@wanadoo.fr>
+Date: Wed, 24 Nov 2010 14:33:09 +0000
+Subject: Silenced a warning when unhibiting
+
+---
+diff --git a/libbrasero-burn/burn-dbus.c b/libbrasero-burn/burn-dbus.c
+index fe5dea0..a6d77cc 100644
+--- a/libbrasero-burn/burn-dbus.c
++++ b/libbrasero-burn/burn-dbus.c
+@@ -81,7 +81,6 @@ brasero_uninhibit_suspend (guint cookie)
+ 			    error->message);
+ 		g_error_free (error);
+ 	} else {
+-                g_variant_get (res, "(u)", &cookie);
+                 g_variant_unref (res);
+         }
+ 
+--
+cgit v0.9
diff --git a/app-cdr/brasero/metadata.xml b/app-cdr/brasero/metadata.xml
index c09593fe6159..65f429789245 100644
--- a/app-cdr/brasero/metadata.xml
+++ b/app-cdr/brasero/metadata.xml
@@ -4,8 +4,6 @@
 <herd>media-optical</herd>
 <herd>gnome</herd>
 <use>
-	<flag name='beagle'>Enable <pkg>app-misc/beagle</pkg> support for
-		searches</flag>
 	<flag name="introspection">Use
 		<pkg>dev-libs/gobject-introspection</pkg> for
 		introspection</flag>