* [meta-oe][PATCH 1/2] calibrateproto: add, from oe-core
@ 2017-01-20 14:43 Ross Burton
2017-01-20 14:43 ` [meta-oe][PATCH 2/2] libxcalibrate: " Ross Burton
0 siblings, 1 reply; 6+ messages in thread
From: Ross Burton @ 2017-01-20 14:43 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
.../xorg-proto/calibrateproto/fix.patch | 42 ++++++++++++++++++++++
.../xorg-proto/calibrateproto_git.bb | 19 ++++++++++
2 files changed, 61 insertions(+)
create mode 100644 meta-oe/recipes-graphics/xorg-proto/calibrateproto/fix.patch
create mode 100644 meta-oe/recipes-graphics/xorg-proto/calibrateproto_git.bb
diff --git a/meta-oe/recipes-graphics/xorg-proto/calibrateproto/fix.patch b/meta-oe/recipes-graphics/xorg-proto/calibrateproto/fix.patch
new file mode 100644
index 0000000..ff8cb25
--- /dev/null
+++ b/meta-oe/recipes-graphics/xorg-proto/calibrateproto/fix.patch
@@ -0,0 +1,42 @@
+Upstream-Status: Pending
+
+Add missing length fields to the replies. Without these, sanity checking in recent X
+breaks things.
+
+RP 11/2/10
+
+
+Index: git/xcalibrateproto.h
+===================================================================
+--- git.orig/xcalibrateproto.h 2010-02-11 11:47:45.711985932 +0000
++++ git/xcalibrateproto.h 2010-02-11 11:40:21.000000000 +0000
+@@ -67,13 +67,13 @@
+ BYTE type; /* X_Reply */
+ BYTE pad1;
+ CARD16 sequenceNumber B16;
++ CARD32 length;
+ CARD32 status;
+ CARD32 pad2 B32;
+ CARD32 pad3 B32;
+ CARD32 pad4 B32;
+ CARD32 pad5 B32;
+ CARD32 pad6 B32;
+- CARD32 pad7 B32;
+ } xXCalibrateRawModeReply;
+
+ #define sz_xXCalibrateRawModeReply 32
+@@ -92,13 +92,13 @@
+ BYTE type; /* X_Reply */
+ BYTE pad1;
+ CARD16 sequenceNumber B16;
++ CARD32 length;
+ CARD32 x;
+ CARD32 y;
+ CARD32 pad2 B32;
+ CARD32 pad3 B32;
+ CARD32 pad4 B32;
+ CARD32 pad5 B32;
+- CARD32 pad6 B32;
+ } xXCalibrateScreenToCoordReply;
+
+ #define sz_xXCalibrateScreenToCoordReply 32
diff --git a/meta-oe/recipes-graphics/xorg-proto/calibrateproto_git.bb b/meta-oe/recipes-graphics/xorg-proto/calibrateproto_git.bb
new file mode 100644
index 0000000..b88d157
--- /dev/null
+++ b/meta-oe/recipes-graphics/xorg-proto/calibrateproto_git.bb
@@ -0,0 +1,19 @@
+require xorg-proto-common.inc
+
+SUMMARY = "XCalibrate: Touchscreen calibration headers"
+
+DESCRIPTION = "This package provides the wire protocol for the \
+Touchscreen calibration extension."
+
+LICENSE = "MIT-style"
+LIC_FILES_CHKSUM = "file://xcalibratewire.h;endline=23;md5=7f86ef7b03cce6c4c9ebd59d20ca485f \
+ file://xcalibrateproto.h;endline=23;md5=e4490491edcc171ca24f98569ee580db"
+
+SRCREV = "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
+
+PV = "0.0+git${SRCPV}"
+PR = "r2"
+
+SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto \
+ file://fix.patch;apply=yes"
+S = "${WORKDIR}/git"
--
2.8.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [meta-oe][PATCH 2/2] libxcalibrate: add, from oe-core
2017-01-20 14:43 [meta-oe][PATCH 1/2] calibrateproto: add, from oe-core Ross Burton
@ 2017-01-20 14:43 ` Ross Burton
2017-01-25 16:18 ` Martin Jansa
0 siblings, 1 reply; 6+ messages in thread
From: Ross Burton @ 2017-01-20 14:43 UTC (permalink / raw)
To: openembedded-devel
---
.../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"
--
2.8.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [meta-oe][PATCH 2/2] libxcalibrate: add, from oe-core
2017-01-20 14:43 ` [meta-oe][PATCH 2/2] libxcalibrate: " Ross Burton
@ 2017-01-25 16:18 ` Martin Jansa
2017-01-25 16:38 ` Burton, Ross
0 siblings, 1 reply; 6+ messages in thread
From: Martin Jansa @ 2017-01-25 16:18 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 3450 bytes --]
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@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [meta-oe][PATCH 2/2] libxcalibrate: add, from oe-core
2017-01-25 16:18 ` Martin Jansa
@ 2017-01-25 16:38 ` Burton, Ross
2017-01-25 22:23 ` Paul Eggleton
2017-01-27 1:44 ` Khem Raj
0 siblings, 2 replies; 6+ messages in thread
From: Burton, Ross @ 2017-01-25 16:38 UTC (permalink / raw)
To: OpenEmbedded Devel List
On 25 January 2017 at 16:18, Martin Jansa <martin.jansa@gmail.com> wrote:
> Why do we need this in meta-oe? Just because xtscal was dumped here as
> well?
>
Yes. xtscal etc are the only users, so they're in oe-core with nothing
using them. They should have moved to meta-oe along with xtscal, but were
missed.
The alternative is to delete xtscal from meta-oe and then we can just drop
these from oe-core as they're not used at all, but that's not my call.
> 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
>
Damnit, sorry.
Ross
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [meta-oe][PATCH 2/2] libxcalibrate: add, from oe-core
2017-01-25 16:38 ` Burton, Ross
@ 2017-01-25 22:23 ` Paul Eggleton
2017-01-27 1:44 ` Khem Raj
1 sibling, 0 replies; 6+ messages in thread
From: Paul Eggleton @ 2017-01-25 22:23 UTC (permalink / raw)
To: Burton, Ross; +Cc: openembedded-devel
On Wednesday, 25 January 2017 4:38:11 PM NZDT Burton, Ross wrote:
> On 25 January 2017 at 16:18, Martin Jansa <martin.jansa@gmail.com> wrote:
> > Why do we need this in meta-oe? Just because xtscal was dumped here as
> > well?
>
> Yes. xtscal etc are the only users, so they're in oe-core with nothing
> using them. They should have moved to meta-oe along with xtscal, but were
> missed.
>
> The alternative is to delete xtscal from meta-oe and then we can just drop
> these from oe-core as they're not used at all, but that's not my call.
Can you mention this in the commit message?
Thanks,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [meta-oe][PATCH 2/2] libxcalibrate: add, from oe-core
2017-01-25 16:38 ` Burton, Ross
2017-01-25 22:23 ` Paul Eggleton
@ 2017-01-27 1:44 ` Khem Raj
1 sibling, 0 replies; 6+ messages in thread
From: Khem Raj @ 2017-01-27 1:44 UTC (permalink / raw)
To: openembedded-devel
On 1/25/17 8:38 AM, Burton, Ross wrote:
> On 25 January 2017 at 16:18, Martin Jansa <martin.jansa@gmail.com> wrote:
>
>> Why do we need this in meta-oe? Just because xtscal was dumped here as
>> well?
>>
>
> Yes. xtscal etc are the only users, so they're in oe-core with nothing
> using them. They should have moved to meta-oe along with xtscal, but were
> missed.
>
> The alternative is to delete xtscal from meta-oe and then we can just drop
> these from oe-core as they're not used at all, but that's not my call.
>
perhaps drop them everywhere and let interested parties come back with
recipes for oe-core. if no one picks them up then we know they are dead
code.
>
>> 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
>>
>
> Damnit, sorry.
>
> Ross
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-01-27 1:44 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-20 14:43 [meta-oe][PATCH 1/2] calibrateproto: add, from oe-core Ross Burton
2017-01-20 14:43 ` [meta-oe][PATCH 2/2] libxcalibrate: " Ross Burton
2017-01-25 16:18 ` Martin Jansa
2017-01-25 16:38 ` Burton, Ross
2017-01-25 22:23 ` Paul Eggleton
2017-01-27 1:44 ` Khem Raj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.