summaryrefslogtreecommitdiff
path: root/recipes/xorg-xserver/xserver-kdrive
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
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')
-rw-r--r--recipes/xorg-xserver/xserver-kdrive/pkgconfig_fix.patch13
-rw-r--r--recipes/xorg-xserver/xserver-kdrive/report-correct-randr10.patch25
-rw-r--r--recipes/xorg-xserver/xserver-kdrive/xorg-avr32-support.diff21
3 files changed, 59 insertions, 0 deletions
diff --git a/recipes/xorg-xserver/xserver-kdrive/pkgconfig_fix.patch b/recipes/xorg-xserver/xserver-kdrive/pkgconfig_fix.patch
new file mode 100644
index 0000000000..e75e209cbe
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-kdrive/pkgconfig_fix.patch
@@ -0,0 +1,13 @@
+Index: xorg-server-1.4/xorg-server.pc.in
+===================================================================
+--- xorg-server-1.4.orig/xorg-server.pc.in 2008-02-29 12:29:02.000000000 +0000
++++ xorg-server-1.4/xorg-server.pc.in 2008-02-29 12:27:36.000000000 +0000
+@@ -7,6 +7,7 @@
+
+ Name: xorg-server
+ Description: Modular X.Org X Server
++Requires: pixman-1
+ Version: @PACKAGE_VERSION@
+-Cflags: -I${sdkdir} @PIXMAN_CFLAGS@
++Cflags: -I${sdkdir}
+ Libs: -L${libdir}
diff --git a/recipes/xorg-xserver/xserver-kdrive/report-correct-randr10.patch b/recipes/xorg-xserver/xserver-kdrive/report-correct-randr10.patch
new file mode 100644
index 0000000000..540f598fad
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-kdrive/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);
diff --git a/recipes/xorg-xserver/xserver-kdrive/xorg-avr32-support.diff b/recipes/xorg-xserver/xserver-kdrive/xorg-avr32-support.diff
new file mode 100644
index 0000000000..583191e84f
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-kdrive/xorg-avr32-support.diff
@@ -0,0 +1,21 @@
+upstream: applied in 82b37d35af13a9f402755e167493ab256b664b9c (2008-04-22)
+
+--- /tmp/servermd.h 2007-09-30 17:27:22.310911628 +0200
++++ xorg-server-1.4/include/servermd.h 2007-09-30 17:28:25.297799199 +0200
+@@ -130,6 +130,16 @@
+
+ #endif /* vax */
+
++#ifdef __avr32__
++
++#define IMAGE_BYTE_ORDER MSBFirst
++#define BITMAP_BIT_ORDER MSBFirst
++#define GLYPHPADBYTES 4
++#define GETLEFTBITS_ALIGNMENT 1
++#define AVOID_MEMORY_READ
++
++#endif /* __avr32__ */
++
+ #ifdef __arm32__
+
+ #define IMAGE_BYTE_ORDER LSBFirst