[132299] users/devans/GNOME-3/unstable/dports/gnome/tracker
devans at macports.org
devans at macports.org
Wed Jan 28 13:22:51 PST 2015
Revision: 132299
https://trac.macports.org/changeset/132299
Author: devans at macports.org
Date: 2015-01-28 13:22:50 -0800 (Wed, 28 Jan 2015)
Log Message:
-----------
GNOME-3/unstable: tracker, update to unstable version 1.3.2, backport upstream patch to use libmediaart-2.0.
Modified Paths:
--------------
users/devans/GNOME-3/unstable/dports/gnome/tracker/Portfile
Added Paths:
-----------
users/devans/GNOME-3/unstable/dports/gnome/tracker/files/patch-libmediaart-2.0.diff
Property Changed:
----------------
users/devans/GNOME-3/unstable/dports/gnome/tracker/
Property changes on: users/devans/GNOME-3/unstable/dports/gnome/tracker
___________________________________________________________________
Modified: svn:mergeinfo
- /users/devans/GNOME-3/unstable/dports/gnome/tracker:120511-125755
+ /users/devans/GNOME-3/stable/dports/gnome/tracker:128275-132141
/users/devans/GNOME-3/unstable/dports/gnome/tracker:120511-125755
Modified: users/devans/GNOME-3/unstable/dports/gnome/tracker/Portfile
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/tracker/Portfile 2015-01-28 21:22:49 UTC (rev 132298)
+++ users/devans/GNOME-3/unstable/dports/gnome/tracker/Portfile 2015-01-28 21:22:50 UTC (rev 132299)
@@ -2,9 +2,10 @@
# $Id$
PortSystem 1.0
+PortGroup gobject_introspection 1.0
name tracker
-version 1.3.0
+version 1.3.2
license GPL-2
set branch [join [lrange [split ${version} .] 0 1] .]
description Metadata database, indexer and search tool.
@@ -21,14 +22,13 @@
use_xz yes
-checksums rmd160 7976634b8a761524bf720891b4c1419da9e8d547 \
- sha256 d265151e6ccacfc1d705700f1f81df57b68a9c17c17fe5f6720dcc6213aa5798
+checksums rmd160 06fe4d79669b17106c123edd5396995a77209bbb \
+ sha256 4cae42baefd43c6a9b97e2eaf1384e191c9da92fb7b03677fbfeea67f8a01db0
depends_build port:pkgconfig \
port:intltool
depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
- port:gobject-introspection \
port:sqlite3 \
port:ossp-uuid \
port:libgee \
@@ -52,8 +52,11 @@
patchfiles patch-extract-configure.ac.diff \
patch-libtracker-sparql-suffix.diff \
- patch-module-flags-no-undefined.diff
+ patch-module-flags-no-undefined.diff \
+ patch-libmediaart-2.0.diff
+gobject_introspection yes
+
# update m4/intltool.m4 and autoreconf
pre-configure {
Added: users/devans/GNOME-3/unstable/dports/gnome/tracker/files/patch-libmediaart-2.0.diff
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/tracker/files/patch-libmediaart-2.0.diff (rev 0)
+++ users/devans/GNOME-3/unstable/dports/gnome/tracker/files/patch-libmediaart-2.0.diff 2015-01-28 21:22:50 UTC (rev 132299)
@@ -0,0 +1,118 @@
+From a87a0319b170276284edaeb6e61bd1c0fe41a834 Mon Sep 17 00:00:00 2001
+From: Yanko Kaneti <yaneti at declera.com>
+Date: Tue, 20 Jan 2015 17:35:12 +0200
+Subject: Mechanically adjust for libmediaart-2.0
+
+https://bugzilla.gnome.org/show_bug.cgi?id=743250
+
+diff --git a/configure.ac b/configure.ac
+index ec8b150..017b4cf 100644
+--- configure.ac
++++ configure.ac
+@@ -231,7 +231,7 @@ NETWORK_MANAGER_REQUIRED=0.8
+ GSTREAMER_REQUIRED=0.10.31
+ GUPNP_DLNA_REQUIRED=0.9.4
+ LIBPNG_REQUIRED=0.89
+-LIBMEDIAART_REQUIRED=0.5.0
++LIBMEDIAART_REQUIRED=1.9.0
+
+ # 3.6.11 for sqlite_backup API
+ # 3.6.16 to fix test failures
+@@ -1107,7 +1107,7 @@ AC_ARG_ENABLE(libmediaart,
+
+ if test "x$enable_libmediaart" != "xno" ; then
+ PKG_CHECK_MODULES(LIBMEDIAART,
+- [libmediaart-1.0 >= $LIBMEDIAART_REQUIRED],
++ [libmediaart-2.0 >= $LIBMEDIAART_REQUIRED],
+ [have_libmediaart=yes],
+ [have_libmediaart=no])
+
+@@ -1124,7 +1124,7 @@ if test "x$enable_libmediaart" != "xno" ; then
+ TRACKER_MINER_FS_LIBS="$TRACKER_MINER_FS_LIBS $LIBMEDIAART_LIBS"
+
+ # Used for .pc file...
+- LIBTRACKER_MINER_PC_REQUIRES="libmediaart-1.0"
++ LIBTRACKER_MINER_PC_REQUIRES="libmediaart-2.0"
+ AC_SUBST(LIBTRACKER_MINER_PC_REQUIRES)
+
+ if test "x$have_libmediaart" = "xyes"; then
+diff --git a/src/libtracker-miner/tracker-media-art.c b/src/libtracker-miner/tracker-media-art.c
+index c0559e9..cbba55d 100644
+--- src/libtracker-miner/tracker-media-art.c
++++ src/libtracker-miner/tracker-media-art.c
+@@ -96,16 +96,16 @@ on_query_finished (GObject *source_object,
+ /* The get_path API does stripping itself */
+ media_art_get_path (artist,
+ album,
+- "album", NULL,
+- &target, NULL);
++ "album",
++ &target);
+
+ g_hash_table_replace (table, target, target);
+
+ /* Also add the file to which the symlinks are made */
+ media_art_get_path (NULL,
+ album,
+- "album", NULL,
+- &album_path, NULL);
++ "album",
++ &album_path);
+
+
+ g_hash_table_replace (table, album_path, album_path);
+diff --git a/src/tracker-extract/tracker-extract-gstreamer.c b/src/tracker-extract/tracker-extract-gstreamer.c
+index 7d52e0b..ef56d88 100644
+--- src/tracker-extract/tracker-extract-gstreamer.c
++++ src/tracker-extract/tracker-extract-gstreamer.c
+@@ -1661,6 +1661,7 @@ tracker_extract_gstreamer (const gchar *uri,
+ extractor->media_art_buffer_mime,
+ extractor->media_art_artist,
+ extractor->media_art_title,
++ NULL,
+ &error);
+ } else {
+ success = media_art_process_file (media_art_process,
+@@ -1669,6 +1670,7 @@ tracker_extract_gstreamer (const gchar *uri,
+ tracker_extract_info_get_file (info),
+ extractor->media_art_artist,
+ extractor->media_art_title,
++ NULL,
+ &error);
+ }
+
+diff --git a/src/tracker-extract/tracker-extract-mp3.c b/src/tracker-extract/tracker-extract-mp3.c
+index f2ef306..b93e4f4 100644
+--- src/tracker-extract/tracker-extract-mp3.c
++++ src/tracker-extract/tracker-extract-mp3.c
+@@ -2675,6 +2675,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
+ md.media_art_mime,
+ md.performer,
+ md.title,
++ NULL,
+ &error);
+ } else {
+ success = media_art_process_file (media_art_process,
+@@ -2683,6 +2684,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
+ file,
+ md.performer,
+ md.title,
++ NULL,
+ &error);
+ }
+
+diff --git a/src/tracker-extract/tracker-extract-vorbis.c b/src/tracker-extract/tracker-extract-vorbis.c
+index e619650..91c383c 100644
+--- src/tracker-extract/tracker-extract-vorbis.c
++++ src/tracker-extract/tracker-extract-vorbis.c
+@@ -527,6 +527,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
+ file,
+ vd.album_artist ? vd.album_artist : vd.artist,
+ vd.album,
++ NULL,
+ &error);
+
+ if (!success || error) {
+--
+cgit v0.10.1
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150128/60889ed2/attachment-0001.html>
More information about the macports-changes
mailing list