Matt Turner · Sam Thursfield · Pawan Chitrakar · Chao-Hsiung Liao · Pawan Chitrakar · Carlos Garnacho
--- a/NEWS
+++ b/NEWS
+NEW in 3.1.2 - 2021-06-11
+=========================
+
+  * Fixes to libav extractor
+  * Allow 64bit time syscalls for 32bit systems in seccomp sandbox
+  * Manpage fixes
+  * Build fixes
+
+Translations: ne, zh_TW
+
 NEW in 3.1.1 - 2021-04-02
 =========================


--- a/docs/manpages/tracker-extract.1.txt
+++ b/docs/manpages/tracker-extract.1.txt
@@ -50,7 +50,7 @@ $ tracker3 extract /path/to/some/file.mp3

 == SEE ALSO

-*tracker3-sparql*(1), *tracker3-stats*(1), *tracker3-info*(1).
+*tracker3-sparql*(1), *tracker3-status*(1), *tracker3-info*(1).

 - */usr/lib/tracker-1.0/extract-modules/*
 - */usr/share/tracker/extract-rules/*
--- a/meson.build
+++ b/meson.build
 project('tracker-miners', 'c',
-        version: '3.1.1',
+        version: '3.1.2',
        meson_version: '>=0.51')

 gnome = import('gnome')
@@ -420,7 +420,6 @@ build_root = meson.current_build_dir()
 # directory, following the existing convention in that directory.
 tracker_api_versioned_name = 'tracker-miners-@0@'.format(tracker_api_version)
 tracker_internal_libs_dir = join_paths(get_option('prefix'), get_option('libdir'), tracker_api_versioned_name)
-tracker_install_rpath = ':'.join([tracker_internal_libs_dir, libdir])

 tracker_extract_modules_dir = join_paths(get_option('prefix'), get_option('libdir'), tracker_api_versioned_name, 'extract-modules')
 tracker_writeback_modules_dir = join_paths(get_option('prefix'), get_option('libdir'), tracker_api_versioned_name, 'writeback-modules')

--- a/po/ne.po
+++ b/po/ne.po
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
--- a/src/libtracker-miners-common/tracker-seccomp.c
+++ b/src/libtracker-miners-common/tracker-seccomp.c
@@ -151,6 +151,7 @@ tracker_seccomp_init (void)
 	/* Processes and threads */
 	ALLOW_RULE (clone);
 	ALLOW_RULE (futex);
+	ALLOW_RULE (futex_time64);
 	ALLOW_RULE (set_robust_list);
 	ALLOW_RULE (rt_sigaction);
 	ALLOW_RULE (rt_sigprocmask);
@@ -159,12 +160,14 @@ tracker_seccomp_init (void)
 	ALLOW_RULE (sched_setattr);
 	ALLOW_RULE (nanosleep);
 	ALLOW_RULE (clock_nanosleep);
+	ALLOW_RULE (clock_nanosleep_time64);
 	ALLOW_RULE (waitid);
 	ALLOW_RULE (waitpid);
 	ALLOW_RULE (wait4);
 	/* Main loops */
 	ALLOW_RULE (poll);
 	ALLOW_RULE (ppoll);
+	ALLOW_RULE (ppoll_time64);
 	ALLOW_RULE (fcntl);
 	ALLOW_RULE (fcntl64);
 	ALLOW_RULE (eventfd);
@@ -179,6 +182,7 @@ tracker_seccomp_init (void)
 	ALLOW_RULE (prctl);
 	ALLOW_RULE (getrandom);
 	ALLOW_RULE (clock_gettime);
+	ALLOW_RULE (clock_gettime64);
 	ALLOW_RULE (clock_getres);
 	ALLOW_RULE (gettimeofday);
 	/* Descriptors */

