Date: Wednesday, October 13, 2021 @ 18:06:46
Author: heftig
Revision: 425863
archrelease: copy trunk to extra-x86_64
Added:
rygel/repos/extra-x86_64/0001-tracker3-Don-t-create-connection-in-static-construct.patch
(from rev 425862,
rygel/trunk/0001-tracker3-Don-t-create-connection-in-static-construct.patch)
rygel/repos/extra-x86_64/0002-tracker3-Correct-graph-name-for-video-items.patch
(from rev 425862,
rygel/trunk/0002-tracker3-Correct-graph-name-for-video-items.patch)
rygel/repos/extra-x86_64/PKGBUILD
(from rev 425862, rygel/trunk/PKGBUILD)
Deleted:
rygel/repos/extra-x86_64/PKGBUILD
-----------------------------------------------------------------+
0001-tracker3-Don-t-create-connection-in-static-construct.patch | 40 +++
0002-tracker3-Correct-graph-name-for-video-items.patch | 22 ++
PKGBUILD | 103
+++++-----
3 files changed, 117 insertions(+), 48 deletions(-)
Copied:
rygel/repos/extra-x86_64/0001-tracker3-Don-t-create-connection-in-static-construct.patch
(from rev 425862,
rygel/trunk/0001-tracker3-Don-t-create-connection-in-static-construct.patch)
===================================================================
--- 0001-tracker3-Don-t-create-connection-in-static-construct.patch
(rev 0)
+++ 0001-tracker3-Don-t-create-connection-in-static-construct.patch
2021-10-13 18:06:46 UTC (rev 425863)
@@ -0,0 +1,40 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com>
+Date: Wed, 13 Oct 2021 17:33:05 +0000
+Subject: [PATCH] tracker3: Don't create connection in static constructor
+
+bus_new will wait for work in the GDBus thread to be completed. However,
+further type initialization in the GDBus thread will block on the GType
+class_init_rec_mutex we're already holding and we end up in a deadlock.
+---
+ .../tracker3/rygel-tracker-root-container.vala | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/plugins/tracker3/rygel-tracker-root-container.vala
b/src/plugins/tracker3/rygel-tracker-root-container.vala
+index c5d3b25a55d6..c7f722a81ce8 100644
+--- a/src/plugins/tracker3/rygel-tracker-root-container.vala
++++ b/src/plugins/tracker3/rygel-tracker-root-container.vala
+@@ -34,15 +34,15 @@ public class Rygel.Tracker.RootContainer :
Rygel.SimpleContainer {
+
+ public static Sparql.Connection connection;
+
+- static construct {
+- try {
+- RootContainer.connection = Sparql.Connection.bus_new
(TRACKER_SERVICE, null);
+- } catch (Error err) {
+- error ("Failed to connect to tracker: %s", err.message);
+- }
+- }
+-
+ public RootContainer (string title) {
++ if (RootContainer.connection == null) {
++ try {
++ RootContainer.connection = Sparql.Connection.bus_new
(TRACKER_SERVICE, null);
++ } catch (Error err) {
++ error ("Failed to connect to tracker: %s", err.message);
++ }
++ }
++
+ base.root (title);
+
+ if (this.get_bool_config_without_error ("share-music")) {
Copied:
rygel/repos/extra-x86_64/0002-tracker3-Correct-graph-name-for-video-items.patch
(from rev 425862,
rygel/trunk/0002-tracker3-Correct-graph-name-for-video-items.patch)
===================================================================
--- 0002-tracker3-Correct-graph-name-for-video-items.patch
(rev 0)
+++ 0002-tracker3-Correct-graph-name-for-video-items.patch 2021-10-13
18:06:46 UTC (rev 425863)
@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com>
+Date: Wed, 13 Oct 2021 17:55:24 +0000
+Subject: [PATCH] tracker3: Correct graph name for video items
+
+---
+ src/plugins/tracker3/rygel-tracker-video-item-factory.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plugins/tracker3/rygel-tracker-video-item-factory.vala
b/src/plugins/tracker3/rygel-tracker-video-item-factory.vala
+index bed04c711eaf..7a765cf772bd 100644
+--- a/src/plugins/tracker3/rygel-tracker-video-item-factory.vala
++++ b/src/plugins/tracker3/rygel-tracker-video-item-factory.vala
+@@ -42,7 +42,7 @@ public class Rygel.Tracker.VideoItemFactory : ItemFactory {
+ private const string CATEGORY = "nmm:Video";
+ private const string CATEGORY_IRI = "http://www.tracker-project.org/"; +
+ "temp/nmm#Video";
+- private const string GRAPH = "tracker:Videos";
++ private const string GRAPH = "tracker:Video";
+
+ public VideoItemFactory () {
+ var upload_folder = Environment.get_user_special_dir
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-10-13 18:06:38 UTC (rev 425862)
+++ PKGBUILD 2021-10-13 18:06:46 UTC (rev 425863)
@@ -1,48 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org>
-# Contributor: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=rygel
-pkgver=0.40.2
-pkgrel=1
-epoch=1
-pkgdesc="UPnP AV MediaServer and MediaRenderer"
-url="https://wiki.gnome.org/Projects/Rygel";
-arch=(x86_64)
-license=(LGPL)
-depends=(gupnp gupnp-av gupnp-dlna libgee gtk3 libunistring tracker3
- libmediaart gst-editing-services)
-makedepends=(vala gobject-introspection git meson)
-optdepends=('gst-plugins-base: Extra media codecs'
- 'gst-plugins-good: Extra media codecs'
- 'gst-plugins-bad: Extra media codecs'
- 'gst-plugins-ugly: Extra media codecs'
- 'gst-libav: Extra media codecs'
- 'tracker3-miners: Share indexed media files')
-backup=(etc/rygel.conf)
-groups=(gnome)
-_commit=4cc71529e53acaae16957d38a6565396a7ebf6b4 # tags/rygel-0.40.2^0
-source=("git+https://gitlab.gnome.org/GNOME/rygel.git#commit=$_commit";)
-sha256sums=('SKIP')
-
-pkgver() {
- cd $pkgname
- git describe --tags | sed 's/^RYGEL//;s/^rygel-//;s/_/./g;s/-/+/g'
-}
-
-prepare() {
- cd $pkgname
- git cherry-pick -n d0410cccf6af55e16d3ba9400ad5e9f703313739
-}
-
-build() {
- arch-meson $pkgname build
- meson compile -C build
-}
-
-check() {
- meson test -C build --print-errorlogs
-}
-
-package() {
- meson install -C build --destdir "$pkgdir"
-}
Copied: rygel/repos/extra-x86_64/PKGBUILD (from rev 425862,
rygel/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-10-13 18:06:46 UTC (rev 425863)
@@ -0,0 +1,55 @@
+# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=rygel
+pkgver=0.40.2
+pkgrel=2
+epoch=1
+pkgdesc="UPnP AV MediaServer and MediaRenderer"
+url="https://wiki.gnome.org/Projects/Rygel";
+arch=(x86_64)
+license=(LGPL)
+depends=(gupnp gupnp-av gupnp-dlna libgee gtk3 libunistring tracker3
+ libmediaart gst-editing-services)
+makedepends=(vala gobject-introspection git meson)
+optdepends=('gst-plugins-base: Extra media codecs'
+ 'gst-plugins-good: Extra media codecs'
+ 'gst-plugins-bad: Extra media codecs'
+ 'gst-plugins-ugly: Extra media codecs'
+ 'gst-libav: Extra media codecs'
+ 'tracker3-miners: Share indexed media files'
+ 'tumbler: Thumbnailing service')
+backup=(etc/rygel.conf)
+groups=(gnome)
+_commit=4cc71529e53acaae16957d38a6565396a7ebf6b4 # tags/rygel-0.40.2^0
+source=("git+https://gitlab.gnome.org/GNOME/rygel.git#commit=$_commit";
+ 0001-tracker3-Don-t-create-connection-in-static-construct.patch
+ 0002-tracker3-Correct-graph-name-for-video-items.patch)
+sha256sums=('SKIP'
+ '888f5e0c23a677521074523b262e19de6f859f8bf44d614429fb75d2f960c4c3'
+ '17ef15116014dda19f6887b8d84b55876f998ed9f660f381f2636a92b63ada46')
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/^RYGEL//;s/^rygel-//;s/_/./g;s/-/+/g'
+}
+
+prepare() {
+ cd $pkgname
+ git cherry-pick -n d0410cccf6af55e16d3ba9400ad5e9f703313739
+ git apply -3
../0001-tracker3-Don-t-create-connection-in-static-construct.patch
+ git apply -3 ../0002-tracker3-Correct-graph-name-for-video-items.patch
+}
+
+build() {
+ arch-meson $pkgname build
+ meson compile -C build
+}
+
+check() {
+ meson test -C build --print-errorlogs
+}
+
+package() {
+ meson install -C build --destdir "$pkgdir"
+}
