1 files changed, 6 insertions, 6 deletions
diff --git a/meta-multimedia/recipes-connectivity/rygel/rygel_0.44.1.bb b/meta-multimedia/recipes-connectivity/rygel/rygel_45.0.bb
index 6423d51a31..97948d896f 100644
--- a/meta-multimedia/recipes-connectivity/rygel/rygel_0.44.1.bb
+++ b/meta-multimedia/recipes-connectivity/rygel/rygel_45.0.bb
@@ -18,15 +18,15 @@ RRECOMMENDS:${PN} = "rygel-plugin-media-export"
 inherit gnomebase features_check vala gobject-introspection gettext systemd
 # gobject-introspection is mandatory for libmediaart-2.0 and cannot be configured
-REQUIRED_DISTRO_FEATURES = "gobject-introspection-data x11"
+REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
-SRC_URI[archive.sha256sum] = "7b2c631b842408da27a54242f8082aba49bd1ca02041e79e1eefba0c7009a87b"
+SRC_URI[archive.sha256sum] = "82667b902fc0672e64cf91eb727a70137a8fdfe7a3d9a4c158b0f4b1fc700882"
 GIR_MESON_ENABLE_FLAG = 'enabled'
 GIR_MESON_DISABLE_FLAG = 'disabled'
 EXTRA_OEMESON = "-Dengines=gstreamer -Dplugins=${@strip_comma('${RYGEL_PLUGINS}')}"
-PACKAGECONFIG:append = "${@bb.utils.contains("DISTRO_FEATURES", "x11", " gtk+3", "", d)}"
+PACKAGECONFIG:append = "${@bb.utils.contains_any("DISTRO_FEATURES", "opengl vulkan", " gtk4", "", d)}"
 PACKAGECONFIG ?= "external mpris ruih gst-launch media-export"
@@ -35,8 +35,8 @@ PACKAGECONFIG[mpris] = ""
 PACKAGECONFIG[ruih] = ""
 PACKAGECONFIG[media-export] = ""
 PACKAGECONFIG[gst-launch] = ""
-PACKAGECONFIG[tracker3] = ""
+PACKAGECONFIG[localsearch] = ""
-PACKAGECONFIG[gtk+3] = ",-Dgtk=disabled,gtk+3"
+PACKAGECONFIG[gtk4] = "-Dgtk=enabled,-Dgtk=disabled,gtk4"
 RYGEL_PLUGINS = ""
 RYGEL_PLUGINS:append = "${@bb.utils.contains('PACKAGECONFIG', 'external', ',external', '', d)}"
@@ -44,7 +44,7 @@ RYGEL_PLUGINS:append = "${@bb.utils.contains('PACKAGECONFIG', 'mpris', ',mpris',
 RYGEL_PLUGINS:append = "${@bb.utils.contains('PACKAGECONFIG', 'ruih', ',ruih', '', d)}"
 RYGEL_PLUGINS:append = "${@bb.utils.contains('PACKAGECONFIG', 'gst-launch', ',gst-launch', '', d)}"
 RYGEL_PLUGINS:append = "${@bb.utils.contains('PACKAGECONFIG', 'media-export', ',media-export', '', d)}"
-RYGEL_PLUGINS:append = "${@bb.utils.contains('PACKAGECONFIG', 'tracker3', ',tracker3', '', d)}"
+RYGEL_PLUGINS:append = "${@bb.utils.contains('PACKAGECONFIG', 'localsearch', ',localsearch', '', d)}"
 RYGEL_PLUGINS:append = "${@bb.utils.contains('PACKAGECONFIG', 'playbin', ',playbin', '', d)}"
 LIBV = "2.8"

