[PATCH] libxkbcommon: new window system-independent XKB library

[PATCH] libxkbcommon: new window system-independent XKB library

[Ross Burton]

Used by Wayland, Clutter, and more.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-graphics/xorg-lib/libxkbcommon_0.2.0.bb |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 meta/recipes-graphics/xorg-lib/libxkbcommon_0.2.0.bb

diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.2.0.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.2.0.bb
new file mode 100644
index 0000000..7304080
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.2.0.bb
@@ -0,0 +1,18 @@
+SUMMARY = "Generic XKB keymap library"
+DESCRIPTION = "libxkbcommon is a keymap compiler and support library which \
+processes a reduced subset of keymaps as defined by the XKB specification."
+HOMEPAGE = "http://www.xkbcommon.org"
+
+LICENSE = "MIT & MIT-style"
+
+DEPENDS = "util-macros flex-native bison-native"
+
+SRC_URI = "http://xkbcommon.org/download/${PN}-${PV}.tar.bz2"
+SRC_URI[md5sum] = "2be3d4a255d02c7d46fc6a9486f21f6a"
+SRC_URI[sha256sum] = "74eb0a121ca3998015fd687591426bb15c524645a72cf602831b2e729172fb42"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=9c0b824e72a22f9d2c40b9c93b1f0ddc"
+
+PR = "r0"
+
+EXTRA_OECONF = "--disable-docs"
-- 
1.7.10

Re: [PATCH] libxkbcommon: new window system-independent XKB library

[Saul Wold]

On 10/23/2012 12:57 PM, Ross Burton wrote:
> Used by Wayland, Clutter, and more.
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>   meta/recipes-graphics/xorg-lib/libxkbcommon_0.2.0.bb |   18 ++++++++++++++++++
>   1 file changed, 18 insertions(+)
>   create mode 100644 meta/recipes-graphics/xorg-lib/libxkbcommon_0.2.0.bb
>
> diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.2.0.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.2.0.bb
> new file mode 100644
> index 0000000..7304080
> --- /dev/null
> +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.2.0.bb
> @@ -0,0 +1,18 @@
> +SUMMARY = "Generic XKB keymap library"
> +DESCRIPTION = "libxkbcommon is a keymap compiler and support library which \
> +processes a reduced subset of keymaps as defined by the XKB specification."
> +HOMEPAGE = "http://www.xkbcommon.org"
> +
> +LICENSE = "MIT & MIT-style"
> +
> +DEPENDS = "util-macros flex-native bison-native"
> +
> +SRC_URI = "http://xkbcommon.org/download/${PN}-${PV}.tar.bz2"
> +SRC_URI[md5sum] = "2be3d4a255d02c7d46fc6a9486f21f6a"
> +SRC_URI[sha256sum] = "74eb0a121ca3998015fd687591426bb15c524645a72cf602831b2e729172fb42"
> +
> +LIC_FILES_CHKSUM = "file://COPYING;md5=9c0b824e72a22f9d2c40b9c93b1f0ddc"
> +
> +PR = "r0"
> +
> +EXTRA_OECONF = "--disable-docs"
>
Merged into OE-Core

Thanks
	Sau!

Re: [PATCH] libxkbcommon: new window system-independent XKB library

[Saul Wold]

My prior email about this being merged was wrong!!

see below
On 10/23/2012 12:57 PM, Ross Burton wrote:
> Used by Wayland, Clutter, and more.
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>   meta/recipes-graphics/xorg-lib/libxkbcommon_0.2.0.bb |   18 ++++++++++++++++++
>   1 file changed, 18 insertions(+)
>   create mode 100644 meta/recipes-graphics/xorg-lib/libxkbcommon_0.2.0.bb
>
> diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.2.0.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.2.0.bb
> new file mode 100644
> index 0000000..7304080
> --- /dev/null
> +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.2.0.bb
> @@ -0,0 +1,18 @@
> +SUMMARY = "Generic XKB keymap library"
> +DESCRIPTION = "libxkbcommon is a keymap compiler and support library which \
> +processes a reduced subset of keymaps as defined by the XKB specification."
> +HOMEPAGE = "http://www.xkbcommon.org"
> +
> +LICENSE = "MIT & MIT-style"
> +
Maybe your missing the require xorg-lib-common.inc?

