[PATCH 0/4] Conditionalize build of x11/gtk frontends

[PATCH 0/4] Conditionalize build of x11/gtk frontends

[Enrico Scholz]

Several packages can be used without graphical frontends, but the
buildsystem brings in statically (heavy) x11 or gtk+ software stacks.
This patchset uses the 'x11' DISTRO_FEATURE to disable building of
these components.

Enrico Scholz (4):
  gst-plugins: do not build x11 related plugins without the x11
    DISTRO_FEATURE
  distcc: honor x11 DISTRO_FEATURE
  latencytop: honor x11 DISTRO_FEATURE
  sysprof: conditionalized build of gtk frontend

 meta/recipes-devtools/distcc/distcc_2.18.3.bb      |    5 +++--
 meta/recipes-kernel/latencytop/latencytop_0.5.bb   |    6 +++++-
 meta/recipes-kernel/sysprof/sysprof_git.bb         |    2 +-
 .../gstreamer/gst-plugins-base_0.10.35.bb          |    4 +++-
 meta/recipes-multimedia/gstreamer/gst-plugins.inc  |    1 +
 5 files changed, 13 insertions(+), 5 deletions(-)

-- 
1.7.7.5

[PATCH 1/4] gst-plugins: do not build x11 related plugins without the x11 DISTRO_FEATURE

[Enrico Scholz]

gst-plugins might be used on headless systems or on systems with
DirectFB or qt frontends.  Building them without the x11 software stack
might be desirable there and is supported by the buildsystem.

Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
---
 .../gstreamer/gst-plugins-base_0.10.35.bb          |    4 +++-
 meta/recipes-multimedia/gstreamer/gst-plugins.inc  |    1 +
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.35.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.35.bb
index e49a00c..dc86c19 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.35.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.35.bb
@@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
                     file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \
                     file://gst/ffmpegcolorspace/utils.c;beginline=1;endline=20;md5=9c83a200b8e597b26ca29df20fc6ecd0"
 
-DEPENDS += "virtual/libx11 alsa-lib freetype liboil libogg libvorbis libxv libtheora avahi util-linux tremor"
+DEPENDS-x11 = 'virtual/libx11 libxv avahi'
+DEPENDS += "alsa-lib freetype liboil libogg libvorbis libtheora util-linux tremor"
+DEPENDS += "${@base_contains('DISTRO_FEATURES','x11', '${DEPENDS-x11}', '', d)}"
 
 SRC_URI += " file://gst-plugins-base-tremor.patch"
 
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins.inc b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
index b23d399..25c44f5 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins.inc
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
@@ -11,6 +11,7 @@ FILESPATH =. "${FILE_DIRNAME}/gst-plugins:"
 SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2"
 
 EXTRA_OECONF = "--disable-valgrind --disable-debug --disable-examples "
+EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES','x11','','--disable-x', d)}"
 
 acpaths = "-I ${S}/common/m4 -I ${S}/m4"
 
-- 
1.7.7.5

[PATCH 2/4] distcc: honor x11 DISTRO_FEATURE

[Enrico Scholz]

'distcc' can be used on headless system and it is desirable to avoid
building of the gnome/gtk+ stacks.

Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
---
 meta/recipes-devtools/distcc/distcc_2.18.3.bb |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/distcc/distcc_2.18.3.bb b/meta/recipes-devtools/distcc/distcc_2.18.3.bb
index ec6ffb3..8ceff9d 100644
--- a/meta/recipes-devtools/distcc/distcc_2.18.3.bb
+++ b/meta/recipes-devtools/distcc/distcc_2.18.3.bb
@@ -8,7 +8,7 @@ PR = "r7"
 
 DEPENDS = "avahi ${GTKDEP}"
 GTKDEP_libc-uclibc = ""
-GTKDEP = "gtk+"
+GTKDEP = "${@base_contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}"
 
 RRECOMMENDS_${PN} = "avahi-daemon"
 
@@ -28,7 +28,8 @@ inherit autotools pkgconfig update-rc.d
 
 INITSCRIPT_NAME = "distcc"
 
-EXTRA_OECONF = "--with-gtk"
+EXTRA_OECONF = "${@base_contains('DISTRO_FEATURES', 'x11', \
+  '--with-gtk', '--without-gtk --without-gnome', d)}"
 EXTRA_OECONF_libc-uclibc = "--without-gtk --without-gnome"
 do_install_append() {
     install -d ${D}${sysconfdir}/init.d/
-- 
1.7.7.5

[PATCH 3/4] latencytop: honor x11 DISTRO_FEATURE

[Enrico Scholz]

'latencytop' can be used on headless system and it is desirable to avoid
building of the gtk+ stack.

Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
---
 meta/recipes-kernel/latencytop/latencytop_0.5.bb |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-kernel/latencytop/latencytop_0.5.bb b/meta/recipes-kernel/latencytop/latencytop_0.5.bb
index 247ec16..1002392 100644
--- a/meta/recipes-kernel/latencytop/latencytop_0.5.bb
+++ b/meta/recipes-kernel/latencytop/latencytop_0.5.bb
@@ -5,7 +5,8 @@ BUGTRACKER = "n/a"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://latencytop.c;endline=23;md5=ee9ea9b1415356e5734adad4a87dc7fa"
 
-DEPENDS = "virtual/libintl ncurses glib-2.0 gtk+"
+DEPENDS = "virtual/libintl ncurses glib-2.0"
+DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}"
 
 PR = "r1"
 
@@ -17,6 +18,9 @@ SRC_URI[sha256sum] = "9e7f72fbea7bd918e71212a1eabaad8488d2c602205d2e3c95d62cd57e
 
 CFLAGS += "${LDFLAGS}"
 
+EXTRA_OEMAKE += "${@base_contains('DISTRO_FEATURES', 'x11', \
+  'HAS_GTK_GUI=1', 'HAS_GTK_GUI=', d)}"
+
 do_install() {
     oe_runmake install DESTDIR=${D}
 }
-- 
1.7.7.5

[PATCH 4/4] sysprof: conditionalized build of gtk frontend

[Enrico Scholz]

'sysprof' can be used on headless system and it is desirable to avoid
building of the gtk+/glade software stacks.

Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
---
 meta/recipes-kernel/sysprof/sysprof_git.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-kernel/sysprof/sysprof_git.bb b/meta/recipes-kernel/sysprof/sysprof_git.bb
index bd34f00..8cacff5 100644
--- a/meta/recipes-kernel/sysprof/sysprof_git.bb
+++ b/meta/recipes-kernel/sysprof/sysprof_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "sysprof - System-wide Performance Profiler for Linux"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-DEPENDS = "gtk+ libglade"
+DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11', 'gtk+ libglade', '', d)}"
 
 SRCREV = "4692f85f625f4fd969cef4ab5dc47cc4655c87f9"
 PR = "r2"
-- 
1.7.7.5