| Message ID | 1484923430-3222-2-git-send-email-ross.burton@intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | [oe,meta-oe,1/2] calibrateproto: add, from oe-core | expand |
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 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
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 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/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 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/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 > -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
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"