[oe] [meta-oe][PATCH 2/2] libxcalibrate: add, from oe-core

[Martin Jansa]

On Fri, Jan 20, 2017 at 02:43:50PM +0000, Ross Burton wrote:
> ---
>  .../xorg-lib/libxcalibrate/fix-xcb.patch           | 29 ++++++++++++++++++++++
>  .../recipes-graphics/xorg-lib/libxcalibrate_git.bb | 22 ++++++++++++++++
>  2 files changed, 51 insertions(+)
>  create mode 100644 meta-oe/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch
>  create mode 100644 meta-oe/recipes-graphics/xorg-lib/libxcalibrate_git.bb
> 
> diff --git a/meta-oe/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch b/meta-oe/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch
> new file mode 100644
> index 0000000..d614883
> --- /dev/null
> +++ b/meta-oe/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch
> @@ -0,0 +1,29 @@
> +Upstream-Status: Pending
> +
> +There is no extra reply data and if we say not to disgard it, xcb
> +throws fatal asserts.
> +
> +RP - 26/11/09
> +
> +Index: git/xcalibrate.c
> +===================================================================
> +--- git.orig/xcalibrate.c	2009-11-26 08:11:48.000000000 +0000
> ++++ git/xcalibrate.c	2009-11-26 08:09:55.000000000 +0000
> +@@ -216,7 +216,7 @@
> +   req->reqType = info->codes->major_opcode;
> +   req->xCalibrateReqType = X_XCalibrateRawMode;
> +   req->on = enable;
> +-  if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) 
> ++  if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) 
> +     {
> +       UnlockDisplay (dpy);
> +       SyncHandle ();
> +@@ -240,7 +240,7 @@
> +   req->xCalibrateReqType = X_XCalibrateScreenToCoord;
> +   req->x = *x;
> +   req->y = *y;
> +-  if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) 
> ++  if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) 
> +     {
> +       UnlockDisplay (dpy);
> +       SyncHandle ();
> diff --git a/meta-oe/recipes-graphics/xorg-lib/libxcalibrate_git.bb b/meta-oe/recipes-graphics/xorg-lib/libxcalibrate_git.bb
> new file mode 100644
> index 0000000..455e869
> --- /dev/null
> +++ b/meta-oe/recipes-graphics/xorg-lib/libxcalibrate_git.bb
> @@ -0,0 +1,22 @@
> +SUMMARY = "XCalibrate: Touchscreen calibration library"
> +
> +DESCRIPTION = "libXCalibrate is a library for performing touchscreen \
> +calibration with the kdrive tslib touchscreen driver."
> +
> +require xorg-lib-common.inc
> +
> +LICENSE = "MIT-style"
> +LIC_FILES_CHKSUM = "file://xcalibrate.h;endline=21;md5=fa572df6439f0f235f2612f370f153d7 \
> +                    file://xcalibrate.c;endline=21;md5=fa572df6439f0f235f2612f370f153d7"
> +
> +DEPENDS = "virtual/libx11 calibrateproto libxext"
> +
> +SRCREV = "209d83af61ed38a002c8096377deac292b3e396c"
> +PV = "0.0+git${SRCPV}"
> +
> +SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate \
> +           file://fix-xcb.patch"
> +
> +S = "${WORKDIR}/git"
> +
> +FILES_${PN}-locale += "${datadir}/X11/locale"

Why do we need this in meta-oe? Just because xtscal was dumped here as
well?

Both are broken because of the path to .inc file:
Parsing recipes...ERROR: ParseError at
/OE/build/oe-core/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libxcalibrate_git.bb:6:
Could not include required file xorg-lib-common.inc


> -- 
> 2.8.1
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20170125/b8405557/attachment-0002.sig>