diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2014-06-25 12:15:03 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2014-06-25 12:15:03 +0000 |
| commit | 69558a09d6e689b1652a4cf07dd6283888fefd58 (patch) | |
| tree | 0f87e83eed0856ca1bdcf33cba073894d28c7ab7 /app-misc | |
| parent | Fix typo. (diff) | |
| download | gentoo-2-69558a09d6e689b1652a4cf07dd6283888fefd58.tar.gz gentoo-2-69558a09d6e689b1652a4cf07dd6283888fefd58.tar.bz2 gentoo-2-69558a09d6e689b1652a4cf07dd6283888fefd58.zip | |
Try to finally fix bug #509048
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/tracker/ChangeLog | 6 | ||||
| -rw-r--r-- | app-misc/tracker/files/tracker-1.0.1-libmediaart-disabled.patch | 40 | ||||
| -rw-r--r-- | app-misc/tracker/tracker-1.0.1.ebuild | 12 |
3 files changed, 54 insertions, 4 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/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 |