Skip to contentSkip to conversation

gtk+/cairo/libsdl: build without x11 in DISTRO_FEATURE

PATCH In review Robert Yang 1 participant 4 messages Jun 3, 2015 – Jun 18, 2015

lore
Share & tools
lore

Robert Yang

author
#0 lore raw

cover gtk+/cairo/libsdl: build without x11 in DISTRO_FEATURE

Hello,

After the two patches, yocto's world build would be OK without x11 in DISTRO_FEATURE.

// Robert

The following changes since commit 968973d55d4b33e1a929ed4cdf9387fcaba2d93f:

qt4: unconditionally disable gstreamer 0.10 support in qt webkit (2015-05-30 22:25:12 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/nox11
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/nox11

Robert Yang (2):
gtk+/cairo: enable x11 or directfb
libsdl: depends on libglu when both x11 and opengl

 meta/recipes-gnome/gtk+/gtk+.inc              |    5 ++---
 meta/recipes-graphics/cairo/cairo.inc         |    8 ++++++--
 meta/recipes-graphics/libsdl/libsdl_1.2.15.bb |    3 ++-
 3 files changed, 10 insertions(+), 6 deletions(-)
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH 1/2 gtk+/cairo: enable x11 or directfb

The gtk+2 requires whether x11 or directfb to build, so we need enable either of them. The cairo can be built without x11 or directfb, but gtk+ requires cairo, so enable x11 or directfb for cairo, too.

Signed-off-by Robert Yang <[email protected]>
---
 meta/recipes-gnome/gtk+/gtk+.inc      |    5 ++---
 meta/recipes-graphics/cairo/cairo.inc |    8 ++++++--
 2 files changed, 8 insertions(+), 5 deletions(-)
meta/recipes-gnome/gtk+/gtk+.inc +2 -3
index 1c0558c..fcfb86f 100644
@@ -14,9 +14,8 @@ X11DEPENDS = "virtual/libx11 libxext libxcursor libxrandr libxdamage libxrender
 DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native docbook-utils-native \
  cairo gdk-pixbuf"
 
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
-           ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
-"
+# Requires x11 or directfb
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'directfb', d)}"
 
 PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}"
 # without --with-gdktarget=directfb it will check for cairo-xlib which isn't available without X11 DISTRO_FEATURE
meta/recipes-graphics/cairo/cairo.inc +6 -2
index 1e45318..f6474bc 100644
@@ -17,8 +17,12 @@ LICENSE_${PN}-perf-utils = "GPLv3+"
 X11DEPENDS = "virtual/libx11 libsm libxrender libxext"
 DEPENDS = "libpng fontconfig pixman glib-2.0 zlib"
 
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \
-           ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
+# Build cairo-xlib or cairo-directfb for gtk+
+PACKAGECONFIG ??= " ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', 'directfb', d)} \
+                    "
+
+# No directfb-native, so set PACKAGECONFIG to null when no x11
+PACKAGECONFIG_class-native ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
 
 PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --disable-xlib,${X11DEPENDS}"
 PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb"
Signature · 1 line
1.7.9.5
author
#2 lore raw

PATCH 2/2 libsdl: depends on libglu when both x11 and opengl

In reply to Robert Yang

The libglu requires both opengl (depends on virtual/libgl) and x11 (needs libGL.so which is provided by mesa when x11 in DISTRO_FEATURES), so let libsdl depends on libglu when both x11 and opengl in DISTRO_FEATURES.

Signed-off-by Robert Yang <[email protected]>
---
 meta/recipes-graphics/libsdl/libsdl_1.2.15.bb |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-graphics/libsdl/libsdl_1.2.15.bb +2 -1
index 266bd42..c0d5c6a 100644
@@ -13,8 +13,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
 PROVIDES = "virtual/libsdl"
 
 DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
-           ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl libglu', '', d)} \
+           ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \
            ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \
+           ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'libglu', '', d)} \
            tslib"
 DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}"
Signature · 1 line
1.7.9.5
author
#3 lore raw
In reply to Robert Yang

Hello,

Any comments on these two patches, please ?

// Robert

Quoted 25 lines · Robert Yang

Hello,

After the two patches, yocto's world build would be OK without x11 in DISTRO_FEATURE.

// Robert

The following changes since commit 968973d55d4b33e1a929ed4cdf9387fcaba2d93f:

   qt4: unconditionally disable gstreamer 0.10 support in qt webkit (2015-05-30 22:25:12 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/nox11
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/nox11

Robert Yang (2):
gtk+/cairo: enable x11 or directfb
libsdl: depends on libglu when both x11 and opengl

  meta/recipes-gnome/gtk+/gtk+.inc              |    5 ++---
  meta/recipes-graphics/cairo/cairo.inc         |    8 ++++++--
  meta/recipes-graphics/libsdl/libsdl_1.2.15.bb |    3 ++-
  3 files changed, 10 insertions(+), 6 deletions(-)