Tue Apr 23 01:16:16 PDT 2013

2 files changed, 12 insertions, 62 deletions

diff --git a/extra/brasero/PKGBUILD b/extra/brasero/PKGBUILD
index 5d6c62f84..b96d207bc 100644
--- a/extra/brasero/PKGBUILD
+++ b/extra/brasero/PKGBUILD
@@ -1,32 +1,35 @@
-# $Id: PKGBUILD 180254 2013-03-18 23:32:28Z jgc $
+# $Id: PKGBUILD 183335 2013-04-21 22:08:35Z heftig $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=brasero
-pkgver=3.6.1
+pkgver=3.8.0
 pkgrel=2
 pkgdesc="A disc burning application for Gnome"
 arch=('i686' 'x86_64')
 url="http://www.gnome.org/projects/brasero"
 license=('GPL')
 options=('!libtool' '!emptydirs')
-depends=('gtk3' 'gst-plugins-good' 'totem-plparser' 'cdrkit' 'cdrdao' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info'  'libcanberra' 'dvd+rw-tools' 'dconf' 'libsm' 'libtracker-sparql')
-makedepends=('gtk-doc' 'intltool' 'libburn' 'libisofs' 'nautilus' 'gobject-introspection' 'gconf' 'itstool' 'docbook-xsl')
+depends=('gtk3' 'gst-plugins-good' 'totem-plparser' 'cdrkit' 'cdrdao' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info'  'libcanberra' 'dvd+rw-tools' 'dconf' 'libsm' 'libtracker-sparql' 'libnotify')
+makedepends=('gtk-doc' 'yelp-tools' 'gnome-common' 'intltool' 'libburn' 'libisofs' 'libnautilus-extension' 'gobject-introspection' 'gconf' 'itstool' 'docbook-xsl')
 optdepends=('libburn: alternative back-end'
             'libisofs: libburn back-end'
             'dvdauthor: video project'
             'vcdimager: video project')
 replaces=('nautilus-cd-burner')
 install=brasero.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        use-mpegaudioparse.patch)
-sha256sums=('d293eb28dc45af3535f09cf91aa6ccc523f3f3d8b7ad3339b5e79b4acc19b932'
-            'c75331d130c248edeaa68211cf96f386d86905510d09b104e4e0cd0ff4c92218')
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('d98a368a6129e50681e8243c5e0833c32cca699bd50b839c6a551d52b396bce4')
 
 build() {
   cd "$pkgname-$pkgver"
-  patch -Np1 -i ../use-mpegaudioparse.patch
+
+  # Update tracker dep
+  sed -i '/tracker/s/0\.14/0.16/' configure.ac
+  autoreconf -f -v -i
+
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-caches \
       --disable-schemas-compile
diff --git a/extra/brasero/use-mpegaudioparse.patch b/extra/brasero/use-mpegaudioparse.patch
deleted file mode 100644
index 79c24d6a8..000000000
--- a/extra/brasero/use-mpegaudioparse.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 895777890485428a23f2e0da0e8ccd2edf624f6e Mon Sep 17 00:00:00 2001
-From: Jeremy Bicha <jbicha@ubuntu.com>
-Date: Fri, 25 Jan 2013 03:26:10 +0000
-Subject: use mpegaudioparse gstreamer plugin instead of mp3parse
-
-Fix "not suitable for audio or video media" error when
-attempting to create a mp3 audio project
-The plugin was basically renamed for gstreamer 1.0.
-Thanks tuxor for identifying the problem!
-
-https://bugzilla.gnome.org/show_bug.cgi?id=687886
----
-diff --git a/libbrasero-utils/brasero-metadata.c b/libbrasero-utils/brasero-metadata.c
-index 1088121..7f10088 100644
---- a/libbrasero-utils/brasero-metadata.c
-+++ b/libbrasero-utils/brasero-metadata.c
-@@ -1200,12 +1200,12 @@ brasero_metadata_create_mp3_pipeline (BraseroMetadata *self)
- 	}
- 	gst_bin_add (GST_BIN (priv->pipeline_mp3), source);
- 
--	parse = gst_element_factory_make ("mp3parse", NULL);
-+	parse = gst_element_factory_make ("mpegaudioparse", NULL);
- 	if (!parse) {
- 		priv->error = g_error_new (BRASERO_UTILS_ERROR,
- 					   BRASERO_UTILS_ERROR_GENERAL,
- 					   _("%s element could not be created"),
--					   "\"mp3parse\"");
-+					   "\"mpegaudioparse\"");
- 
- 		g_object_unref (priv->pipeline_mp3);
- 		priv->pipeline_mp3 = NULL;
-diff --git a/plugins/transcode/burn-transcode.c b/plugins/transcode/burn-transcode.c
-index a6a0f40..6861168 100644
---- a/plugins/transcode/burn-transcode.c
-+++ b/plugins/transcode/burn-transcode.c
-@@ -284,13 +284,13 @@ brasero_transcode_create_pipeline_size_mp3 (BraseroTranscode *transcode,
- 
- 	BRASERO_JOB_LOG (transcode, "Creating specific pipeline for MP3s");
- 
--	parse = gst_element_factory_make ("mp3parse", NULL);
-+	parse = gst_element_factory_make ("mpegaudioparse", NULL);
- 	if (!parse) {
- 		g_set_error (error,
- 			     BRASERO_BURN_ERROR,
- 			     BRASERO_BURN_ERROR_GENERAL,
- 			     _("%s element could not be created"),
--			     "\"Mp3parse\"");
-+			     "\"mpegaudioparse\"");
- 		g_object_unref (pipeline);
- 		return FALSE;
- 	}
---
-cgit v0.9.1