[meta-oe][PATCH v2 1/1] recipes-graphics/lxdm: add missing automake file, update build config

[meta-oe][PATCH v2 1/1] recipes-graphics/lxdm: add missing automake file, update build config

[Stephen Arnold]

From: "Stephen Arnold" <stephen.arnold42@gmail.com>

PATCH recipes-graphics/lxdm:

 - add missing depends and inherit pkgconfig for autogen/configure
 - silence confgure warnings and update configure options
 - provide missing input file for automake

Built and tested on master branches using meta-raspberrypi and meta-alt-destop-extras.

Signed-off-by: Stephen Arnold <stephen.arnold42@gmail.com>

---
 meta-oe/recipes-graphics/lxdm/lxdm_git.bb | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
index c12eddf..6ef014f 100644
--- a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
+++ b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
@@ -16,18 +16,27 @@ SRCREV = "07fb151a99ef99318b71f3de0afbba977b1e6267"
 PV = "0.5.0+git${SRCPV}"
 PE = "1"
 
-DEPENDS = "cairo dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango"
+DEPENDS = "virtual/libintl intltool-native cairo dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango iso-codes"
 DEPENDS += "${@base_contains("DISTRO_FEATURES", "systemd", "", "consolekit", d)}"
 
 # combine oe-core way with angstrom DISTRO_TYPE
 DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}"
 
-inherit autotools gettext systemd
+inherit autotools pkgconfig gettext systemd
 
 S = "${WORKDIR}/git"
 
+CFLAGS_append = " -fno-builtin-fork -fno-builtin-memset -fno-builtin-strstr "
+
+EXTRA_OECONF += "--enable-gtk3=no --enable-password=yes --with-x -with-xconn=xcb"
 EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/ --disable-consolekit', '--without-systemdsystemunitdir', d)}"
 
+do_patch_extra() {
+    cp ${STAGING_DATADIR}/gettext/po/Makefile.in.in ${S}/po/
+}
+
+addtask do_patch_extra before do_configure after do_patch
+
 do_compile_append() {
     # default background configured not available / no password field available / no default screensaver
     sed -i     -e 's,bg=,# bg=,g' \
-- 
1.8.5.3

Re: [meta-oe][PATCH v2 1/1] recipes-graphics/lxdm: add missing automake file, update build config

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Stephen Arnold schreef op 17-03-14 01:04:
> From: "Stephen Arnold" <stephen.arnold42@gmail.com>
> 
> PATCH recipes-graphics/lxdm:
> 
> - add missing depends and inherit pkgconfig for autogen/configure -
> silence confgure warnings and update configure options - provide missing
> input file for automake
> 
> Built and tested on master branches using meta-raspberrypi and
> meta-alt-destop-extras.
> 
> Signed-off-by: Stephen Arnold <stephen.arnold42@gmail.com>
> 
> --- meta-oe/recipes-graphics/lxdm/lxdm_git.bb | 13 +++++++++++-- 1 file
> changed, 11 insertions(+), 2 deletions(-)
> 
> diff --git a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
> b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb index c12eddf..6ef014f
> 100644 --- a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb +++
> b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb @@ -16,18 +16,27 @@ SRCREV =
> "07fb151a99ef99318b71f3de0afbba977b1e6267" PV = "0.5.0+git${SRCPV}" PE =
> "1"
> 
> -DEPENDS = "cairo dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb
> pango" +DEPENDS = "virtual/libintl intltool-native cairo dbus gdk-pixbuf
> glib-2.0 gtk+ virtual/libx11 libxcb pango iso-codes" DEPENDS +=
> "${@base_contains("DISTRO_FEATURES", "systemd", "", "consolekit", d)}"
> 
> # combine oe-core way with angstrom DISTRO_TYPE DISTRO_TYPE ?=
> "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}"
> 
> -inherit autotools gettext systemd +inherit autotools pkgconfig gettext
> systemd
> 
> S = "${WORKDIR}/git"
> 
> +CFLAGS_append = " -fno-builtin-fork -fno-builtin-memset
> -fno-builtin-strstr "

Why is this needed?

> + +EXTRA_OECONF += "--enable-gtk3=no --enable-password=yes --with-x
> -with-xconn=xcb" EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES',
> 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/
> --disable-consolekit', '--without-systemdsystemunitdir', d)}"

Please merge those 2 into a single EXTRA_OECONF

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFTJrnmMkyGM64RGpERAjj6AKCjLjwuMeDHNZEY22fPsNKnf9ZijQCgl0Gj
RVZBFHTR0QsI2gXGzLy8+lg=
=rUX5
-----END PGP SIGNATURE-----