diff options
Diffstat (limited to 'meta/recipes-graphics/packagegroups')
5 files changed, 23 insertions, 32 deletions
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb deleted file mode 100644 index 2e7b47dd40..0000000000 --- a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | # | ||
2 | # Copyright (C) 2007 OpenedHand Ltd. | ||
3 | # | ||
4 | |||
5 | SUMMARY = "Clutter package groups" | ||
6 | |||
7 | PR = "r6" | ||
8 | |||
9 | inherit packagegroup features_check | ||
10 | # rdepends on clutter-* | ||
11 | REQUIRED_DISTRO_FEATURES = "opengl" | ||
12 | |||
13 | PACKAGES = "\ | ||
14 | ${PN}-core \ | ||
15 | " | ||
16 | |||
17 | SUMMARY_${PN}-core = "Clutter graphics library" | ||
18 | RDEPENDS_${PN}-core = "\ | ||
19 | clutter-1.0 \ | ||
20 | clutter-gst-3.0 \ | ||
21 | clutter-gtk-1.0 \ | ||
22 | " | ||
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-weston.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-weston.bb new file mode 100644 index 0000000000..dd302c89e7 --- /dev/null +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-weston.bb | |||
@@ -0,0 +1,14 @@ | |||
1 | SUMMARY = "Basic Weston compositor setup" | ||
2 | DESCRIPTION = "Packages required to set up a basic working Weston session" | ||
3 | |||
4 | inherit packagegroup features_check | ||
5 | |||
6 | # weston-init requires pam enabled if started via systemd | ||
7 | REQUIRED_DISTRO_FEATURES = "wayland ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', 'pam', '', d)}" | ||
8 | |||
9 | RDEPENDS:${PN} = "\ | ||
10 | weston \ | ||
11 | weston-init \ | ||
12 | weston-examples \ | ||
13 | wayland-utils \ | ||
14 | " | ||
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb index 9ca2705a5f..db6242af33 100644 --- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb | |||
@@ -1,15 +1,13 @@ | |||
1 | SUMMARY = "Basic X11 session" | 1 | SUMMARY = "Basic X11 session" |
2 | DESCRIPTION = "Packages required to set up a basic working X11 session" | 2 | DESCRIPTION = "Packages required to set up a basic working X11 session" |
3 | PR = "r1" | ||
4 | 3 | ||
5 | inherit packagegroup features_check | 4 | inherit packagegroup features_check |
6 | # rdepends on matchbox-wm | 5 | # rdepends on matchbox-wm |
7 | REQUIRED_DISTRO_FEATURES = "x11" | 6 | REQUIRED_DISTRO_FEATURES = "x11" |
8 | 7 | ||
9 | RDEPENDS_${PN} = "\ | 8 | RDEPENDS:${PN} = "\ |
10 | packagegroup-core-x11-xserver \ | 9 | packagegroup-core-x11-xserver \ |
11 | packagegroup-core-x11-utils \ | 10 | packagegroup-core-x11-utils \ |
12 | dbus \ | ||
13 | matchbox-terminal \ | 11 | matchbox-terminal \ |
14 | matchbox-wm \ | 12 | matchbox-wm \ |
15 | mini-x-session \ | 13 | mini-x-session \ |
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb index a0b944a678..ebc1330055 100644 --- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb | |||
@@ -3,7 +3,6 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | SUMMARY = "X11 display server" | 5 | SUMMARY = "X11 display server" |
6 | PR = "r40" | ||
7 | 6 | ||
8 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 7 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
9 | 8 | ||
@@ -11,10 +10,13 @@ inherit packagegroup features_check | |||
11 | # rdepends on XSERVER | 10 | # rdepends on XSERVER |
12 | REQUIRED_DISTRO_FEATURES = "x11" | 11 | REQUIRED_DISTRO_FEATURES = "x11" |
13 | 12 | ||
14 | XSERVER ?= "xserver-xorg xf86-video-fbdev" | 13 | XSERVER ?= "xserver-xorg \ |
14 | xf86-video-fbdev \ | ||
15 | xf86-video-modesetting \ | ||
16 | " | ||
15 | XSERVERCODECS ?= "" | 17 | XSERVERCODECS ?= "" |
16 | 18 | ||
17 | RDEPENDS_${PN} = "\ | 19 | RDEPENDS:${PN} = "\ |
18 | ${XSERVER} \ | 20 | ${XSERVER} \ |
19 | ${XSERVERCODECS} \ | 21 | ${XSERVERCODECS} \ |
20 | " | 22 | " |
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb index cddf1932f3..91db7ed33b 100644 --- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb | |||
@@ -2,7 +2,6 @@ | |||
2 | # Copyright (C) 2011 Intel Corporation | 2 | # Copyright (C) 2011 Intel Corporation |
3 | # | 3 | # |
4 | 4 | ||
5 | PR = "r40" | ||
6 | 5 | ||
7 | inherit packagegroup features_check | 6 | inherit packagegroup features_check |
8 | REQUIRED_DISTRO_FEATURES = "x11" | 7 | REQUIRED_DISTRO_FEATURES = "x11" |
@@ -16,13 +15,13 @@ VIRTUAL-RUNTIME_xserver_common ?= "" | |||
16 | VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init" | 15 | VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init" |
17 | 16 | ||
18 | SUMMARY = "X11 display server and basic utilities" | 17 | SUMMARY = "X11 display server and basic utilities" |
19 | RDEPENDS_${PN} = "\ | 18 | RDEPENDS:${PN} = "\ |
20 | ${PN}-xserver \ | 19 | ${PN}-xserver \ |
21 | ${PN}-utils \ | 20 | ${PN}-utils \ |
22 | " | 21 | " |
23 | 22 | ||
24 | SUMMARY_${PN}-utils = "X11 basic utilities and init" | 23 | SUMMARY:${PN}-utils = "X11 basic utilities and init" |
25 | RDEPENDS_${PN}-utils = "\ | 24 | RDEPENDS:${PN}-utils = "\ |
26 | ${VIRTUAL-RUNTIME_xserver_common} \ | 25 | ${VIRTUAL-RUNTIME_xserver_common} \ |
27 | ${VIRTUAL-RUNTIME_graphical_init_manager} \ | 26 | ${VIRTUAL-RUNTIME_graphical_init_manager} \ |
28 | xauth \ | 27 | xauth \ |