Changes of Revision 2
| [-] [+] | Changed | _service:tar_git:tracker-miners.spec |
| [-] [+] | Changed | _service:tar_git:0001-Tracker-config-overrides.patch ^ |
| @@ -16,7 +16,7 @@ 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/data/org.freedesktop.Tracker.Miner.Files.gschema.xml b/data/org.freedesktop.Tracker.Miner.Files.gschema.xml -index dd4a106a6..c53c245a5 100644 +index dd4a106a6c03a3714e5f1293460624129ff1aad7..c53c245a571c7b54e9d342a4f69694c79857b6ba 100644 --- a/data/org.freedesktop.Tracker.Miner.Files.gschema.xml +++ b/data/org.freedesktop.Tracker.Miner.Files.gschema.xml @@ -23,14 +23,14 @@ Boston, MA 02110-1301, USA. @@ -80,6 +80,3 @@ </key> </schema> </schemalist> --- -2.31.1 - | ||
| [-] [+] | Changed | _service:tar_git:0002-Fix-systemd-unit-files.patch ^ |
| @@ -9,7 +9,7 @@ 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/miners/fs/tracker-miner-fs.service.in b/src/miners/fs/tracker-miner-fs.service.in -index 373a7c0ea..590248f85 100644 +index 373a7c0eabcaa6e3ff7ae550bd3d382f99a40595..590248f853de069d711d3d7eff45f668e676d011 100644 --- a/src/miners/fs/tracker-miner-fs.service.in +++ b/src/miners/fs/tracker-miner-fs.service.in @@ -1,16 +1,15 @@ @@ -33,6 +33,3 @@ [Install] -WantedBy=gnome-session.target +WantedBy=post-user-session.target --- -2.31.1 - | ||
| [-] [+] | Changed | _service:tar_git:0003-Prevent-tracker-extract-failing-when-seccomp-loading.patch ^ |
| @@ -9,10 +9,10 @@ 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/libtracker-miners-common/tracker-seccomp.c b/src/libtracker-miners-common/tracker-seccomp.c -index 7d88395da..47b555d65 100644 +index 88fbbe197e36c4a21d59adf9e6eaffda5e6f7c64..b4016b69b1522d27a7ea2b7ecf87400fe9c50099 100644 --- a/src/libtracker-miners-common/tracker-seccomp.c +++ b/src/libtracker-miners-common/tracker-seccomp.c -@@ -270,11 +270,16 @@ tracker_seccomp_init (void) +@@ -274,11 +274,16 @@ tracker_seccomp_init (void) #endif g_debug ("Loading seccomp rules."); @@ -31,6 +31,3 @@ } out: --- -2.31.1 - | ||
| [-] [+] | Changed | _service:tar_git:0004-Fix-database-corruption-caused-by-the-miner-being-re.patch ^ |
| @@ -12,7 +12,7 @@ 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/miners/fs/tracker-main.c b/src/miners/fs/tracker-main.c -index 52cb4ed7c..493d2220a 100644 +index 52cb4ed7c14eb4db5bff3b70db8a577f39e7022f..493d2220a91fddad1ae4f8802c0ab22b42852c9a 100644 --- a/src/miners/fs/tracker-main.c +++ b/src/miners/fs/tracker-main.c @@ -1033,6 +1033,8 @@ main (gint argc, gchar *argv[]) @@ -33,6 +33,3 @@ /* Go, go, go! */ g_main_loop_run (main_loop); --- -2.31.1 - | ||
| [-] [+] | Changed | _service:tar_git:0005-Allow-D-Bus-activation-only-through-systemd.patch ^ |
| @@ -16,7 +16,7 @@ 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/miners/fs/org.freedesktop.Tracker3.Miner.Files.service.in b/src/miners/fs/org.freedesktop.Tracker3.Miner.Files.service.in -index cc35460dd..9db5967f4 100644 +index cc35460dde39e39023c89dd9895a47452a75fbd0..9db5967f4e5d9d300399b8f2d0773239bbff3bdc 100644 --- a/src/miners/fs/org.freedesktop.Tracker3.Miner.Files.service.in +++ b/src/miners/fs/org.freedesktop.Tracker3.Miner.Files.service.in @@ -1,6 +1,6 @@ @@ -28,7 +28,7 @@ # Miner details needed for tracker-control diff --git a/src/miners/rss/org.freedesktop.Tracker3.Miner.RSS.service.in b/src/miners/rss/org.freedesktop.Tracker3.Miner.RSS.service.in -index 359db6ecc..566801627 100644 +index 359db6eccb55433d5125f913a5d510d359e21b15..5668016279c1d09e1641e487852021b605d28bc1 100644 --- a/src/miners/rss/org.freedesktop.Tracker3.Miner.RSS.service.in +++ b/src/miners/rss/org.freedesktop.Tracker3.Miner.RSS.service.in @@ -1,6 +1,6 @@ @@ -40,7 +40,7 @@ # Miner details needed for tracker-control diff --git a/src/tracker-control/org.freedesktop.Tracker3.Miner.Files.Control.service.in b/src/tracker-control/org.freedesktop.Tracker3.Miner.Files.Control.service.in -index 261a2f5bb..fde240041 100644 +index 261a2f5bbb3d440f8c15ba54e521a4f5f0988c36..fde240041bbf6a0602afcfdf33a6d7ab9bcceae7 100644 --- a/src/tracker-control/org.freedesktop.Tracker3.Miner.Files.Control.service.in +++ b/src/tracker-control/org.freedesktop.Tracker3.Miner.Files.Control.service.in @@ -1,4 +1,4 @@ @@ -50,7 +50,7 @@ +Exec=/bin/false @SYSTEMD_SERVICE@ diff --git a/src/tracker-extract/org.freedesktop.Tracker3.Miner.Extract.service.in b/src/tracker-extract/org.freedesktop.Tracker3.Miner.Extract.service.in -index cd396057a..d56f103cc 100644 +index cd396057a973da2b55e9757d2a38ba3eadb47e11..d56f103cc3542b46450c7bec6e5ce0939a64815e 100644 --- a/src/tracker-extract/org.freedesktop.Tracker3.Miner.Extract.service.in +++ b/src/tracker-extract/org.freedesktop.Tracker3.Miner.Extract.service.in @@ -1,6 +1,6 @@ @@ -62,7 +62,7 @@ # Miner details needed for tracker-control diff --git a/src/tracker-writeback/org.freedesktop.Tracker3.Writeback.service.in b/src/tracker-writeback/org.freedesktop.Tracker3.Writeback.service.in -index 484fa2f81..8bc3425c4 100644 +index 484fa2f8127e9eabdd39b45981356331361d992d..8bc3425c4ea13cad969470188b7a1bc8035ded50 100644 --- a/src/tracker-writeback/org.freedesktop.Tracker3.Writeback.service.in +++ b/src/tracker-writeback/org.freedesktop.Tracker3.Writeback.service.in @@ -1,4 +1,4 @@ @@ -71,6 +71,3 @@ -Exec=@libexecdir@/tracker-writeback-3 +Exec=/bin/false SystemdService=tracker-writeback-3.service --- -2.31.1 - | ||
| [-] [+] | Added | _service:tar_git:0006-backport-Avoid-non-existing-nfo-language-on-libav-ex.patch ^ |
| @@ -0,0 +1,27 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Pekka Vuorela <pekka.vuorela@jolla.com> +Date: Thu, 7 Jul 2022 17:46:05 +0300 +Subject: [PATCH] backport: Avoid non-existing nfo:language on libav extractor + +Suppose this should have been dc:language but since to my knowledge +this has never worked, and the other audio/video extractor don't +use such a property, let's just remove this here. +--- + src/tracker-extract/tracker-extract-libav.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/tracker-extract/tracker-extract-libav.c b/src/tracker-extract/tracker-extract-libav.c +index d2d4baf6d68a9dd4ce475dabeea2a2d0e70322d2..87fe6e026a067de4ad8b01fad93a6d7f2e26ab1a 100644 +--- a/src/tracker-extract/tracker-extract-libav.c ++++ b/src/tracker-extract/tracker-extract-libav.c +@@ -251,10 +251,6 @@ tracker_extract_get_metadata (TrackerExtractInfo *info, + tracker_resource_set_string (metadata, "nfo:genre", tag->value); + } + +- if ((tag = av_dict_get (format->metadata, "language", NULL, 0))) { +- tracker_resource_set_string (metadata, "nfo:language", tag->value); +- } +- + if ((tag = av_dict_get (format->metadata, "title", NULL, 0))) { + title = tag->value; + } | ||
| [-] [+] | Added | _service:tar_git:0007-backport-tracker-extract-libav-Check-for-all-tags-al.patch ^ |
| @@ -0,0 +1,155 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Matti=20Lehtim=C3=A4ki?= <matti.lehtimaki@jolla.com> +Date: Sat, 27 Aug 2022 17:17:46 +0300 +Subject: [PATCH] backport: tracker-extract-libav: Check for all tags also from + streams + +At least in Ogg audio and video files the tags are actually inside the +streams not in the format context. Check for the tags in suitable streams +and as fallback for generic information check first the audio stream and +then finally also video stream. + +Fix some existing style issues in code. +--- + src/tracker-extract/tracker-extract-libav.c | 55 ++++++++++++--------- + 1 file changed, 31 insertions(+), 24 deletions(-) + +diff --git a/src/tracker-extract/tracker-extract-libav.c b/src/tracker-extract/tracker-extract-libav.c +index 87fe6e026a067de4ad8b01fad93a6d7f2e26ab1a..7c1cd3fb7a1953f8912d86deb3e021b520cbd11c 100644 +--- a/src/tracker-extract/tracker-extract-libav.c ++++ b/src/tracker-extract/tracker-extract-libav.c +@@ -30,11 +30,18 @@ + #include <libavformat/avformat.h> + #include <libavutil/mathematics.h> + +-static AVDictionaryEntry *find_tag (AVFormatContext *format, AVStream *stream, const gchar *name) ++static AVDictionaryEntry * ++find_tag (AVFormatContext *format, ++ AVStream *stream1, ++ AVStream *stream2, ++ const gchar *name) + { +- AVDictionaryEntry *tag = av_dict_get(format->metadata, name, NULL, 0); +- if (!tag) { +- tag = av_dict_get(stream->metadata, name, NULL, 0); ++ AVDictionaryEntry *tag = av_dict_get (format->metadata, name, NULL, 0); ++ if (!tag && stream1) { ++ tag = av_dict_get (stream1->metadata, name, NULL, 0); ++ } ++ if (!tag && stream2) { ++ tag = av_dict_get (stream2->metadata, name, NULL, 0); + } + + return tag; +@@ -130,19 +137,19 @@ tracker_extract_get_metadata (TrackerExtractInfo *info, + tracker_resource_set_int64 (metadata, "nfo:frameCount", video_stream->nb_frames); + } + +- if ((tag = av_dict_get (format->metadata, "synopsis", NULL, 0))) { ++ if ((tag = find_tag (format, video_stream, NULL, "synopsis"))) { + tracker_resource_set_string (metadata, "nmm:synopsis", tag->value); + } + +- if ((tag = av_dict_get (format->metadata, "episode_sort", NULL, 0))) { +- tracker_resource_set_int64 (metadata, "nmm:episodeNumber", atoi(tag->value)); ++ if ((tag = find_tag (format, video_stream, NULL, "episode_sort"))) { ++ tracker_resource_set_int64 (metadata, "nmm:episodeNumber", atoi (tag->value)); + } + +- if ((tag = av_dict_get (format->metadata, "season_number", NULL, 0))) { +- tracker_resource_set_int64 (metadata, "nmm:season", atoi(tag->value)); ++ if ((tag = find_tag (format, video_stream, NULL, "season_number"))) { ++ tracker_resource_set_int64 (metadata, "nmm:season", atoi (tag->value)); + } + +- if ((tag = av_dict_get (format->metadata, "creation_time", NULL, 0))) { ++ if ((tag = find_tag (format, video_stream, NULL, "creation_time"))) { + content_created = tracker_date_guess (tag->value); + if (content_created) { + tracker_resource_set_string (metadata, "nie:contentCreated", content_created); +@@ -163,31 +170,31 @@ tracker_extract_get_metadata (TrackerExtractInfo *info, + tracker_resource_set_int64 (metadata, "nfo:duration", duration); + } + +- if ((tag = find_tag (format, audio_stream, "track"))) { +- int track = atoi(tag->value); ++ if ((tag = find_tag (format, audio_stream, NULL, "track"))) { ++ int track = atoi (tag->value); + if (track > 0) { + tracker_resource_set_int64 (metadata, "nmm:trackNumber", track); + } + } + +- if ((tag = find_tag (format, audio_stream, "album"))) { ++ if ((tag = find_tag (format, audio_stream, NULL, "album"))) { + album_title = tag->value; + } + +- if (album_title && (tag = find_tag (format, audio_stream, "album_artist"))) { ++ if (album_title && (tag = find_tag (format, audio_stream, NULL, "album_artist"))) { + album_artist_name = tag->value; + album_artist = tracker_extract_new_artist (album_artist_name); + } + +- if ((tag = find_tag (format, audio_stream, "artist"))) { ++ if ((tag = find_tag (format, audio_stream, NULL, "artist"))) { + artist = tracker_extract_new_artist (tag->value); + } + +- if ((tag = find_tag (format, audio_stream, "performer"))) { ++ if ((tag = find_tag (format, audio_stream, NULL, "performer"))) { + performer = tracker_extract_new_artist (tag->value); + } + +- if ((tag = av_dict_get (format->metadata, "date", NULL, 0))) { ++ if ((tag = find_tag (format, audio_stream, NULL, "date"))) { + content_created = tracker_date_guess (tag->value); + if (content_created) { + tracker_resource_set_string (metadata, "nie:contentCreated", content_created); +@@ -202,7 +209,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info, + tracker_resource_set_relation (metadata, "nmm:performer", performer); + } + +- if ((tag = find_tag (format, audio_stream, "composer"))) { ++ if ((tag = find_tag (format, audio_stream, NULL, "composer"))) { + TrackerResource *composer = tracker_extract_new_artist (tag->value); + tracker_resource_set_relation (metadata, "nmm:composer", composer); + g_object_unref (composer); +@@ -212,7 +219,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info, + int disc_number = 1; + TrackerResource *album_disc; + +- if ((tag = find_tag (format, audio_stream, "disc"))) { ++ if ((tag = find_tag (format, audio_stream, NULL, "disc"))) { + disc_number = atoi (tag->value); + } + +@@ -235,23 +242,23 @@ tracker_extract_get_metadata (TrackerExtractInfo *info, + tracker_resource_set_int64 (metadata, "nfo:averageBitrate", format->bit_rate); + } + +- if ((tag = av_dict_get (format->metadata, "comment", NULL, 0))) { ++ if ((tag = find_tag (format, audio_stream, video_stream, "comment"))) { + tracker_resource_set_string (metadata, "nie:comment", tag->value); + } + +- if ((tag = av_dict_get (format->metadata, "copyright", NULL, 0))) { ++ if ((tag = find_tag (format, audio_stream, video_stream, "copyright"))) { + tracker_resource_set_string (metadata, "nie:copyright", tag->value); + } + +- if ((tag = av_dict_get (format->metadata, "description", NULL, 0))) { ++ if ((tag = find_tag (format, audio_stream, video_stream, "description"))) { + tracker_resource_set_string (metadata, "nie:description", tag->value); + } + +- if ((tag = av_dict_get (format->metadata, "genre", NULL, 0))) { ++ if ((tag = find_tag (format, audio_stream, video_stream, "genre"))) { + tracker_resource_set_string (metadata, "nfo:genre", tag->value); + } + +- if ((tag = av_dict_get (format->metadata, "title", NULL, 0))) { ++ if ((tag = find_tag (format, audio_stream, video_stream, "title"))) { + title = tag->value; + } + | ||
| [-] [+] | Added | _service:tar_git:0008-backport-tracker-extract-libav-Add-missing-include.patch ^ |
| @@ -0,0 +1,25 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Matti=20Lehtim=C3=A4ki?= <matti.lehtimaki@jolla.com> +Date: Sat, 27 Aug 2022 17:15:03 +0300 +Subject: [PATCH] backport: tracker-extract-libav: Add missing include + +Nothing was used from tracker-utils.h so replace it with missing +tracker-file-utils.h. Missing header was causing a build warning +and crashing the tracker-extract process. +--- + src/tracker-extract/tracker-extract-libav.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tracker-extract/tracker-extract-libav.c b/src/tracker-extract/tracker-extract-libav.c +index 7c1cd3fb7a1953f8912d86deb3e021b520cbd11c..c5cfaae6df22281ec9d2df980bbda14a48be0074 100644 +--- a/src/tracker-extract/tracker-extract-libav.c ++++ b/src/tracker-extract/tracker-extract-libav.c +@@ -22,7 +22,7 @@ + #include <glib.h> + + #include <libtracker-sparql/tracker-ontologies.h> +-#include <libtracker-miners-common/tracker-utils.h> ++#include <libtracker-miners-common/tracker-file-utils.h> + + #include <libtracker-extract/tracker-extract.h> + | ||
| [-] [+] | Changed | _service ^ |
| @@ -1,7 +1,7 @@ <services> <service name="tar_git"> <param name="url">https://github.com/elros34/tracker-miners.git</param> - <param name="branch">seccomp-125</param> + <param name="branch">sfos-4.5.0.24</param> <param name="revision"></param> </service> </services> | ||
| Deleted | _service:tar_git:tracker-miners-3.2.1+git2+seccomp.125.20220530203916.1.gd74a324.tar.bz2 ^ | |
| Added | _service:tar_git:tracker-miners-3.2.1+git2+sfos.4.5.0.24.20231105120707.6.g95d2744.tar.bz2 ^ | |