app-cdr/brasero: add 3.3.91

Linking patch has been applied upstream.

4 files changed, 100 insertions, 310 deletions

diff --git a/app-cdr/brasero/Manifest b/app-cdr/brasero/Manifest
index cac3895b..e594e7c1 100644
--- a/app-cdr/brasero/Manifest
+++ b/app-cdr/brasero/Manifest
@@ -1,2 +1,3 @@
-AUX brasero-2.91.6-build-plugins-against-local-library.patch 14905 RMD160 a84a15050c4b21999c4efdff520606d8d1d563f2 SHA1 bff5cd114b5f98a8b0a39132619a6d39a000d29e SHA256 5978545e14615c43d306e7eb134f1efd6dab9be2e1f80756bd9948e6d6a9db69
-EBUILD brasero-9999.ebuild 2798 RMD160 a6a09a630e0ded1abcb881153d0830a528ffe745 SHA1 13b54b11853214ecfd84edd10a89e9b7d4f397e5 SHA256 49f2cbc6a54730ae3fe13a1d7ac7215830747dc5c54c2fde4bde217e25abfb15
+DIST brasero-3.3.91.tar.xz 3209156 RMD160 d23a0a6e7e1ad6f074412de9c3e5cdaba4cec727 SHA1 087df18e3c274dfb30ddf16d09136b159f16b986 SHA256 a6caa775bdd6b7f1bda51fabd8d580d9416402da80b65351ab2de8fbd38dc7a4
+EBUILD brasero-3.3.91.ebuild 2467 RMD160 04ee25677ed8b556748e2a1fe3566abb0d368f3f SHA1 1afeb66c612c5b1816898ee2cdfee75fe6445e73 SHA256 0e16ffa7ce8c227e94f6bcd67e00d38e82596c699185035b308947c6db645b27
+EBUILD brasero-9999.ebuild 2467 RMD160 04ee25677ed8b556748e2a1fe3566abb0d368f3f SHA1 1afeb66c612c5b1816898ee2cdfee75fe6445e73 SHA256 0e16ffa7ce8c227e94f6bcd67e00d38e82596c699185035b308947c6db645b27
diff --git a/app-cdr/brasero/brasero-3.3.91.ebuild b/app-cdr/brasero/brasero-3.3.91.ebuild
new file mode 100644
index 00000000..fd48bbc4
--- /dev/null
+++ b/app-cdr/brasero/brasero-3.3.91.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+if [[ ${PV} = 9999 ]]; then
+	inherit gnome2-live
+fi
+
+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"
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+IUSE="+css doc +introspection +libburn mp3 nautilus packagekit playlist test tracker"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.29.14:2
+	>=x11-libs/gtk+-3.0.0:3[introspection?]
+	>=media-libs/gstreamer-0.10.15:0.10
+	>=media-libs/gst-plugins-base-0.10:0.10
+	>=dev-libs/libxml2-2.6:2
+	>=x11-libs/libnotify-0.6.1
+
+	media-libs/libcanberra[gtk3]
+	x11-libs/libICE
+	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.91.90 )
+	playlist? ( >=dev-libs/totem-pl-parser-2.29.1 )
+	tracker? ( >=app-misc/tracker-0.12 )"
+RDEPEND="${COMMON_DEPEND}
+	media-libs/gst-plugins-good:0.10
+	media-plugins/gst-plugins-gconf:0.10
+	media-plugins/gst-plugins-meta:0.10[mp3?]
+	x11-themes/hicolor-icon-theme
+	css? ( media-libs/libdvdcss:1.2 )
+	!libburn? (
+		app-cdr/cdrdao
+		app-cdr/dvd+rw-tools
+		virtual/cdrtools )
+	mp3? ( media-libs/gst-plugins-ugly:0.10 )
+	packagekit? ( app-admin/packagekit-base )"
+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
+		$(use_enable !libburn cdrtools)
+		$(use_enable !libburn cdrkit)
+		$(use_enable !libburn cdrdao)
+		$(use_enable !libburn growisofs)
+		$(use_enable introspection)
+		$(use_enable libburn libburnia)
+		$(use_enable nautilus)
+		$(use_enable playlist)
+		$(use_enable tracker search)"
+
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	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/brasero-9999.ebuild b/app-cdr/brasero/brasero-9999.ebuild
index b9e1bb41..fd48bbc4 100644
--- a/app-cdr/brasero/brasero-9999.ebuild
+++ b/app-cdr/brasero/brasero-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -6,7 +6,7 @@ EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2 multilib
+inherit gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -86,18 +86,6 @@ pkg_setup() {
 	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
 }
 