diff --git a/meta-multimedia/recipes-connectivity/rygel/rygel_0.44.1.bb b/meta-multimedia/recipes-connectivity/rygel/rygel_45.0.bb index 6423d51a31..97948d896f 100644 --- a/meta-multimedia/recipes-connectivity/rygel/rygel_0.44.1.bb +++ b/meta-multimedia/recipes-connectivity/rygel/rygel_45.0.bb
@@ -18,15 +18,15 @@ RRECOMMENDS:${PN} = "rygel-plugin-media-export"
18	inherit gnomebase features_check vala gobject-introspection gettext systemd	18	inherit gnomebase features_check vala gobject-introspection gettext systemd
19		19
20	# gobject-introspection is mandatory for libmediaart-2.0 and cannot be configured	20	# gobject-introspection is mandatory for libmediaart-2.0 and cannot be configured
21	REQUIRED_DISTRO_FEATURES = "gobject-introspection-data x11"	21	REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
22		22
23	SRC_URI[archive.sha256sum] = "7b2c631b842408da27a54242f8082aba49bd1ca02041e79e1eefba0c7009a87b"	23	SRC_URI[archive.sha256sum] = "82667b902fc0672e64cf91eb727a70137a8fdfe7a3d9a4c158b0f4b1fc700882"
24		24
25	GIR_MESON_ENABLE_FLAG = 'enabled'	25	GIR_MESON_ENABLE_FLAG = 'enabled'
26	GIR_MESON_DISABLE_FLAG = 'disabled'	26	GIR_MESON_DISABLE_FLAG = 'disabled'
27		27
28	EXTRA_OEMESON = "-Dengines=gstreamer -Dplugins=${@strip_comma('${RYGEL_PLUGINS}')}"	28	EXTRA_OEMESON = "-Dengines=gstreamer -Dplugins=${@strip_comma('${RYGEL_PLUGINS}')}"
29	PACKAGECONFIG:append = "${@bb.utils.contains("DISTRO_FEATURES", "x11", " gtk+3", "", d)}"	29	PACKAGECONFIG:append = "${@bb.utils.contains_any("DISTRO_FEATURES", "opengl vulkan", " gtk4", "", d)}"
30		30
31	PACKAGECONFIG ?= "external mpris ruih gst-launch media-export"	31	PACKAGECONFIG ?= "external mpris ruih gst-launch media-export"
32		32
@@ -35,8 +35,8 @@ PACKAGECONFIG[mpris] = ""
35	PACKAGECONFIG[ruih] = ""	35	PACKAGECONFIG[ruih] = ""
36	PACKAGECONFIG[media-export] = ""	36	PACKAGECONFIG[media-export] = ""
37	PACKAGECONFIG[gst-launch] = ""	37	PACKAGECONFIG[gst-launch] = ""
38	PACKAGECONFIG[tracker3] = ""	38	PACKAGECONFIG[localsearch] = ""
39	PACKAGECONFIG[gtk+3] = ",-Dgtk=disabled,gtk+3"	39	PACKAGECONFIG[gtk4] = "-Dgtk=enabled,-Dgtk=disabled,gtk4"
40		40
41	RYGEL_PLUGINS = ""	41	RYGEL_PLUGINS = ""
42	RYGEL_PLUGINS:append = "${@bb.utils.contains('PACKAGECONFIG', 'external', ',external', '', d)}"	42	RYGEL_PLUGINS:append = "${@bb.utils.contains('PACKAGECONFIG', 'external', ',external', '', d)}"
@@ -44,7 +44,7 @@ RYGEL_PLUGINS:append = "${@bb.utils.contains('PACKAGECONFIG', 'mpris', ',mpris',
44	RYGEL_PLUGINS:append = "${@bb.utils.contains('PACKAGECONFIG', 'ruih', ',ruih', '', d)}"	44	RYGEL_PLUGINS:append = "${@bb.utils.contains('PACKAGECONFIG', 'ruih', ',ruih', '', d)}"
45	RYGEL_PLUGINS:append = "${@bb.utils.contains('PACKAGECONFIG', 'gst-launch', ',gst-launch', '', d)}"	45	RYGEL_PLUGINS:append = "${@bb.utils.contains('PACKAGECONFIG', 'gst-launch', ',gst-launch', '', d)}"
46	RYGEL_PLUGINS:append = "${@bb.utils.contains('PACKAGECONFIG', 'media-export', ',media-export', '', d)}"	46	RYGEL_PLUGINS:append = "${@bb.utils.contains('PACKAGECONFIG', 'media-export', ',media-export', '', d)}"
47	RYGEL_PLUGINS:append = "${@bb.utils.contains('PACKAGECONFIG', 'tracker3', ',tracker3', '', d)}"	47	RYGEL_PLUGINS:append = "${@bb.utils.contains('PACKAGECONFIG', 'localsearch', ',localsearch', '', d)}"
48	RYGEL_PLUGINS:append = "${@bb.utils.contains('PACKAGECONFIG', 'playbin', ',playbin', '', d)}"	48	RYGEL_PLUGINS:append = "${@bb.utils.contains('PACKAGECONFIG', 'playbin', ',playbin', '', d)}"
49		49
50	LIBV = "2.8"	50	LIBV = "2.8"