> +DEPENDS = "util-macros flex-native bison-native"
> +
You have a different DEPENDS set than the git version.

Should there be a libxkbcommon.inc that's shared between the git and 
"version" bb files for the generic header / license stuff?

> +SRC_URI = "http://xkbcommon.org/download/${PN}-${PV}.tar.bz2"
> +SRC_URI[md5sum] = "2be3d4a255d02c7d46fc6a9486f21f6a"
> +SRC_URI[sha256sum] = "74eb0a121ca3998015fd687591426bb15c524645a72cf602831b2e729172fb42"
> +
> +LIC_FILES_CHKSUM = "file://COPYING;md5=9c0b824e72a22f9d2c40b9c93b1f0ddc"
> +
> +PR = "r0"
> +
> +EXTRA_OECONF = "--disable-docs"
>
The git version does not disable docs, any reason to do it here?

Sau!

Re: [PATCH] libxkbcommon: new window system-independent XKB library

[Burton, Ross]

On 26 October 2012 17:27, Saul Wold <sgw@linux.intel.com> wrote:
> My prior email about this being merged was wrong!!

Really?

$ git show 3cabe899c11c65c7a1853b0d2b6fe459098dd4af
commit 3cabe899c11c65c7a1853b0d2b6fe459098dd4af
Author: Ross Burton <ross.burton@intel.com>
Date:   Tue Oct 23 20:57:37 2012 +0100

    libxkbcommon: new window system-independent XKB library

    Used by Wayland, Clutter, and more.

    (From OE-Core rev: 2e4b2d2b8d6f2aeb37654f305bcf6c1c2ffc04f9)

    Signed-off-by: Ross Burton <ross.burton@intel.com>
    Signed-off-by: Saul Wold <sgw@linux.intel.com>
    Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.2.0.bb
b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.2.0
new file mode 100644
index 0000000..7304080
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.2.0.bb
...

> Maybe your missing the require xorg-lib-common.inc?

Nope - it's only vaguely a xorg-lib and there's a good argument to
move it up directly into recipes-graphics.

>> +DEPENDS = "util-macros flex-native bison-native"
>> +
>
> You have a different DEPENDS set than the git version.

Yes, the release has fewer dependencies.

> Should there be a libxkbcommon.inc that's shared between the git and
> "version" bb files for the generic header / license stuff?

Ah. Ignore the git version, that's been succeeded by the release packaging.

Ross

Re: [PATCH] libxkbcommon: new window system-independent XKB library

[Saul Wold]

On 10/26/2012 10:22 AM, Burton, Ross wrote:
> On 26 October 2012 17:27, Saul Wold <sgw@linux.intel.com> wrote:
>> My prior email about this being merged was wrong!!
>
> Really?
>

Ok, I am really confused now!  Your right the version'ed one is in 
master, which is this commit, your other commit with the git version is not.

Also, the git version had a change xorg-lib-common.inc also.


Sorry about the confusion

Thanks
	Sau!

> $ git show 3cabe899c11c65c7a1853b0d2b6fe459098dd4af
> commit 3cabe899c11c65c7a1853b0d2b6fe459098dd4af
> Author: Ross Burton <ross.burton@intel.com>
> Date:   Tue Oct 23 20:57:37 2012 +0100
>
>      libxkbcommon: new window system-independent XKB library
>
>      Used by Wayland, Clutter, and more.
>
>      (From OE-Core rev: 2e4b2d2b8d6f2aeb37654f305bcf6c1c2ffc04f9)
>
>      Signed-off-by: Ross Burton <ross.burton@intel.com>
>      Signed-off-by: Saul Wold <sgw@linux.intel.com>
>      Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>
> diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.2.0.bb
> b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.2.0
> new file mode 100644
> index 0000000..7304080
> --- /dev/null
> +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.2.0.bb
> ...
>
>> Maybe your missing the require xorg-lib-common.inc?
>
> Nope - it's only vaguely a xorg-lib and there's a good argument to
> move it up directly into recipes-graphics.
>
>>> +DEPENDS = "util-macros flex-native bison-native"
>>> +
>>
>> You have a different DEPENDS set than the git version.
>
> Yes, the release has fewer dependencies.
>
>> Should there be a libxkbcommon.inc that's shared between the git and
>> "version" bb files for the generic header / license stuff?
>
> Ah. Ignore the git version, that's been succeeded by the release packaging.
>
> Ross
>
>

