diff options
author | Ross Burton <ross@burtonini.com> | 2021-06-01 17:21:44 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-06-03 23:09:42 +0100 |
commit | 84317082015afa3ac7e9eeb23139861ec2c0d220 (patch) | |
tree | 3f752b20a4a2680796c83528d6cf81a0c88cfdc8 /meta/recipes-graphics/clutter | |
parent | 0eb836a58fe62232cf57a47b9ae256c50ff914ef (diff) | |
download | poky-84317082015afa3ac7e9eeb23139861ec2c0d220.tar.gz |
Remove Clutter and Cogl
Clutter and Cogl are not used by anything in oe-core, and in Gnome are
legacy components so are only used by a few applications. The recipes
have already been moved to meta-gnome so they can now be removed from
oe-core.
(From OE-Core rev: c4f167d05f58f35a6b94e8dbc4721ab67e7e71eb)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/clutter')
12 files changed, 0 insertions, 384 deletions
diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc deleted file mode 100644 index 80472178be..0000000000 --- a/meta/recipes-graphics/clutter/clutter-1.0.inc +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | SUMMARY = "Graphics library for creating hardware-accelerated user interfaces" | ||
2 | DESCRIPTION = "Clutter is an Open GL based interactive canvas library, \ | ||
3 | designed for creating fast, mainly 2D single window applications such as media \ | ||
4 | box UIs, presentations, kiosk style applications and so on." | ||
5 | HOMEPAGE = "http://www.clutter-project.org/" | ||
6 | LICENSE = "LGPLv2.1+" | ||
7 | |||
8 | inherit clutter ptest-gnome features_check upstream-version-is-even gobject-introspection | ||
9 | # depends on cogl-1.0 which needs opengl | ||
10 | REQUIRED_DISTRO_FEATURES ?= "opengl" | ||
11 | |||
12 | DEPENDS = "pango glib-2.0 json-glib atk udev cogl-1.0" | ||
13 | PACKAGE_BEFORE_PN += "${PN}-examples" | ||
14 | AUTOTOOLS_AUXDIR = "${S}/build-aux" | ||
15 | |||
16 | EDEPENDS_X11 = "virtual/libx11 libxi libxfixes" | ||
17 | EDEPENDS_GLX = "virtual/libgl" | ||
18 | EDEPENDS_EGL = "virtual/egl" | ||
19 | EDEPENDS_WAYLAND = "wayland libxkbcommon gdk-pixbuf" | ||
20 | |||
21 | EDEPENDS_EVDEV = "libxkbcommon" | ||
22 | ERDEPENDS_EVDEV = "xkeyboard-config" | ||
23 | |||
24 | # Disable pretty much everything, override in platform specific set up | ||
25 | EXTRA_OECONF += "--disable-quartz-backend \ | ||
26 | --disable-win32-backend \ | ||
27 | --disable-cex100-backend \ | ||
28 | --disable-tslib-input \ | ||
29 | " | ||
30 | |||
31 | PACKAGECONFIG[gdk] = "--enable-gdk-backend,--disable-gdk-backend,gtk+3" | ||
32 | PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,${EDEPENDS_X11}" | ||
33 | PACKAGECONFIG[glx] = ",,${EDEPENDS_X11} ${EDEPENDS_GLX}" | ||
34 | PACKAGECONFIG[egl] = "--enable-egl-backend,--disable-egl-backend,${EDEPENDS_EGL}" | ||
35 | PACKAGECONFIG[evdev] = "--enable-evdev-input,--disable-evdev-input,${EDEPENDS_EVDEV},${ERDEPENDS_EVDEV}" | ||
36 | PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,${EDEPENDS_WAYLAND}" | ||
37 | PACKAGECONFIG[wayland-compositor] = "--enable-wayland-compositor,--disable-wayland-compositor,wayland" | ||
38 | |||
39 | # Default configuration, distros might want to override | ||
40 | PACKAGECONFIG ??= "egl gdk \ | ||
41 | ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ | ||
42 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11', '', d)}" | ||
43 | |||
44 | FILES_${PN}-examples = "${libdir}/clutter/examples" | ||
45 | |||
46 | do_configure_prepend() { | ||
47 | # see https://bugzilla.gnome.org/show_bug.cgi?id=661128 for this | ||
48 | touch -t 200001010000 ${S}/po/clutter-1.0.pot | ||
49 | } | ||
diff --git a/meta/recipes-graphics/clutter/clutter-1.0/0001-Remove-clutter.types-as-it-is-build-configuration-sp.patch b/meta/recipes-graphics/clutter/clutter-1.0/0001-Remove-clutter.types-as-it-is-build-configuration-sp.patch deleted file mode 100644 index 7b3c1980b6..0000000000 --- a/meta/recipes-graphics/clutter/clutter-1.0/0001-Remove-clutter.types-as-it-is-build-configuration-sp.patch +++ /dev/null | |||
@@ -1,143 +0,0 @@ | |||
1 | From 3a0404dfbc65c6a864e01d1200a48074e19d5def Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Fri, 2 Sep 2016 14:28:38 +0300 | ||
4 | Subject: [PATCH] Remove clutter.types as it is build configuration-specific. | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | --- | ||
9 | doc/reference/clutter.types | 122 -------------------------------------------- | ||
10 | 1 file changed, 122 deletions(-) | ||
11 | delete mode 100644 doc/reference/clutter.types | ||
12 | |||
13 | diff --git a/doc/reference/clutter.types b/doc/reference/clutter.types | ||
14 | deleted file mode 100644 | ||
15 | index 0037acc..0000000 | ||
16 | --- a/doc/reference/clutter.types | ||
17 | +++ /dev/null | ||
18 | @@ -1,122 +0,0 @@ | ||
19 | -cally_actor_get_type | ||
20 | -cally_clone_get_type | ||
21 | -cally_group_get_type | ||
22 | -cally_rectangle_get_type | ||
23 | -cally_root_get_type | ||
24 | -cally_stage_get_type | ||
25 | -cally_text_get_type | ||
26 | -cally_texture_get_type | ||
27 | -cally_util_get_type | ||
28 | -clutter_action_get_type | ||
29 | -clutter_actor_box_get_type | ||
30 | -clutter_actor_get_type | ||
31 | -clutter_actor_meta_get_type | ||
32 | -clutter_align_constraint_get_type | ||
33 | -clutter_alpha_get_type | ||
34 | -clutter_animatable_get_type | ||
35 | -clutter_animation_get_type | ||
36 | -clutter_animator_get_type | ||
37 | -clutter_animator_key_get_type | ||
38 | -clutter_backend_get_type | ||
39 | -clutter_behaviour_depth_get_type | ||
40 | -clutter_behaviour_ellipse_get_type | ||
41 | -clutter_behaviour_get_type | ||
42 | -clutter_behaviour_opacity_get_type | ||
43 | -clutter_behaviour_path_get_type | ||
44 | -clutter_behaviour_rotate_get_type | ||
45 | -clutter_behaviour_scale_get_type | ||
46 | -clutter_bin_layout_get_type | ||
47 | -clutter_bind_constraint_get_type | ||
48 | -clutter_binding_pool_get_type | ||
49 | -clutter_blur_effect_get_type | ||
50 | -clutter_box_get_type | ||
51 | -clutter_box_layout_get_type | ||
52 | -clutter_brightness_contrast_effect_get_type | ||
53 | -clutter_cairo_texture_get_type | ||
54 | -clutter_canvas_get_type | ||
55 | -clutter_child_meta_get_type | ||
56 | -clutter_click_action_get_type | ||
57 | -clutter_clip_node_get_type | ||
58 | -clutter_clone_get_type | ||
59 | -clutter_color_get_type | ||
60 | -clutter_color_node_get_type | ||
61 | -clutter_colorize_effect_get_type | ||
62 | -clutter_constraint_get_type | ||
63 | -clutter_container_get_type | ||
64 | -clutter_content_get_type | ||
65 | -clutter_deform_effect_get_type | ||
66 | -clutter_desaturate_effect_get_type | ||
67 | -clutter_device_manager_get_type | ||
68 | -clutter_drag_action_get_type | ||
69 | -clutter_drop_action_get_type | ||
70 | -clutter_effect_get_type | ||
71 | -clutter_event_get_type | ||
72 | -clutter_event_sequence_get_type | ||
73 | -clutter_fixed_layout_get_type | ||
74 | -clutter_flow_layout_get_type | ||
75 | -clutter_fog_get_type | ||
76 | -clutter_geometry_get_type | ||
77 | -clutter_gesture_action_get_type | ||
78 | -clutter_glx_texture_pixmap_get_type | ||
79 | -clutter_grid_layout_get_type | ||
80 | -clutter_group_get_type | ||
81 | -clutter_image_get_type | ||
82 | -clutter_input_device_get_type | ||
83 | -clutter_interval_get_type | ||
84 | -clutter_keyframe_transition_get_type | ||
85 | -clutter_knot_get_type | ||
86 | -clutter_layout_manager_get_type | ||
87 | -clutter_layout_meta_get_type | ||
88 | -clutter_list_model_get_type | ||
89 | -clutter_margin_get_type | ||
90 | -clutter_media_get_type | ||
91 | -clutter_model_get_type | ||
92 | -clutter_model_iter_get_type | ||
93 | -clutter_offscreen_effect_get_type | ||
94 | -clutter_page_turn_effect_get_type | ||
95 | -clutter_paint_node_get_type | ||
96 | -clutter_paint_volume_get_type | ||
97 | -clutter_pan_action_get_type | ||
98 | -clutter_param_color_get_type | ||
99 | -clutter_param_fixed_get_type | ||
100 | -clutter_param_units_get_type | ||
101 | -clutter_path_constraint_get_type | ||
102 | -clutter_path_get_type | ||
103 | -clutter_path_node_get_type | ||
104 | -clutter_perspective_get_type | ||
105 | -clutter_pipeline_node_get_type | ||
106 | -clutter_point_get_type | ||
107 | -clutter_property_transition_get_type | ||
108 | -clutter_rect_get_type | ||
109 | -clutter_rectangle_get_type | ||
110 | -clutter_rotate_action_get_type | ||
111 | -clutter_score_get_type | ||
112 | -clutter_script_get_type | ||
113 | -clutter_scriptable_get_type | ||
114 | -clutter_scroll_actor_get_type | ||
115 | -clutter_settings_get_type | ||
116 | -clutter_shader_effect_get_type | ||
117 | -clutter_shader_float_get_type | ||
118 | -clutter_shader_get_type | ||
119 | -clutter_shader_int_get_type | ||
120 | -clutter_shader_matrix_get_type | ||
121 | -clutter_size_get_type | ||
122 | -clutter_snap_constraint_get_type | ||
123 | -clutter_stage_get_type | ||
124 | -clutter_stage_manager_get_type | ||
125 | -clutter_state_get_type | ||
126 | -clutter_state_key_get_type | ||
127 | -clutter_swipe_action_get_type | ||
128 | -clutter_table_layout_get_type | ||
129 | -clutter_tap_action_get_type | ||
130 | -clutter_text_buffer_get_type | ||
131 | -clutter_text_get_type | ||
132 | -clutter_text_node_get_type | ||
133 | -clutter_texture_get_type | ||
134 | -clutter_texture_node_get_type | ||
135 | -clutter_timeline_get_type | ||
136 | -clutter_transition_get_type | ||
137 | -clutter_transition_group_get_type | ||
138 | -clutter_units_get_type | ||
139 | -clutter_vertex_get_type | ||
140 | -clutter_zoom_action_get_type | ||
141 | -- | ||
142 | 2.9.3 | ||
143 | |||
diff --git a/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch b/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch deleted file mode 100644 index ce9ab3a248..0000000000 --- a/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | Install the examples to $libdir/clutter/. | ||
2 | |||
3 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
4 | Upstream-Status: Inappropriate | ||
5 | |||
6 | Index: clutter-1.26.2/examples/Makefile.am | ||
7 | =================================================================== | ||
8 | --- clutter-1.26.2.orig/examples/Makefile.am | ||
9 | +++ clutter-1.26.2/examples/Makefile.am | ||
10 | @@ -33,7 +33,8 @@ AM_CPPFLAGS = \ | ||
11 | -I$(top_srcdir)/clutter \ | ||
12 | -I$(top_builddir)/clutter | ||
13 | |||
14 | -noinst_PROGRAMS = $(all_examples) | ||
15 | +exampledir = $(pkglibdir)/examples | ||
16 | +example_PROGRAMS = $(all_examples) | ||
17 | |||
18 | EXTRA_DIST = redhand.png | ||
19 | |||
diff --git a/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch b/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch deleted file mode 100644 index fef82eaf92..0000000000 --- a/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From d6ceb5a44b28e0e50ede22b84984d8516897de4b Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Mon, 27 Apr 2015 20:12:33 +0300 | ||
4 | Subject: [PATCH] Run installed tests with tap output | ||
5 | |||
6 | Configure output from installed-tests to be TAP compliant such that | ||
7 | gnome-desktop-testing-runner properly interprets the results. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Tim Orling <TicoTimo@gmail.com> | ||
12 | |||
13 | --- | ||
14 | build-aux/autotools/glib-tap.mk | 3 ++- | ||
15 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/build-aux/autotools/glib-tap.mk b/build-aux/autotools/glib-tap.mk | ||
18 | index a4f0dad..51cfa31 100644 | ||
19 | --- a/build-aux/autotools/glib-tap.mk | ||
20 | +++ b/build-aux/autotools/glib-tap.mk | ||
21 | @@ -127,7 +127,8 @@ installed_test_meta_DATA = $(installed_testcases:=.test) | ||
22 | %.test: %$(EXEEXT) Makefile | ||
23 | $(AM_V_GEN) (echo '[Test]' > $@.tmp; \ | ||
24 | echo 'Type=session' >> $@.tmp; \ | ||
25 | - echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 CLUTTER_ENABLE_DIAGNOSTIC=0 $(installed_testdir)/$<' >> $@.tmp; \ | ||
26 | + echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 CLUTTER_ENABLE_DIAGNOSTIC=0 $(installed_testdir)/$< --tap' >> $@.tmp; \ | ||
27 | + echo 'Output=TAP' >> $@.tmp; \ | ||
28 | mv $@.tmp $@) | ||
29 | |||
30 | CLEANFILES += $(installed_test_meta_DATA) | ||
diff --git a/meta/recipes-graphics/clutter/clutter-1.0/run-ptest b/meta/recipes-graphics/clutter/clutter-1.0/run-ptest deleted file mode 100644 index 98877e5226..0000000000 --- a/meta/recipes-graphics/clutter/clutter-1.0/run-ptest +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | #! /bin/sh | ||
2 | |||
3 | gnome-desktop-testing-runner clutter | ||
diff --git a/meta/recipes-graphics/clutter/clutter-1.0_1.26.4.bb b/meta/recipes-graphics/clutter/clutter-1.0_1.26.4.bb deleted file mode 100644 index ee549fbdd5..0000000000 --- a/meta/recipes-graphics/clutter/clutter-1.0_1.26.4.bb +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | require clutter-1.0.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | ||
4 | |||
5 | SRC_URI[archive.md5sum] = "624dd776a5159de0267587b1df6b97b2" | ||
6 | SRC_URI[archive.sha256sum] = "8b48fac159843f556d0a6be3dbfc6b083fc6d9c58a20a49a6b4919ab4263c4e6" | ||
7 | SRC_URI += "file://install-examples.patch \ | ||
8 | file://run-installed-tests-with-tap-output.patch \ | ||
9 | file://0001-Remove-clutter.types-as-it-is-build-configuration-sp.patch \ | ||
10 | file://run-ptest" | ||
diff --git a/meta/recipes-graphics/clutter/clutter-gst-3.0.inc b/meta/recipes-graphics/clutter/clutter-gst-3.0.inc deleted file mode 100644 index 73315c97ec..0000000000 --- a/meta/recipes-graphics/clutter/clutter-gst-3.0.inc +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | SUMMARY = "GStreamer integration library for Clutter" | ||
2 | DESCRIPTION = "Clutter-Gst is an integration library for using GStreamer with Clutter. \ | ||
3 | It provides a GStreamer sink to upload frames to GL and an actor that \ | ||
4 | implements the ClutterGstPlayer interface using playbin." | ||
5 | HOMEPAGE = "http://www.clutter-project.org/" | ||
6 | BUGTRACKER = "https://gitlab.gnome.org/GNOME/clutter-gst/-/issues" | ||
7 | LICENSE = "LGPLv2+" | ||
8 | |||
9 | inherit clutter features_check upstream-version-is-even gobject-introspection | ||
10 | # depends on clutter-1.0 which depends on cogl-1.0 | ||
11 | REQUIRED_DISTRO_FEATURES ?= "opengl" | ||
12 | |||
13 | export GST_PLUGIN_SCANNER_1_0="${S}/gst-plugin-scanner-dummy" | ||
14 | |||
15 | SRC_URI += "file://0001-Install-example-binary-needed-for-core-image-clutter.patch" | ||
16 | |||
17 | DEPENDS = "gstreamer1.0-plugins-base gstreamer1.0-plugins-bad clutter-1.0 libgudev" | ||
18 | RDEPENDS_${PN} += "gstreamer1.0-meta-base" | ||
19 | PACKAGES =+ "${PN}-examples" | ||
20 | |||
21 | FILES_${PN} += "${libdir}/gstreamer-1.0/lib*.so" | ||
22 | FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la" | ||
23 | FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink" | ||
diff --git a/meta/recipes-graphics/clutter/clutter-gst-3.0/0001-Install-example-binary-needed-for-core-image-clutter.patch b/meta/recipes-graphics/clutter/clutter-gst-3.0/0001-Install-example-binary-needed-for-core-image-clutter.patch deleted file mode 100644 index 0b26b990d7..0000000000 --- a/meta/recipes-graphics/clutter/clutter-gst-3.0/0001-Install-example-binary-needed-for-core-image-clutter.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From d77c711277bf075ce0545c19b322f040c49c778a Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Thu, 30 Apr 2015 12:19:13 +0300 | ||
4 | Subject: [PATCH] Install example binary needed for core-image-clutter | ||
5 | |||
6 | Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> | ||
7 | |||
8 | Upstream-Status: Inappropriate [configuration] | ||
9 | |||
10 | Imported from clutter-gst-1.8 package, git://git.openembedded.org/openembedded, | ||
11 | commit ae28ee3f7a060b9e0d13154a84f2444a98490b5b, updated for clutter-gst 3.0 | ||
12 | |||
13 | Signed-off-by: Tomas Frydrych <tomas@sleepfive.com> | ||
14 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
15 | --- | ||
16 | examples/Makefile.am | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/examples/Makefile.am b/examples/Makefile.am | ||
20 | index bfbc1b5..09655e3 100644 | ||
21 | --- a/examples/Makefile.am | ||
22 | +++ b/examples/Makefile.am | ||
23 | @@ -1,6 +1,6 @@ | ||
24 | NULL = # | ||
25 | |||
26 | -noinst_PROGRAMS = camera-player video-player video-sink video-sink-navigation video-content | ||
27 | +bin_PROGRAMS = camera-player video-player video-sink video-sink-navigation video-content | ||
28 | |||
29 | AM_CPPFLAGS = -I$(top_srcdir) \ | ||
30 | $(MAINTAINER_CFLAGS) \ | ||
31 | -- | ||
32 | 2.1.4 | ||
33 | |||
diff --git a/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.27.bb b/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.27.bb deleted file mode 100644 index 35382453c2..0000000000 --- a/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.27.bb +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | require clutter-gst-3.0.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ | ||
4 | file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4" | ||
5 | |||
6 | SRC_URI[archive.md5sum] = "2bf9d7ca146c9d71e86c45cd00e9a28e" | ||
7 | SRC_URI[archive.sha256sum] = "fe69bd6c659d24ab30da3f091eb91cd1970026d431179b0724f13791e8ad9f9d" | ||
diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc b/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc deleted file mode 100644 index 9a28b5219b..0000000000 --- a/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | SUMMARY = "Library for embedding a Clutter canvas in a GTK+ application" | ||
2 | DESCRIPTION = "Clutter-GTK is a library providing facilities to integrate Clutter into GTK+ \ | ||
3 | applications and vice versa. It provides a GTK+ widget, GtkClutterEmbed, for embedding the \ | ||
4 | a Clutter stage into any GtkContainer; and GtkClutterActor, a Clutter \ | ||
5 | actor for embedding any GtkWidget inside a Clutter stage." | ||
6 | HOMEPAGE = "http://www.clutter-project.org/" | ||
7 | BUGTRACKER = "https://gitlab.gnome.org/GNOME/clutter/-/issues" | ||
8 | LICENSE = "LGPLv2+" | ||
9 | |||
10 | CLUTTERBASEBUILDCLASS = "meson" | ||
11 | inherit clutter features_check upstream-version-is-even gobject-introspection gtk-doc | ||
12 | |||
13 | # depends on clutter-1.0 which depends on cogl-1.0 | ||
14 | REQUIRED_DISTRO_FEATURES ?= "opengl" | ||
15 | # depends on gtk+3 | ||
16 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | ||
17 | |||
18 | DEPENDS = "clutter-1.0 gtk+3" | ||
19 | PACKAGES =+ "${PN}-examples" | ||
20 | |||
21 | GTKDOC_MESON_OPTION = "enable_docs" | ||
22 | |||
23 | GIR_MESON_OPTION = 'enable_gi' | ||
diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0/0001-Add-a-config-variable-for-enabling-disabling-introsp.patch b/meta/recipes-graphics/clutter/clutter-gtk-1.0/0001-Add-a-config-variable-for-enabling-disabling-introsp.patch deleted file mode 100644 index e21c6fd903..0000000000 --- a/meta/recipes-graphics/clutter/clutter-gtk-1.0/0001-Add-a-config-variable-for-enabling-disabling-introsp.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From 7233883c6bd4e80c0e91b29b5c76fe798023e9fe Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Mon, 11 Feb 2019 16:41:13 +0100 | ||
4 | Subject: [PATCH] Add a config variable for enabling/disabling introspection | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | --- | ||
9 | clutter-gtk/meson.build | 2 +- | ||
10 | meson_options.txt | 4 ++++ | ||
11 | 2 files changed, 5 insertions(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/clutter-gtk/meson.build b/clutter-gtk/meson.build | ||
14 | index 5d6847d..5d934b6 100644 | ||
15 | --- a/clutter-gtk/meson.build | ||
16 | +++ b/clutter-gtk/meson.build | ||
17 | @@ -49,7 +49,7 @@ clutter_gtk_dep = declare_dependency(link_with: clutter_gtk, | ||
18 | dependencies: [ mathlib_dep, clutter_dep, gtk_dep ], | ||
19 | include_directories: include_directories('.')) | ||
20 | |||
21 | -if not meson.is_cross_build() | ||
22 | +if get_option('enable_gi') | ||
23 | gnome.generate_gir(clutter_gtk, | ||
24 | sources: clutter_gtk_headers + clutter_gtk_sources, | ||
25 | namespace: 'GtkClutter', | ||
26 | diff --git a/meson_options.txt b/meson_options.txt | ||
27 | index aaf59f1..b7e51c3 100644 | ||
28 | --- a/meson_options.txt | ||
29 | +++ b/meson_options.txt | ||
30 | @@ -2,3 +2,7 @@ option('enable_docs', | ||
31 | type: 'boolean', | ||
32 | value: false, | ||
33 | description: 'Enable generating the API reference (depends on GTK-Doc)') | ||
34 | +option('enable_gi', | ||
35 | + type: 'boolean', | ||
36 | + value: false, | ||
37 | + description: 'Enable gobject introspection') | ||
diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb b/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb deleted file mode 100644 index 53948c8944..0000000000 --- a/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | require clutter-gtk-1.0.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" | ||
4 | |||
5 | SRC_URI += " file://0001-Add-a-config-variable-for-enabling-disabling-introsp.patch" | ||
6 | SRC_URI[archive.md5sum] = "b363ac9878e2337be887b8ee9e1da00e" | ||
7 | SRC_URI[archive.sha256sum] = "521493ec038973c77edcb8bc5eac23eed41645117894aaee7300b2487cb42b06" | ||