--- a/src/miners/fs/meson.build
+++ b/src/miners/fs/meson.build
@@ -26,7 +26,7 @@ executable('tracker-miner-fs-@0@'.format(tracker_api_major),
    c_args: tracker_c_args,
    install: true,
    install_dir: get_option('libexecdir'),
-    install_rpath: tracker_install_rpath,
+    install_rpath: tracker_internal_libs_dir,
 )

 # This file allows starting the service with D-Bus autoactivation.

--- a/src/miners/rss/meson.build
+++ b/src/miners/rss/meson.build
@@ -9,7 +9,6 @@ executable('tracker-miner-rss-@0@'.format(tracker_api_major),
    c_args: tracker_c_args,
    install: true,
    install_dir: get_option('libexecdir'),
-    install_rpath: tracker_install_rpath,
 )

 # This file allows starting the service with D-Bus autoactivation.

--- a/src/tracker-control/meson.build
+++ b/src/tracker-control/meson.build
@@ -36,7 +36,6 @@ executable('tracker-miner-fs-control-@0@'.format(tracker_api_major),
    c_args: tracker_c_args,
    install: true,
    install_dir: get_option('libexecdir'),
-    install_rpath: tracker_install_rpath,
 )

 # This file allows starting the service with D-Bus autoactivation.

--- a/src/tracker-extract/meson.build
+++ b/src/tracker-extract/meson.build
@@ -162,7 +162,7 @@ executable('tracker-extract-@0@'.format(tracker_api_major),
  dependencies: tracker_extract_dependencies,
  install: true,
  install_dir: join_paths(get_option('prefix'), get_option('libexecdir')),
-  install_rpath: tracker_install_rpath)
+  install_rpath: tracker_internal_libs_dir)

 # This file allows starting the service with D-Bus autoactivation.
 # It's also used by tracker-control to identify the miner.

--- a/src/tracker-extract/tracker-extract-libav.c
+++ b/src/tracker-extract/tracker-extract-libav.c
@@ -150,7 +150,7 @@ tracker_extract_get_metadata (TrackerExtractInfo  *info,
 		}

 	} else if (audio_stream) {
-		TrackerResource *album_artist = NULL, *performer = NULL;
+		TrackerResource *album_artist = NULL, *artist = NULL, *performer = NULL;
 		char *album_artist_name = NULL;
 		char *album_title = NULL;

@@ -180,10 +180,10 @@ tracker_extract_get_metadata (TrackerExtractInfo  *info,
 		}

 		if ((tag = find_tag (format, audio_stream, "artist"))) {
-			performer = tracker_extract_new_artist (tag->value);
+			artist = tracker_extract_new_artist (tag->value);
 		}

-		if (!performer && (tag = find_tag (format, audio_stream, "performer"))) {
+		if ((tag = find_tag (format, audio_stream, "performer"))) {
 			performer = tracker_extract_new_artist (tag->value);
 		}

@@ -194,6 +194,10 @@ tracker_extract_get_metadata (TrackerExtractInfo  *info,
 			}
 		}

+		if (artist) {
+			tracker_resource_set_relation (metadata, "nmm:artist", artist);
+		}
+
 		if (performer) {
 			tracker_resource_set_relation (metadata, "nmm:performer", performer);
 		}
@@ -220,6 +224,9 @@ tracker_extract_get_metadata (TrackerExtractInfo  *info,
 			g_object_unref (album_disc);
 		}

+		if (artist)
+			g_object_unref (artist);
+
 		if (performer)
 			g_object_unref (performer);
 	}

--- a/src/tracker-writeback/meson.build
+++ b/src/tracker-writeback/meson.build
@@ -45,7 +45,7 @@ executable('tracker-writeback-@0@'.format(tracker_api_major),
  dependencies: [gmodule, tracker_miner, tracker_sparql, tracker_miners_common_dep],
  install: true,
  install_dir: join_paths(get_option('prefix'), get_option('libexecdir')),
-  install_rpath: tracker_install_rpath)
+  install_rpath: tracker_internal_libs_dir)

 dbus_service_file = configure_file(
  input: 'org.freedesktop.Tracker3.Writeback.service.in',

--- a/src/tracker/meson.build
+++ b/src/tracker/meson.build
@@ -24,7 +24,6 @@ foreach m: modules
            '-DMANDIR="@0@"'.format(join_paths(get_option('prefix'), get_option('datadir'), 'man')),
        ],
        install: true,
