Merge branch 'master' of git+ssh://openadk.org/git/openadk

3 files changed, 27 insertions, 42 deletions

diff --git a/package/xorg-server/patches/patch-hw_xfree86_common_xf86VGAarbiter_c b/package/xorg-server/patches/patch-hw_xfree86_common_xf86VGAarbiter_c
deleted file mode 100644
index 411d7b2e2..000000000
--- a/package/xorg-server/patches/patch-hw_xfree86_common_xf86VGAarbiter_c
+++ /dev/null
@@ -1,17 +0,0 @@
---- xorg-server-1.7.1.orig/hw/xfree86/common/xf86VGAarbiter.c	2009-10-09 06:08:28.000000000 +0200
-+++ xorg-server-1.7.1/hw/xfree86/common/xf86VGAarbiter.c	2009-12-10 17:14:01.000000000 +0100
-@@ -38,14 +38,8 @@
- #include "xf86Priv.h"
- #include "pciaccess.h"
- 
--#ifdef DEBUG
--#error "no, really, you dont want to do this"
--#define DPRINT_S(x,y) ErrorF(x ": %i\n",y);
--#define DPRINT(x) ErrorF(x "\n");
--#else
- #define DPRINT_S(x,y)
- #define DPRINT(x)
--#endif
- 
- static GCFuncs VGAarbiterGCFuncs = {
-     VGAarbiterValidateGC, VGAarbiterChangeGC, VGAarbiterCopyGC,
diff --git a/package/xorg-server/patches/patch-hw_xfree86_loader_sdksyms_c b/package/xorg-server/patches/patch-hw_xfree86_loader_sdksyms_c
index 8ee439b75..771d3a1e6 100644
--- a/package/xorg-server/patches/patch-hw_xfree86_loader_sdksyms_c
+++ b/package/xorg-server/patches/patch-hw_xfree86_loader_sdksyms_c
@@ -1,15 +1,6 @@
---- xorg-server-1.7.5.orig/hw/xfree86/loader/sdksyms.c	2010-02-16 02:42:49.000000000 +0100
-+++ xorg-server-1.7.5/hw/xfree86/loader/sdksyms.c	2010-04-21 19:50:58.000000000 +0200
-@@ -429,8 +429,6 @@ _X_HIDDEN void *xorg_symbols[] = {
-     (void *) &AbortDDX,
-     (void *) &ddxGiveUp,
-     (void *) &TimeSinceLastInputEvent,
--    (void *) &strlcpy,
--    (void *) &strlcat,
-     (void *) &LogInit,
-     (void *) &LogClose,
-     (void *) &LogSetParameter,
-@@ -634,7 +632,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+--- xorg-server-1.7.6.orig/hw/xfree86/loader/sdksyms.c	2010-03-17 01:56:04.000000000 +0100
++++ xorg-server-1.7.6/hw/xfree86/loader/sdksyms.c	2010-05-14 15:54:56.232212764 +0200
+@@ -634,7 +634,6 @@ _X_HIDDEN void *xorg_symbols[] = {
      (void *) &NewCurrentScreen,
      (void *) &PointerConfinedToScreen,
      (void *) &GetSpritePosition,
@@ -17,7 +8,7 @@
      (void *) &GEExtensions,
      (void *) &GERegisterExtension,
      (void *) &GEInitEvent,
-@@ -724,7 +721,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+@@ -724,7 +723,6 @@ _X_HIDDEN void *xorg_symbols[] = {
      (void *) &PickPointer,
      (void *) &PickKeyboard,
      (void *) &IsInterferingGrab,
@@ -25,7 +16,7 @@
      (void *) &ScreenRestructured,
      (void *) &ffs,
      (void *) &AddCallback,
-@@ -874,8 +870,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+@@ -874,8 +872,6 @@ _X_HIDDEN void *xorg_symbols[] = {
      (void *) &CreateLinearGradientPicture,
      (void *) &CreateRadialGradientPicture,
      (void *) &CreateConicalGradientPicture,
@@ -34,7 +25,7 @@
      (void *) &PictTransform_from_xRenderTransform,
      (void *) &xRenderTransform_from_PictTransform,
      (void *) &PictureTransformPoint,
-@@ -977,25 +971,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+@@ -977,25 +973,6 @@ _X_HIDDEN void *xorg_symbols[] = {
      (void *) &ShmSegType,
      (void *) &ShmCompletionCode,
      (void *) &BadShmSegCode,
@@ -60,7 +51,7 @@
      (void *) &xf86CreateI2CBusRec,
      (void *) &xf86DestroyI2CBusRec,
      (void *) &xf86I2CBusInit,
-@@ -1034,19 +1009,9 @@ _X_HIDDEN void *xorg_symbols[] = {
+@@ -1034,31 +1011,17 @@ _X_HIDDEN void *xorg_symbols[] = {
      (void *) &noTestExtensions,
      (void *) &dixScreenOrigins,
      (void *) &ConnectionInfo,
@@ -80,16 +71,18 @@
      (void *) &noScreenSaverExtension,
      (void *) &noMITShmExtension,
      (void *) &noRRExtension,
-@@ -1054,9 +1019,7 @@ _X_HIDDEN void *xorg_symbols[] = {
+     (void *) &noRenderExtension,
      (void *) &noResExtension,
      (void *) &noXFree86DGAExtension,
-     (void *) &noXFree86DRIExtension,
+-    (void *) &noXFree86DRIExtension,
 -    (void *) &noXFree86VidModeExtension,
      (void *) &noXFixesExtension,
 -    (void *) &noPanoramiXExtension,
      (void *) &noXvExtension,
-     (void *) &noDRI2Extension,
+-    (void *) &noDRI2Extension,
      (void *) &defaultTextFont,
+     (void *) &defaultCursorFont,
+     (void *) &MaxClients,
 @@ -1193,7 +1156,6 @@ _X_HIDDEN void *xorg_symbols[] = {
      (void *) &ProcRRQueryOutputProperty,
      (void *) &ProcRRConfigureOutputProperty,
@@ -116,7 +109,7 @@
      (void *) &xf86fpFlag,
      (void *) &xf86sFlag,
      (void *) &xf86bsEnableFlag,
-@@ -1935,7 +1893,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+@@ -1937,7 +1895,6 @@ _X_HIDDEN void *xorg_symbols[] = {
      (void *) &ProcGrabButton,
      (void *) &ProcUngrabButton,
      (void *) &ProcRecolorCursor,
@@ -124,7 +117,7 @@
      (void *) &SetDefaultFont,
      (void *) &QueueFontWakeup,
      (void *) &RemoveFontWakeup,
-@@ -2185,15 +2142,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+@@ -2187,15 +2144,6 @@ _X_HIDDEN void *xorg_symbols[] = {
      (void *) &SProcUngrabButton,
      (void *) &SProcUngrabKey,
      (void *) &SProcWarpPointer,
diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c
index 8c93131b1..d0c187169 100644
--- a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c
+++ b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c
@@ -1,6 +1,15 @@
---- xorg-server-1.7.5.orig/hw/xfree86/os-support/linux/lnx_video.c	2010-02-16 01:24:23.000000000 +0100
-+++ xorg-server-1.7.5/hw/xfree86/os-support/linux/lnx_video.c	2010-03-08 21:31:20.000000000 +0100
-@@ -497,7 +497,7 @@ volatile unsigned char *ioBase = NULL;
+--- xorg-server-1.7.6.orig/hw/xfree86/os-support/linux/lnx_video.c	2010-03-12 05:38:22.000000000 +0100
++++ xorg-server-1.7.6/hw/xfree86/os-support/linux/lnx_video.c	2010-05-14 19:06:06.873473002 +0200
+@@ -64,6 +64,8 @@ static Bool ExtendedEnabled = FALSE;
+       !defined(__mips__) && \
+       !defined(__arm__)
+ 
++#include "compiler.h"
++
+ /*
+  * Due to conflicts with "compiler.h", don't rely on <sys/io.h> to declare
+  * these.
+@@ -497,7 +499,7 @@ volatile unsigned char *ioBase = NULL;
  Bool
  xf86EnableIO(void)
  {
@@ -9,7 +18,7 @@
  	int fd;
  	unsigned int ioBase_phys;
  #endif
-@@ -524,6 +524,20 @@ xf86EnableIO(void)
+@@ -524,6 +526,20 @@ xf86EnableIO(void)
  #endif
  	}
  	close(fd);