Try to finally fix bug #509048

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 60 insertions, 9 deletions

diff --git a/app-misc/tracker/ChangeLog b/app-misc/tracker/ChangeLog
index 7a1cb7734f9f..d933a12ab9be 100644
--- a/app-misc/tracker/ChangeLog
+++ b/app-misc/tracker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/tracker
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.169 2014/06/01 07:55:46 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.170 2014/06/25 12:15:03 pacho Exp $
+
+  25 Jun 2014; Pacho Ramos <pacho@gentoo.org>
+  +files/tracker-1.0.1-libmediaart-disabled.patch, tracker-1.0.1.ebuild:
+  Try to finally fix bug #509048
 
   01 Jun 2014; Pacho Ramos <pacho@gentoo.org> tracker-0.16.4.ebuild:
   Old tracker only supports old upower
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 95bce1b95e91..0d2ca94f716a 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX tracker-1.0.1-libmediaart-disabled.patch 1163 SHA256 dcc360064454177a6eb9bee46b4ee1c99efd97e5efd51e0ec12ebf1e9b971687 SHA512 f836e3b39f73517d78a628983860006c97b6b2427ed991e8ad750e04a8fdec64fb4b5177175a915fb914b96c551ea95f55e95d877a6ca36a1ed7da3a200a1009 WHIRLPOOL 05d532ef6de36e83b47c16ebca9ecc45df3dc95992b38af513b2b7510a6f0c185762ee59e583d6ec90c736e79ff974095ac4dc66b4e062b0a8f567753800136e
 DIST tracker-0.16.4.tar.xz 5745592 SHA256 9c2f50839c2b8b352ab9a022597ef985c1900e6286c0c3bcb7a64da39dbb3580 SHA512 82cc63f5a89e70e5d7d3c306005c9119b7f52a244cc453b789f19f56ec4858fd4c02421e07ab392dc1198b3352e99022986dfff043f9b4757e59723c038ffda0 WHIRLPOOL 07ec3cb39f619b930fba194c8cb5843786d9b0afa0d759498f72b35305ad06e1b9aba53fee64dad73186d74b7207c80ffa892adc9b5b350a108d882eaead9d9a
 DIST tracker-1.0.1.tar.xz 6060276 SHA256 76e7918e62526a8209f9c9226f82abe592a6332826ac7c12e6e405063181e889 SHA512 b41908756e10a1019901ad9313d795958eff40b7025d72e1c6670810b14f2968e05fa7f35451a53c354ba70d938aeb49e1ee9ab81d88531d1dfd75037b5e38eb WHIRLPOOL 08b46212e7ba5be97044bed416d5966ed5e1ec3ebe134827253fd20b3463f37f13449b82d8e705cb02dd5d29fd8d059911562c159e8ae5012454063f7265b826
 EBUILD tracker-0.16.4.ebuild 9149 SHA256 aba92687db939cc8a58b60947a95a77f22102812df3b4b5983b73e86f1a60c18 SHA512 6f0085c15b11e2a350b8fa6043b1749e40f90cc5d80d847d3fdab03ed3d5eba98c169e87ed8808ea0ba4dcecb3064d4fb9412cb88dcbeb92b82d336a21be1a4c WHIRLPOOL b655fc10333c5954d0da3873a07be925972327ee06e144c79e645db0882dbbf3703eb4e22a2dc617f7f58d73808d8c15bc817d7f01b4022d64b35720594aba17
-EBUILD tracker-1.0.1.ebuild 7902 SHA256 1bf24064715084dc0936fd0bd85696328a8a98d5c146e065f5d7445a62dd3847 SHA512 8a4367753212ba0af6d2991a4cb2d2bc91948dcc4e824a4a17c5882261ffe8ec2c667a140a6aaadaed8b831e5e5f01131a2e1dceb5846afd3cd7c011639ba33d WHIRLPOOL e67e4c58aa9b471f42cbf77b298650df4a98df1e15c64737357dfd0625b8f26b73fa91a9c92f97e1399bea8d625ee0120e1165b58d8efcc184c55333082ffb1e
-MISC ChangeLog 31491 SHA256 63e08dd9d58a6df049080eb51552a9158e4a24a32ac638fb1e86acaedfe1fe12 SHA512 b027c6e14350b242cdbe18b6cdc6794593d07ed08ac56714132ecf408cae51b71236f8c764afd476e97e882b42591d01b917848bf5ea6bc46856199bbf6a23d8 WHIRLPOOL e70c67437dd0a2ba6d5ca8f49e2de73988ca14471fc076098f3ac51ca420abbd86273ee56386a4082aa7a2e9f6c38abcfec96fa8a16c9c3ccb0bfe5cc03290ee
+EBUILD tracker-1.0.1.ebuild 8027 SHA256 22ab8e412f605c0725489410c5eb68df129290dd8bdf6c4059df62cae6c7a718 SHA512 3cd3c150ab33f1cf8385bb4f5ea79a9195f0a239eb6942131d70730feb015bb6063cc1c0da0c82327cf392a2101f2e27ef98e91483e660d81d9d1bffb2b60763 WHIRLPOOL a15ba7d7c1b2e4e4c6119155d6cc21810178b089c9389732260852a7d1c3b59d73bf1b6fa3d3480fe04a44e19e97bbe3c3b1aaeebb81c0279b4d3cbec8c362b3
+MISC ChangeLog 31644 SHA256 de9ef3a125bdb47b333a8fe81a695d396f043099a220794b6ad8a970ccb1ae6f SHA512 ed27d73966b360ad3014d68217d49c147fcf34bb9a0269b7440305f425e89532bc05f1a9ea3fb82024ce1551e6d3fbce95517d55a7c3a8b80b8d438832b9cbf7 WHIRLPOOL 335daaadb2178c5efa9ee17a6aac665709fe9ce48437d76561d6a67f31a6206353d87e42a39262de8f5db5cba662d68d4a6748720828d9df5cf590279b6c8ff1
 MISC metadata.xml 1484 SHA256 5d395e74b62ec9b377456b66221e5ecb1b3afb8097db358cfe9029c5018cb1dc SHA512 c188ca86938c56518d0fa01fedacd1aee189364358dbbda2cc8b70d2efd9549c2e4b3b92f3f177733a5061e31ae78048a25c30e90c0e6d065879688c53f94e63 WHIRLPOOL 232fff635a2fb3437f915301aa57a096189b4bc6658038d63c626e2b8cf8814b24bfd7b4ff96d9e9f4ac24ee562b16127ea7ec195b7923bc6799fc0002cb210d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlOK3IMACgkQCaWpQKGI+9SFzgCgh+ZIa59Hp/EygFHj4BcxB+lE
