From 87113e40d79675965195e7336fa04b2412d9d417 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 26 Nov 2009 09:19:11 +0000 Subject: xserver-kdrive-1.3.0.0: Add randr12 fix from OE Signed-off-by: Richard Purdie --- .../report-correct-randr12.patch | 29 ++++++++++++++++++++++ .../xorg-xserver/xserver-kdrive_1.3.0.0.bb | 3 ++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/report-correct-randr12.patch (limited to 'meta/packages') diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/report-correct-randr12.patch b/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/report-correct-randr12.patch new file mode 100644 index 000000000..72c8a18ad --- /dev/null +++ b/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/report-correct-randr12.patch @@ -0,0 +1,29 @@ +Server reports XRandR version provided by libxrandr instead of XRandR +version implemented. It confuses applications that execute XRandR +version dependent code (e. g. gtk+ >= 2.18.0). + +Index: xorg-server-1.3.0.0/randr/rrdispatch.c +=================================================================== +--- xorg-server-1.3.0.0.orig/randr/rrdispatch.c ++++ xorg-server-1.3.0.0/randr/rrdispatch.c +@@ -22,6 +22,9 @@ + + #include "randrstr.h" + ++#define SERVER_RANDR_MAJOR 1 ++#define SERVER_RANDR_MINOR 2 ++ + Bool + RRClientKnowsRates (ClientPtr pClient) + { +@@ -49,8 +52,8 @@ ProcRRQueryVersion (ClientPtr client) + * Report the current version; the current + * spec says they're all compatible after 1.0 + */ +- rep.majorVersion = RANDR_MAJOR; +- rep.minorVersion = RANDR_MINOR; ++ rep.majorVersion = SERVER_RANDR_MAJOR; ++ rep.minorVersion = SERVER_RANDR_MINOR; + if (client->swapped) { + swaps(&rep.sequenceNumber, n); + swapl(&rep.length, n); diff --git a/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb index 54826e44e..7625a3d6f 100644 --- a/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb +++ b/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb @@ -22,6 +22,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ file://xcalibrate_coords.patch;patch=1 \ file://fbdev_xrandr_ioctl.patch;patch=1 \ file://scheduler.patch;patch=1 \ - file://fix-newer-xorg-headers.patch;patch=1" + file://fix-newer-xorg-headers.patch;patch=1 \ + file://report-correct-randr12.patch;patch=1 " S = "${WORKDIR}/xorg-server-${PV}" -- cgit v1.2.3