Skip to contentSkip to conversation

Wayland precursors

PATCH Applied Ross Burton 4 participants 12 messages Oct 22, 2012 – Oct 23, 2012

lore
Share & tools
lore
#0 lore raw

cover Wayland precursors

Hi,

Some additions and upgrades as part of the build up for integration of Wayland.

Ross

The following changes since commit caba9cbfce09f19eb27f4c6615c0c5c48e1a2952:

kernel.bbclass: add kernel-modules to PACKAGES (2012-10-19 23:06:26 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib ross/wayland

for you to fetch changes up to af1365a98c78c547e373195e27c538f71c963dd3:

atk: Update to 2.6.0 (2012-10-22 09:26:19 +0100)

----------------------------------------------------------------
Damien Lespiau (2):
libxkbcommon: New window system-independent xkb library
mtdev: New recipe for mtdev

Daniel Stone (1):

      atk: Update to 2.6.0
 meta/recipes-graphics/wayland/mtdev_1.1.2.bb       |   20 ++++++++++++++++++++
 meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb |   19 +++++++++++++++++++
 meta/recipes-graphics/xorg-lib/xorg-lib-common.inc |    2 +-
 .../atk/{atk_2.4.0.bb => atk_2.6.0.bb}             |    8 ++++----
 4 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 meta/recipes-graphics/wayland/mtdev_1.1.2.bb
 create mode 100644 meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb
 rename meta/recipes-support/atk/{atk_2.4.0.bb => atk_2.6.0.bb} (74%)

Damien Lespiau (2):
libxkbcommon: New window system-independent xkb library
mtdev: New recipe for mtdev

Daniel Stone (1):
atk: Update to 2.6.0

 meta/recipes-graphics/wayland/mtdev_1.1.2.bb       |   20 ++++++++++++++++++++
 meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb |   19 +++++++++++++++++++
 meta/recipes-graphics/xorg-lib/xorg-lib-common.inc |    2 +-
 .../atk/{atk_2.4.0.bb => atk_2.6.0.bb}             |    8 ++++----
 4 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 meta/recipes-graphics/wayland/mtdev_1.1.2.bb
 create mode 100644 meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb
 rename meta/recipes-support/atk/{atk_2.4.0.bb => atk_2.6.0.bb} (74%)
Signature · 1 line
1.7.10
#1 lore raw

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

From: Damien Lespiau <[email protected]>

Needed for weston and wayland clients to compile key maps.

---
 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
meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb new file +19 -0
new file mode 100644
index 0000000..b426115
@@ -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"
meta/recipes-graphics/xorg-lib/xorg-lib-common.inc +1 -1
index c911925..f3c08ab 100644
@@ -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")
 }
Signature · 1 line
1.7.10
#2 lore raw

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

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

Quoted 50 lines · Ross Burton

From: Damien Lespiau <[email protected]>

Needed for weston and wayland clients to compile key maps.

---
 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
meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb new file +19 -0
new file mode 100644
index 0000000..b426115
@@ -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"
meta/recipes-graphics/xorg-lib/xorg-lib-common.inc +1 -1
index c911925..f3c08ab 100644
@@ -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")
 }
#3 lore raw

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

Hi,

Quoted 2 lines · Tomas Frydrych

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

#4 lore raw

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

Quoted 8 lines · Daniel Stone

Hi,

Quoted 2 lines · Tomas Frydrych

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

#5 lore raw

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

Quoted 10 lines · Tomas Frydrych
Quoted 6 lines · Tomas Frydrych
Quoted 2 lines

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

#6 lore raw

PATCH 1/1 libxkbcommon: New window system-independent xkb library

From: Damien Lespiau <[email protected]>

Needed for weston and wayland clients to compile key maps.

---
 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
meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb new file +26 -0
new file mode 100644
index 0000000..00172bf
@@ -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}"
meta/recipes-graphics/xorg-lib/xorg-lib-common.inc +1 -1
index c911925..f3c08ab 100644
@@ -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")
 }