Re: [PATCH] libxkbcommon: new window system-independent XKB library

[Burton, Ross]

On 26 October 2012 18:45, Saul Wold <sgw@linux.intel.com> wrote:
> Ok, I am really confused now!  Your right the version'ed one is in master,
> which is this commit, your other commit with the git version is not.
>
> Also, the git version had a change xorg-lib-common.inc also.

Drop the git version, that had a required change to xorg-lib-common
but as the versioned version doesn't use that include the change isn't
required.

Ross

Re: [PATCH 1/3] libxkbcommon: New window system-independent xkb library

[Burton, Ross]

On 23 October 2012 11:00, Tomas Frydrych <tf+lists.yocto@r-finger.com> wrote:
>> On 23 October 2012 20:12, Tomas Frydrych <tf+lists.yocto@r-finger.com> wrote:
>>> I think this needs a -native tools as well, like,
>>> https://github.com/Guacamayo/meta-guacamayo/blob/master/meta-guacamayo/recipes-graphics/xorg-lib/libxkbcommon_git.bb
>>
>> Not anymore, we use Python for makekeys nowadays.  (And, in an
>> unpushed tree, don't use Python at all if we can avoid it.)
>
> Good news, but perhaps you forgot to push this into the public repo?
> makekeys seems to be C program even in the current master, certainly in
> 1c880887666f84e08ea1752bb8a5ab2a7bf1d8a0.

There's a better way than a -native package, see libx11.  Sorry for
not noticing this, fixing now.

Ross

[PATCH] libxkbcommon: New window system-independent xkb library

[Ross Burton]

From: Damien Lespiau <damien.lespiau@intel.com>

Needed for weston and wayland clients to compile key maps.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb |   26 ++++++++++++++++++++
 meta/recipes-graphics/xorg-lib/xorg-lib-common.inc |    2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb

diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb
new file mode 100644
index 0000000..00172bf
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb
@@ -0,0 +1,26 @@
+SUMMARY = "Generic XKB keymap library"
+
+DESCRIPTION = "libxkbcommon is a keymap compiler and support library which \
+processes a reduced subset of keymaps as defined by the XKB specification."
+
+LICENSE = "MIT & MIT-style"
+
+require xorg-lib-common.inc
+
+DEPENDS = "flex-native bison-native"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=9c0b824e72a22f9d2c40b9c93b1f0ddc"
+
+SRCREV = "1c880887666f84e08ea1752bb8a5ab2a7bf1d8a0"
+PV = "0.1.0+git${SRCPV}"
+PR = "r0"
+
+SRC_URI = "git://anongit.freedesktop.org/xorg/lib/libxkbcommon;protocol=git"
+S = "${WORKDIR}/git"
+
+# makekeys needs to be compiled natively, so tell it what compiler to
+# use.
+export CC_FOR_BUILD = "${BUILD_CC}"
+export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
+export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}"
+export LDFLAGS_FOR_BUILD = "${BUILD_LDFLAGS}"
diff --git a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
index c911925..f3c08ab 100644
--- a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
+++ b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
@@ -17,7 +17,7 @@ EXTRA_OECONF = "--enable-malloc0returnsnull \
                 --disable-specs --with-groff=no --with-ps2pdf=no --with-fop=no --without-xmlto"
 
 python () {
-        whitelist = [ "pixman", "libpciaccess" ]
+        whitelist = [ "pixman", "libpciaccess", "libxkbcommon" ]
         if not d.getVar('BPN', True) in whitelist and not oe.utils.contains ('DISTRO_FEATURES', 'x11', True, False, d):
                 raise bb.parse.SkipPackage("'x11' not in DISTRO_FEATURES")
 }
-- 
1.7.10