-src_prepare() {
-	# Fix linking against installed libraries, bug #340767, gnome #641233
-	epatch "${FILESDIR}/${PN}-2.91.6-build-plugins-against-local-library.patch"
-
-	if [[ ${PV} != 9999 ]]; then
-		intltoolize --force --copy --automake || die "intltoolize failed"
-		eautoreconf
-	fi
-
-	gnome2_src_prepare
-}
-
 pkg_postinst() {
 	gnome2_pkg_postinst
 
diff --git a/app-cdr/brasero/files/brasero-2.91.6-build-plugins-against-local-library.patch b/app-cdr/brasero/files/brasero-2.91.6-build-plugins-against-local-library.patch
deleted file mode 100644
index 31beb4c1..00000000
--- a/app-cdr/brasero/files/brasero-2.91.6-build-plugins-against-local-library.patch
+++ /dev/null
@@ -1,294 +0,0 @@
-From 80dc44efc63e5e16d13852a6c2163d2ad07249b7 Mon Sep 17 00:00:00 2001
-From: Mike Auty <ikelos@gentoo.org>
-Date: Wed, 2 Feb 2011 13:14:32 +0200
-Subject: [PATCH] Fix linking against system brasero instead of current source
-
----
- nautilus/Makefile.am            |    2 +-
- plugins/audio2cue/Makefile.am   |    2 +-
- plugins/cdrdao/Makefile.am      |    2 +-
- plugins/cdrkit/Makefile.am      |    6 +++---
- plugins/cdrtools/Makefile.am    |    8 ++++----
- plugins/checksum/Makefile.am    |    4 ++--
- plugins/dvdauthor/Makefile.am   |    2 +-
- plugins/dvdcss/Makefile.am      |    2 +-
- plugins/growisofs/Makefile.am   |    4 ++--
- plugins/libburnia/Makefile.am   |    4 ++--
- plugins/local-track/Makefile.am |    4 ++--
- plugins/transcode/Makefile.am   |    6 +++---
- plugins/vcdimager/Makefile.am   |    2 +-
- 13 files changed, 24 insertions(+), 24 deletions(-)
-
-diff --git a/nautilus/Makefile.am b/nautilus/Makefile.am
-index dc74eed..aee736a 100644
---- a/nautilus/Makefile.am
-+++ b/nautilus/Makefile.am
-@@ -9,7 +9,6 @@ INCLUDES =					\
- 	-I$(top_builddir)/libbrasero-burn/	\
- 	-I$(top_srcdir)/src/			\
- 	-I$(top_builddir)/src/			\
--	$(NAUTILUS_EXTENSION_CFLAGS)		\
- 	$(WARN_CFLAGS)							\
- 	$(WERROR)				\
- 	-D_FILE_OFFSET_BITS=64			\
-@@ -22,6 +21,7 @@ INCLUDES =					\
- 	-DLIBEXECDIR=\""$(libexecdir)"\"	\
- 	-DSHAREDIR=\""$(datadir)"\"		\
- 	-DDATADIR=\""$(datadir)/brasero"\"	\
-+	$(NAUTILUS_EXTENSION_CFLAGS)		\
- 	$(DISABLE_DEPRECATED)
- 
- @INTLTOOL_DESKTOP_RULE@
-diff --git a/plugins/audio2cue/Makefile.am b/plugins/audio2cue/Makefile.am
-index 60fcae7..ebe6caf 100644
---- a/plugins/audio2cue/Makefile.am
-+++ b/plugins/audio2cue/Makefile.am
-@@ -18,7 +18,7 @@ INCLUDES = \
- audio2cuedir = $(BRASERO_PLUGIN_DIRECTORY)
- audio2cue_LTLIBRARIES = libbrasero-audio2cue.la
- libbrasero_audio2cue_la_SOURCES = burn-audio2cue.c
--libbrasero_audio2cue_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn3.la
-+libbrasero_audio2cue_la_LIBADD = ../../libbrasero-burn/libbrasero-burn3.la $(BRASERO_GLIB_LIBS)
- libbrasero_audio2cue_la_LDFLAGS = -module -avoid-version
- 
- -include $(top_srcdir)/git.mk
-diff --git a/plugins/cdrdao/Makefile.am b/plugins/cdrdao/Makefile.am
-index b46c9a8..86024fa 100644
---- a/plugins/cdrdao/Makefile.am
-+++ b/plugins/cdrdao/Makefile.am
-@@ -18,7 +18,7 @@ INCLUDES = \
- cdrdaodir = $(BRASERO_PLUGIN_DIRECTORY)
- cdrdao_LTLIBRARIES = libbrasero-cdrdao.la
- libbrasero_cdrdao_la_SOURCES = burn-cdrdao.c 
--libbrasero_cdrdao_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-media/libbrasero-media3.la ../../libbrasero-burn/libbrasero-burn3.la
-+libbrasero_cdrdao_la_LIBADD = ../../libbrasero-media/libbrasero-media3.la ../../libbrasero-burn/libbrasero-burn3.la $(BRASERO_GLIB_LIBS)
- libbrasero_cdrdao_la_LDFLAGS = -module -avoid-version
- 
- -include $(top_srcdir)/git.mk
-diff --git a/plugins/cdrkit/Makefile.am b/plugins/cdrkit/Makefile.am
-index 20e7f8a..4359720 100644
---- a/plugins/cdrkit/Makefile.am
-+++ b/plugins/cdrkit/Makefile.am
-@@ -19,7 +19,7 @@ wodimdir = $(BRASERO_PLUGIN_DIRECTORY)
- wodim_LTLIBRARIES = libbrasero-wodim.la
- libbrasero_wodim_la_SOURCES = burn-wodim.c \
- 	burn-cdrkit.h 
--libbrasero_wodim_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-media/libbrasero-media3.la ../../libbrasero-burn/libbrasero-burn3.la
-+libbrasero_wodim_la_LIBADD = ../../libbrasero-media/libbrasero-media3.la ../../libbrasero-burn/libbrasero-burn3.la $(BRASERO_GLIB_LIBS)
- libbrasero_wodim_la_LDFLAGS = -module -avoid-version
- 
- #genisoimage
-@@ -27,7 +27,7 @@ genisoimagedir = $(BRASERO_PLUGIN_DIRECTORY)
- genisoimage_LTLIBRARIES = libbrasero-genisoimage.la
- libbrasero_genisoimage_la_SOURCES = burn-genisoimage.c \
- 	burn-cdrkit.h 
--libbrasero_genisoimage_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn3.la
-+libbrasero_genisoimage_la_LIBADD = ../../libbrasero-burn/libbrasero-burn3.la $(BRASERO_GLIB_LIBS)
- libbrasero_genisoimage_la_LDFLAGS = -module -avoid-version
- 
- #readom
-@@ -35,7 +35,7 @@ readomdir = $(BRASERO_PLUGIN_DIRECTORY)
- readom_LTLIBRARIES = libbrasero-readom.la
- libbrasero_readom_la_SOURCES = burn-readom.c \
- 	burn-cdrkit.h 
--libbrasero_readom_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-media/libbrasero-media3.la ../../libbrasero-burn/libbrasero-burn3.la
-+libbrasero_readom_la_LIBADD = ../../libbrasero-media/libbrasero-media3.la ../../libbrasero-burn/libbrasero-burn3.la $(BRASERO_GLIB_LIBS)
- libbrasero_readom_la_LDFLAGS = -module -avoid-version
- 
- -include $(top_srcdir)/git.mk
-diff --git a/plugins/cdrtools/Makefile.am b/plugins/cdrtools/Makefile.am
-index b82b753..d8b4650 100644
---- a/plugins/cdrtools/Makefile.am
-+++ b/plugins/cdrtools/Makefile.am
-@@ -19,7 +19,7 @@ cdrecorddir = $(BRASERO_PLUGIN_DIRECTORY)
- cdrecord_LTLIBRARIES = libbrasero-cdrecord.la
- libbrasero_cdrecord_la_SOURCES = burn-cdrecord.c \
- 	burn-cdrtools.h 
--libbrasero_cdrecord_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn3.la
-+libbrasero_cdrecord_la_LIBADD = ../../libbrasero-burn/libbrasero-burn3.la $(BRASERO_GLIB_LIBS)
- libbrasero_cdrecord_la_LDFLAGS = -module -avoid-version
- 
- #mkisofs
-@@ -27,7 +27,7 @@ mkisofsdir = $(BRASERO_PLUGIN_DIRECTORY)
- mkisofs_LTLIBRARIES = libbrasero-mkisofs.la
- libbrasero_mkisofs_la_SOURCES = burn-mkisofs.c \
- 	burn-cdrtools.h 
--libbrasero_mkisofs_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn3.la
-+libbrasero_mkisofs_la_LIBADD = ../../libbrasero-burn/libbrasero-burn3.la $(BRASERO_GLIB_LIBS)
- libbrasero_mkisofs_la_LDFLAGS = -module -avoid-version
- 
- #readcd
-@@ -35,14 +35,14 @@ readcddir = $(BRASERO_PLUGIN_DIRECTORY)
- readcd_LTLIBRARIES = libbrasero-readcd.la
- libbrasero_readcd_la_SOURCES = burn-readcd.c \
- 	burn-cdrtools.h 
--libbrasero_readcd_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-media/libbrasero-media3.la ../../libbrasero-burn/libbrasero-burn3.la
-+libbrasero_readcd_la_LIBADD = ../../libbrasero-media/libbrasero-media3.la ../../libbrasero-burn/libbrasero-burn3.la $(BRASERO_GLIB_LIBS)
- libbrasero_readcd_la_LDFLAGS = -module -avoid-version
- 
- #cdda2wav
- cdda2wavdir = $(BRASERO_PLUGIN_DIRECTORY)
- cdda2wav_LTLIBRARIES = libbrasero-cdda2wav.la
- libbrasero_cdda2wav_la_SOURCES = burn-cdda2wav.c burn-cdrtools.h 
--libbrasero_cdda2wav_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-media/libbrasero-media3.la ../../libbrasero-burn/libbrasero-burn3.la
-+libbrasero_cdda2wav_la_LIBADD = ../../libbrasero-media/libbrasero-media3.la ../../libbrasero-burn/libbrasero-burn3.la $(BRASERO_GLIB_LIBS)
- libbrasero_cdda2wav_la_LDFLAGS = -module -avoid-version
- 
- -include $(top_srcdir)/git.mk
-diff --git a/plugins/checksum/Makefile.am b/plugins/checksum/Makefile.am
-index 57855e4..4acef8c 100644
---- a/plugins/checksum/Makefile.am
-+++ b/plugins/checksum/Makefile.am
-@@ -20,7 +20,7 @@ checksum_LTLIBRARIES = libbrasero-checksum.la
- libbrasero_checksum_la_SOURCES = burn-checksum-image.c	
- 
- libbrasero_checksum_la_LDFLAGS = -module -avoid-version
--libbrasero_checksum_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-media/libbrasero-media3.la ../../libbrasero-burn/libbrasero-burn3.la
-+libbrasero_checksum_la_LIBADD = ../../libbrasero-media/libbrasero-media3.la ../../libbrasero-burn/libbrasero-burn3.la $(BRASERO_GLIB_LIBS)
- 
- checksumfiledir = $(BRASERO_PLUGIN_DIRECTORY)
- checksumfile_LTLIBRARIES = libbrasero-checksum-file.la
-@@ -29,6 +29,6 @@ libbrasero_checksum_file_la_SOURCES = burn-checksum-files.c	\
- 				      burn-volume-read.h
- 
- libbrasero_checksum_file_la_LDFLAGS = -module -avoid-version
--libbrasero_checksum_file_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GTK_LIBS) ../../libbrasero-media/libbrasero-media3.la ../../libbrasero-burn/libbrasero-burn3.la
-+libbrasero_checksum_file_la_LIBADD = ../../libbrasero-media/libbrasero-media3.la ../../libbrasero-burn/libbrasero-burn3.la $(BRASERO_GLIB_LIBS) $(BRASERO_GTK_LIBS)
- 
- -include $(top_srcdir)/git.mk
-diff --git a/plugins/dvdauthor/Makefile.am b/plugins/dvdauthor/Makefile.am
-index 3ecbff4..0fcd411 100644
---- a/plugins/dvdauthor/Makefile.am
-+++ b/plugins/dvdauthor/Makefile.am
-@@ -19,7 +19,7 @@ dvdauthordir = $(BRASERO_PLUGIN_DIRECTORY)
- dvdauthor_LTLIBRARIES = libbrasero-dvdauthor.la
- 
- libbrasero_dvdauthor_la_SOURCES = burn-dvdauthor.c 
--libbrasero_dvdauthor_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_LIBXML_LIBS) ../../libbrasero-burn/libbrasero-burn3.la
-+libbrasero_dvdauthor_la_LIBADD = ../../libbrasero-burn/libbrasero-burn3.la $(BRASERO_GLIB_LIBS) $(BRASERO_LIBXML_LIBS)
- libbrasero_dvdauthor_la_LDFLAGS = -module -avoid-version
- 
- 
-diff --git a/plugins/dvdcss/Makefile.am b/plugins/dvdcss/Makefile.am
-index 8f6718c..467a5e1 100644
---- a/plugins/dvdcss/Makefile.am
-+++ b/plugins/dvdcss/Makefile.am
-@@ -17,7 +17,7 @@ plugindir = $(BRASERO_PLUGIN_DIRECTORY)
- plugin_LTLIBRARIES = libbrasero-dvdcss.la
- libbrasero_dvdcss_la_SOURCES = burn-dvdcss.c \
- 	burn-dvdcss-private.h 
--libbrasero_dvdcss_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GMODULE_LIBS) ../../libbrasero-media/libbrasero-media3.la ../../libbrasero-burn/libbrasero-burn3.la
-+libbrasero_dvdcss_la_LIBADD = ../../libbrasero-media/libbrasero-media3.la ../../libbrasero-burn/libbrasero-burn3.la $(BRASERO_GLIB_LIBS) $(BRASERO_GMODULE_LIBS)
- libbrasero_dvdcss_la_LDFLAGS = -module -avoid-version
- 
- -include $(top_srcdir)/git.mk
-diff --git a/plugins/growisofs/Makefile.am b/plugins/growisofs/Makefile.am
-index 8dd3328..99d3efd 100644
---- a/plugins/growisofs/Makefile.am
-+++ b/plugins/growisofs/Makefile.am
-@@ -19,14 +19,14 @@ growisofsdir = $(BRASERO_PLUGIN_DIRECTORY)
- growisofs_LTLIBRARIES = libbrasero-growisofs.la
- libbrasero_growisofs_la_SOURCES = burn-growisofs.c \
- 	burn-growisofs-common.h 
--libbrasero_growisofs_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn3.la
-+libbrasero_growisofs_la_LIBADD = ../../libbrasero-burn/libbrasero-burn3.la $(BRASERO_GLIB_LIBS)
- libbrasero_growisofs_la_LDFLAGS = -module -avoid-version
- 
- #dvdrwformat
- dvdrwformatdir = $(BRASERO_PLUGIN_DIRECTORY)
- dvdrwformat_LTLIBRARIES = libbrasero-dvdrwformat.la
- libbrasero_dvdrwformat_la_SOURCES = burn-dvd-rw-format.c 
--libbrasero_dvdrwformat_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn3.la
-+libbrasero_dvdrwformat_la_LIBADD = ../../libbrasero-burn/libbrasero-burn3.la $(BRASERO_GLIB_LIBS)
- libbrasero_dvdrwformat_la_LDFLAGS = -module -avoid-version
- 
- -include $(top_srcdir)/git.mk
-diff --git a/plugins/libburnia/Makefile.am b/plugins/libburnia/Makefile.am
-index 1351967..b4062a2 100644
---- a/plugins/libburnia/Makefile.am
-+++ b/plugins/libburnia/Makefile.am
-@@ -23,7 +23,7 @@ libbrasero_libburn_la_SOURCES = burn-libburn.c 		\
- 				burn-libburn-common.c	\
- 				burn-libburn-common.h  \
- 				burn-libburnia.h 
--libbrasero_libburn_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_LIBBURNIA_LIBS) ../../libbrasero-burn/libbrasero-burn3.la
-+libbrasero_libburn_la_LIBADD = ../../libbrasero-burn/libbrasero-burn3.la $(BRASERO_GLIB_LIBS) $(BRASERO_LIBBURNIA_LIBS)
- libbrasero_libburn_la_LDFLAGS = -module -avoid-version
- 
- #libisofs (apparently libisofs needs one libburn function)
-@@ -32,7 +32,7 @@ libisofs_LTLIBRARIES = libbrasero-libisofs.la
- libbrasero_libisofs_la_SOURCES = burn-libisofs.c                       \
- 	burn-libburn-common.c burn-libburn-common.h			\
- 	burn-libburnia.h 
--libbrasero_libisofs_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_LIBBURNIA_LIBS) ../../libbrasero-burn/libbrasero-burn3.la
-+libbrasero_libisofs_la_LIBADD = ../../libbrasero-burn/libbrasero-burn3.la $(BRASERO_GLIB_LIBS) $(BRASERO_LIBBURNIA_LIBS)
- libbrasero_libisofs_la_LDFLAGS = -module -avoid-version
- 
- -include $(top_srcdir)/git.mk
-diff --git a/plugins/local-track/Makefile.am b/plugins/local-track/Makefile.am
-index 5f75139..b553220 100644
---- a/plugins/local-track/Makefile.am
-+++ b/plugins/local-track/Makefile.am
-@@ -20,7 +20,7 @@ local_trackdir = $(BRASERO_PLUGIN_DIRECTORY)
- local_track_LTLIBRARIES = libbrasero-local-track.la
- 
- libbrasero_local_track_la_SOURCES = burn-local-image.c 
--libbrasero_local_track_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GIO_LIBS) ../../libbrasero-burn/libbrasero-burn3.la
-+libbrasero_local_track_la_LIBADD = ../../libbrasero-burn/libbrasero-burn3.la $(BRASERO_GLIB_LIBS) $(BRASERO_GIO_LIBS)
- libbrasero_local_track_la_LDFLAGS = -module -avoid-version
- 
- #burn-uri
-@@ -28,7 +28,7 @@ burn_uridir = $(BRASERO_PLUGIN_DIRECTORY)
- burn_uri_LTLIBRARIES = libbrasero-burn-uri.la
- 
- libbrasero_burn_uri_la_SOURCES = burn-uri.c 
--libbrasero_burn_uri_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GIO_LIBS) ../../libbrasero-burn/libbrasero-burn3.la
-+libbrasero_burn_uri_la_LIBADD = ../../libbrasero-burn/libbrasero-burn3.la $(BRASERO_GLIB_LIBS) $(BRASERO_GIO_LIBS)
- libbrasero_burn_uri_la_LDFLAGS = -module -avoid-version
- 
- -include $(top_srcdir)/git.mk
-diff --git a/plugins/transcode/Makefile.am b/plugins/transcode/Makefile.am
-index 3ce1d28..4cdf5ec 100644
---- a/plugins/transcode/Makefile.am
-+++ b/plugins/transcode/Makefile.am
-@@ -19,21 +19,21 @@ transcodedir = $(BRASERO_PLUGIN_DIRECTORY)
- transcode_LTLIBRARIES = libbrasero-transcode.la
- 
- libbrasero_transcode_la_SOURCES = burn-transcode.c burn-normalize.h 
--libbrasero_transcode_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GSTREAMER_LIBS) ../../libbrasero-burn/libbrasero-burn3.la
-+libbrasero_transcode_la_LIBADD = ../../libbrasero-burn/libbrasero-burn3.la $(BRASERO_GLIB_LIBS) $(BRASERO_GSTREAMER_LIBS)
- libbrasero_transcode_la_LDFLAGS = -module -avoid-version
- 
- normalizedir = $(BRASERO_PLUGIN_DIRECTORY)
- normalize_LTLIBRARIES = libbrasero-normalize.la
- 
- libbrasero_normalize_la_SOURCES = burn-normalize.c burn-normalize.h
--libbrasero_normalize_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GSTREAMER_LIBS) ../../libbrasero-burn/libbrasero-burn3.la
-+libbrasero_normalize_la_LIBADD = ../../libbrasero-burn/libbrasero-burn3.la $(BRASERO_GLIB_LIBS) $(BRASERO_GSTREAMER_LIBS)
- libbrasero_normalize_la_LDFLAGS = -module -avoid-version
- 
- vobdir = $(BRASERO_PLUGIN_DIRECTORY)
- vob_LTLIBRARIES = libbrasero-vob.la
- 
- libbrasero_vob_la_SOURCES = burn-vob.c 
--libbrasero_vob_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GSTREAMER_LIBS) ../../libbrasero-burn/libbrasero-burn3.la
-+libbrasero_vob_la_LIBADD = ../../libbrasero-burn/libbrasero-burn3.la $(BRASERO_GLIB_LIBS) $(BRASERO_GSTREAMER_LIBS)
- libbrasero_vob_la_LDFLAGS = -module -avoid-version
- 
- -include $(top_srcdir)/git.mk
-diff --git a/plugins/vcdimager/Makefile.am b/plugins/vcdimager/Makefile.am
-index 2a55f8c..b265585 100644
---- a/plugins/vcdimager/Makefile.am
-+++ b/plugins/vcdimager/Makefile.am
-@@ -19,7 +19,7 @@ vcdimagerdir = $(BRASERO_PLUGIN_DIRECTORY)
- vcdimager_LTLIBRARIES = libbrasero-vcdimager.la
- 
- libbrasero_vcdimager_la_SOURCES = burn-vcdimager.c 
--libbrasero_vcdimager_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_LIBXML_LIBS) ../../libbrasero-burn/libbrasero-burn3.la
-+libbrasero_vcdimager_la_LIBADD = ../../libbrasero-burn/libbrasero-burn3.la $(BRASERO_GLIB_LIBS) $(BRASERO_LIBXML_LIBS)
- libbrasero_vcdimager_la_LDFLAGS = -module -avoid-version
- 
- 
--- 
-1.7.4.rc2
-