Signature · 1 line
1.7.10
#7 lore raw

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

In reply to Tomas Frydrych

Hi,

Quoted 7 lines · Tomas Frydrych
Quoted 2 lines · Daniel Stone

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

#8 lore raw

PATCH 2/3 mtdev: New recipe for mtdev

In reply to Ross Burton

From: Damien Lespiau <[email protected]>

---
 meta/recipes-graphics/wayland/mtdev_1.1.2.bb |   20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 meta/recipes-graphics/wayland/mtdev_1.1.2.bb
meta/recipes-graphics/wayland/mtdev_1.1.2.bb new file +20 -0
new file mode 100644
index 0000000..95d99ee
@@ -0,0 +1,20 @@
+inherit autotools pkgconfig
+
+SUMMARY = "Multitouch Protocol Translation Library"
+
+DESCRIPTION = " The mtdev is a stand-alone library which transforms all \
+variants of kernel MT events to the slotted type B protocol. The events put \
+into mtdev may be from any MT device, specifically type A without contact \
+tracking, type A with contact tracking, or type B with contact tracking"
+
+HOMEPAGE = "http://bitmath.org/code/mtdev/"
+SECTION = "libs"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ea6bd0268bb0fcd6b27698616ceee5d6"
+
+SRC_URI = "http://bitmath.org/code/mtdev/mtdev-1.1.2.tar.bz2"
+SRC_URI[md5sum] = "d9c7700918fc392e29da7477ae20c5c2"
+SRC_URI[sha256sum] = "698dd11ca08b3a73ad33d8a5076f6d9e018d97afad3eba36f540b8ea7b775a30"
+
+PR = "r0"
Signature · 1 line
1.7.10
Applied
#9 lore raw

Re: [PATCH 2/3] mtdev: New recipe for mtdev

Quoted 26 lines · Ross Burton

From: Damien Lespiau <[email protected]>

---
  meta/recipes-graphics/wayland/mtdev_1.1.2.bb |   20 ++++++++++++++++++++
  1 file changed, 20 insertions(+)

create mode 100644 meta/recipes-graphics/wayland/mtdev_1.1.2.bb

meta/recipes-graphics/wayland/mtdev_1.1.2.bb new file +10 -0
new file mode 100644
index 0000000..95d99ee
@@ -0,0 +1,20 @@
+inherit autotools pkgconfig
+
+SUMMARY = "Multitouch Protocol Translation Library"
+
+DESCRIPTION = " The mtdev is a stand-alone library which transforms all \
+variants of kernel MT events to the slotted type B protocol. The events put \
+into mtdev may be from any MT device, specifically type A without contact \
+tracking, type A with contact tracking, or type B with contact tracking"
+
+HOMEPAGE = "http://bitmath.org/code/mtdev/"

meta/recipes-graphics/wayland/mtdev_1.1.2.bb line 20

Quoted 10 lines
meta/recipes-graphics/wayland/mtdev_1.1.2.bb new file +10 -0
+SECTION = "libs"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ea6bd0268bb0fcd6b27698616ceee5d6"
+
+SRC_URI = "http://bitmath.org/code/mtdev/mtdev-1.1.2.tar.bz2"
+SRC_URI[md5sum] = "d9c7700918fc392e29da7477ae20c5c2"
+SRC_URI[sha256sum] = "698dd11ca08b3a73ad33d8a5076f6d9e018d97afad3eba36f540b8ea7b775a30"
+
+PR = "r0"

Merged into OE-Core

#10 lore raw

PATCH 3/3 atk: Update to 2.6.0

In reply to Ross Burton

From: Daniel Stone <[email protected]>

Newer Clutter releases want 2.5.3+, so upgrade to the stable 2.6.0.

---
 meta/recipes-support/atk/{atk_2.4.0.bb => atk_2.6.0.bb} |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-support/atk/{atk_2.4.0.bb => atk_2.6.0.bb} (74%)
