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

login
register
mail settings
Submitter Ross Burton
Date Oct. 22, 2012, 9:30 a.m.
Message ID <dc59bf999e1f8a6d5953c02d21c6e45c53c204a9.1350898066.git.ross.burton@intel.com>
Download mbox | patch
Permalink /patch/38385/
State New
Headers show

Comments

Ross Burton - Oct. 22, 2012, 9:30 a.m.
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 |   19 +++++++++++++++++++
 meta/recipes-graphics/xorg-lib/xorg-lib-common.inc |    2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb
Tomas Frydrych - Oct. 23, 2012, 9:12 a.m.
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

Tomas


On 22/10/12 10:30, Ross Burton wrote:
> 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 |   19 +++++++++++++++++++
>  meta/recipes-graphics/xorg-lib/xorg-lib-common.inc |    2 +-
>  2 files changed, 20 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..b426115
> --- /dev/null
> +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb
> @@ -0,0 +1,19 @@
> +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"
> 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")
>  }
Daniel Stone - Oct. 23, 2012, 9:15 a.m.
Hi,

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.)

I'm about to push something after dinner which breaks ABI (as well as
a tiny bit of API that thankfully seems thus far unused), so if you
could please either hold off until I do or bump SRCREV shortly after,
that'd be great, thanks. :)

Cheers,
Daniel
Tomas Frydrych - Oct. 23, 2012, 10 a.m.
On 23/10/12 10:15, Daniel Stone wrote:
> Hi,
> 
> 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.

Tomas
Ross Burton - Oct. 23, 2012, 10:21 a.m.
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
Daniel Stone - Oct. 23, 2012, 1:32 p.m.
Hi,

On 23 October 2012 21:00, Tomas Frydrych <tf+lists.yocto@r-finger.com> wrote:
> On 23/10/12 10:15, Daniel Stone wrote:
>> 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.

My bad, look in master now and then you can remove everything around makekeys.

Cheers,
Daniel

Patch

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..b426115
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb
@@ -0,0 +1,19 @@ 
+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"
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")
 }