xserver-kdrive-1.3.0.0: Add randr12 fix from OE

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

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 (file)
index 0000000..72c8a18
--- /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 54826e44e11d5b02ea9934afa56e360a46521210..7625a3d6f9ab0ed4c52f24f8195f85852fbbe571 100644 (file)
--- 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}"