meta/recipes-support/atk/atk_2.6.0.bb renamed from meta/recipes-support/atk/atk_2.4.0.bb +4 -4
similarity index 74%
rename from meta/recipes-support/atk/atk_2.4.0.bb
rename to meta/recipes-support/atk/atk_2.6.0.bb
index 4a2d853..be797c7 100644
@@ -7,15 +7,15 @@ LICENSE = "GPLv2+ & LGPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
                     file://atk/atkutil.c;endline=20;md5=db21b0bdbef9da4dc6eb122debc9f9bc \
                     file://atk/atk.h;endline=20;md5=c58238d688c24387376d6c69d06248a7"
-PR = "r1"
+PR = "r0"
 
 DEPENDS = "glib-2.0"
 
 inherit autotools gtk-doc pkgconfig
 
-SRC_URI = "http://download.gnome.org/sources/atk/2.4/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "2184a140f71d50276669d6eda5cce5db"
-SRC_URI[sha256sum] = "091e9ce975a9fbbc7cd8fa64c9c389ffb7fa6cdde58b6d5c01b2c267093d888d"
+SRC_URI = "http://download.gnome.org/sources/atk/2.6/${BPN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "6b34e2a63dda4429b5692be7ca3aa5bf"
+SRC_URI[sha256sum] = "eff663f90847620bb68c9c2cbaaf7f45e2ff44163b9ab3f10d15be763680491f"
 
 BBCLASSEXTEND = "native"
 
Signature · 1 line
1.7.10
Applied
#11 lore raw

Re: [PATCH 3/3] atk: Update to 2.6.0

Quoted 29 lines · Ross Burton

From: Daniel Stone <[email protected]>

Newer Clutter releases want 2.5.3+, so upgrade to the stable 2.6.0.

---
  meta/recipes-support/atk/{atk_2.4.0.bb => atk_2.6.0.bb} |    8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)

rename meta/recipes-support/atk/{atk_2.4.0.bb => atk_2.6.0.bb} (74%)

meta/recipes-support/atk/atk_2.6.0.bb renamed from meta/recipes-support/atk/atk_2.4.0.bb +1 -1
similarity index 74%
rename from meta/recipes-support/atk/atk_2.4.0.bb
rename to meta/recipes-support/atk/atk_2.6.0.bb
index 4a2d853..be797c7 100644
@@ -7,15 +7,15 @@ LICENSE = "GPLv2+ & LGPLv2+"
  LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
                      file://atk/atkutil.c;endline=20;md5=db21b0bdbef9da4dc6eb122debc9f9bc \
                      file://atk/atk.h;endline=20;md5=c58238d688c24387376d6c69d06248a7"
-PR = "r1"
+PR = "r0"
 
  DEPENDS = "glib-2.0"
 
  inherit autotools gtk-doc pkgconfig

meta/recipes-support/atk/atk_2.6.0.bb LICENSE = "GPLv2+ & LGPLv2+" · line 21

Quoted 10 lines
meta/recipes-support/atk/atk_2.6.0.bb renamed from meta/recipes-support/atk/atk_2.4.0.bb +3 -3
 
-SRC_URI = "http://download.gnome.org/sources/atk/2.4/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "2184a140f71d50276669d6eda5cce5db"
-SRC_URI[sha256sum] = "091e9ce975a9fbbc7cd8fa64c9c389ffb7fa6cdde58b6d5c01b2c267093d888d"
+SRC_URI = "http://download.gnome.org/sources/atk/2.6/${BPN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "6b34e2a63dda4429b5692be7ca3aa5bf"
+SRC_URI[sha256sum] = "eff663f90847620bb68c9c2cbaaf7f45e2ff44163b9ab3f10d15be763680491f"
 
  BBCLASSEXTEND = "native"
 

Merged into OE-Core

Thanks
Sau!