diff options
author | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
---|---|---|
committer | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
commit | 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf (patch) | |
tree | cd70a267a5ef105ba32f200aa088e281fbd85747 /external/poky/meta/recipes-graphics/clutter | |
parent | 4204309872da5cb401cbb2729d9e2d4869a87f42 (diff) |
basesystem-jjsandbox/ToshikazuOhiwa/master-jj
recipes
Diffstat (limited to 'external/poky/meta/recipes-graphics/clutter')
-rw-r--r-- | external/poky/meta/recipes-graphics/clutter/clutter-1.0.inc | 9 | ||||
-rw-r--r-- | external/poky/meta/recipes-graphics/clutter/clutter-gst-3.0.inc | 2 | ||||
-rw-r--r-- | external/poky/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.27.bb (renamed from external/poky/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.26.bb) | 4 | ||||
-rw-r--r-- | external/poky/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc | 7 | ||||
-rw-r--r-- | external/poky/meta/recipes-graphics/clutter/clutter-gtk-1.0/0001-Add-a-config-variable-for-enabling-disabling-introsp.patch | 37 | ||||
-rw-r--r-- | external/poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb | 1 |
6 files changed, 52 insertions, 8 deletions
diff --git a/external/poky/meta/recipes-graphics/clutter/clutter-1.0.inc b/external/poky/meta/recipes-graphics/clutter/clutter-1.0.inc index 6dbbf4d8..e0ac819e 100644 --- a/external/poky/meta/recipes-graphics/clutter/clutter-1.0.inc +++ b/external/poky/meta/recipes-graphics/clutter/clutter-1.0.inc @@ -1,8 +1,11 @@ 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 distro_features_check upstream-version-is-even gobject-introspection +inherit clutter ptest-gnome features_check upstream-version-is-even gobject-introspection # depends on cogl-1.0 which needs opengl REQUIRED_DISTRO_FEATURES ?= "opengl" @@ -21,11 +24,11 @@ ERDEPENDS_EVDEV = "xkeyboard-config" # Disable pretty much everything, override in platform specific set up EXTRA_OECONF += "--disable-quartz-backend \ --disable-win32-backend \ - --disable-gdk-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}" @@ -34,7 +37,7 @@ PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,${E PACKAGECONFIG[wayland-compositor] = "--enable-wayland-compositor,--disable-wayland-compositor,wayland" # Default configuration, distros might want to override -PACKAGECONFIG ??= "egl \ +PACKAGECONFIG ??= "egl gdk \ ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11', '', d)}" diff --git a/external/poky/meta/recipes-graphics/clutter/clutter-gst-3.0.inc b/external/poky/meta/recipes-graphics/clutter/clutter-gst-3.0.inc index 4c877982..fc3eade8 100644 --- a/external/poky/meta/recipes-graphics/clutter/clutter-gst-3.0.inc +++ b/external/poky/meta/recipes-graphics/clutter/clutter-gst-3.0.inc @@ -2,7 +2,7 @@ SUMMARY = "GStreamer integration library for Clutter" HOMEPAGE = "http://www.clutter-project.org/" LICENSE = "LGPLv2+" -inherit clutter distro_features_check upstream-version-is-even gobject-introspection +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" diff --git a/external/poky/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.26.bb b/external/poky/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.27.bb index 8a0dda54..35382453 100644 --- a/external/poky/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.26.bb +++ b/external/poky/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.27.bb @@ -3,5 +3,5 @@ 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] = "7809ca6ce9d1a3490597fd4a7375c389" -SRC_URI[archive.sha256sum] = "d8618a6d9accec0f2a8574c5e1220051f8505fb82b20336c26bdbd482aa6cb3a" +SRC_URI[archive.md5sum] = "2bf9d7ca146c9d71e86c45cd00e9a28e" +SRC_URI[archive.sha256sum] = "fe69bd6c659d24ab30da3f091eb91cd1970026d431179b0724f13791e8ad9f9d" diff --git a/external/poky/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc b/external/poky/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc index 05c4e5f5..7bf22785 100644 --- a/external/poky/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc +++ b/external/poky/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc @@ -2,7 +2,9 @@ SUMMARY = "Library for embedding a Clutter canvas in a GTK+ application" HOMEPAGE = "http://www.clutter-project.org/" LICENSE = "LGPLv2+" -inherit clutter distro_features_check upstream-version-is-even gobject-introspection +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 @@ -10,6 +12,7 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" DEPENDS = "clutter-1.0 gtk+3" PACKAGES =+ "${PN}-examples" -AUTOTOOLS_AUXDIR = "${S}/build" +GTKDOC_MESON_OPTION = "enable_docs" +GIR_MESON_OPTION = 'enable_gi' diff --git a/external/poky/meta/recipes-graphics/clutter/clutter-gtk-1.0/0001-Add-a-config-variable-for-enabling-disabling-introsp.patch b/external/poky/meta/recipes-graphics/clutter/clutter-gtk-1.0/0001-Add-a-config-variable-for-enabling-disabling-introsp.patch new file mode 100644 index 00000000..e21c6fd9 --- /dev/null +++ b/external/poky/meta/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/external/poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb b/external/poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb index f0300c71..53948c89 100644 --- a/external/poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb +++ b/external/poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb @@ -2,5 +2,6 @@ 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" |