-LasAn1P9x6tLE9MXK0NGjghfqvCO0rvI
-=u5XG
+iEYEAREIAAYFAlOqvUgACgkQCaWpQKGI+9T2WACcD9uGXhSCygJIS9UTNQEHVky5
+xiIAn1+ilKwA/WiUIqUZU+DJCCe01JvK
+=cmWB
 -----END PGP SIGNATURE-----
diff --git a/app-misc/tracker/files/tracker-1.0.1-libmediaart-disabled.patch b/app-misc/tracker/files/tracker-1.0.1-libmediaart-disabled.patch
new file mode 100644
index 000000000000..3ea95bd38ce6
--- /dev/null
+++ b/app-misc/tracker/files/tracker-1.0.1-libmediaart-disabled.patch
@@ -0,0 +1,40 @@
+From 3a360934d4520db279490e1c5c929aa61916ac90 Mon Sep 17 00:00:00 2001
+From: Martyn Russell <martyn@lanedo.com>
+Date: Thu, 5 Jun 2014 10:08:30 +0100
+Subject: tracker-extract: Fix build with libav when libmediaaart is disabled
+
+https://bugzilla.gnome.org/show_bug.cgi?id=728370
+
+diff --git a/src/tracker-extract/tracker-extract-libav.c b/src/tracker-extract/tracker-extract-libav.c
+index fea30a3..c14998b 100644
+--- a/src/tracker-extract/tracker-extract-libav.c
++++ b/src/tracker-extract/tracker-extract-libav.c
+@@ -26,7 +26,9 @@
+ 
+ #include <libtracker-extract/tracker-extract.h>
+ 
++#ifdef HAVE_LIBMEDIAART
+ #include <tracker-media-art.h>
++#endif
+ 
+ #include <libavcodec/avcodec.h>
+ #include <libavformat/avformat.h>
+@@ -327,6 +329,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
+ 			g_free (album_uri);
+ 		}
+ 
++#ifdef HAVE_LIBMEDIAART
+ 		media_art_process (NULL,
+ 		                   0,
+ 		                   NULL,
+@@ -334,6 +337,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
+ 		                   album_artist,
+ 		                   album_title,
+ 		                   uri);
++#endif
+ 
+ 		g_free(performer_uri);
+ 	}
+-- 
+cgit v0.10.1
+
diff --git a/app-misc/tracker/tracker-1.0.1.ebuild b/app-misc/tracker/tracker-1.0.1.ebuild
index c48883931f09..13a5f3502d84 100644
--- a/app-misc/tracker/tracker-1.0.1.ebuild
+++ b/app-misc/tracker/tracker-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-1.0.1.ebuild,v 1.2 2014/05/31 18:43:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-1.0.1.ebuild,v 1.3 2014/06/25 12:15:03 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -8,14 +8,17 @@ GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python2_{6,7} )
 VALA_MIN_API_VERSION="0.14"
 
-inherit autotools gnome2 linux-info multilib python-any-r1 vala versionator virtualx
+inherit autotools eutils gnome2 linux-info multilib python-any-r1 vala versionator virtualx
 
 DESCRIPTION="A tagging metadata database, search tool and indexer"
 HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/100"
-IUSE="cue eds elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf gstreamer gtk iptc +iso +jpeg laptop +miner-fs mp3 nautilus networkmanager pdf playlist rss test thunderbird +tiff upnp-av +vorbis +xml xmp xps"
+IUSE="cue eds elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf
+gstreamer gtk iptc +iso +jpeg laptop +miner-fs mp3 nautilus networkmanager
+pdf playlist rss test thunderbird +tiff upnp-av +vorbis +xml xmp xps"
+
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 REQUIRED_USE="
@@ -139,6 +142,9 @@ src_prepare() {
 	sed -e '\%/steroids/tracker/tracker_sparql_update_async%,+3 d' \
 		-i tests/tracker-steroids/tracker-test.c || die
 
+	# Fix building with libmediaart disabled, bug #509048
+	epatch "${FILESDIR}/${PN}-1.0.1-libmediaart-disabled.patch"
+
 	eautoreconf # See bug #367975
 	gnome2_src_prepare
 	vala_src_prepare