diff options
Diffstat (limited to 'meta-openembedded/meta-gnome')
51 files changed, 834 insertions, 753 deletions
diff --git a/meta-openembedded/meta-gnome/classes/clutter.bbclass b/meta-openembedded/meta-gnome/classes/clutter.bbclass new file mode 100644 index 0000000000..24b53a13e4 --- /dev/null +++ b/meta-openembedded/meta-gnome/classes/clutter.bbclass @@ -0,0 +1,18 @@ +def get_minor_dir(v): + import re + m = re.match(r"^([0-9]+)\.([0-9]+)", v) + return "%s.%s" % (m.group(1), m.group(2)) + +def get_real_name(n): + import re + m = re.match(r"^([a-z]+(-[a-z]+)?)(-[0-9]+\.[0-9]+)?", n) + return "%s" % (m.group(1)) + +VERMINOR = "${@get_minor_dir("${PV}")}" +REALNAME = "${@get_real_name("${BPN}")}" + +SRC_URI = "${GNOME_MIRROR}/${REALNAME}/${VERMINOR}/${REALNAME}-${PV}.tar.xz;name=archive" +S = "${WORKDIR}/${REALNAME}-${PV}" + +CLUTTERBASEBUILDCLASS ??= "autotools" +inherit ${CLUTTERBASEBUILDCLASS} pkgconfig gtk-doc gettext diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.18.0.bb b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.22.0.bb index bc3e66ca2e..936f761230 100644 --- a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.18.0.bb +++ b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.22.0.bb @@ -9,7 +9,7 @@ inherit features_check gnomebase gsettings gtk-icon-cache gettext REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.sha256sum] = "ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96284c8c1ef2b18b" +SRC_URI[archive.sha256sum] = "c70d80b48d40a9cb99ec967cc4389f67e7f0301528a69d481572041331a646be" # We don't not have ubuntu's appindicator (yet?) EXTRA_OEMESON = "-Dappindicator=no" diff --git a/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_1.2.0.bb b/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_1.3.0.bb index d0a499e6ea..4eb383bbf2 100644 --- a/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_1.2.0.bb +++ b/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_1.3.0.bb @@ -11,7 +11,7 @@ SRC_URI = " \ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.gz \ file://0001-Install-polkit-action-unconditionally-executable-pke.patch \ " -SRC_URI[sha256sum] = "6c90715d254d7a7ec0208b29007b64160dd9fb7df4c4aa7f8ec2c9d23114c719" +SRC_URI[sha256sum] = "8dc180245dd9ea45e6e2f4bc69512f187e08be7f799c98a825a0b04c161cbd2a" DEPENDS += " \ glib-2.0-native \ diff --git a/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.84.bb b/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.86.bb index b49d9d7e8b..d264bf8c51 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.84.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.86.bb @@ -15,6 +15,6 @@ CFLAGS_append_toolchain-clang_mipsarch = " -ffp-exception-behavior=ignore " CFLAGS_append_toolchain-clang_riscv64 = " -ffp-exception-behavior=ignore " SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz" -SRC_URI[sha256sum] = "e7e38b8441f77feb9dc8231cb434a86190a21f2f3692c281457e99d35e9c34ea" +SRC_URI[sha256sum] = "0b3f595159ad1b216cd729c0504c3a5f6cf780c641f4dc63fc164f3c0382c8f0" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb index d08a3a3c9a..bb0cd1f8a9 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb @@ -28,7 +28,7 @@ SRC_URI = " \ " SRC_URI[sha256sum] = "c112782cf4096969e23217ccdfabe42284e35d5435ff0c43d40e4c70faeca8dd" -PACKAGECONFIG ??= "gexiv2 jpeg libpng librsvg sdl2" +PACKAGECONFIG ??= "gexiv2 jpeg libpng libraw librsvg poppler sdl2" PACKAGECONFIG_class-native = "libpng librsvg" PACKAGECONFIG[jasper] = "-Djasper=enabled,-Djasper=disabled,jasper" @@ -38,7 +38,9 @@ PACKAGECONFIG[jpeg] = "-Dlibjpeg=enabled,-Dlibjpeg=disabled,jpeg" PACKAGECONFIG[lcms] = "-Dlcms=enabled,-Dlcms=disabled,lcms" PACKAGECONFIG[libav] = "-Dlibav=enabled,-Dlibav=disabled,libav" PACKAGECONFIG[libpng] = "-Dlibpng=enabled,-Dlibpng=disabled,libpng" +PACKAGECONFIG[libraw] = "-Dlibraw=enabled,-Dlibraw=disabled,libraw" PACKAGECONFIG[librsvg] = "-Dlibrsvg=enabled,-Dlibrsvg=disabled,librsvg" +PACKAGECONFIG[poppler] = "-Dpoppler=enabled,-Dpoppler=disabled,poppler" PACKAGECONFIG[sdl] = "-Dsdl1=enabled,-Dsdl1=disabled,virtual/libsdl" PACKAGECONFIG[sdl2] = "-Dsdl2=enabled,-Dsdl2=disabled,virtual/libsdl2" PACKAGECONFIG[tiff] = "-Dlibtiff=enabled,-Dlibtiff=disabled,tiff" diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp/0001-configure.ac-fix-with-linux-input-handling-with-upco.patch b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp/0001-configure.ac-fix-with-linux-input-handling-with-upco.patch deleted file mode 100644 index 7e12487c7b..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp/0001-configure.ac-fix-with-linux-input-handling-with-upco.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 1b66e4cca6d95f4607599bcbdd4afeb601aee84e Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <slyfox@gentoo.org> -Date: Sun, 25 Oct 2020 18:09:21 +0000 -Subject: [PATCH] configure.ac: fix `--with-linux-input` handling with upcoming autoconf-2.70 - -Upcoming autoconf-2.70 exposes deficiency in configure.ac: - -``` -$ autoconf-2.70_beta2 && ./configure --host=x86_64-pc-linux-gnu -./configure: line 1430: 5: Bad file descriptor -checking whether is declared... ./configure: line 1432: ${+y}: bad -``` - -It happens because macros are called with parameters using insufficient quoting. - -More details at https://lists.gnu.org/archive/html/bug-autoconf/2020-10/msg00027.html - -The fix only amends `--with-linux-input`. Other cases of underquoting -will need to be handled separately. - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gimp/-/commit/cebeb90a87105cd6e35bcb357d53cc04c828ca21] -Fix-by: Zack Weinberg -Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> ---- - configure.ac | 17 ++++++++--------- - 1 file changed, 8 insertions(+), 9 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 6e2c193..afbcdd8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2138,15 +2138,14 @@ fi - AC_ARG_WITH(linux-input, [ --without-linux-input don't build linux input event controller module]) - - have_linux_input="no (linux input support disabled)" --if test "x$with_linux_input" != "xno"; then -- AC_CHECK_HEADER(linux/input.h, -- AC_CHECK_DECL(KEY_OK, -- have_linux_input=yes, -- have_linux_input="no (needs Linux 2.6)", -- [#include <linux/input.h>])) --fi -- --AM_CONDITIONAL(HAVE_LINUX_INPUT, test "x$have_linux_input" = xyes) -+AS_IF([test "x$with_linux_input" != "xno"], -+ [AC_CHECK_HEADER([linux/input.h], -+ [AC_CHECK_DECL([KEY_OK], -+ [have_linux_input=yes], -+ [have_linux_input="no (needs Linux 2.6)"], -+ [#include <linux/input.h>])])]) -+ -+AM_CONDITIONAL([HAVE_LINUX_INPUT], [test "x$have_linux_input" = xyes]) - - - ############################### --- -2.30.0 - diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb index 717716e1f9..e729d9deb7 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb @@ -43,10 +43,8 @@ REQUIRED_DISTRO_FEATURES = "x11" SHPV = "${@gnome_verdir("${PV}")}" -SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2 \ - file://0001-configure.ac-fix-with-linux-input-handling-with-upco.patch \ - " -SRC_URI[sha256sum] = "2db84b57f3778d80b3466d7c21a21d22e315c7b062de2883cbaaeda9a0f618bb" +SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2" +SRC_URI[sha256sum] = "bd1bb762368c0dd3175cf05006812dd676949c3707e21f4e6857435cb435989e" EXTRA_OECONF = "--disable-python \ --without-webkit \ @@ -56,7 +54,7 @@ EXTRA_OECONF = "--disable-python \ EXTRA_OECONF_append_mipsarch = " --disable-vector-icons" EXTRA_OECONF_append_libc-musl_riscv32 = " --disable-vector-icons" EXTRA_OECONF_append_libc-musl_x86 = " --disable-vector-icons" -EXTRA_OECONF_append_arm = " --disable-vector-icons" +EXTRA_OECONF_append_toolchain-clang_arm = " --disable-vector-icons" do_configure_append() { find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g diff --git a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor/0001-Don-t-alter-or-try-to-write-GtkChild-fields.patch b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor/0001-Don-t-alter-or-try-to-write-GtkChild-fields.patch deleted file mode 100644 index 7c83ae3397..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor/0001-Don-t-alter-or-try-to-write-GtkChild-fields.patch +++ /dev/null @@ -1,522 +0,0 @@ -From ba4a39b74067b73c9bed64dad7be3d53e837dd8d Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz <ricotz@ubuntu.com> -Date: Sat, 16 Jan 2021 13:26:32 +0100 -Subject: [PATCH] Don't alter or try to write GtkChild fields - -See https://gitlab.gnome.org/GNOME/vala/issues/1121 - -Upstream-Status: Backport [https://github.com/GNOME/dconf-editor/commit/9272e9fb6867e71426bfd0aa5edce5ec39cf0ad4] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - editor/bookmarks-headerbar.vala | 4 +-- - editor/bookmarks-list.vala | 4 +-- - editor/bookmarks.vala | 12 +++---- - editor/delayed-setting-view.vala | 54 ++++++++++++++++---------------- - editor/overlayed-list.vala | 38 +++++++++++----------- - editor/pathentry.vala | 24 +++++++------- - editor/registry-list.vala | 6 ++-- - editor/registry-search.vala | 6 ++-- - editor/registry-view.vala | 2 +- - 9 files changed, 75 insertions(+), 75 deletions(-) - -diff --git a/editor/bookmarks-headerbar.vala b/editor/bookmarks-headerbar.vala -index 54848a5..0522c37 100644 ---- a/editor/bookmarks-headerbar.vala -+++ b/editor/bookmarks-headerbar.vala -@@ -24,7 +24,7 @@ private abstract class BookmarksHeaderBar : BrowserHeaderBar, AdaptativeWidget - install_action_entries (); - - add_bookmarks_revealer (out bookmarks_revealer, -- out bookmarks_button, ref center_box); -+ out bookmarks_button, center_box); - connect_bookmarks_signals (); - add_bookmarks_controller (out bookmarks_controller, ref this); - -@@ -58,7 +58,7 @@ private abstract class BookmarksHeaderBar : BrowserHeaderBar, AdaptativeWidget - private Bookmarks bookmarks_button; - private BookmarksController bookmarks_controller; - -- private static void add_bookmarks_revealer (out Revealer bookmarks_revealer, out Bookmarks bookmarks_button, ref Box center_box) -+ private static void add_bookmarks_revealer (out Revealer bookmarks_revealer, out Bookmarks bookmarks_button, Box center_box) - { - bookmarks_revealer = new Revealer (); - bookmarks_revealer.transition_type = RevealerTransitionType.SLIDE_LEFT; -diff --git a/editor/bookmarks-list.vala b/editor/bookmarks-list.vala -index 393973b..c9280d5 100644 ---- a/editor/bookmarks-list.vala -+++ b/editor/bookmarks-list.vala -@@ -146,10 +146,10 @@ private class BookmarksList : OverlayedList - - internal bool create_bookmark_rows (Variant bookmarks_variant) - { -- _create_bookmark_rows (bookmarks_variant, view_mode, ref main_list_store, ref main_list_box, ref bookmarks_hashtable); -+ _create_bookmark_rows (bookmarks_variant, view_mode, ref main_list_store, main_list_box, ref bookmarks_hashtable); - return n_items == 0; - } -- private static void _create_bookmark_rows (Variant bookmarks_variant, bool view_mode, ref GLib.ListStore main_list_store, ref ListBox main_list_box, ref HashTable<string, Bookmark> bookmarks_hashtable) -+ private static void _create_bookmark_rows (Variant bookmarks_variant, bool view_mode, ref GLib.ListStore main_list_store, ListBox main_list_box, ref HashTable<string, Bookmark> bookmarks_hashtable) - { - string saved_bookmark_name = ""; - ListBoxRow? selected_row = main_list_box.get_selected_row (); -diff --git a/editor/bookmarks.vala b/editor/bookmarks.vala -index 153af10..d8cea7c 100644 ---- a/editor/bookmarks.vala -+++ b/editor/bookmarks.vala -@@ -84,7 +84,7 @@ private class Bookmarks : MenuButton - - construct - { -- update_switch_label (ViewType.SEARCH, ViewType.FOLDER, ref switch_label); // init text with "Bookmark this Location" -+ update_switch_label (ViewType.SEARCH, ViewType.FOLDER, switch_label); // init text with "Bookmark this Location" - - install_action_entries (); - -@@ -184,7 +184,7 @@ private class Bookmarks : MenuButton - - internal void set_path (ViewType type, string path) - { -- update_switch_label (current_type, type, ref switch_label); -+ update_switch_label (current_type, type, switch_label); - - current_path = path; - current_type = type; -@@ -392,7 +392,7 @@ private class Bookmarks : MenuButton - * * Bookmarks management - \*/ - -- private static void update_switch_label (ViewType old_type, ViewType new_type, ref Label switch_label) -+ private static void update_switch_label (ViewType old_type, ViewType new_type, Label switch_label) - { - if (new_type == ViewType.SEARCH && old_type != ViewType.SEARCH) - switch_label.label = bookmark_this_search_text; -@@ -414,18 +414,18 @@ private class Bookmarks : MenuButton - { - if (bookmarks_icon.icon_name != "starred-symbolic") - bookmarks_icon.icon_name = "starred-symbolic"; -- update_switch_state (true, ref bookmarked_switch); -+ update_switch_state (true, bookmarked_switch); - bookmarked_switch.set_detailed_action_name ("bookmarks.unbookmark(" + variant.print (true) + ")"); - } - else - { - if (bookmarks_icon.icon_name != "non-starred-symbolic") - bookmarks_icon.icon_name = "non-starred-symbolic"; -- update_switch_state (false, ref bookmarked_switch); -+ update_switch_state (false, bookmarked_switch); - bookmarked_switch.set_detailed_action_name ("bookmarks.bookmark(" + variant.print (true) + ")"); - } - } -- private static void update_switch_state (bool bookmarked, ref Switch bookmarked_switch) -+ private static void update_switch_state (bool bookmarked, Switch bookmarked_switch) - { - if (bookmarked == bookmarked_switch.active) - return; -diff --git a/editor/delayed-setting-view.vala b/editor/delayed-setting-view.vala -index add6852..b1f774c 100644 ---- a/editor/delayed-setting-view.vala -+++ b/editor/delayed-setting-view.vala -@@ -41,24 +41,24 @@ private class DelayedSettingView : OverlayedListRow - { - // at row creation, key is never ghost - _update_dconf_key_current_value (key_value, -- ref key_value_label, -- ref key_value_default); -+ key_value_label, -+ key_value_default); - - _update_dconf_key_planned_value (cool_planned_value, -- ref planned_value_label, -- ref planned_value_default); -+ planned_value_label, -+ planned_value_default); - } - else - { - _update_gsettings_key_current_value (key_value, - has_schema_and_is_default, -- ref key_value_label, -- ref key_value_default); -+ key_value_label, -+ key_value_default); - - _update_gsettings_key_planned_value (cool_planned_value, - (!) cool_default_value, -- ref planned_value_label, -- ref planned_value_default); -+ planned_value_label, -+ planned_value_default); - } - } - -@@ -74,23 +74,23 @@ private class DelayedSettingView : OverlayedListRow - - private static inline void _update_gsettings_key_planned_value (string? cool_planned_value, - string cool_default_value, -- ref Label planned_value_label, -- ref Label planned_value_default) -+ Label planned_value_label, -+ Label planned_value_default) - { - bool is_default = cool_planned_value == null; - planned_value_label.label = is_default ? cool_default_value : (!) cool_planned_value; -- update_value_default_label (is_default, ref planned_value_default); -+ update_value_default_label (is_default, planned_value_default); - } - - private static inline void _update_dconf_key_planned_value (string? cool_planned_value, -- ref Label planned_value_label, -- ref Label planned_value_default) -+ Label planned_value_label, -+ Label planned_value_default) - { - if (cool_planned_value == null) -- update_labels_dconf_key_erased (ref planned_value_label, ref planned_value_default); -+ update_labels_dconf_key_erased (planned_value_label, planned_value_default); - else - update_labels_dconf_key_values ((!) cool_planned_value, -- ref planned_value_label, ref planned_value_default); -+ planned_value_label, planned_value_default); - } - - /*\ -@@ -99,37 +99,37 @@ private class DelayedSettingView : OverlayedListRow - - internal void update_gsettings_key_current_value (Variant key_value, bool is_default) - { -- _update_gsettings_key_current_value (key_value, is_default, ref key_value_label, ref key_value_default); -+ _update_gsettings_key_current_value (key_value, is_default, key_value_label, key_value_default); - } - private static void _update_gsettings_key_current_value (Variant key_value, - bool is_default, -- ref Label key_value_label, -- ref Label key_value_default) -+ Label key_value_label, -+ Label key_value_default) - { - key_value_label.label = Key.cool_text_value_from_variant (key_value); -- update_value_default_label (is_default, ref key_value_default); -+ update_value_default_label (is_default, key_value_default); - } - - internal void update_dconf_key_current_value (Variant? key_value_or_null) - { -- _update_dconf_key_current_value (key_value_or_null, ref key_value_label, ref key_value_default); -+ _update_dconf_key_current_value (key_value_or_null, key_value_label, key_value_default); - } - private static void _update_dconf_key_current_value (Variant? key_value_or_null, -- ref Label key_value_label, -- ref Label key_value_default) -+ Label key_value_label, -+ Label key_value_default) - { - if (key_value_or_null == null) -- update_labels_dconf_key_erased (ref key_value_label, ref key_value_default); -+ update_labels_dconf_key_erased (key_value_label, key_value_default); - else - update_labels_dconf_key_values (Key.cool_text_value_from_variant ((!) key_value_or_null), -- ref key_value_label, ref key_value_default); -+ key_value_label, key_value_default); - } - - /*\ - * * common utilities - \*/ - -- private static void update_labels_dconf_key_erased (ref Label value_label, ref Label value_default) -+ private static void update_labels_dconf_key_erased (Label value_label, Label value_default) - { - value_label.visible = false; - /* Translators: displayed in the list of pending changes (could be an in-window panel, or in the popover of the bottom bar); for dconf keys */ -@@ -137,14 +137,14 @@ private class DelayedSettingView : OverlayedListRow - value_default.visible = true; - } - -- private static void update_labels_dconf_key_values (string key_value, ref Label value_label, ref Label value_default) -+ private static void update_labels_dconf_key_values (string key_value, Label value_label, Label value_default) - { - value_default.visible = false; - value_label.label = key_value; // TODO move Key.cool_text_value_from_variant here? - value_label.visible = true; - } - -- private static void update_value_default_label (bool is_default, ref Label value_default) -+ private static void update_value_default_label (bool is_default, Label value_default) - { - if (is_default) - /* Translators: displayed in the list of pending changes (could be an in-window panel, or in the popover of the bottom bar); for gsettings keys */ -diff --git a/editor/overlayed-list.vala b/editor/overlayed-list.vala -index 8b0ec51..bcdfc3a 100644 ---- a/editor/overlayed-list.vala -+++ b/editor/overlayed-list.vala -@@ -89,11 +89,11 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget - internal void set_window_size (AdaptativeWidget.WindowSize new_size) - { - if (!AdaptativeWidget.WindowSize.is_extra_thin (new_size) && AdaptativeWidget.WindowSize.is_extra_flat (new_size)) -- set_horizontal (ref main_context, ref edit_mode_box); -+ set_horizontal (ref main_context, edit_mode_box); - else -- set_vertical (ref main_context, ref edit_mode_box); -+ set_vertical (ref main_context, edit_mode_box); - } -- private static inline void set_horizontal (ref StyleContext main_context, ref Box edit_mode_box) -+ private static inline void set_horizontal (ref StyleContext main_context, Box edit_mode_box) - { - main_context.remove_class ("vertical"); - edit_mode_box.halign = Align.END; -@@ -102,7 +102,7 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget - edit_mode_box.width_request = 160; - main_context.add_class ("horizontal"); - } -- private static inline void set_vertical (ref StyleContext main_context, ref Box edit_mode_box) -+ private static inline void set_vertical (ref StyleContext main_context, Box edit_mode_box) - { - main_context.remove_class ("horizontal"); - edit_mode_box.halign = Align.CENTER; -@@ -118,9 +118,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget - - internal bool next_match () - { -- return _next_match (ref main_list_box); -+ return _next_match (main_list_box); - } -- private static inline bool _next_match (ref ListBox main_list_box) -+ private static inline bool _next_match (ListBox main_list_box) - { - ListBoxRow? row = main_list_box.get_selected_row (); // TODO multiple rows and focus-only lists - if (row == null) -@@ -130,7 +130,7 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget - - if (row == null) - { -- _scroll_bottom (ref main_list_box); -+ _scroll_bottom (main_list_box); - return false; - } - main_list_box.select_row ((!) row); -@@ -140,9 +140,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget - - internal bool previous_match () - { -- return _previous_match (ref main_list_box); -+ return _previous_match (main_list_box); - } -- private static inline bool _previous_match (ref ListBox main_list_box) -+ private static inline bool _previous_match (ListBox main_list_box) - { - uint n_items = main_list_box.get_children ().length (); // FIXME OverlayedList.n_items is unreliable - if (n_items == 0) -@@ -189,9 +189,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget - - protected int [] get_selected_rows_indices () - { -- return _get_selected_rows_indices (ref main_list_box); -+ return _get_selected_rows_indices (main_list_box); - } -- private static inline int [] _get_selected_rows_indices (ref ListBox main_list_box) -+ private static inline int [] _get_selected_rows_indices (ListBox main_list_box) - { - int [] indices = new int [0]; - main_list_box.selected_foreach ((_list_box, selected_row) => { -@@ -205,9 +205,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget - - protected void scroll_top () - { -- _scroll_top (ref main_list_box); -+ _scroll_top (main_list_box); - } -- private static inline void _scroll_top (ref ListBox main_list_box) -+ private static inline void _scroll_top (ListBox main_list_box) - { - Adjustment adjustment = main_list_box.get_adjustment (); - adjustment.set_value (adjustment.get_lower ()); -@@ -215,9 +215,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget - - protected void scroll_bottom () - { -- _scroll_bottom (ref main_list_box); -+ _scroll_bottom (main_list_box); - } -- private static inline void _scroll_bottom (ref ListBox main_list_box) -+ private static inline void _scroll_bottom (ListBox main_list_box) - { - Adjustment adjustment = main_list_box.get_adjustment (); - adjustment.set_value (adjustment.get_upper ()); -@@ -225,9 +225,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget - - internal bool handle_copy_text (out string copy_text) - { -- return _handle_copy_text (out copy_text, ref main_list_box); -+ return _handle_copy_text (out copy_text, main_list_box); - } -- private static inline bool _handle_copy_text (out string copy_text, ref ListBox main_list_box) -+ private static inline bool _handle_copy_text (out string copy_text, ListBox main_list_box) - { - List<weak ListBoxRow> selected_rows = main_list_box.get_selected_rows (); - OverlayedListRow row; -@@ -283,9 +283,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget - - internal SelectionState get_selection_state () - { -- return _get_selection_state (ref main_list_box, ref main_list_store); -+ return _get_selection_state (main_list_box, ref main_list_store); - } -- private static inline SelectionState _get_selection_state (ref ListBox main_list_box, ref GLib.ListStore main_list_store) -+ private static inline SelectionState _get_selection_state (ListBox main_list_box, ref GLib.ListStore main_list_store) - { - List<weak ListBoxRow> selected_rows = main_list_box.get_selected_rows (); - uint n_selected_rows = selected_rows.length (); -diff --git a/editor/pathentry.vala b/editor/pathentry.vala -index 5000b21..5c7efc5 100644 ---- a/editor/pathentry.vala -+++ b/editor/pathentry.vala -@@ -133,9 +133,9 @@ private class PathEntry : Box, AdaptativeWidget - - internal void entry_grab_focus_without_selecting () - { -- _entry_grab_focus_without_selecting (ref search_entry); -+ _entry_grab_focus_without_selecting (search_entry); - } -- private static void _entry_grab_focus_without_selecting (ref BrowserEntry search_entry) -+ private static void _entry_grab_focus_without_selecting (BrowserEntry search_entry) - { - if (search_entry.text_length != 0) - { -@@ -172,36 +172,36 @@ private class PathEntry : Box, AdaptativeWidget - requires (search_changed_handler != 0) - { - SignalHandler.block (search_entry, search_changed_handler); -- _prepare (mode, nullable_search, ref current_path, ref search_entry); -+ _prepare (mode, nullable_search, ref current_path, search_entry); - SignalHandler.unblock (search_entry, search_changed_handler); - } - - private static inline void _prepare (SearchMode mode, - string? nullable_search, - ref string current_path, -- ref BrowserEntry search_entry) -+ BrowserEntry search_entry) - { - string search; - switch (mode) - { - case SearchMode.EDIT_PATH_MOVE_END: - search = nullable_search == null ? current_path : (!) nullable_search; -- _prepare_move_end (ref search, ref search_entry); -+ _prepare_move_end (ref search, search_entry); - return; - - case SearchMode.EDIT_PATH_SELECT_ALL: - search = nullable_search == null ? current_path : (!) nullable_search; -- _prepare_search (ref search, ref search_entry); -+ _prepare_search (ref search, search_entry); - return; - - case SearchMode.EDIT_PATH_SELECT_LAST_WORD: - search = current_path; -- _prepare_select_last_word (ref search, ref search_entry); -+ _prepare_select_last_word (ref search, search_entry); - return; - - case SearchMode.SEARCH: - search = ""; -- _prepare_search (ref search, ref search_entry); -+ _prepare_search (ref search, search_entry); - return; - - case SearchMode.UNCLEAR: -@@ -210,19 +210,19 @@ private class PathEntry : Box, AdaptativeWidget - } - } - -- private static inline void _prepare_move_end (ref string text, ref BrowserEntry search_entry) -+ private static inline void _prepare_move_end (ref string text, BrowserEntry search_entry) - { - search_entry.text = text; -- _entry_grab_focus_without_selecting (ref search_entry); -+ _entry_grab_focus_without_selecting (search_entry); - } - -- private static inline void _prepare_search (ref string text, ref BrowserEntry search_entry) -+ private static inline void _prepare_search (ref string text, BrowserEntry search_entry) - { - search_entry.text = text; - search_entry.grab_focus (); - } - -- private static inline void _prepare_select_last_word (ref string current_path, ref BrowserEntry search_entry) -+ private static inline void _prepare_select_last_word (ref string current_path, BrowserEntry search_entry) - { - search_entry.move_cursor (MovementStep.DISPLAY_LINE_ENDS, -1, false); - search_entry.text = current_path; -diff --git a/editor/registry-list.vala b/editor/registry-list.vala -index 74b7f99..54aa6fa 100644 ---- a/editor/registry-list.vala -+++ b/editor/registry-list.vala -@@ -291,9 +291,9 @@ private abstract class RegistryList : Grid, BrowsableView, AdaptativeWidget - - internal bool handle_copy_text (out string copy_text) // can compile with "private", but is public 1/2 - { -- return _handle_copy_text (out copy_text, ref key_list_box); -+ return _handle_copy_text (out copy_text, key_list_box); - } -- private bool _handle_copy_text (out string copy_text, ref ListBox key_list_box) -+ private bool _handle_copy_text (out string copy_text, ListBox key_list_box) - { - ListBoxRow? selected_row = (ListBoxRow?) key_list_box.get_selected_row (); - if (selected_row == null) -@@ -1138,7 +1138,7 @@ private abstract class RegistryList : Grid, BrowsableView, AdaptativeWidget - * * headers - \*/ - -- protected static bool is_first_row (int row_index, ref unowned ListBoxRow? before) -+ protected static bool is_first_row (int row_index, ListBoxRow? before) - { - bool is_first_row = row_index == 0; - if (is_first_row != (before == null)) -diff --git a/editor/registry-search.vala b/editor/registry-search.vala -index 220583f..eb8e6f2 100644 ---- a/editor/registry-search.vala -+++ b/editor/registry-search.vala -@@ -48,7 +48,7 @@ private class RegistrySearch : RegistryList - - internal bool handle_alt_copy_text (out string copy_text) - { -- return _handle_alt_copy_text (out copy_text, ref key_list_box); -+ return _handle_alt_copy_text (out copy_text, key_list_box); - } - - internal void clean () -@@ -145,7 +145,7 @@ private class RegistrySearch : RegistryList - * * Keyboard calls - \*/ - -- private static bool _handle_alt_copy_text (out string copy_text, ref ListBox key_list_box) -+ private static bool _handle_alt_copy_text (out string copy_text, ListBox key_list_box) - { - ListBoxRow? selected_row = key_list_box.get_selected_row (); - if (selected_row == null) -@@ -521,7 +521,7 @@ private class RegistrySearch : RegistryList - private void update_row_header (ListBoxRow row, ListBoxRow? before) - { - int row_index = row.get_index (); -- if (is_first_row (row_index, ref before)) -+ if (is_first_row (row_index, before)) - return; - - if (search_is_path_search) -diff --git a/editor/registry-view.vala b/editor/registry-view.vala -index e0ff379..7d9eb1f 100644 ---- a/editor/registry-view.vala -+++ b/editor/registry-view.vala -@@ -114,7 +114,7 @@ private class RegistryView : RegistryList - - private void update_row_header (ListBoxRow row, ListBoxRow? before) - { -- if (is_first_row (row.get_index (), ref before)) -+ if (is_first_row (row.get_index (), before)) - return; - update_row_header_with_context (row, (!) before, modifications_handler.model, /* local search header */ false); - } --- -2.30.1 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.3.bb index 776558ebf3..5b68467a18 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.3.bb @@ -8,9 +8,7 @@ DEPENDS = "dconf gtk+3" inherit gnomebase vala gettext gsettings bash-completion -SRC_URI += "file://0001-Don-t-alter-or-try-to-write-GtkChild-fields.patch" - -SRC_URI[archive.sha256sum] = "1253dad87e6213fbf313ff9ec9dc4358aa1b10261f28072c1dc0e0997b92f835" +SRC_URI[archive.sha256sum] = "571af4c7dad4f049b53e6cd728b79addf08c27ddab6bc57b396d211866ee79e3" FILES_${PN} += " \ ${datadir}/dbus-1 \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.38.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_40.1.bb index 9c1d8641e5..3b1a978c64 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.38.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_40.1.bb @@ -13,14 +13,18 @@ DEPENDS = " \ gstreamer1.0-plugins-base \ orc \ adwaita-icon-theme \ + libhandy \ ${@bb.utils.contains('DISTRO_FEATURES','x11','gnome-desktop3','',d)} \ " GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase itstool gnome-help pkgconfig gsettings gobject-introspection upstream-version-is-even gettext mime-xdg gtk-doc +inherit gnomebase itstool gnome-help pkgconfig gsettings gobject-introspection gettext mime-xdg gtk-doc -SRC_URI[archive.sha256sum] = "26df897a417545b476d2606b14731122e84278ae994bd64ea535449c3cf01948" +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +SRC_URI[archive.sha256sum] = "7a666363c350af2e3bbba7f14b3c1befc5012f9ed3d9d073447f4c59f33dcf2d" GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc index f39440cc6f..870a9c0e94 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc +++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc @@ -9,6 +9,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \ inherit gnomebase upstream-version-is-even -SRC_URI[archive.sha256sum] = "c555528c546d457be0dc0eaca5d766d4dfef7c408276cb05f9724c463bfe7fd9" -PV = "3.36.5" - +SRC_URI[archive.sha256sum] = "eac75f348aa5defbe9473fa30ab6084635ee64d8e3eaaec60a62c27f149c3e22" +PV = "3.40.1" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.36.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.38.1.bb index 9af88f2a9e..379857c94e 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.36.3.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.38.1.bb @@ -13,7 +13,7 @@ DEPENDS = " \ inherit gnomebase gsettings itstool gnome-help gettext upstream-version-is-even mime-xdg -SRC_URI[archive.sha256sum] = "0959e10a5d7a7442809624be9879d95db462ca76e8c66ad6299310e6acdb81b7" +SRC_URI[archive.sha256sum] = "94a0130e12d321aa119793a14d09716523e2e4a61f29570cee53fd88dd6abc57" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'packagekit', '', d)}" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_3.36.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_40.1.bb index b20f20449f..ee94cdd2a8 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_3.36.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_40.1.bb @@ -16,12 +16,18 @@ DEPENDS = " \ tepl \ " -inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc vala gettext features_check upstream-version-is-even mime-xdg python3targetconfig +inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc vala gettext features_check mime-xdg python3targetconfig + +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.md5sum] = "438217bbbcf92a17c4f259b4a5426b03" -SRC_URI[archive.sha256sum] = "6887554643c5b1b3862ac364d97b7b50224bff95e6758aeaa08f4a482b554197" +SRC_URI[archive.sha256sum] = "55e394a82cb65678b1ab49526cf5bd43f00d8fba21476a4849051a8e137d3691" + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.2.bb index 12ea5938c5..708523ee8c 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.2.bb @@ -9,8 +9,8 @@ GTKDOC_MESON_OPTION = "gtk_doc" inherit gnomebase gobject-introspection gtk-doc -SRC_URI[archive.md5sum] = "44a3cfeab1afd83a71e852835d24e656" -SRC_URI[archive.sha256sum] = "8aeafd59653ea88f6b78cb03780ee9fd61a2f993070c5f0d0976bed93ac2bd77" +SRC_URI[archive.md5sum] = "4c0cd962f021f937507904df147ea750" +SRC_URI[archive.sha256sum] = "2322b552aca330eef79724a699c51a302345d5e074738578b398b7f2ff97944c" EXTRA_OEMESON = " \ -Dvapi=false \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.3.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.3.2.bb index 5e833a91ac..8eba859419 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.3.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.3.2.bb @@ -9,8 +9,8 @@ DEPENDS = " \ inherit gnomebase gobject-introspection gtk-doc vala -SRC_URI[archive.md5sum] = "3149496d0189623a8e1289bbab4d8385" -SRC_URI[archive.sha256sum] = "0e78713e6f0de339fdee16bab82753ae290fe80fa7b4ba6e3db8c1465b81d0f8" +SRC_URI[archive.md5sum] = "3c8da1a8489255f2aaa5fdb690308e5d" +SRC_URI[archive.sha256sum] = "a48c4d5ce9a9ed05ba8bc8fdeb9af2d1a7bd8091c2911d6c37223c4f488f7c72" do_compile_prepend() { export GIR_EXTRA_LIBS_PATH="${B}/gnome-autoar/.libs" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.5.bb index 77c89d95c2..31d3bf6eb7 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.5.bb @@ -18,7 +18,7 @@ REQUIRED_DISTRO_FEATURES = "x11" # gtk-icon-cache bbclass will take care of this for us. EXTRA_OEMESON = "-Dicon_update=false" -SRC_URI[archive.md5sum] = "09b6bab7ceaafb35da766a5476fbc466" -SRC_URI[archive.sha256sum] = "3ec91076c2822cd1f9abdc8e27663c3bda4c9c8a7a9773f9e92bfbf2b745d386" +SRC_URI[archive.md5sum] = "d83faa54abaf64bb40b5313bc233e74e" +SRC_URI[archive.sha256sum] = "6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9" RDEPENDS_${PN} += "bluez5" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_3.36.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_40.1.bb index c250981c42..ef96632bdd 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_3.36.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_40.1.bb @@ -11,6 +11,7 @@ DEPENDS = " \ libgee \ libmpc \ gtksourceview4 \ + libhandy \ " GIR_MESON_OPTION = 'disable-introspection' @@ -19,12 +20,14 @@ GIR_MESON_DISABLE_FLAG = 'true' GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gobject-introspection gnome-help vala gtk-icon-cache gettext features_check upstream-version-is-even +inherit gnomebase gobject-introspection gnome-help vala gtk-icon-cache gettext features_check + +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.md5sum] = "71854fb58671b4a88ac990e2f2439e4f" -SRC_URI[archive.sha256sum] = "a2e830f9c9856fad65dad1d6c0ae6abad0f0b496c9984ac005315c5cc4220db3" +SRC_URI[archive.sha256sum] = "7fe6c561f7b1f485ac106219772e45cc135c983bfa4278dd2d3fd83b57ff6af6" FILES_${PN} += " \ ${datadir}/dbus-1 \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_3.34.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb index bb70ae7a89..6b69c08eb9 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_3.34.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb @@ -18,19 +18,29 @@ DEPENDS = " \ libgdata \ gfbgraph \ tracker \ + libhandy \ " GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gettext upstream-version-is-even gnome-help features_check +inherit gnomebase gettext gnome-help features_check + +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.md5sum] = "1dd0d477eac4707e8cfe9f35e26d1f29" -SRC_URI[archive.sha256sum] = "3c59c76ef28618ec055a1799d1040287b90a0b021feb0a02b1eac28e9c2eb41a" +SRC_URI[archive.sha256sum] = "e02d73e138af8b2868b5cad7faa1bdd278aeade3b6c3c92836511a4e6f3af1af" + +do_install_append() { + # make gnome-photos available on all desktops + sed -i 's:OnlyShowIn=:#OnlyShowIn=:g' ${D}${datadir}/applications/org.gnome.Photos.desktop +} FILES_${PN} += " \ ${datadir}/dbus-1 \ ${datadir}/metainfo \ ${datadir}/gnome-shell \ " + +RRECOMMENDS_${PN} = "grilo-plugins" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.36.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_40.1.bb index ddd11201b1..ecc5a09a03 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.36.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_40.1.bb @@ -10,16 +10,19 @@ DEPENDS = " \ libgtop \ librsvg \ polkit \ + libhandy \ " GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gsettings gnome-help itstool gtk-icon-cache features_check gettext upstream-version-is-even +inherit gnomebase gsettings gnome-help itstool gtk-icon-cache features_check gettext REQUIRED_DISTRO_FEATURES = "x11 polkit" -SRC_URI[archive.md5sum] = "b1443ab12c3b7bcca940d28754e5b948" -SRC_URI[archive.sha256sum] = "866b47ab0f4c75b0ec57d6300337a7373463aaad5df95eddfe5354c22be7bca1" +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +SRC_URI[archive.sha256sum] = "fdb30f4367907aab86d7c2bb76a7b773ba850b765c9666a39f42abfe22691d1a" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo-plugins/0001-Avoid-running-trackertestutils.patch b/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo-plugins/0001-Avoid-running-trackertestutils.patch new file mode 100644 index 0000000000..a07cd49fdf --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo-plugins/0001-Avoid-running-trackertestutils.patch @@ -0,0 +1,34 @@ +From 9deaed70221a12e26f968be26233b75fa5669476 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sat, 15 May 2021 23:25:09 +0200 +Subject: [PATCH] Avoid running trackertestutils +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It breaks configuration: +| ../grilo-plugins-0.3.13/tests/tracker3/meson.build:5:0: ERROR: Program '/usr/lib/tracker-3.0/trackertestutils/tracker-sandbox' not found + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 6a03778..17ef1e1 100644 +--- a/meson.build ++++ b/meson.build +@@ -78,7 +78,7 @@ totem_plparser_dep = dependency('totem-plparser', version: '>= 3.4.1', required: + totem_plparser_mini_dep = dependency('totem-plparser-mini', version: '>= 3.4.1', required: false) + tracker_sparql_dep = dependency('tracker-sparql-2.0', version: '>= 2.3.0', required: false) + tracker3_dep = dependency('tracker-sparql-3.0', required: false) +-tracker3_testutils_dep = dependency('tracker-testutils-3.0', required: false) ++tracker3_testutils_dep = dependency('tracker-testutils-3.0-avoid-find', required: false) + + lua_dep = dependency('lua', version: '>= 5.3.0', required: false) + if not lua_dep.found() +-- +2.31.1 + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.13.bb b/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.13.bb new file mode 100644 index 0000000000..4ead998c79 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.13.bb @@ -0,0 +1,22 @@ +SUMMARY = "Grilo is a framework forsearching media content from various sources" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" + +DEPENDS = " \ + glib-2.0-native \ + gperf-native \ + itstool-native \ + grilo \ + tracker \ + lua \ + liboauth \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gnome-help vala + +SRC_URI += "file://0001-Avoid-running-trackertestutils.patch" +SRC_URI[archive.sha256sum] = "1c4305d67364a930543836cc1982f30e946973b8ff6af3efe31d87709ab520f8" + +FILES_${PN} += "${libdir}/grilo-0.3" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop/0001-fix-compile-error-for-cross-compile.patch b/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop/0001-fix-compile-error-for-cross-compile.patch new file mode 100644 index 0000000000..1bd6e101b5 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop/0001-fix-compile-error-for-cross-compile.patch @@ -0,0 +1,37 @@ +From e865a93000913b4597607289356114cd159f4e28 Mon Sep 17 00:00:00 2001 +From: Your Name <you@example.com> +Date: Fri, 21 May 2021 03:02:29 +0000 +Subject: [PATCH] fix compile error for cross compile + +On some distros, such as fedora32, cross compile failed with following +error since host library is used. undefined reference to +`stat64@GLIBC_2.33' + +According doc of ld, set searchdir begins with "=", but not hardcoded +locations. + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libgtop/-/merge_requests/26] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 472f44b..ed6a4d7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -270,8 +270,8 @@ AC_ARG_ENABLE(fatal-warnings, + [Define to enable fatal warnings])) + + dnl These definitions are expanded in make. +-LIBGTOP_LIBS='-L$(libdir)' +-LIBGTOP_INCS='-I$(includedir)/libgtop-2.0' ++LIBGTOP_LIBS='-L=$(libdir)' ++LIBGTOP_INCS='-I=$(includedir)/libgtop-2.0' + + if test x$libgtop_have_sysinfo = xyes ; then + LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_LIBGTOP_SYSINFO" +-- +2.26.2 + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb index f0c9cdb0e2..6d9398f4e4 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb @@ -1,4 +1,4 @@ -SUMMARY = "LibGTop2" +SUMMARY = "A library for collecting system monitoring data" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" @@ -8,9 +8,8 @@ inherit gnomebase lib_package gtk-doc gobject-introspection gettext upstream-ver inherit features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.md5sum] = "c6d67325cd97b2208b41e07e6cc7b947" +SRC_URI += "file://0001-fix-compile-error-for-cross-compile.patch" + SRC_URI[archive.sha256sum] = "78f3274c0c79c434c03655c1b35edf7b95ec0421430897fb1345a98a265ed2d4" DEPENDS = "glib-2.0 libxau" - -EXTRA_OEMAKE += "LIBGTOP_LIBS=" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather_3.36.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather_3.36.2.bb index 3ee382937e..c2cb2f19be 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather_3.36.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather_3.36.2.bb @@ -7,8 +7,8 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings gobject-introspection gettext gtk-doc vala features_check upstream-version-is-even -SRC_URI[archive.md5sum] = "d6081108f9c224c5cb594f8ccb025db9" -SRC_URI[archive.sha256sum] = "de2709f0ee233b20116d5fa9861d406071798c4aa37830ca25f5ef2c0083e450" +SRC_URI[archive.md5sum] = "ff399cf89e97a3e574ae05db5617b96b" +SRC_URI[archive.sha256sum] = "ee1201a8fc25c14e940d3b26db49a34947c8aebf67dee01ee67fbcb06ecb37a0" # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_3.36.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_40.0.bb index 8bca93f6d1..bfb52e5bbf 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_3.36.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_40.0.bb @@ -17,8 +17,10 @@ GIR_MESON_DISABLE_FLAG = 'disabled' inherit gnomebase gobject-introspection gtk-doc gettext features_check -SRC_URI[archive.md5sum] = "00bb40dc6fab76af0da33e88a34b6378" -SRC_URI[archive.sha256sum] = "bc508150b3ed5d22354b0e6774ad4eee465381ebc0ace45eb0e2d3a4186c925f" +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +SRC_URI[archive.sha256sum] = "30cb79a839f90cd66f3e202f3f98cb5166fa0cd9b92eb571ad9c470a43021d83" # libxres means x11 only REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_3.34.6.bb b/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_3.34.6.bb index adbfcd6d7d..c7f91f0db6 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_3.34.6.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_3.34.6.bb @@ -27,7 +27,7 @@ SRC_URI[archive.sha256sum] = "23bde87d33b8981358831cec8915bb5ff1eaf9c1de74c90cd1 SRC_URI += "file://0001-EGL-Include-EGL-eglmesaext.h.patch" # x11 is still manadatory - see meson.build -REQUIRED_DISTRO_FEATURES = "x11" +REQUIRED_DISTRO_FEATURES = "x11 polkit" # systemd can be replaced by libelogind (not available atow - make systemd # mandatory distro feature) diff --git a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus/0001-Drop-use-of-volatile.patch b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus/0001-Drop-use-of-volatile.patch deleted file mode 100644 index 46831429d0..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus/0001-Drop-use-of-volatile.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 9ab5acb902a38b420592931ec9e46ccd0624035a Mon Sep 17 00:00:00 2001 -From: Ondrej Holy <oholy@redhat.com> -Date: Wed, 13 Jan 2021 13:22:58 +0100 -Subject: [PATCH] Drop use of volatile - -The `fedora rawhide` CI job currently fails because of usage of the -`volatile` qualifier. Let's drop the `volatile` qualifier as it doesn't -help anyway. It was dropped in GLib as well, see: -https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1719 - -Fixes: https://gitlab.gnome.org/GNOME/nautilus/-/issues/1741 ---- -Upstream-Status: Backport [https://github.com/GNOME/nautilus/commit/9b733dd9df9d6d9805c56749d05ada15a7560ef4] - src/nautilus-enum-types.c.template | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/nautilus-enum-types.c.template b/src/nautilus-enum-types.c.template -index 00155ca..9d8ac83 100644 ---- a/src/nautilus-enum-types.c.template -+++ b/src/nautilus-enum-types.c.template -@@ -13,7 +13,7 @@ - GType - @enum_name@_get_type (void) - { -- static volatile GType type_once = 0; -+ static GType type_once = 0; - - if (g_once_init_enter (&type_once)) - { --- -2.30.1 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_3.36.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_40.1.bb index cf138d9739..75fc03237d 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_3.36.3.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_40.1.bb @@ -13,16 +13,23 @@ DEPENDS = " \ gsettings-desktop-schemas \ gnome-autoar \ tracker \ + libhandy \ + libportal \ " -inherit gnomebase gsettings gobject-introspection gtk-doc gettext features_check upstream-version-is-even mime-xdg +inherit gnomebase gsettings gobject-introspection gtk-doc gettext features_check mime-xdg -SRC_URI += "file://0001-Drop-use-of-volatile.patch" -SRC_URI[archive.md5sum] = "c3c8dbb90d8eeed6c127aa568e131395" -SRC_URI[archive.sha256sum] = "b6cafc7ab1e70a64383de391b6097fcccbf36b208f8502d8c46423224fd30ef8" +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +SRC_URI[archive.sha256sum] = "8ecfb90174a0bd5815b1ceb9cbfcd91fec0fb5e34907a4f2df2d05e5d6c99d33" REQUIRED_DISTRO_FEATURES = "x11" +EXTRA_OEMESON += " \ + -Dtests=none \ +" + PACKAGECONFIG = "extensions" PACKAGECONFIG[extensions] = "-Dextensions=true,-Dextensions=false, gexiv2 gstreamer1.0-plugins-base" @@ -30,6 +37,7 @@ FILES_${PN} += " \ ${datadir}/dbus-1 \ ${datadir}/metainfo \ ${datadir}/gnome-shell \ + ${datadir}/tracker3 \ " # mandatory - not checked during configuration: diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tepl/tepl_4.4.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/tepl/tepl_4.4.0.bb deleted file mode 100644 index 4120c6260a..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/tepl/tepl_4.4.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Tepl library eases the development of GtkSourceView-based projects" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -DEPENDS = " \ - glib-2.0-native \ - gtk+3 \ - gtksourceview4 \ - amtk \ - libxml2 \ - uchardet \ -" - -inherit gnomebase gobject-introspection gettext - -SRC_URI[archive.md5sum] = "013ee8aae178f75cc74e05fac70786b3" -SRC_URI[archive.sha256sum] = "e6f6673a8a27e8f280725db8fbacec79b20676ae0558755239d15a9808faa256" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tepl/tepl_6.00.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/tepl/tepl_6.00.0.bb new file mode 100644 index 0000000000..dd0242f4c5 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/tepl/tepl_6.00.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "Tepl library eases the development of GtkSourceView-based projects" +LICENSE = "LGPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSES/LGPL-3.0-or-later.txt;md5=c51d3eef3be114124d11349ca0d7e117" + +DEPENDS = " \ + glib-2.0-native \ + gtk+3 \ + gtksourceview4 \ + amtk \ + libxml2 \ + uchardet \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gobject-introspection gettext features_check + +SRC_URI[archive.sha256sum] = "a86397a895dca9c0de7a5ccb063bda8f7ef691cccb950ce2cfdee367903e7a63" + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" + +GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.5.bb b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_3.0.5.bb index 07fa10a0e2..6672195e00 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.5.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_3.0.5.bb @@ -13,9 +13,9 @@ DEPENDS = " \ GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gsettings gobject-introspection vala gtk-doc manpages bash-completion features_check +inherit gnomebase gsettings gobject-introspection vala bash-completion features_check -SRC_URI[archive.sha256sum] = "9509d37fb29acd233058f4df5bd1234b692ac6f946bc2e5f7b8dbf51dfe5b9fa" +SRC_URI[archive.sha256sum] = "c9be14871b1398e6e656a354a8f8f59e69e93169017f2b28308ef439324fd12b" SRC_URI += "file://0001-meson.build-Just-warn-if-we-build-without-libseccomp.patch" # gobject-introspection is mandatory and cannot be configured @@ -24,34 +24,33 @@ UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" PACKAGECONFIG ??= " \ ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "ffmpeg", "", d)} \ - flac \ gexiv2 \ gstreamer \ icu \ libexif \ libgsf \ jpeg \ + pdf \ png \ tiff \ xml \ - pdf \ " +PACKAGECONFIG[battery] = "-Dbattery_detection=upower,-Dbattery_detection=none,upower" PACKAGECONFIG[ffmpeg] = ",,ffmpeg" -PACKAGECONFIG[flac] = "-Dflac=enabled,-Dflac=disabled,flac" PACKAGECONFIG[gexiv2] = ",,gexiv2" PACKAGECONFIG[gstreamer] = ",,gstreamer1.0 gstreamer1.0-plugins-base" PACKAGECONFIG[gupnp] = ",,gupnp-dlna" +PACKAGECONFIG[gif] = "-Dgif=enabled,-Dgif=disabled,giflib" PACKAGECONFIG[icu] = ",,icu" +PACKAGECONFIG[jpeg] = "-Djpeg=enabled,-Djpeg=disabled,jpeg" PACKAGECONFIG[libexif] = "-Dexif=enabled,-Dexif=disabled,libexif" PACKAGECONFIG[libgsf] = "-Dgsf=enabled,-Dgsf=disabled,libgsf" -PACKAGECONFIG[jpeg] = "-Djpeg=enabled,-Djpeg=disabled,jpeg" +PACKAGECONFIG[pdf] = "-Dpdf=enabled,-Dpdf=disabled,poppler" PACKAGECONFIG[png] = "-Dpng=enabled,-Dpng=disabled,libpng" PACKAGECONFIG[tiff] = "-Dtiff=enabled,-Dtiff=disabled,tiff" PACKAGECONFIG[xml] = "-Dxml=enabled,-Dxml=disabled,libxml2" -PACKAGECONFIG[vorbis] = "-Dvorbis=enabled,-Dvorbis=disabled,libvorbis" -PACKAGECONFIG[pdf] = "-Dpdf=enabled,-Dpdf=disabled,poppler" -PACKAGECONFIG[upower] = ",,upower" +PACKAGECONFIG[networkmanager] = "-Dnetwork_manager=enabled,-Dnetwork_manager=disabled,networkmanger" # For security reasons it is strongly recommended to set add meta-security in # your layers and 'libseccomp' to PACKAGECONFIG". @@ -60,12 +59,14 @@ PACKAGECONFIG[libseccomp] = ",,libseccomp" PACKAGECONFIG[rss] = "-Dminer_rss=true,-Dminer_rss=false,libgrss" EXTRA_OEMESON += " \ - -Dsystemd_user_services=${systemd_user_unitdir} \ + -Dman=false \ + -Dsystemd_user_services=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)} \ + -Dsystemd_user_services_dir=${systemd_user_unitdir} \ " FILES_${PN} += " \ ${datadir}/dbus-1 \ - ${datadir}/tracker \ - ${libdir}/tracker-miners-2.0 \ + ${datadir}/tracker3-miners \ + ${libdir}/tracker-miners-3.0 \ ${systemd_user_unitdir} \ " diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_2.3.6.bb b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_3.0.4.bb index 2c11976ca6..82e3d006e4 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_2.3.6.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_3.0.4.bb @@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = " \ " DEPENDS = " \ - libxml2-native \ dbus-native \ glib-2.0 \ sqlite3 \ @@ -22,30 +21,32 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings gobject-introspection vala gtk-doc manpages bash-completion features_check -SRC_URI[archive.sha256sum] = "bd1eb4122135296fa7b57b1c3fa0ed602cf7d06c0b8e534d0bd17ff5f97feef2" +SRC_URI[archive.sha256sum] = "c120d81f2df94aa794b1a7953b55cfa46de318ed68e6f3b5ad4fce0c729c2483" # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" -PACKAGECONFIG ??= "fts" -PACKAGECONFIG[networkmanager] = "-Dnetwork_manager=enabled,-Dnetwork_manager=disabled,networkmanger" -# full text search requires sqlite3 build with PACKAGECONFIG[fts5] set -PACKAGECONFIG[fts] = "-Dfts=true,-Dfts=false" +# text search is not an option anymore and requires sqlite3 build with +# PACKAGECONFIG[fts5] set (default) # set required cross property sqlite3_has_fts5 do_write_config[vardeps] += "PACKAGECONFIG" do_write_config_append() { echo "[properties]" > ${WORKDIR}/meson-tracker.cross - echo "sqlite3_has_fts5 = '${@bb.utils.contains('PACKAGECONFIG', 'fts', 'true', 'false', d)}'" >> ${WORKDIR}/meson-tracker.cross + echo "sqlite3_has_fts5 = 'true'" >> ${WORKDIR}/meson-tracker.cross } -EXTRA_OEMESON = "--cross-file ${WORKDIR}/meson-tracker.cross \ - -Dsystemd_user_services=${systemd_user_unitdir} \ +EXTRA_OEMESON = " \ + --cross-file ${WORKDIR}/meson-tracker.cross \ + -Dman=false \ + -Dsystemd_user_services=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)} \ + -Dsystemd_user_services_dir=${systemd_user_unitdir} \ " FILES_${PN} += " \ ${datadir}/dbus-1 \ - ${libdir}/tracker-2.0 \ + ${datadir}/tracker3 \ + ${libdir}/tracker-3.0 \ ${systemd_user_unitdir} \ " diff --git a/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0.inc b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0.inc new file mode 100644 index 0000000000..80472178be --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0.inc @@ -0,0 +1,49 @@ +SUMMARY = "Graphics library for creating hardware-accelerated user interfaces" +DESCRIPTION = "Clutter is an Open GL based interactive canvas library, \ +designed for creating fast, mainly 2D single window applications such as media \ +box UIs, presentations, kiosk style applications and so on." +HOMEPAGE = "http://www.clutter-project.org/" +LICENSE = "LGPLv2.1+" + +inherit clutter ptest-gnome features_check upstream-version-is-even gobject-introspection +# depends on cogl-1.0 which needs opengl +REQUIRED_DISTRO_FEATURES ?= "opengl" + +DEPENDS = "pango glib-2.0 json-glib atk udev cogl-1.0" +PACKAGE_BEFORE_PN += "${PN}-examples" +AUTOTOOLS_AUXDIR = "${S}/build-aux" + +EDEPENDS_X11 = "virtual/libx11 libxi libxfixes" +EDEPENDS_GLX = "virtual/libgl" +EDEPENDS_EGL = "virtual/egl" +EDEPENDS_WAYLAND = "wayland libxkbcommon gdk-pixbuf" + +EDEPENDS_EVDEV = "libxkbcommon" +ERDEPENDS_EVDEV = "xkeyboard-config" + +# Disable pretty much everything, override in platform specific set up +EXTRA_OECONF += "--disable-quartz-backend \ + --disable-win32-backend \ + --disable-cex100-backend \ + --disable-tslib-input \ + " + +PACKAGECONFIG[gdk] = "--enable-gdk-backend,--disable-gdk-backend,gtk+3" +PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,${EDEPENDS_X11}" +PACKAGECONFIG[glx] = ",,${EDEPENDS_X11} ${EDEPENDS_GLX}" +PACKAGECONFIG[egl] = "--enable-egl-backend,--disable-egl-backend,${EDEPENDS_EGL}" +PACKAGECONFIG[evdev] = "--enable-evdev-input,--disable-evdev-input,${EDEPENDS_EVDEV},${ERDEPENDS_EVDEV}" +PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,${EDEPENDS_WAYLAND}" +PACKAGECONFIG[wayland-compositor] = "--enable-wayland-compositor,--disable-wayland-compositor,wayland" + +# Default configuration, distros might want to override +PACKAGECONFIG ??= "egl gdk \ + ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11', '', d)}" + +FILES_${PN}-examples = "${libdir}/clutter/examples" + +do_configure_prepend() { + # see https://bugzilla.gnome.org/show_bug.cgi?id=661128 for this + touch -t 200001010000 ${S}/po/clutter-1.0.pot +} diff --git a/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0/0001-Remove-clutter.types-as-it-is-build-configuration-sp.patch b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0/0001-Remove-clutter.types-as-it-is-build-configuration-sp.patch new file mode 100644 index 0000000000..7b3c1980b6 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0/0001-Remove-clutter.types-as-it-is-build-configuration-sp.patch @@ -0,0 +1,143 @@ +From 3a0404dfbc65c6a864e01d1200a48074e19d5def Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Fri, 2 Sep 2016 14:28:38 +0300 +Subject: [PATCH] Remove clutter.types as it is build configuration-specific. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + doc/reference/clutter.types | 122 -------------------------------------------- + 1 file changed, 122 deletions(-) + delete mode 100644 doc/reference/clutter.types + +diff --git a/doc/reference/clutter.types b/doc/reference/clutter.types +deleted file mode 100644 +index 0037acc..0000000 +--- a/doc/reference/clutter.types ++++ /dev/null +@@ -1,122 +0,0 @@ +-cally_actor_get_type +-cally_clone_get_type +-cally_group_get_type +-cally_rectangle_get_type +-cally_root_get_type +-cally_stage_get_type +-cally_text_get_type +-cally_texture_get_type +-cally_util_get_type +-clutter_action_get_type +-clutter_actor_box_get_type +-clutter_actor_get_type +-clutter_actor_meta_get_type +-clutter_align_constraint_get_type +-clutter_alpha_get_type +-clutter_animatable_get_type +-clutter_animation_get_type +-clutter_animator_get_type +-clutter_animator_key_get_type +-clutter_backend_get_type +-clutter_behaviour_depth_get_type +-clutter_behaviour_ellipse_get_type +-clutter_behaviour_get_type +-clutter_behaviour_opacity_get_type +-clutter_behaviour_path_get_type +-clutter_behaviour_rotate_get_type +-clutter_behaviour_scale_get_type +-clutter_bin_layout_get_type +-clutter_bind_constraint_get_type +-clutter_binding_pool_get_type +-clutter_blur_effect_get_type +-clutter_box_get_type +-clutter_box_layout_get_type +-clutter_brightness_contrast_effect_get_type +-clutter_cairo_texture_get_type +-clutter_canvas_get_type +-clutter_child_meta_get_type +-clutter_click_action_get_type +-clutter_clip_node_get_type +-clutter_clone_get_type +-clutter_color_get_type +-clutter_color_node_get_type +-clutter_colorize_effect_get_type +-clutter_constraint_get_type +-clutter_container_get_type +-clutter_content_get_type +-clutter_deform_effect_get_type +-clutter_desaturate_effect_get_type +-clutter_device_manager_get_type +-clutter_drag_action_get_type +-clutter_drop_action_get_type +-clutter_effect_get_type +-clutter_event_get_type +-clutter_event_sequence_get_type +-clutter_fixed_layout_get_type +-clutter_flow_layout_get_type +-clutter_fog_get_type +-clutter_geometry_get_type +-clutter_gesture_action_get_type +-clutter_glx_texture_pixmap_get_type +-clutter_grid_layout_get_type +-clutter_group_get_type +-clutter_image_get_type +-clutter_input_device_get_type +-clutter_interval_get_type +-clutter_keyframe_transition_get_type +-clutter_knot_get_type +-clutter_layout_manager_get_type +-clutter_layout_meta_get_type +-clutter_list_model_get_type +-clutter_margin_get_type +-clutter_media_get_type +-clutter_model_get_type +-clutter_model_iter_get_type +-clutter_offscreen_effect_get_type +-clutter_page_turn_effect_get_type +-clutter_paint_node_get_type +-clutter_paint_volume_get_type +-clutter_pan_action_get_type +-clutter_param_color_get_type +-clutter_param_fixed_get_type +-clutter_param_units_get_type +-clutter_path_constraint_get_type +-clutter_path_get_type +-clutter_path_node_get_type +-clutter_perspective_get_type +-clutter_pipeline_node_get_type +-clutter_point_get_type +-clutter_property_transition_get_type +-clutter_rect_get_type +-clutter_rectangle_get_type +-clutter_rotate_action_get_type +-clutter_score_get_type +-clutter_script_get_type +-clutter_scriptable_get_type +-clutter_scroll_actor_get_type +-clutter_settings_get_type +-clutter_shader_effect_get_type +-clutter_shader_float_get_type +-clutter_shader_get_type +-clutter_shader_int_get_type +-clutter_shader_matrix_get_type +-clutter_size_get_type +-clutter_snap_constraint_get_type +-clutter_stage_get_type +-clutter_stage_manager_get_type +-clutter_state_get_type +-clutter_state_key_get_type +-clutter_swipe_action_get_type +-clutter_table_layout_get_type +-clutter_tap_action_get_type +-clutter_text_buffer_get_type +-clutter_text_get_type +-clutter_text_node_get_type +-clutter_texture_get_type +-clutter_texture_node_get_type +-clutter_timeline_get_type +-clutter_transition_get_type +-clutter_transition_group_get_type +-clutter_units_get_type +-clutter_vertex_get_type +-clutter_zoom_action_get_type +-- +2.9.3 + diff --git a/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0/install-examples.patch b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0/install-examples.patch new file mode 100644 index 0000000000..ce9ab3a248 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0/install-examples.patch @@ -0,0 +1,19 @@ +Install the examples to $libdir/clutter/. + +Signed-off-by: Ross Burton <ross.burton@intel.com> +Upstream-Status: Inappropriate + +Index: clutter-1.26.2/examples/Makefile.am +=================================================================== +--- clutter-1.26.2.orig/examples/Makefile.am ++++ clutter-1.26.2/examples/Makefile.am +@@ -33,7 +33,8 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/clutter \ + -I$(top_builddir)/clutter + +-noinst_PROGRAMS = $(all_examples) ++exampledir = $(pkglibdir)/examples ++example_PROGRAMS = $(all_examples) + + EXTRA_DIST = redhand.png + diff --git a/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch new file mode 100644 index 0000000000..fef82eaf92 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch @@ -0,0 +1,30 @@ +From d6ceb5a44b28e0e50ede22b84984d8516897de4b Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Mon, 27 Apr 2015 20:12:33 +0300 +Subject: [PATCH] Run installed tests with tap output + +Configure output from installed-tests to be TAP compliant such that +gnome-desktop-testing-runner properly interprets the results. + +Upstream-Status: Pending + +Signed-off-by: Tim Orling <TicoTimo@gmail.com> + +--- + build-aux/autotools/glib-tap.mk | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/build-aux/autotools/glib-tap.mk b/build-aux/autotools/glib-tap.mk +index a4f0dad..51cfa31 100644 +--- a/build-aux/autotools/glib-tap.mk ++++ b/build-aux/autotools/glib-tap.mk +@@ -127,7 +127,8 @@ installed_test_meta_DATA = $(installed_testcases:=.test) + %.test: %$(EXEEXT) Makefile + $(AM_V_GEN) (echo '[Test]' > $@.tmp; \ + echo 'Type=session' >> $@.tmp; \ +- echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 CLUTTER_ENABLE_DIAGNOSTIC=0 $(installed_testdir)/$<' >> $@.tmp; \ ++ echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 CLUTTER_ENABLE_DIAGNOSTIC=0 $(installed_testdir)/$< --tap' >> $@.tmp; \ ++ echo 'Output=TAP' >> $@.tmp; \ + mv $@.tmp $@) + + CLEANFILES += $(installed_test_meta_DATA) diff --git a/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0/run-ptest b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0/run-ptest new file mode 100644 index 0000000000..98877e5226 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0/run-ptest @@ -0,0 +1,3 @@ +#! /bin/sh + +gnome-desktop-testing-runner clutter diff --git a/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0_1.26.4.bb b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0_1.26.4.bb new file mode 100644 index 0000000000..ee549fbdd5 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0_1.26.4.bb @@ -0,0 +1,10 @@ +require clutter-1.0.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI[archive.md5sum] = "624dd776a5159de0267587b1df6b97b2" +SRC_URI[archive.sha256sum] = "8b48fac159843f556d0a6be3dbfc6b083fc6d9c58a20a49a6b4919ab4263c4e6" +SRC_URI += "file://install-examples.patch \ + file://run-installed-tests-with-tap-output.patch \ + file://0001-Remove-clutter.types-as-it-is-build-configuration-sp.patch \ + file://run-ptest" diff --git a/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gst-3.0.inc b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gst-3.0.inc new file mode 100644 index 0000000000..73315c97ec --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gst-3.0.inc @@ -0,0 +1,23 @@ +SUMMARY = "GStreamer integration library for Clutter" +DESCRIPTION = "Clutter-Gst is an integration library for using GStreamer with Clutter. \ +It provides a GStreamer sink to upload frames to GL and an actor that \ +implements the ClutterGstPlayer interface using playbin." +HOMEPAGE = "http://www.clutter-project.org/" +BUGTRACKER = "https://gitlab.gnome.org/GNOME/clutter-gst/-/issues" +LICENSE = "LGPLv2+" + +inherit clutter features_check upstream-version-is-even gobject-introspection +# depends on clutter-1.0 which depends on cogl-1.0 +REQUIRED_DISTRO_FEATURES ?= "opengl" + +export GST_PLUGIN_SCANNER_1_0="${S}/gst-plugin-scanner-dummy" + +SRC_URI += "file://0001-Install-example-binary-needed-for-core-image-clutter.patch" + +DEPENDS = "gstreamer1.0-plugins-base gstreamer1.0-plugins-bad clutter-1.0 libgudev" +RDEPENDS_${PN} += "gstreamer1.0-meta-base" +PACKAGES =+ "${PN}-examples" + +FILES_${PN} += "${libdir}/gstreamer-1.0/lib*.so" +FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la" +FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink" diff --git a/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gst-3.0/0001-Install-example-binary-needed-for-core-image-clutter.patch b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gst-3.0/0001-Install-example-binary-needed-for-core-image-clutter.patch new file mode 100644 index 0000000000..0b26b990d7 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gst-3.0/0001-Install-example-binary-needed-for-core-image-clutter.patch @@ -0,0 +1,33 @@ +From d77c711277bf075ce0545c19b322f040c49c778a Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Thu, 30 Apr 2015 12:19:13 +0300 +Subject: [PATCH] Install example binary needed for core-image-clutter + +Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> + +Upstream-Status: Inappropriate [configuration] + +Imported from clutter-gst-1.8 package, git://git.openembedded.org/openembedded, +commit ae28ee3f7a060b9e0d13154a84f2444a98490b5b, updated for clutter-gst 3.0 + +Signed-off-by: Tomas Frydrych <tomas@sleepfive.com> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + examples/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/examples/Makefile.am b/examples/Makefile.am +index bfbc1b5..09655e3 100644 +--- a/examples/Makefile.am ++++ b/examples/Makefile.am +@@ -1,6 +1,6 @@ + NULL = # + +-noinst_PROGRAMS = camera-player video-player video-sink video-sink-navigation video-content ++bin_PROGRAMS = camera-player video-player video-sink video-sink-navigation video-content + + AM_CPPFLAGS = -I$(top_srcdir) \ + $(MAINTAINER_CFLAGS) \ +-- +2.1.4 + diff --git a/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gst-3.0_3.0.27.bb b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gst-3.0_3.0.27.bb new file mode 100644 index 0000000000..35382453c2 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gst-3.0_3.0.27.bb @@ -0,0 +1,7 @@ +require clutter-gst-3.0.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4" + +SRC_URI[archive.md5sum] = "2bf9d7ca146c9d71e86c45cd00e9a28e" +SRC_URI[archive.sha256sum] = "fe69bd6c659d24ab30da3f091eb91cd1970026d431179b0724f13791e8ad9f9d" diff --git a/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gtk-1.0.inc b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gtk-1.0.inc new file mode 100644 index 0000000000..9a28b5219b --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gtk-1.0.inc @@ -0,0 +1,23 @@ +SUMMARY = "Library for embedding a Clutter canvas in a GTK+ application" +DESCRIPTION = "Clutter-GTK is a library providing facilities to integrate Clutter into GTK+ \ +applications and vice versa. It provides a GTK+ widget, GtkClutterEmbed, for embedding the \ +a Clutter stage into any GtkContainer; and GtkClutterActor, a Clutter \ +actor for embedding any GtkWidget inside a Clutter stage." +HOMEPAGE = "http://www.clutter-project.org/" +BUGTRACKER = "https://gitlab.gnome.org/GNOME/clutter/-/issues" +LICENSE = "LGPLv2+" + +CLUTTERBASEBUILDCLASS = "meson" +inherit clutter features_check upstream-version-is-even gobject-introspection gtk-doc + +# depends on clutter-1.0 which depends on cogl-1.0 +REQUIRED_DISTRO_FEATURES ?= "opengl" +# depends on gtk+3 +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +DEPENDS = "clutter-1.0 gtk+3" +PACKAGES =+ "${PN}-examples" + +GTKDOC_MESON_OPTION = "enable_docs" + +GIR_MESON_OPTION = 'enable_gi' diff --git a/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gtk-1.0/0001-Add-a-config-variable-for-enabling-disabling-introsp.patch b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gtk-1.0/0001-Add-a-config-variable-for-enabling-disabling-introsp.patch new file mode 100644 index 0000000000..e21c6fd903 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gtk-1.0/0001-Add-a-config-variable-for-enabling-disabling-introsp.patch @@ -0,0 +1,37 @@ +From 7233883c6bd4e80c0e91b29b5c76fe798023e9fe Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Mon, 11 Feb 2019 16:41:13 +0100 +Subject: [PATCH] Add a config variable for enabling/disabling introspection + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + clutter-gtk/meson.build | 2 +- + meson_options.txt | 4 ++++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/clutter-gtk/meson.build b/clutter-gtk/meson.build +index 5d6847d..5d934b6 100644 +--- a/clutter-gtk/meson.build ++++ b/clutter-gtk/meson.build +@@ -49,7 +49,7 @@ clutter_gtk_dep = declare_dependency(link_with: clutter_gtk, + dependencies: [ mathlib_dep, clutter_dep, gtk_dep ], + include_directories: include_directories('.')) + +-if not meson.is_cross_build() ++if get_option('enable_gi') + gnome.generate_gir(clutter_gtk, + sources: clutter_gtk_headers + clutter_gtk_sources, + namespace: 'GtkClutter', +diff --git a/meson_options.txt b/meson_options.txt +index aaf59f1..b7e51c3 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -2,3 +2,7 @@ option('enable_docs', + type: 'boolean', + value: false, + description: 'Enable generating the API reference (depends on GTK-Doc)') ++option('enable_gi', ++ type: 'boolean', ++ value: false, ++ description: 'Enable gobject introspection') diff --git a/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb new file mode 100644 index 0000000000..53948c8944 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb @@ -0,0 +1,7 @@ +require clutter-gtk-1.0.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" + +SRC_URI += " file://0001-Add-a-config-variable-for-enabling-disabling-introsp.patch" +SRC_URI[archive.md5sum] = "b363ac9878e2337be887b8ee9e1da00e" +SRC_URI[archive.sha256sum] = "521493ec038973c77edcb8bc5eac23eed41645117894aaee7300b2487cb42b06" diff --git a/meta-openembedded/meta-gnome/recipes-graphics/cogl/cogl-1.0.inc b/meta-openembedded/meta-gnome/recipes-graphics/cogl/cogl-1.0.inc new file mode 100644 index 0000000000..d581ad1c04 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-graphics/cogl/cogl-1.0.inc @@ -0,0 +1,84 @@ +SUMMARY = "Modern 3D graphics API with associated utility APIs" +DESCRIPTION = "Cogl is a small open source library for using 3D graphics \ +hardware for rendering. The API departs from the flat state machine style of \ +OpenGL and is designed to make it easy to write orthogonal components that \ +can render without stepping on each others toes." +HOMEPAGE = "https://gitlab.gnome.org/GNOME/cogl" +LICENSE = "MIT" + +inherit clutter features_check upstream-version-is-even gobject-introspection +# cogl-1.0 needs opengl to build +REQUIRED_DISTRO_FEATURES ?= "opengl" + +DEPENDS = "glib-2.0 gdk-pixbuf" +PACKAGES =+ "${PN}-examples \ + libcogl libcogl-gles2 libcogl-pango libcogl-path \ + " +AUTOTOOLS_AUXDIR = "${S}/build" + +# Extra DEPENDS for PACKAGECONFIG +EDEPENDS_GL = "virtual/libgl libdrm" +EDEPENDS_GLES2 = "virtual/libgles2" +EDEPENDS_KMS = "libdrm virtual/egl" +EDEPENDS_EGL = "virtual/egl" +EDEPENDS_X11 = "virtual/libx11 libxcomposite libxdamage libxfixes libxrandr" +EDEPENDS_WAYLAND = "virtual/egl virtual/libgles2 wayland" + +# Extra RDEPENDS for PACKAGECONFIG +# This has to be explictly listed, because cogl dlopens the backends +ERDEPENDS_GL = "libgl" +ERDEPENDS_GLES2 = "libgles2" + +# GLESv1 is rarely tested, so disable it +EXTRA_OECONF += "--enable-examples-install \ + --enable-debug \ + --disable-gles1 \ + --disable-cairo \ + " +DEBUG_OPTIMIZATION_append = " -Wno-error=maybe-uninitialized" + +# OpenGL/GLX +PACKAGECONFIG[glx] = "--enable-gl --enable-glx,--disable-gl --disable-glx,${EDEPENDS_GL} ${EDEPENDS_X11},${ERDEPENDS_GL}" + +# GLESv2 +PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,${EDEPENDS_GLES2}, ${ERDEPENDS_GLES2}" + +# EGL backends +PACKAGECONFIG[egl-kms] = "--enable-kms-egl-platform,--disable-kms-egl-platform,${EDEPENDS_KMS}" +PACKAGECONFIG[egl-null] = "--enable-null-egl-platform,--disable-null-egl-platform" +PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,--disable-xlib-egl-platform,${EDEPENDS_X11} ${EDEPENDS_EGL}" +PACKAGECONFIG[egl-wayland] = "--enable-wayland-egl-platform,--disable-wayland-egl-platform,${EDEPENDS_WAYLAND}" + +# Wayland (server-side) +PACKAGECONFIG[wayland-server] = "--enable-wayland-egl-server,--disable-wayland-egl-server,${EDEPENDS_WAYLAND}" + +# Support rendering text directly with Pango +PACKAGECONFIG[cogl-pango] = "--enable-cogl-pango,--disable-cogl-pango,pango" + +# Respect the DISTRO_FEATURES to pull in GLX or Wayland as appropriate by +# default. +PACKAGECONFIG ??= "cogl-pango gles2 \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx egl-x11', '', d)} \ + " + +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/cogl/.libs" +} + +FILES_${PN} = "" +FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*" +FILES_libcogl = "${libdir}/libcogl${SOLIBS} ${libdir}/girepository-1.0/Cogl-*.typelib" +FILES_libcogl-gles2 = "${libdir}/libcogl-gles2${SOLIBS}" +FILES_libcogl-pango = "${libdir}/libcogl-pango${SOLIBS} ${libdir}/girepository-1.0/CoglPango*.typelib" + +FILES_libcogl-path = "${libdir}/libcogl-path${SOLIBS}" + +# For backwards compatibility after Debian-renaming +RPROVIDES_libcogl = "cogl-1.0" +RCONFLICTS_libcogl = "cogl-1.0" +RREPLACES_libcogl = "cogl-1.0" + +RDEPENDS_${PN}-dev = "libcogl" + +COMPATIBLE_HOST_armv4 = 'null' diff --git a/meta-openembedded/meta-gnome/recipes-graphics/cogl/cogl-1.0/0001-configure.ac-don-t-require-eglmesaext.h.patch b/meta-openembedded/meta-gnome/recipes-graphics/cogl/cogl-1.0/0001-configure.ac-don-t-require-eglmesaext.h.patch new file mode 100644 index 0000000000..328984a63f --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-graphics/cogl/cogl-1.0/0001-configure.ac-don-t-require-eglmesaext.h.patch @@ -0,0 +1,92 @@ +From bb9765a926588ebfe1eb324fbbe8fc22d419eebe Mon Sep 17 00:00:00 2001 +From: Max Krummenacher <max.krummenacher@toradex.com> +Date: Thu, 25 Jun 2020 11:27:40 +0000 +Subject: [PATCH] configure.ac: don't require eglmesaext.h + +E.g. the Vivante EGL implementation does not provide eglmesaext.h. + +The commit moves the check for header file existence outside of the +check for existence of a egl packageconfig and makes the existence +of eglmesaext.h optional. + +fixes commit fb1acfec ("Fix building against libglvnd-provided EGL headers") +Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/cogl/-/merge_requests/28] +Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> +--- + configure.ac | 51 ++++++++++++++++++++++++++++++++------------------- + 1 file changed, 32 insertions(+), 19 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b7ba95d..0d1d8de 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1212,22 +1212,6 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"], + PKG_CHECK_EXISTS([egl], + [COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES egl"], + [ +- AC_CHECK_HEADERS( +- [EGL/egl.h], +- [], +- [AC_MSG_ERROR([Unable to locate required EGL headers])]) +- AC_CHECK_HEADERS( +- [EGL/eglext.h], +- [], +- [AC_MSG_ERROR([Unable to locate required EGL headers])], +- [#include <EGL/egl.h>]) +- AC_CHECK_HEADERS( +- [EGL/eglmesaext.h], +- [], +- [AC_MSG_ERROR([Unable to locate required EGL headers])], +- [#include <EGL/egl.h> +-#include <EGL/eglext.h>]) +- + AC_CHECK_LIB(EGL, [eglInitialize], + [COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -lEGL"], + [AC_MSG_ERROR([Unable to locate required EGL library])]) +@@ -1236,9 +1220,38 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"], + ] + ) + +- COGL_EGL_INCLUDES="#include <EGL/egl.h> +-#include <EGL/eglext.h> +-#include <EGL/eglmesaext.h>" ++dnl Test for the existence of egl headers. ++dnl egl*.h includes eglplatform.h which on __unix__ defaults to a X11 platform. ++dnl In that case AC_CHECK_HEADERS failes if X11 headers are not available. ++dnl Set the usual include guard define and, if the EGL implementation doesn't ++dnl use that guard fall back to USE_OZONE and EGL_NO_X11 platforms which don't ++dnl require additional headers. ++ AC_CHECK_HEADERS( ++ [EGL/egl.h], ++ [COGL_EGL_INCLUDES="#include <EGL/egl.h>"], ++ [AC_MSG_ERROR([Unable to locate required EGL headers])], ++ [#define __egl_h_ ++ #define USE_OZONE ++ #define EGL_NO_X11]) ++ AC_CHECK_HEADERS( ++ [EGL/eglext.h], ++ [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDES ++#include <EGL/eglext.h>"], ++ [AC_MSG_ERROR([Unable to locate required EGL headers])], ++ [#define __eglext_h_ ++ #define USE_OZONE ++ #define EGL_NO_X11 ++$COGL_EGL_INCLUDES]) ++ AC_CHECK_HEADERS( ++ [EGL/eglmesaext.h], ++ [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDES ++#include <EGL/eglmesaext.h>"], ++ [], ++ [#define __eglmesaext_h_ ++#define USE_OZONE ++#define EGL_NO_X11 ++$COGL_EGL_INCLUDES]) ++ + AC_SUBST([COGL_EGL_INCLUDES]) + ]) + +-- +2.20.1 + diff --git a/meta-openembedded/meta-gnome/recipes-graphics/cogl/cogl-1.0_1.22.8.bb b/meta-openembedded/meta-gnome/recipes-graphics/cogl/cogl-1.0_1.22.8.bb new file mode 100644 index 0000000000..b9446fab38 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-graphics/cogl/cogl-1.0_1.22.8.bb @@ -0,0 +1,6 @@ +require cogl-1.0.inc + +SRC_URI += "file://0001-configure.ac-don-t-require-eglmesaext.h.patch" +SRC_URI[archive.sha256sum] = "a805b2b019184710ff53d0496f9f0ce6dcca420c141a0f4f6fcc02131581d759" + +LIC_FILES_CHKSUM = "file://COPYING;md5=1b1a508d91d25ca607c83f92f3e31c84" diff --git a/meta-openembedded/meta-gnome/recipes-graphics/packagegroups/packagegroup-core-clutter.bb b/meta-openembedded/meta-gnome/recipes-graphics/packagegroups/packagegroup-core-clutter.bb new file mode 100644 index 0000000000..2e7b47dd40 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-graphics/packagegroups/packagegroup-core-clutter.bb @@ -0,0 +1,22 @@ +# +# Copyright (C) 2007 OpenedHand Ltd. +# + +SUMMARY = "Clutter package groups" + +PR = "r6" + +inherit packagegroup features_check +# rdepends on clutter-* +REQUIRED_DISTRO_FEATURES = "opengl" + +PACKAGES = "\ + ${PN}-core \ + " + +SUMMARY_${PN}-core = "Clutter graphics library" +RDEPENDS_${PN}-core = "\ + clutter-1.0 \ + clutter-gst-3.0 \ + clutter-gtk-1.0 \ + " diff --git a/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch b/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch index 73ebeb4847..37c5c3dc02 100644 --- a/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch +++ b/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch @@ -23,7 +23,7 @@ diff --git a/GNUmakefile b/GNUmakefile index cbd6ff7..a85230b 100644 --- a/GNUmakefile +++ b/GNUmakefile -@@ -142,10 +142,10 @@ C_OTHER_OBJECTS = $(C_OTHER_SOURCES:.c=.o) +@@ -162,10 +162,10 @@ C_OTHER_OBJECTS = $(C_OTHER_SOURCES:.c=.o) JAVA_CLASSES = $(JAVA_SOURCES:.java=.class) JAVA_RUNTIME_CLASSES=$(JAVARUNTIME_SOURCES:.java=.class) @@ -36,7 +36,7 @@ index cbd6ff7..a85230b 100644 clean: rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \ -@@ -192,6 +192,9 @@ libstemmer/libstemmer.o: libstemmer/modules.h $(C_LIB_HEADERS) +@@ -212,6 +212,9 @@ libstemmer/libstemmer.o: libstemmer/modules.h $(C_LIB_HEADERS) libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS) $(AR) -cru $@ $^ @@ -44,7 +44,7 @@ index cbd6ff7..a85230b 100644 + $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,libstemmer.so.0,-version-script,libstemmer/symbol.map -o $@.0.0.0 $^ + stemwords: $(STEMWORDS_OBJECTS) libstemmer.o - $(CC) $(CFLAGS) -o $@ $^ + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ diff --git a/libstemmer/symbol.map b/libstemmer/symbol.map new file mode 100644 diff --git a/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer/0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch b/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer/0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch deleted file mode 100644 index 69c1d670e7..0000000000 --- a/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer/0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 23eacfbcc10c777ce47283a5285455ec83c8aa41 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Sun, 6 Oct 2019 13:05:08 +0200 -Subject: [PATCH] snowball/stemwords: do link with LDFLAGS set by build - environment -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Some (cross-)build systems as OpeneEmbedded are picky (for certain reasons) if -their LDFLAGS are ignored. - -Upstream-Status: Submitted [1] - -[1] https://github.com/snowballstem/snowball/pull/120 - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - GNUmakefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/GNUmakefile b/GNUmakefile -index 76f6ae9..47c6077 100644 ---- a/GNUmakefile -+++ b/GNUmakefile -@@ -179,7 +179,7 @@ clean: - -rmdir $(js_output_dir) - - snowball: $(COMPILER_OBJECTS) -- $(CC) $(CFLAGS) -o $@ $^ -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ - - $(COMPILER_OBJECTS): $(COMPILER_HEADERS) - -@@ -204,7 +204,7 @@ libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS) - $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,libstemmer.so.0,-version-script,libstemmer/symbol.map -o $@.0.0.0 $^ - - stemwords: $(STEMWORDS_OBJECTS) libstemmer.o -- $(CC) $(CFLAGS) -o $@ $^ -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ - - csharp_stemwords: $(CSHARP_STEMWORDS_SOURCES) $(CSHARP_RUNTIME_SOURCES) $(CSHARP_SOURCES) - $(MCS) -unsafe -target:exe -out:$@ $(CSHARP_STEMWORDS_SOURCES) $(CSHARP_RUNTIME_SOURCES) $(CSHARP_SOURCES) --- -2.21.0 - diff --git a/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer_git.bb b/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer_git.bb index 96dd880b6a..c1a06c0d0d 100644 --- a/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer_git.bb +++ b/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer_git.bb @@ -1,18 +1,17 @@ SUMMARY = "Snowball compiler and stemming algorithms" HOMEPAGE = "https://snowballstem.org/" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=2750797da77c1d784e7626b3f7d7ff3e" +LIC_FILES_CHKSUM = "file://COPYING;md5=19139aaf3c8c8fa1ca6edd59c072fb9f" DEPENDS_class-target = "${BPN}-native" SRC_URI = "\ git://github.com/snowballstem/snowball.git \ file://0001-Build-so-lib.patch \ - file://0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch \ " -SRCREV = "c70ed64f9d41c1032fba4e962b054f8e9d489a74" +SRCREV = "4764395431c8f2a0b4fe18b816ab1fc966a45837" S = "${WORKDIR}/git" -PV = "2.0.0" +PV = "2.1.0" LIBVER = "0.0.0" inherit lib_package |