-        install_rpath: tracker_install_rpath,
        install_dir: join_paths(get_option('libexecdir'), 'tracker@0@'.format(tracker_api_major)),
        dependencies: [tracker_sparql, tracker_miners_common_dep],
        include_directories: [commoninc, configinc, srcinc],

--- a/src/tracker/tracker-index.c
+++ b/src/tracker/tracker-index.c
@@ -324,11 +324,16 @@ print_list (GStrv    list,
 		else
 			continue;

-		str = tracker_term_ellipsize (path, len, TRACKER_ELLIPSIZE_START);
-		g_print ("%-*s " BOLD_BEGIN "%s" BOLD_END "\n",
-		         len, str,
-		         recursive ? "*" : "-");
-		g_free (str);
+		if (path) {
+			str = tracker_term_ellipsize (path, len, TRACKER_ELLIPSIZE_START);
+			g_print ("%-*s " BOLD_BEGIN "%s" BOLD_END "\n",
+		    	     len, str,
+		    	     recursive ? "*" : "-");
+			g_free (str);
+		}
+		else {
+			g_print("Could not expand XDG user directory %s", list[i]);
+		}
 	}
 }


--- a/tests/functional-tests/configuration.json.in
+++ b/tests/functional-tests/configuration.json.in
@@ -9,6 +9,6 @@
    "TEST_GSETTINGS_SCHEMA_DIR": "@TEST_GSETTINGS_SCHEMA_DIR@",
    "TEST_LANGUAGE_STOP_WORDS_DIR": "@TEST_LANGUAGE_STOP_WORDS_DIR@",
    "TEST_WRITEBACK_MODULES_DIR": "@TEST_WRITEBACK_MODULES_DIR@",
-    "TEST_TAP_ENABLED": "@TEST_TAP_ENABLED@",
+    "TEST_TAP_ENABLED": @TEST_TAP_ENABLED@,
    "TRACKER_EXTRACT_PATH": "@TRACKER_EXTRACT_PATH@"
 }
--- a/tests/functional-tests/meson.build
+++ b/tests/functional-tests/meson.build
@@ -18,7 +18,7 @@ testconf.set('TEST_GSETTINGS_SCHEMA_DIR', tracker_miners_uninstalled_gsettings_s
 testconf.set('TEST_LANGUAGE_STOP_WORDS_DIR', tracker_uninstalled_stop_words_dir)
 testconf.set('TEST_ONTOLOGIES_DIR', tracker_uninstalled_nepomuk_ontologies_dir)
 testconf.set('TEST_WRITEBACK_MODULES_DIR', tracker_uninstalled_writeback_modules_dir)
-testconf.set('TEST_TAP_ENABLED', get_option('tests_tap_protocol'))
+testconf.set('TEST_TAP_ENABLED', get_option('tests_tap_protocol').to_string())
 testconf.set('TRACKER_EXTRACT_PATH', uninstalled_tracker_extract_path)

 test_domain_rule = configure_file(

--- a/tests/libtracker-extract/meson.build
+++ b/tests/libtracker-extract/meson.build
@@ -30,7 +30,7 @@ foreach base_name: libtracker_extract_tests
      c_args: test_c_args)

    test(base_name, binary,
-      environtment: extract_test_environment,
+      env: extract_test_environment,
      protocol: test_protocol,
      suite: 'extract')
 endforeach
@@ -42,7 +42,7 @@ if libiptcdata.found() and libjpeg.found()
    c_args: test_c_args,
  )
  test('extract-iptc', iptc_test,
-    environtment: extract_test_environment,
+    env: extract_test_environment,
    protocol: test_protocol,
    suite: 'extract')
 endif