summaryrefslogtreecommitdiff
path: root/recipes/xorg-xserver/xserver-kdrive-xomap
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2010-08-16 15:43:45 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2010-08-19 07:29:17 +0200
commit5250895e0421cbd95cb97d201fcb8fbc3a7bcc18 (patch)
tree61bd75f270c13c23d5d4bbb84926d724eb3b0dc2 /recipes/xorg-xserver/xserver-kdrive-xomap
parent2c2b2d98a72ede9a3cf6213351bcd0019bed686f (diff)
xorg-xserver: move older not pinned versions to obsolete dir
Acked-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/xorg-xserver/xserver-kdrive-xomap')
-rw-r--r--recipes/xorg-xserver/xserver-kdrive-xomap/fix-picturestr-include-order.patch15
-rw-r--r--recipes/xorg-xserver/xserver-kdrive-xomap/report-correct-randr10.patch25
2 files changed, 40 insertions, 0 deletions
diff --git a/recipes/xorg-xserver/xserver-kdrive-xomap/fix-picturestr-include-order.patch b/recipes/xorg-xserver/xserver-kdrive-xomap/fix-picturestr-include-order.patch
new file mode 100644
index 0000000000..3da235e1e1
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-kdrive-xomap/fix-picturestr-include-order.patch
@@ -0,0 +1,15 @@
+# Reverse include order in render/picturestr.h to be able to compile against renderproto >= 0.9.3
+Index: xorg-server-1.2.0/render/picturestr.h
+===================================================================
+--- xorg-server-1.2.0.orig/render/picturestr.h 2008-02-09 22:54:46.000000000 +0100
++++ xorg-server-1.2.0/render/picturestr.h 2008-02-09 22:54:50.000000000 +0100
+@@ -26,8 +26,8 @@
+ #ifndef _PICTURESTR_H_
+ #define _PICTURESTR_H_
+
+-#include "glyphstr.h"
+ #include "scrnintstr.h"
++#include "glyphstr.h"
+ #include "resource.h"
+
+ typedef struct _DirectFormat {
diff --git a/recipes/xorg-xserver/xserver-kdrive-xomap/report-correct-randr10.patch b/recipes/xorg-xserver/xserver-kdrive-xomap/report-correct-randr10.patch
new file mode 100644
index 0000000000..540f598fad
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-kdrive-xomap/report-correct-randr10.patch
@@ -0,0 +1,25 @@
+Index: xorg-server-1.1.0/randr/randr.c
+===================================================================
+--- xorg-server-1.1.0.orig/randr/randr.c
++++ xorg-server-1.1.0/randr/randr.c
+@@ -56,6 +56,9 @@
+ #define SubPixelUnknown 0
+ #endif
+
++#define SERVER_RANDR_MAJOR 1
++#define SERVER_RANDR_MINOR 0
++
+ #define RR_VALIDATE
+ int RRGeneration;
+ int RRNScreens;
+@@ -473,8 +476,8 @@ ProcRRQueryVersion (ClientPtr client)
+ rep.type = X_Reply;
+ rep.length = 0;
+ rep.sequenceNumber = client->sequence;
+- 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);