[xorg-server] add patches to fix compiling with --disable-xv and --disable-mitshm

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

3 files changed, 84 insertions, 0 deletions

diff --git a/patches/xorg-server-1.8.2/07-xfree86-fix-build-with-xv-disabled.diff b/patches/xorg-server-1.8.2/07-xfree86-fix-build-with-xv-disabled.diff
new file mode 100644
index 000000000..d240b6617
--- /dev/null
+++ b/patches/xorg-server-1.8.2/07-xfree86-fix-build-with-xv-disabled.diff
@@ -0,0 +1,50 @@
+From fe7575e929d65e8c798104ec2f72b879051694d3 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Mon, 8 Feb 2010 02:04:33 +0100
+Subject: [PATCH] xfree86: fix build with xv disabled
+
+---
+ hw/xfree86/modes/xf86Crtc.c |    2 ++
+ hw/xfree86/modes/xf86Crtc.h |    2 ++
+ 2 files changed, 4 insertions(+), 0 deletions(-)
+
+Index: xorg-server/hw/xfree86/modes/xf86Crtc.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/modes/xf86Crtc.c	2010-07-05 16:58:09.758394001 +1000
++++ xorg-server/hw/xfree86/modes/xf86Crtc.c	2010-07-05 16:59:15.268394002 +1000
+@@ -3084,6 +3084,7 @@
+     return (int) (box->x2 - box->x1) * (int) (box->y2 - box->y1);
+ }
+ 
++#ifdef XV
+ /*
+  * Return the crtc covering 'box'. If two crtcs cover a portion of
+  * 'box', then prefer 'desired'. If 'desired' is NULL, then prefer the crtc
+@@ -3172,6 +3173,7 @@
+ 
+     return ret;
+ }
++#endif
+ 
+ xf86_crtc_notify_proc_ptr
+ xf86_wrap_crtc_notify (ScreenPtr screen, xf86_crtc_notify_proc_ptr new)
+Index: xorg-server/hw/xfree86/modes/xf86Crtc.h
+===================================================================
+--- xorg-server.orig/hw/xfree86/modes/xf86Crtc.h	2010-07-05 16:58:09.778394001 +1000
++++ xorg-server/hw/xfree86/modes/xf86Crtc.h	2010-07-05 16:59:15.268394002 +1000
+@@ -934,6 +934,7 @@
+ extern _X_EXPORT void
+ xf86_cursors_fini (ScreenPtr screen);
+ 
++#ifdef XV
+ /*
+  * For overlay video, compute the relevant CRTC and
+  * clip video to that.
+@@ -952,6 +953,7 @@
+ 			    RegionPtr   reg,
+ 			    INT32	width,
+ 			    INT32	height);
++#endif
+     
+ extern _X_EXPORT xf86_crtc_notify_proc_ptr
+ xf86_wrap_crtc_notify (ScreenPtr pScreen, xf86_crtc_notify_proc_ptr new);
diff --git a/patches/xorg-server-1.8.2/loader-when-creating-sdksyms.c-only-include-shmint.h.patch b/patches/xorg-server-1.8.2/loader-when-creating-sdksyms.c-only-include-shmint.h.patch
new file mode 100644
index 000000000..0d9845109
--- /dev/null
+++ b/patches/xorg-server-1.8.2/loader-when-creating-sdksyms.c-only-include-shmint.h.patch
@@ -0,0 +1,31 @@
+From 9312e7898b6863fb8d472b854a3b9d05e0cfdcbc Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Fri, 16 Jul 2010 15:18:02 +0200
+Subject: [PATCH] loader: when creating sdksyms.c only include shmint.h if MITSHM is enabled #29109
+
+When configured with --disable-mitshm the symbols declared in shmint.h
+do not exist. By guarding the include with '#ifdef MITSHM' these
+symbols are skipped when generating sdksyms.c with --disable-mitshm.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ hw/xfree86/loader/sdksyms.sh |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/hw/xfree86/loader/sdksyms.sh b/hw/xfree86/loader/sdksyms.sh
+index 13c5ae5..bbda4fa 100755
+--- a/hw/xfree86/loader/sdksyms.sh
++++ b/hw/xfree86/loader/sdksyms.sh
+@@ -50,7 +50,9 @@ cat > sdksyms.c << EOF
+  */
+ #include "geext.h"
+ #include "geint.h"
++#ifdef MITSHM
+ #include "shmint.h"
++#endif
+ #if XINERAMA
+ # include "panoramiXsrv.h"
+ # include "panoramiX.h"
+-- 
+1.7.1
+
diff --git a/patches/xorg-server-1.8.2/series b/patches/xorg-server-1.8.2/series
index 985d04ca9..5eac29fc3 100644
--- a/patches/xorg-server-1.8.2/series
+++ b/patches/xorg-server-1.8.2/series
@@ -1 +1,4 @@
 0001-Fix-typo.patch
+07-xfree86-fix-build-with-xv-disabled.diff
+loader-when-creating-sdksyms.c-only-include-shmint.h.patch
+