From 8fd5b489476e9141f22726b744fe107ee8c4734c7cbc5241722f881248e39b41 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 2 Mar 2009 00:19:45 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=115 --- ...ssing-configlayout-when-deleting-dev.patch | 63 +- 64bit-portability-issue.diff | 16 - 64bit.diff | 13 - bitmap_always_unscaled.diff | 18 - commit-59f9fb4b8.diff | 70 -- commit-a9e2030.diff | 49 - confine_to_shape.diff | 143 ++- dga_cleanup.diff | 935 ------------------ fbdevhw.diff | 12 - miPointerUpdate-crashfix.diff | 29 - p_ia64-console.diff | 20 +- p_mouse_misc.diff | 50 - ps_showopts.diff | 218 ---- randr1_1-sig11.diff | 10 +- unplugged_monitor_crashfix.diff | 17 - xephyr.diff | 22 +- xorg-server-1.5.2.tar.bz2 | 3 - xorg-server-1.6.0.tar.bz2 | 3 + xorg-server-xf4vnc.patch | 647 +++++------- xorg-x11-server.changes | 14 + xorg-x11-server.spec | 44 +- zap_warning_xserver.diff | 115 ++- 22 files changed, 475 insertions(+), 2036 deletions(-) delete mode 100644 64bit-portability-issue.diff delete mode 100644 64bit.diff delete mode 100644 commit-59f9fb4b8.diff delete mode 100644 commit-a9e2030.diff delete mode 100644 dga_cleanup.diff delete mode 100644 miPointerUpdate-crashfix.diff delete mode 100644 p_mouse_misc.diff delete mode 100644 ps_showopts.diff delete mode 100644 unplugged_monitor_crashfix.diff delete mode 100644 xorg-server-1.5.2.tar.bz2 create mode 100644 xorg-server-1.6.0.tar.bz2 diff --git a/0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch b/0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch index 176e061..21998f1 100644 --- a/0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch +++ b/0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch @@ -10,41 +10,36 @@ even if idev is null. This takes down the xserver hard in some cases hw/xfree86/common/xf86Xinput.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) -diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c -index 710e787..c0b6124 100644 ---- a/hw/xfree86/common/xf86Xinput.c -+++ b/hw/xfree86/common/xf86Xinput.c -@@ -466,17 +466,20 @@ DeleteInputDeviceRequest(DeviceIntPtr pDev) - else - xf86DeleteInput(pInfo, 0); +--- xorg-server-1.6.0/hw/xfree86/common/xf86Xinput.c.orig 2009-02-25 20:12:11.000000000 +0100 ++++ xorg-server-1.6.0/hw/xfree86/common/xf86Xinput.c 2009-02-27 17:26:35.000000000 +0100 +@@ -675,17 +675,20 @@ DeleteInputDeviceRequest(DeviceIntPtr pD + else + xf86DeleteInput(pInfo, 0); -- /* devices added through HAL aren't in the config layout */ -- it = xf86ConfigLayout.inputs; -- while(*it && *it != idev) -- it++; +- /* devices added through HAL aren't in the config layout */ +- it = xf86ConfigLayout.inputs; +- while(*it && *it != idev) +- it++; - -- if (!(*it)) /* end of list, not in the layout */ -+ if (idev) - { -- xfree(idev->driver); -- xfree(idev->identifier); -- xf86optionListFree(idev->commonOptions); -- xfree(idev); -+ /* devices added through HAL aren't in the config layout */ -+ it = xf86ConfigLayout.inputs; -+ while(*it && *it != idev) -+ it++; +- if (!(*it)) /* end of list, not in the layout */ ++ if (idev) + { +- xfree(idev->driver); +- xfree(idev->identifier); +- xf86optionListFree(idev->commonOptions); +- xfree(idev); ++ /* devices added through HAL aren't in the config layout */ ++ it = xf86ConfigLayout.inputs; ++ while(*it && *it != idev) ++ it++; + -+ if (!(*it)) /* end of list, not in the layout */ -+ { -+ xfree(idev->driver); -+ xfree(idev->identifier); -+ xf86optionListFree(idev->commonOptions); -+ xfree(idev); -+ } ++ if (!(*it)) /* end of list, not in the layout */ ++ { ++ xfree(idev->driver); ++ xfree(idev->identifier); ++ xf86optionListFree(idev->commonOptions); ++ xfree(idev); ++ } + } } - } - --- -1.5.2.4 - + OsReleaseSignals(); diff --git a/64bit-portability-issue.diff b/64bit-portability-issue.diff deleted file mode 100644 index 9068160..0000000 --- a/64bit-portability-issue.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- composite/compinit.c.orig 2008-06-27 19:54:41.000000000 +0000 -+++ composite/compinit.c 2008-06-27 20:10:45.000000000 +0000 -@@ -122,11 +122,11 @@ - if (ret && (mask & CWBackingStore)) { - if (pWin->backingStore != NotUseful) { - compRedirectWindow(serverClient, pWin, CompositeRedirectAutomatic); -- pWin->backStorage = TRUE; -+ pWin->backStorage = (pointer) TRUE; - } else { - compUnredirectWindow(serverClient, pWin, - CompositeRedirectAutomatic); -- pWin->backStorage = FALSE; -+ pWin->backStorage = (pointer) FALSE; - } - } - diff --git a/64bit.diff b/64bit.diff deleted file mode 100644 index 7532317..0000000 --- a/64bit.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- hw/xfree86/common.orig/xf86Events.c 2006-06-27 10:16:25.000000000 +0000 -+++ hw/xfree86/common/xf86Events.c 2006-06-27 10:43:01.000000000 +0000 -@@ -1292,8 +1292,8 @@ - size_t size, i; - char **strings; - ErrorF("\nBacktrace:\n"); -- size = backtrace(array, 32); -- strings = backtrace_symbols(array, size); -+ size = (size_t) backtrace(array, 32); -+ strings = (char **) backtrace_symbols(array, size); - for (i = 0; i < size; i++) - ErrorF("%d: %s\n", i, strings[i]); - free(strings); diff --git a/bitmap_always_unscaled.diff b/bitmap_always_unscaled.diff index 494f1bd..42b7010 100644 --- a/bitmap_always_unscaled.diff +++ b/bitmap_always_unscaled.diff @@ -53,21 +53,3 @@ index 03c2c3a..843efb7 100644 case $host_os in darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;; esac ---- xorg-server-1.4.99.902/hw/xfree86/utils/xorgconfig/xorgconfig.c.orig 2008-04-10 20:58:01.000000000 +0200 -+++ xorg-server-1.4.99.902/hw/xfree86/utils/xorgconfig/xorgconfig.c 2008-06-16 19:26:46.000000000 +0200 -@@ -1908,14 +1908,12 @@ - { - /* " FontPath \"" TREEROOTFONT "/75dpi/\"\n"*/ - "/local/", -- "/misc/", -+ "/misc/:unscaled", - "/75dpi/:unscaled", - "/100dpi/:unscaled", - "/Type1/", - "/TrueType/", - "/freefont/", -- "/75dpi/", -- "/100dpi/", - 0 /* end of fontpaths */ - }; - diff --git a/commit-59f9fb4b8.diff b/commit-59f9fb4b8.diff deleted file mode 100644 index 5dfa35d..0000000 --- a/commit-59f9fb4b8.diff +++ /dev/null @@ -1,70 +0,0 @@ -commit 59f9fb4b8c031df69b3592a26b77e744ff4a556e -Author: Luc Verhaegen -Date: Fri Nov 7 19:11:11 2008 +0100 - - XAA PixmapOps: Sync before accessing unwrapped callbacks. - - When using any XAAPixmapOps, we call into unknown but freshly - unwrapped callbacks (like fb ones). Unlike the XAA*Fallback calls, - we did so without syncing first, exposing us to all kinds of - synchronisation issues. - - I believe that the rendering errors appeared now because *PaintWindow - vanished (e4d11e58), and we just use miPaintWindow instead. This - takes a less direct route to the hw and ends up at - PolyFillRectPixmap, which very often left drawing artifacts. - - We now sync accordingly, and no longer get the rendering artifacts i - was methodically reproducing on radeonhd, radeon, unichrome... - - Also, in order to allow driver authors to remove extensive syncing - or flushing to hide this issue, create XAA_VERSION_ defines, put - them in xaa.h and bump the patchlevel. - - (novell bug #435791) - -diff --git a/hw/xfree86/xaa/xaa.h b/hw/xfree86/xaa/xaa.h -index 1dc7ed2..d6ccc31 100644 ---- a/hw/xfree86/xaa/xaa.h -+++ b/hw/xfree86/xaa/xaa.h -@@ -2,6 +2,10 @@ - #ifndef _XAA_H - #define _XAA_H - -+#define XAA_VERSION_MAJOR 1 -+#define XAA_VERSION_MINOR 2 -+#define XAA_VERSION_RELEASE 1 -+ - /* - - ******** OPERATION SPECIFIC FLAGS ********* -diff --git a/hw/xfree86/xaa/xaaInitAccel.c b/hw/xfree86/xaa/xaaInitAccel.c -index 53795f0..0672bcf 100644 ---- a/hw/xfree86/xaa/xaaInitAccel.c -+++ b/hw/xfree86/xaa/xaaInitAccel.c -@@ -100,7 +100,9 @@ static XF86ModuleVersionInfo xaaVersRec = - MODINFOSTRING1, - MODINFOSTRING2, - XORG_VERSION_CURRENT, -- 1, 2, 0, -+ XAA_VERSION_MAJOR, -+ XAA_VERSION_MINOR, -+ XAA_VERSION_RELEASE, - ABI_CLASS_VIDEODRV, /* requires the video driver ABI */ - ABI_VIDEODRV_VERSION, - MOD_CLASS_NONE, -diff --git a/hw/xfree86/xaa/xaawrap.h b/hw/xfree86/xaa/xaawrap.h -index 38c97d7..857dbc3 100644 ---- a/hw/xfree86/xaa/xaawrap.h -+++ b/hw/xfree86/xaa/xaawrap.h -@@ -48,8 +48,8 @@ - XAAPixmapPtr pixPriv = XAA_GET_PIXMAP_PRIVATE((PixmapPtr)(pDraw));\ - GCFuncs *oldFuncs = pGC->funcs;\ - pGC->funcs = pGCPriv->wrapFuncs;\ -- pGC->ops = pGCPriv->wrapOps -- -+ pGC->ops = pGCPriv->wrapOps; \ -+ SYNC_CHECK(pGC) - - #define XAA_PIXMAP_OP_EPILOGUE(pGC)\ - pGCPriv->wrapOps = pGC->ops;\ diff --git a/commit-a9e2030.diff b/commit-a9e2030.diff deleted file mode 100644 index c779f19..0000000 --- a/commit-a9e2030.diff +++ /dev/null @@ -1,49 +0,0 @@ -commit a9e20306fbe3262602f21b876a52a1ef38cdf20a -Author: Egbert Eich -Date: Fri Nov 21 18:50:01 2008 +0100 - - int10: Do an mprotect(..,PROT_EXEC) on shmat()ed memory ranges. - - When the linux kernel sets the NX bit vm86 segfaults when it tries to execute - code in memory that is not marked EXEC. Such code gets called whenever - we return from a VBIOS call to signal the calling program that the call - is actually finished and that we are not trapping for other reasons (like - IO accesses). - Use mprotect(2) to set these memory ranges PROT_EXEC. - -diff --git a/hw/xfree86/os-support/linux/int10/linux.c b/hw/xfree86/os-support/linux/int10/linux.c -index 67eb161..b15f7fd 100644 ---- a/hw/xfree86/os-support/linux/int10/linux.c -+++ b/hw/xfree86/os-support/linux/int10/linux.c -@@ -1,6 +1,6 @@ - /* - * linux specific part of the int10 module -- * Copyright 1999, 2000, 2001, 2002, 2003, 2004 Egbert Eich -+ * Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2008 Egbert Eich - */ - #ifdef HAVE_XORG_CONFIG_H - #include -@@ -357,7 +357,10 @@ MapCurrentInt10(xf86Int10InfoPtr pInt) - "shmat(low_mem) error: %s\n",strerror(errno)); - return FALSE; - } -- -+ if (mprotect((void*)0, V_RAM, PROT_READ|PROT_WRITE|PROT_EXEC) != 0) -+ xf86DrvMsg(pInt->scrnIndex, X_ERROR, -+ "Cannot set EXEC bit on low memory: %s\n", strerror(errno)); -+ - if (((linuxInt10Priv*)pInt->private)->highMem >= 0) { - addr = shmat(((linuxInt10Priv*)pInt->private)->highMem, - (char*)HIGH_MEM, 0); -@@ -368,6 +371,11 @@ MapCurrentInt10(xf86Int10InfoPtr pInt) - "shmget error: %s\n",strerror(errno)); - return FALSE; - } -+ if (mprotect((void*)HIGH_MEM, HIGH_MEM_SIZE, -+ PROT_READ|PROT_WRITE|PROT_EXEC) != 0) -+ xf86DrvMsg(pInt->scrnIndex, X_ERROR, -+ "Cannot set EXEC bit on high memory: %s\n", -+ strerror(errno)); - } else { - if ((fd = open(DEV_MEM, O_RDWR, 0)) >= 0) { - if (mmap((void *)(V_BIOS), SYS_BIOS - V_BIOS, diff --git a/confine_to_shape.diff b/confine_to_shape.diff index d2fce3c..4b8dbdf 100644 --- a/confine_to_shape.diff +++ b/confine_to_shape.diff @@ -1,23 +1,19 @@ -Index: events.c -=================================================================== -RCS file: /home/eich/cvs/xc/programs/Xserver/dix/events.c,v -retrieving revision 1.1.1.19 -diff -u -r1.1.1.19 events.c ---- dix/events.c.orig 26 Aug 2004 12:09:13 -0000 1.1.1.19 -+++ dix/events.c 2 Mar 2005 20:04:13 -0000 -@@ -656,35 +656,79 @@ +--- dix/events.c.orig 2009-02-25 20:12:10.000000000 +0100 ++++ dix/events.c 2009-02-27 16:53:47.000000000 +0100 +@@ -786,37 +786,80 @@ ConfineToShape(DeviceIntPtr pDev, Region { BoxRec box; int x = *px, y = *py; - int incx = 1, incy = 1; -- + SpritePtr pSprite; + int nbox; + BoxPtr pbox; -+ int d, min = (~0U >> 1), dx2, dy2, x_r, y_r; -+ - if (POINT_IN_REGION(sprite.hot.pScreen, shape, x, y, &box)) ++ int d, min = (~0U >> 1), dx2, dy2, x_r, y_r; + + pSprite = pDev->spriteInfo->sprite; + if (POINT_IN_REGION(pSprite->hot.pScreen, shape, x, y, &box)) return; -- box = *REGION_EXTENTS(sprite.hot.pScreen, shape); +- box = *REGION_EXTENTS(pSprite->hot.pScreen, shape); - /* this is rather crude */ - do { - x += incx; @@ -27,27 +23,27 @@ diff -u -r1.1.1.19 events.c - x = *px - 1; + + for (nbox = REGION_NUM_RECTS (shape), -+ pbox = REGION_RECTS(shape); ++ pbox = REGION_RECTS(shape); + nbox--; + pbox++) + { -+ if (pbox->x1 < x && pbox->x2 > x) { -+ d = pbox->y1 - y; -+ if (d >= 0) { -+ d *= d; -+ if (d < min) { -+ *px = x; -+ *py = pbox->y1 + 1; -+ min = d; -+ } -+ } else { -+ d = pbox->y2 - y; d *= d; -+ if (d < min) { -+ *px = x; -+ *py = pbox->y2 - 1; -+ min = d; -+ } -+ } ++ if (pbox->x1 < x && pbox->x2 > x) { ++ d = pbox->y1 - y; ++ if (d >= 0) { ++ d *= d; ++ if (d < min) { ++ *px = x; ++ *py = pbox->y1 + 1; ++ min = d; ++ } ++ } else { ++ d = pbox->y2 - y; d *= d; ++ if (d < min) { ++ *px = x; ++ *py = pbox->y2 - 1; ++ min = d; ++ } ++ } } - else if (x < box.x1) - { @@ -58,54 +54,53 @@ diff -u -r1.1.1.19 events.c - { - incy = -1; - y = *py - 1; -+ else if (pbox->y1 < y && pbox->y2 > y) { -+ d = pbox->x1 - x; -+ if (d >= 0) { -+ d *= d; -+ if (d < min) { -+ *px = pbox->x1 + 1; -+ *py = y; -+ min = d; -+ } -+ } else { -+ d = pbox->x2 - x; d *= d; -+ if (d < min) { -+ *px = pbox->x2 - 1; -+ *py = y; -+ min = d; -+ } -+ } -+ -+ } else { -+ dx2 = pbox->x1 - x; -+ if (dx2 >= 0) { -+ dx2 *= dx2; -+ x_r = pbox->x1 + 1; -+ } else { -+ dx2 = pbox->x2 - x; dx2 *= dx2; -+ x_r = pbox->x2 - 1; -+ } -+ dy2 = pbox->y1 - y; -+ if (dy2 >= 0) { -+ dy2 *= dy2; -+ y_r = pbox->y1 + 1; -+ } else { -+ dy2 = pbox->y2 - y; dy2 *= dy2; -+ y_r = pbox->y2 - 1; -+ } -+ if ((d = dx2 + dy2) < min) { -+ *px = x_r; -+ *py = y_r; -+ min = d; ++ else if (pbox->y1 < y && pbox->y2 > y) { ++ d = pbox->x1 - x; ++ if (d >= 0) { ++ d *= d; ++ if (d < min) { ++ *px = pbox->x1 + 1; ++ *py = y; ++ min = d; ++ } ++ } else { ++ d = pbox->x2 - x; d *= d; ++ if (d < min) { ++ *px = pbox->x2 - 1; ++ *py = y; ++ min = d; ++ } ++ } ++ ++ } else { ++ dx2 = pbox->x1 - x; ++ if (dx2 >= 0) { ++ dx2 *= dx2; ++ x_r = pbox->x1 + 1; ++ } else { ++ dx2 = pbox->x2 - x; dx2 *= dx2; ++ x_r = pbox->x2 - 1; ++ } ++ dy2 = pbox->y1 - y; ++ if (dy2 >= 0) { ++ dy2 *= dy2; ++ y_r = pbox->y1 + 1; ++ } else { ++ dy2 = pbox->y2 - y; dy2 *= dy2; ++ y_r = pbox->y2 - 1; ++ } ++ if ((d = dx2 + dy2) < min) { ++ *px = x_r; ++ *py = y_r; ++ min = d; } - else if (y < box.y1) - return; /* should never get here! */ } -- } while (!POINT_IN_REGION(sprite.hot.pScreen, shape, x, y, &box)); +- } while (!POINT_IN_REGION(pSprite->hot.pScreen, shape, x, y, &box)); - *px = x; - *py = y; -+ } -+ ++ } } - #endif + static void diff --git a/dga_cleanup.diff b/dga_cleanup.diff deleted file mode 100644 index 2cf2e10..0000000 --- a/dga_cleanup.diff +++ /dev/null @@ -1,935 +0,0 @@ -commit 322335d5b5b6f155f56fe3c1cbe372f13dc20932 -Author: Luc Verhaegen -Date: Thu Oct 9 22:21:05 2008 +0200 - - DGA: Mash together xf86dga.c and xf86dga2.c. - - This in preparation for an upcoming client state tracking fix. - -diff --git a/hw/xfree86/dixmods/extmod/Makefile.am b/hw/xfree86/dixmods/extmod/Makefile.am -index 317971d..dd4ccd6 100644 ---- a/hw/xfree86/dixmods/extmod/Makefile.am -+++ b/hw/xfree86/dixmods/extmod/Makefile.am -@@ -4,7 +4,7 @@ extsmoduledir = $(moduledir)/extensions - extsmodule_LTLIBRARIES = libextmod.la - - if DGA --DGA_SRCS = xf86dga.c xf86dga2.c dgaproc.h xf86dgaext.h -+DGA_SRCS = xf86dga2.c dgaproc.h xf86dgaext.h - endif - - if XV -diff --git a/hw/xfree86/dixmods/extmod/xf86dga.c b/hw/xfree86/dixmods/extmod/xf86dga.c -deleted file mode 100644 -index c66bca2..0000000 ---- a/hw/xfree86/dixmods/extmod/xf86dga.c -+++ /dev/null -@@ -1,309 +0,0 @@ -- --/* -- --Copyright (c) 1995 Jon Tombs --Copyright (c) 1995, 1996, 1999 XFree86 Inc -- --*/ -- --#ifdef HAVE_XORG_CONFIG_H --#include --#endif -- --#define NEED_REPLIES --#define NEED_EVENTS --#include --#include --#include "misc.h" --#include "dixstruct.h" --#include "extnsionst.h" --#include "colormapst.h" --#include "cursorstr.h" --#include "scrnintstr.h" --#include "servermd.h" --#define _XF86DGA_SERVER_ --#include --#include --#include "swaprep.h" --#include "dgaproc.h" -- --#include "xf86dgaext.h" -- -- --static DISPATCH_PROC(ProcXF86DGADirectVideo); --static DISPATCH_PROC(ProcXF86DGAGetVidPage); --static DISPATCH_PROC(ProcXF86DGAGetVideoLL); --static DISPATCH_PROC(ProcXF86DGAGetViewPortSize); --static DISPATCH_PROC(ProcXF86DGASetVidPage); --static DISPATCH_PROC(ProcXF86DGASetViewPort); --static DISPATCH_PROC(ProcXF86DGAInstallColormap); --static DISPATCH_PROC(ProcXF86DGAQueryDirectVideo); --static DISPATCH_PROC(ProcXF86DGAViewPortChanged); -- -- --static int --ProcXF86DGAGetVideoLL(ClientPtr client) --{ -- REQUEST(xXF86DGAGetVideoLLReq); -- xXF86DGAGetVideoLLReply rep; -- XDGAModeRec mode; -- int num, offset, flags; -- char *name; -- -- if (stuff->screen > screenInfo.numScreens) -- return BadValue; -- -- REQUEST_SIZE_MATCH(xXF86DGAGetVideoLLReq); -- rep.type = X_Reply; -- rep.length = 0; -- rep.sequenceNumber = client->sequence; -- -- if(!DGAAvailable(stuff->screen)) -- return (DGAErrorBase + XF86DGANoDirectVideoMode); -- -- if(!(num = DGAGetOldDGAMode(stuff->screen))) -- return (DGAErrorBase + XF86DGANoDirectVideoMode); -- -- /* get the parameters for the mode that best matches */ -- DGAGetModeInfo(stuff->screen, &mode, num); -- -- if(!DGAOpenFramebuffer(stuff->screen, &name, -- (unsigned char**)(&rep.offset), -- (int*)(&rep.bank_size), &offset, &flags)) -- return BadAlloc; -- -- rep.offset += mode.offset; -- rep.width = mode.bytesPerScanline / (mode.bitsPerPixel >> 3); -- rep.ram_size = rep.bank_size >> 10; -- -- WriteToClient(client, SIZEOF(xXF86DGAGetVideoLLReply), (char *)&rep); -- return (client->noClientException); --} -- --static int --ProcXF86DGADirectVideo(ClientPtr client) --{ -- int num; -- PixmapPtr pix; -- XDGAModeRec mode; -- REQUEST(xXF86DGADirectVideoReq); -- -- if (stuff->screen > screenInfo.numScreens) -- return BadValue; -- -- REQUEST_SIZE_MATCH(xXF86DGADirectVideoReq); -- -- if (!DGAAvailable(stuff->screen)) -- return DGAErrorBase + XF86DGANoDirectVideoMode; -- -- if (stuff->enable & XF86DGADirectGraphics) { -- if(!(num = DGAGetOldDGAMode(stuff->screen))) -- return (DGAErrorBase + XF86DGANoDirectVideoMode); -- } else -- num = 0; -- -- if(Success != DGASetMode(stuff->screen, num, &mode, &pix)) -- return (DGAErrorBase + XF86DGAScreenNotActive); -- -- DGASetInputMode (stuff->screen, -- (stuff->enable & XF86DGADirectKeyb) != 0, -- (stuff->enable & XF86DGADirectMouse) != 0); -- -- return (client->noClientException); --} -- --static int --ProcXF86DGAGetViewPortSize(ClientPtr client) --{ -- int num; -- XDGAModeRec mode; -- REQUEST(xXF86DGAGetViewPortSizeReq); -- xXF86DGAGetViewPortSizeReply rep; -- -- if (stuff->screen > screenInfo.numScreens) -- return BadValue; -- -- REQUEST_SIZE_MATCH(xXF86DGAGetViewPortSizeReq); -- rep.type = X_Reply; -- rep.length = 0; -- rep.sequenceNumber = client->sequence; -- -- if (!DGAAvailable(stuff->screen)) -- return (DGAErrorBase + XF86DGANoDirectVideoMode); -- -- if(!(num = DGAGetOldDGAMode(stuff->screen))) -- return (DGAErrorBase + XF86DGANoDirectVideoMode); -- -- DGAGetModeInfo(stuff->screen, &mode, num); -- -- rep.width = mode.viewportWidth; -- rep.height = mode.viewportHeight; -- -- WriteToClient(client, SIZEOF(xXF86DGAGetViewPortSizeReply), (char *)&rep); -- return (client->noClientException); --} -- --static int --ProcXF86DGASetViewPort(ClientPtr client) --{ -- REQUEST(xXF86DGASetViewPortReq); -- -- if (stuff->screen > screenInfo.numScreens) -- return BadValue; -- -- REQUEST_SIZE_MATCH(xXF86DGASetViewPortReq); -- -- if (!DGAAvailable(stuff->screen)) -- return (DGAErrorBase + XF86DGANoDirectVideoMode); -- -- if (!DGAActive(stuff->screen)) -- { -- int num; -- PixmapPtr pix; -- XDGAModeRec mode; -- -- if(!(num = DGAGetOldDGAMode(stuff->screen))) -- return (DGAErrorBase + XF86DGANoDirectVideoMode); -- if(Success != DGASetMode(stuff->screen, num, &mode, &pix)) -- return (DGAErrorBase + XF86DGAScreenNotActive); -- } -- -- if (DGASetViewport(stuff->screen, stuff->x, stuff->y, DGA_FLIP_RETRACE) -- != Success) -- return DGAErrorBase + XF86DGADirectNotActivated; -- -- return (client->noClientException); --} -- --static int --ProcXF86DGAGetVidPage(ClientPtr client) --{ -- REQUEST(xXF86DGAGetVidPageReq); -- xXF86DGAGetVidPageReply rep; -- -- if (stuff->screen > screenInfo.numScreens) -- return BadValue; -- -- REQUEST_SIZE_MATCH(xXF86DGAGetVidPageReq); -- rep.type = X_Reply; -- rep.length = 0; -- rep.sequenceNumber = client->sequence; -- rep.vpage = 0; /* silently fail */ -- -- WriteToClient(client, SIZEOF(xXF86DGAGetVidPageReply), (char *)&rep); -- return (client->noClientException); --} -- -- --static int --ProcXF86DGASetVidPage(ClientPtr client) --{ -- REQUEST(xXF86DGASetVidPageReq); -- -- if (stuff->screen > screenInfo.numScreens) -- return BadValue; -- -- REQUEST_SIZE_MATCH(xXF86DGASetVidPageReq); -- -- /* silently fail */ -- -- return (client->noClientException); --} -- -- --static int --ProcXF86DGAInstallColormap(ClientPtr client) --{ -- ColormapPtr pcmp; -- REQUEST(xXF86DGAInstallColormapReq); -- -- REQUEST_SIZE_MATCH(xXF86DGAInstallColormapReq); -- -- if (!DGAActive(stuff->screen)) -- return (DGAErrorBase + XF86DGADirectNotActivated); -- -- pcmp = (ColormapPtr )LookupIDByType(stuff->id, RT_COLORMAP); -- if (pcmp) { -- DGAInstallCmap(pcmp); -- return (client->noClientException); -- } else { -- client->errorValue = stuff->id; -- return (BadColor); -- } --} -- --static int --ProcXF86DGAQueryDirectVideo(ClientPtr client) --{ -- REQUEST(xXF86DGAQueryDirectVideoReq); -- xXF86DGAQueryDirectVideoReply rep; -- -- if (stuff->screen > screenInfo.numScreens) -- return BadValue; -- -- REQUEST_SIZE_MATCH(xXF86DGAQueryDirectVideoReq); -- rep.type = X_Reply; -- rep.length = 0; -- rep.sequenceNumber = client->sequence; -- rep.flags = 0; -- -- if (DGAAvailable(stuff->screen)) -- rep.flags = XF86DGADirectPresent; -- -- WriteToClient(client, SIZEOF(xXF86DGAQueryDirectVideoReply), (char *)&rep); -- return (client->noClientException); --} -- --static int --ProcXF86DGAViewPortChanged(ClientPtr client) --{ -- REQUEST(xXF86DGAViewPortChangedReq); -- xXF86DGAViewPortChangedReply rep; -- -- if (stuff->screen > screenInfo.numScreens) -- return BadValue; -- -- REQUEST_SIZE_MATCH(xXF86DGAViewPortChangedReq); -- -- if (!DGAActive(stuff->screen)) -- return (DGAErrorBase + XF86DGADirectNotActivated); -- -- rep.type = X_Reply; -- rep.length = 0; -- rep.sequenceNumber = client->sequence; -- rep.result = 1; -- -- WriteToClient(client, SIZEOF(xXF86DGAViewPortChangedReply), (char *)&rep); -- return (client->noClientException); --} -- --int --ProcXF86DGADispatch(register ClientPtr client) --{ -- REQUEST(xReq); -- -- switch (stuff->data) -- { -- case X_XF86DGAGetVideoLL: -- return ProcXF86DGAGetVideoLL(client); -- case X_XF86DGADirectVideo: -- return ProcXF86DGADirectVideo(client); -- case X_XF86DGAGetViewPortSize: -- return ProcXF86DGAGetViewPortSize(client); -- case X_XF86DGASetViewPort: -- return ProcXF86DGASetViewPort(client); -- case X_XF86DGAGetVidPage: -- return ProcXF86DGAGetVidPage(client); -- case X_XF86DGASetVidPage: -- return ProcXF86DGASetVidPage(client); -- case X_XF86DGAInstallColormap: -- return ProcXF86DGAInstallColormap(client); -- case X_XF86DGAQueryDirectVideo: -- return ProcXF86DGAQueryDirectVideo(client); -- case X_XF86DGAViewPortChanged: -- return ProcXF86DGAViewPortChanged(client); -- default: -- return BadRequest; -- } --} -- -diff --git a/hw/xfree86/dixmods/extmod/xf86dga2.c b/hw/xfree86/dixmods/extmod/xf86dga2.c -index c12178f..100bde9 100644 ---- a/hw/xfree86/dixmods/extmod/xf86dga2.c -+++ b/hw/xfree86/dixmods/extmod/xf86dga2.c -@@ -1,8 +1,10 @@ - /* -- Copyright (c) 1999 - The XFree86 Project Inc. -- -- Written by Mark Vojkovich --*/ -+ * Copyright (c) 1995 Jon Tombs -+ * Copyright (c) 1995, 1996, 1999 XFree86 Inc -+ * Copyright (c) 1999 - The XFree86 Project Inc. -+ * -+ * Written by Mark Vojkovich -+ */ - - - #ifdef HAVE_XORG_CONFIG_H -@@ -33,6 +35,8 @@ - - #include "modinit.h" - -+#define DGA_PROTOCOL_OLD_SUPPORT 1 -+ - static DISPATCH_PROC(ProcXDGADispatch); - static DISPATCH_PROC(SProcXDGADispatch); - static DISPATCH_PROC(ProcXDGAQueryVersion); -@@ -141,7 +145,7 @@ ProcXDGAOpenFramebuffer(ClientPtr client) - if (stuff->screen > screenInfo.numScreens) - return BadValue; - -- if (!DGAAvailable(stuff->screen)) -+ if (!DGAAvailable(stuff->screen)) - return DGAErrorBase + XF86DGANoDirectVideoMode; - - REQUEST_SIZE_MATCH(xXDGAOpenFramebufferReq); -@@ -149,9 +153,9 @@ ProcXDGAOpenFramebuffer(ClientPtr client) - rep.length = 0; - rep.sequenceNumber = client->sequence; - -- if(!DGAOpenFramebuffer(stuff->screen, &deviceName, -+ if(!DGAOpenFramebuffer(stuff->screen, &deviceName, - (unsigned char**)(&rep.mem1), -- (int*)&rep.size, (int*)&rep.offset, (int*)&rep.extra)) -+ (int*)&rep.size, (int*)&rep.offset, (int*)&rep.extra)) - { - return BadAlloc; - } -@@ -175,7 +179,7 @@ ProcXDGACloseFramebuffer(ClientPtr client) - if (stuff->screen > screenInfo.numScreens) - return BadValue; - -- if (!DGAAvailable(stuff->screen)) -+ if (!DGAAvailable(stuff->screen)) - return DGAErrorBase + XF86DGANoDirectVideoMode; - - REQUEST_SIZE_MATCH(xXDGACloseFramebufferReq); -@@ -259,7 +263,7 @@ ProcXDGAQueryModes(ClientPtr client) - info.viewport_flags = mode[i].viewportFlags; - info.reserved1 = mode[i].reserved1; - info.reserved2 = mode[i].reserved2; -- -+ - WriteToClient(client, sz_xXDGAModeInfo, (char*)(&info)); - WriteToClient(client, size, mode[i].name); - } -@@ -270,7 +274,7 @@ ProcXDGAQueryModes(ClientPtr client) - } - - --static void -+static void - DGAClientStateChange ( - CallbackListPtr* pcbl, - pointer nulldata, -@@ -287,7 +291,7 @@ DGAClientStateChange ( - } - } - -- if(client && -+ if(client && - ((client->clientState == ClientStateGone) || - (client->clientState == ClientStateRetained))) { - XDGAModeRec mode; -@@ -322,10 +326,10 @@ ProcXDGASetMode(ClientPtr client) - rep.flags = 0; - rep.sequenceNumber = client->sequence; - -- if (!DGAAvailable(stuff->screen)) -+ if (!DGAAvailable(stuff->screen)) - return DGAErrorBase + XF86DGANoDirectVideoMode; - -- if(DGAClients[stuff->screen] && -+ if(DGAClients[stuff->screen] && - (DGAClients[stuff->screen] != client)) - return DGAErrorBase + XF86DGANoDirectVideoMode; - -@@ -339,7 +343,7 @@ ProcXDGASetMode(ClientPtr client) - DGASetMode(stuff->screen, 0, &mode, &pPix); - WriteToClient(client, sz_xXDGASetModeReply, (char*)&rep); - return (client->noClientException); -- } -+ } - - if(Success != DGASetMode(stuff->screen, stuff->mode, &mode, &pPix)) - return BadValue; -@@ -359,7 +363,7 @@ ProcXDGASetMode(ClientPtr client) - } - - size = strlen(mode.name) + 1; -- -+ - info.byte_order = mode.byteOrder; - info.depth = mode.depth; - info.num = mode.num; -@@ -427,7 +431,7 @@ ProcXDGAInstallColormap(ClientPtr client) - return DGAErrorBase + XF86DGADirectNotActivated; - - REQUEST_SIZE_MATCH(xXDGAInstallColormapReq); -- -+ - cmap = (ColormapPtr)LookupIDByType(stuff->cmap, RT_COLORMAP); - if (cmap) { - DGAInstallCmap(cmap); -@@ -453,7 +457,7 @@ ProcXDGASelectInput(ClientPtr client) - return DGAErrorBase + XF86DGADirectNotActivated; - - REQUEST_SIZE_MATCH(xXDGASelectInputReq); -- -+ - if(DGAClients[stuff->screen] == client) - DGASelectInput(stuff->screen, client, stuff->mask); - -@@ -473,7 +477,7 @@ ProcXDGAFillRectangle(ClientPtr client) - return DGAErrorBase + XF86DGADirectNotActivated; - - REQUEST_SIZE_MATCH(xXDGAFillRectangleReq); -- -+ - if(Success != DGAFillRect(stuff->screen, stuff->x, stuff->y, - stuff->width, stuff->height, stuff->color)) - return BadMatch; -@@ -493,7 +497,7 @@ ProcXDGACopyArea(ClientPtr client) - return DGAErrorBase + XF86DGADirectNotActivated; - - REQUEST_SIZE_MATCH(xXDGACopyAreaReq); -- -+ - if(Success != DGABlitRect(stuff->screen, stuff->srcx, stuff->srcy, - stuff->width, stuff->height, stuff->dstx, stuff->dsty)) - return BadMatch; -@@ -514,7 +518,7 @@ ProcXDGACopyTransparentArea(ClientPtr client) - return DGAErrorBase + XF86DGADirectNotActivated; - - REQUEST_SIZE_MATCH(xXDGACopyTransparentAreaReq); -- -+ - if(Success != DGABlitTransRect(stuff->screen, stuff->srcx, stuff->srcy, - stuff->width, stuff->height, stuff->dstx, stuff->dsty, stuff->key)) - return BadMatch; -@@ -607,7 +611,7 @@ ProcXDGAChangePixmapMode(ClientPtr client) - rep.type = X_Reply; - rep.length = 0; - rep.sequenceNumber = client->sequence; -- -+ - x = stuff->x; - y = stuff->y; - -@@ -638,8 +642,8 @@ ProcXDGACreateColormap(ClientPtr client) - - if(!stuff->mode) - return BadValue; -- -- result = DGACreateColormap(stuff->screen, client, stuff->id, -+ -+ result = DGACreateColormap(stuff->screen, client, stuff->id, - stuff->mode, stuff->alloc); - if(result != Success) - return result; -@@ -647,6 +651,262 @@ ProcXDGACreateColormap(ClientPtr client) - return (client->noClientException); - } - -+/* -+ * -+ * Support for the old DGA protocol, used to live in xf86dga.c -+ * -+ */ -+ -+#ifdef DGA_PROTOCOL_OLD_SUPPORT -+ -+static DISPATCH_PROC(ProcXF86DGADirectVideo); -+static DISPATCH_PROC(ProcXF86DGAGetVidPage); -+static DISPATCH_PROC(ProcXF86DGAGetVideoLL); -+static DISPATCH_PROC(ProcXF86DGAGetViewPortSize); -+static DISPATCH_PROC(ProcXF86DGASetVidPage); -+static DISPATCH_PROC(ProcXF86DGASetViewPort); -+static DISPATCH_PROC(ProcXF86DGAInstallColormap); -+static DISPATCH_PROC(ProcXF86DGAQueryDirectVideo); -+static DISPATCH_PROC(ProcXF86DGAViewPortChanged); -+ -+ -+static int -+ProcXF86DGAGetVideoLL(ClientPtr client) -+{ -+ REQUEST(xXF86DGAGetVideoLLReq); -+ xXF86DGAGetVideoLLReply rep; -+ XDGAModeRec mode; -+ int num, offset, flags; -+ char *name; -+ -+ if (stuff->screen > screenInfo.numScreens) -+ return BadValue; -+ -+ REQUEST_SIZE_MATCH(xXF86DGAGetVideoLLReq); -+ rep.type = X_Reply; -+ rep.length = 0; -+ rep.sequenceNumber = client->sequence; -+ -+ if(!DGAAvailable(stuff->screen)) -+ return (DGAErrorBase + XF86DGANoDirectVideoMode); -+ -+ if(!(num = DGAGetOldDGAMode(stuff->screen))) -+ return (DGAErrorBase + XF86DGANoDirectVideoMode); -+ -+ /* get the parameters for the mode that best matches */ -+ DGAGetModeInfo(stuff->screen, &mode, num); -+ -+ if(!DGAOpenFramebuffer(stuff->screen, &name, -+ (unsigned char**)(&rep.offset), -+ (int*)(&rep.bank_size), &offset, &flags)) -+ return BadAlloc; -+ -+ rep.offset += mode.offset; -+ rep.width = mode.bytesPerScanline / (mode.bitsPerPixel >> 3); -+ rep.ram_size = rep.bank_size >> 10; -+ -+ WriteToClient(client, SIZEOF(xXF86DGAGetVideoLLReply), (char *)&rep); -+ return (client->noClientException); -+} -+ -+static int -+ProcXF86DGADirectVideo(ClientPtr client) -+{ -+ int num; -+ PixmapPtr pix; -+ XDGAModeRec mode; -+ REQUEST(xXF86DGADirectVideoReq); -+ -+ if (stuff->screen > screenInfo.numScreens) -+ return BadValue; -+ -+ REQUEST_SIZE_MATCH(xXF86DGADirectVideoReq); -+ -+ if (!DGAAvailable(stuff->screen)) -+ return DGAErrorBase + XF86DGANoDirectVideoMode; -+ -+ if (stuff->enable & XF86DGADirectGraphics) { -+ if(!(num = DGAGetOldDGAMode(stuff->screen))) -+ return (DGAErrorBase + XF86DGANoDirectVideoMode); -+ } else -+ num = 0; -+ -+ if(Success != DGASetMode(stuff->screen, num, &mode, &pix)) -+ return (DGAErrorBase + XF86DGAScreenNotActive); -+ -+ DGASetInputMode (stuff->screen, -+ (stuff->enable & XF86DGADirectKeyb) != 0, -+ (stuff->enable & XF86DGADirectMouse) != 0); -+ -+ return (client->noClientException); -+} -+ -+static int -+ProcXF86DGAGetViewPortSize(ClientPtr client) -+{ -+ int num; -+ XDGAModeRec mode; -+ REQUEST(xXF86DGAGetViewPortSizeReq); -+ xXF86DGAGetViewPortSizeReply rep; -+ -+ if (stuff->screen > screenInfo.numScreens) -+ return BadValue; -+ -+ REQUEST_SIZE_MATCH(xXF86DGAGetViewPortSizeReq); -+ rep.type = X_Reply; -+ rep.length = 0; -+ rep.sequenceNumber = client->sequence; -+ -+ if (!DGAAvailable(stuff->screen)) -+ return (DGAErrorBase + XF86DGANoDirectVideoMode); -+ -+ if(!(num = DGAGetOldDGAMode(stuff->screen))) -+ return (DGAErrorBase + XF86DGANoDirectVideoMode); -+ -+ DGAGetModeInfo(stuff->screen, &mode, num); -+ -+ rep.width = mode.viewportWidth; -+ rep.height = mode.viewportHeight; -+ -+ WriteToClient(client, SIZEOF(xXF86DGAGetViewPortSizeReply), (char *)&rep); -+ return (client->noClientException); -+} -+ -+static int -+ProcXF86DGASetViewPort(ClientPtr client) -+{ -+ REQUEST(xXF86DGASetViewPortReq); -+ -+ if (stuff->screen > screenInfo.numScreens) -+ return BadValue; -+ -+ REQUEST_SIZE_MATCH(xXF86DGASetViewPortReq); -+ -+ if (!DGAAvailable(stuff->screen)) -+ return (DGAErrorBase + XF86DGANoDirectVideoMode); -+ -+ if (!DGAActive(stuff->screen)) -+ { -+ int num; -+ PixmapPtr pix; -+ XDGAModeRec mode; -+ -+ if(!(num = DGAGetOldDGAMode(stuff->screen))) -+ return (DGAErrorBase + XF86DGANoDirectVideoMode); -+ if(Success != DGASetMode(stuff->screen, num, &mode, &pix)) -+ return (DGAErrorBase + XF86DGAScreenNotActive); -+ } -+ -+ if (DGASetViewport(stuff->screen, stuff->x, stuff->y, DGA_FLIP_RETRACE) -+ != Success) -+ return DGAErrorBase + XF86DGADirectNotActivated; -+ -+ return (client->noClientException); -+} -+ -+static int -+ProcXF86DGAGetVidPage(ClientPtr client) -+{ -+ REQUEST(xXF86DGAGetVidPageReq); -+ xXF86DGAGetVidPageReply rep; -+ -+ if (stuff->screen > screenInfo.numScreens) -+ return BadValue; -+ -+ REQUEST_SIZE_MATCH(xXF86DGAGetVidPageReq); -+ rep.type = X_Reply; -+ rep.length = 0; -+ rep.sequenceNumber = client->sequence; -+ rep.vpage = 0; /* silently fail */ -+ -+ WriteToClient(client, SIZEOF(xXF86DGAGetVidPageReply), (char *)&rep); -+ return (client->noClientException); -+} -+ -+ -+static int -+ProcXF86DGASetVidPage(ClientPtr client) -+{ -+ REQUEST(xXF86DGASetVidPageReq); -+ -+ if (stuff->screen > screenInfo.numScreens) -+ return BadValue; -+ -+ REQUEST_SIZE_MATCH(xXF86DGASetVidPageReq); -+ -+ /* silently fail */ -+ -+ return (client->noClientException); -+} -+ -+ -+static int -+ProcXF86DGAInstallColormap(ClientPtr client) -+{ -+ ColormapPtr pcmp; -+ REQUEST(xXF86DGAInstallColormapReq); -+ -+ REQUEST_SIZE_MATCH(xXF86DGAInstallColormapReq); -+ -+ if (!DGAActive(stuff->screen)) -+ return (DGAErrorBase + XF86DGADirectNotActivated); -+ -+ pcmp = (ColormapPtr )LookupIDByType(stuff->id, RT_COLORMAP); -+ if (pcmp) { -+ DGAInstallCmap(pcmp); -+ return (client->noClientException); -+ } else { -+ client->errorValue = stuff->id; -+ return (BadColor); -+ } -+} -+ -+static int -+ProcXF86DGAQueryDirectVideo(ClientPtr client) -+{ -+ REQUEST(xXF86DGAQueryDirectVideoReq); -+ xXF86DGAQueryDirectVideoReply rep; -+ -+ if (stuff->screen > screenInfo.numScreens) -+ return BadValue; -+ -+ REQUEST_SIZE_MATCH(xXF86DGAQueryDirectVideoReq); -+ rep.type = X_Reply; -+ rep.length = 0; -+ rep.sequenceNumber = client->sequence; -+ rep.flags = 0; -+ -+ if (DGAAvailable(stuff->screen)) -+ rep.flags = XF86DGADirectPresent; -+ -+ WriteToClient(client, SIZEOF(xXF86DGAQueryDirectVideoReply), (char *)&rep); -+ return (client->noClientException); -+} -+ -+static int -+ProcXF86DGAViewPortChanged(ClientPtr client) -+{ -+ REQUEST(xXF86DGAViewPortChangedReq); -+ xXF86DGAViewPortChangedReply rep; -+ -+ if (stuff->screen > screenInfo.numScreens) -+ return BadValue; -+ -+ REQUEST_SIZE_MATCH(xXF86DGAViewPortChangedReq); -+ -+ if (!DGAActive(stuff->screen)) -+ return (DGAErrorBase + XF86DGADirectNotActivated); -+ -+ rep.type = X_Reply; -+ rep.length = 0; -+ rep.sequenceNumber = client->sequence; -+ rep.result = 1; -+ -+ WriteToClient(client, SIZEOF(xXF86DGAViewPortChangedReply), (char *)&rep); -+ return (client->noClientException); -+} -+ -+#endif /* DGA_PROTOCOL_OLD_SUPPORT */ - - static int - SProcXDGADispatch (ClientPtr client) -@@ -702,15 +962,11 @@ ProcXDGADispatch (ClientPtr client) - if (stuff->data <= X_XDGACreateColormap) - fprintf (stderr, " DGA %s\n", dgaMinor[stuff->data]); - #endif -- -- /* divert old protocol */ --#if 1 -- if( (stuff->data <= X_XF86DGAViewPortChanged) && -- (stuff->data >= X_XF86DGAGetVideoLL)) -- return ProcXF86DGADispatch(client); --#endif - - switch (stuff->data){ -+ /* -+ * DGA2 Protocol -+ */ - case X_XDGAQueryVersion: - return ProcXDGAQueryVersion(client); - case X_XDGAQueryModes: -@@ -743,6 +999,29 @@ ProcXDGADispatch (ClientPtr client) - return ProcXDGAChangePixmapMode(client); - case X_XDGACreateColormap: - return ProcXDGACreateColormap(client); -+ /* -+ * Old DGA Protocol -+ */ -+#ifdef DGA_PROTOCOL_OLD_SUPPORT -+ case X_XF86DGAGetVideoLL: -+ return ProcXF86DGAGetVideoLL(client); -+ case X_XF86DGADirectVideo: -+ return ProcXF86DGADirectVideo(client); -+ case X_XF86DGAGetViewPortSize: -+ return ProcXF86DGAGetViewPortSize(client); -+ case X_XF86DGASetViewPort: -+ return ProcXF86DGASetViewPort(client); -+ case X_XF86DGAGetVidPage: -+ return ProcXF86DGAGetVidPage(client); -+ case X_XF86DGASetVidPage: -+ return ProcXF86DGASetVidPage(client); -+ case X_XF86DGAInstallColormap: -+ return ProcXF86DGAInstallColormap(client); -+ case X_XF86DGAQueryDirectVideo: -+ return ProcXF86DGAQueryDirectVideo(client); -+ case X_XF86DGAViewPortChanged: -+ return ProcXF86DGAViewPortChanged(client); -+#endif /* DGA_PROTOCOL_OLD_SUPPORT */ - default: - return BadRequest; - } -@@ -751,5 +1030,5 @@ ProcXDGADispatch (ClientPtr client) - void - XFree86DGARegister(INITARGS) - { -- XDGAEventBase = &DGAEventBase; -+ XDGAEventBase = &DGAEventBase; - } -commit 2d9da7a5f384d5f38b2be79b1ea0df5a3deb52d1 -Author: Luc Verhaegen -Date: Thu Oct 9 22:22:53 2008 +0200 - - DGA: Track client state even when using old style DGA. - - This fixes the issue that a badly killed DGA will keep on hogging - mode/framebuffer/mouse/keyboard. - -diff --git a/hw/xfree86/dixmods/extmod/xf86dga2.c b/hw/xfree86/dixmods/extmod/xf86dga2.c -index 100bde9..df0030e 100644 ---- a/hw/xfree86/dixmods/extmod/xf86dga2.c -+++ b/hw/xfree86/dixmods/extmod/xf86dga2.c -@@ -725,6 +725,10 @@ ProcXF86DGADirectVideo(ClientPtr client) - if (!DGAAvailable(stuff->screen)) - return DGAErrorBase + XF86DGANoDirectVideoMode; - -+ if (DGAClients[stuff->screen] && -+ (DGAClients[stuff->screen] != client)) -+ return DGAErrorBase + XF86DGANoDirectVideoMode; -+ - if (stuff->enable & XF86DGADirectGraphics) { - if(!(num = DGAGetOldDGAMode(stuff->screen))) - return (DGAErrorBase + XF86DGANoDirectVideoMode); -@@ -738,6 +742,24 @@ ProcXF86DGADirectVideo(ClientPtr client) - (stuff->enable & XF86DGADirectKeyb) != 0, - (stuff->enable & XF86DGADirectMouse) != 0); - -+ /* We need to track the client and attach the teardown callback */ -+ if (stuff->enable & -+ (XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse)) { -+ if (!DGAClients[stuff->screen]) { -+ if (DGACallbackRefCount++ == 0) -+ AddCallback (&ClientStateCallback, DGAClientStateChange, NULL); -+ } -+ -+ DGAClients[stuff->screen] = client; -+ } else { -+ if (DGAClients[stuff->screen]) { -+ if (--DGACallbackRefCount == 0) -+ DeleteCallback(&ClientStateCallback, DGAClientStateChange, NULL); -+ } -+ -+ DGAClients[stuff->screen] = NULL; -+ } -+ - return (client->noClientException); - } - -@@ -780,22 +802,16 @@ ProcXF86DGASetViewPort(ClientPtr client) - if (stuff->screen > screenInfo.numScreens) - return BadValue; - -+ if (DGAClients[stuff->screen] != client) -+ return DGAErrorBase + XF86DGADirectNotActivated; -+ - REQUEST_SIZE_MATCH(xXF86DGASetViewPortReq); - - if (!DGAAvailable(stuff->screen)) - return (DGAErrorBase + XF86DGANoDirectVideoMode); - - if (!DGAActive(stuff->screen)) -- { -- int num; -- PixmapPtr pix; -- XDGAModeRec mode; -- -- if(!(num = DGAGetOldDGAMode(stuff->screen))) -- return (DGAErrorBase + XF86DGANoDirectVideoMode); -- if(Success != DGASetMode(stuff->screen, num, &mode, &pix)) -- return (DGAErrorBase + XF86DGAScreenNotActive); -- } -+ return DGAErrorBase + XF86DGADirectNotActivated; - - if (DGASetViewport(stuff->screen, stuff->x, stuff->y, DGA_FLIP_RETRACE) - != Success) -@@ -846,6 +862,12 @@ ProcXF86DGAInstallColormap(ClientPtr client) - ColormapPtr pcmp; - REQUEST(xXF86DGAInstallColormapReq); - -+ if (stuff->screen > screenInfo.numScreens) -+ return BadValue; -+ -+ if (DGAClients[stuff->screen] != client) -+ return DGAErrorBase + XF86DGADirectNotActivated; -+ - REQUEST_SIZE_MATCH(xXF86DGAInstallColormapReq); - - if (!DGAActive(stuff->screen)) -@@ -892,6 +914,9 @@ ProcXF86DGAViewPortChanged(ClientPtr client) - if (stuff->screen > screenInfo.numScreens) - return BadValue; - -+ if (DGAClients[stuff->screen] != client) -+ return DGAErrorBase + XF86DGADirectNotActivated; -+ - REQUEST_SIZE_MATCH(xXF86DGAViewPortChangedReq); - - if (!DGAActive(stuff->screen)) diff --git a/fbdevhw.diff b/fbdevhw.diff index c076055..c2fb32c 100644 --- a/fbdevhw.diff +++ b/fbdevhw.diff @@ -1,15 +1,3 @@ ---- hw/xfree86/fbdevhw/fbdevhw.c.orig 2007-09-03 20:48:47.000000000 +0000 -+++ hw/xfree86/fbdevhw/fbdevhw.c 2007-09-03 20:53:12.000000000 +0000 -@@ -245,7 +245,8 @@ - set->green.length == req->green.length && - set->blue.length == req->blue.length && - set->xres == req->xres && set->yres == req->yres && -- set->pixclock == req->pixclock && -+ /* xenfb sets pixclock to 0 (Novell Bug #285523) */ -+ ((set->pixclock == req->pixclock) || !set->pixclock) && - set->right_margin == req->right_margin && - set->hsync_len == req->hsync_len && - set->left_margin == req->left_margin && --- hw/xfree86/fbdevhw/fbdevhw.c.orig 2008-04-20 03:06:32.000000000 +0000 +++ hw/xfree86/fbdevhw/fbdevhw.c 2008-04-20 03:30:00.000000000 +0000 @@ -923,9 +923,10 @@ fbdevHWDPMSSet(ScrnInfoPtr pScrn, int mo diff --git a/miPointerUpdate-crashfix.diff b/miPointerUpdate-crashfix.diff deleted file mode 100644 index 159ea5e..0000000 --- a/miPointerUpdate-crashfix.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- mi/mipointer.c.orig 2008-10-17 15:46:26.000000000 +0200 -+++ mi/mipointer.c 2008-10-17 15:47:11.000000000 +0200 -@@ -252,7 +252,7 @@ miPointerWarpCursor (pScreen, x, y) - { - miPointer.devx = x; - miPointer.devy = y; -- if(!miPointer.pCursor->bits->emptyMask) -+ if(miPointer.pCursor && !miPointer.pCursor->bits->emptyMask) - (*pScreenPriv->spriteFuncs->MoveCursor) (pScreen, x, y); - } - miPointer.x = x; -@@ -345,7 +345,7 @@ miPointerUpdateSprite (DeviceIntPtr pDev - { - miPointer.devx = x; - miPointer.devy = y; -- if(!miPointer.pCursor->bits->emptyMask) -+ if(miPointer.pCursor && !miPointer.pCursor->bits->emptyMask) - (*pScreenPriv->spriteFuncs->MoveCursor) (pScreen, x, y); - } - } -@@ -416,7 +416,7 @@ miPointerMoved (DeviceIntPtr pDev, Scree - { - miPointer.devx = x; - miPointer.devy = y; -- if(!miPointer.pCursor->bits->emptyMask) -+ if(miPointer.pCursor && !miPointer.pCursor->bits->emptyMask) - (*pScreenPriv->spriteFuncs->MoveCursor) (pScreen, x, y); - } - diff --git a/p_ia64-console.diff b/p_ia64-console.diff index dbb4d5a..2371299 100644 --- a/p_ia64-console.diff +++ b/p_ia64-console.diff @@ -24,19 +24,19 @@ diff -u -r1.5 VTsw_usl.c return(TRUE); } } ---- linux/lnx_init.c.orig 2007-08-23 21:04:53.000000000 +0200 -+++ linux/lnx_init.c 2007-09-29 16:19:53.771798500 +0200 -@@ -240,9 +240,6 @@ - - if (!ShareVTs) +--- linux/lnx_init.c.orig 2009-02-27 15:41:39.000000000 +0100 ++++ linux/lnx_init.c 2009-02-27 15:41:47.000000000 +0100 +@@ -252,9 +252,6 @@ xf86OpenConsole(void) { + struct termios nTty; + -#if defined(DO_OS_FONTRESTORE) - lnx_savefont(); -#endif /* * now get the VT. This _must_ succeed, or else fail completely. */ -@@ -254,6 +251,10 @@ +@@ -266,6 +263,10 @@ xf86OpenConsole(void) FatalError("xf86OpenConsole: VT_WAITACTIVE failed: %s\n", strerror(errno)); @@ -47,19 +47,19 @@ diff -u -r1.5 VTsw_usl.c if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) < 0) FatalError("xf86OpenConsole: VT_GETMODE failed %s\n", strerror(errno)); -@@ -342,6 +343,11 @@ +@@ -384,6 +385,11 @@ xf86CloseConsole() if (VTSwitch) { +#if defined(DO_OS_FONTRESTORE) -+ if (xf86Info.vtno == vtno) /* check if we are active */ ++ if (xf86Info.vtno == vtno) /* check if we are active */ + lnx_restorefont(); -+ lnx_freefontdata(); ++ lnx_freefontdata(); +#endif /* * Perform a switch back to the active VT when we were started */ -@@ -356,11 +362,6 @@ +@@ -398,11 +404,6 @@ xf86CloseConsole() activeVT = -1; } diff --git a/p_mouse_misc.diff b/p_mouse_misc.diff deleted file mode 100644 index 2e54b72..0000000 --- a/p_mouse_misc.diff +++ /dev/null @@ -1,50 +0,0 @@ -Index: programs/Xserver/hw/xfree86/common/xf86MiscExt.c -=================================================================== -RCS file: /home/eich/cvs/xc/programs/Xserver/hw/xfree86/common/xf86MiscExt.c,v -retrieving revision 1.1.1.15 -diff -u -r1.1.1.15 xf86MiscExt.c ---- programs/Xserver/hw/xfree86/common/xf86MiscExt.c 6 Jul 2004 15:12:40 -0000 1.1.1.15 -+++ programs/Xserver/hw/xfree86/common/xf86MiscExt.c 17 Mar 2005 18:39:52 -0000 -@@ -166,6 +166,11 @@ - *devname = xf86FindOptionValue(pInfo->options, "Device"); - pMse = pInfo->private; - -+ if (pMse->magic != MOUSE_MAGIC -+ || pMse->size != sizeof(*pMse)) -+ return FALSE; -+ -+ - mseptr->type = MapMseProtoToMisc(pMse->protocolID); - mseptr->baudrate = pMse->baudRate; - mseptr->samplerate = pMse->sampleRate; -@@ -533,6 +538,11 @@ - - pInfo = mse->private; - pMse = pInfo->private; -+ -+ if (pMse->magic != MOUSE_MAGIC -+ || pMse->size != sizeof(*pMse)) -+ return MISC_RET_NOMODULE; -+ - oldflags = pMse->mouseFlags; - - newProtocol = MapMseMiscToProto(mse->type); -Index: programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h -=================================================================== -RCS file: /home/eich/cvs/xc/programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h,v -retrieving revision 1.1.1.21 -diff -u -r1.1.1.21 xf86OSmouse.h ---- programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h 1 Nov 2004 16:46:39 -0000 1.1.1.21 -+++ programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h 17 Mar 2005 18:39:52 -0000 -@@ -204,7 +204,11 @@ - int dx, int dy, int dz, int dw); - typedef void (*MouseCommonOptProc)(InputInfoPtr pInfo); - -+#define MOUSE_MAGIC 15031995 -+ - typedef struct _MouseDevRec { -+ unsigned long magic; -+ int size; - PtrCtrlProcPtr Ctrl; - PostMseEventProc PostEvent; - MouseCommonOptProc CommonOptions; diff --git a/ps_showopts.diff b/ps_showopts.diff deleted file mode 100644 index df5c53f..0000000 --- a/ps_showopts.diff +++ /dev/null @@ -1,218 +0,0 @@ ---- hw/xfree86/common/Makefile.am.orig 2008-05-21 23:51:52.000000000 +0200 -+++ hw/xfree86/common/Makefile.am 2008-06-16 17:42:56.000000000 +0200 -@@ -29,7 +29,7 @@ - BUILT_SOURCES = xf86DefModeSet.c - - AM_LDFLAGS = -r --libcommon_la_SOURCES = xf86Configure.c xf86Bus.c xf86Config.c \ -+libcommon_la_SOURCES = xf86Configure.c xf86ShowOpts.c xf86Bus.c xf86Config.c \ - xf86Cursor.c xf86DGA.c xf86DPMS.c \ - xf86DoProbe.c xf86Events.c \ - xf86Globals.c xf86AutoConfig.c \ ---- hw/xfree86/common.orig/xf86.h 2006-08-06 18:01:51.000000000 +0200 -+++ hw/xfree86/common/xf86.h 2006-08-06 18:05:18.000000000 +0200 -@@ -48,6 +48,7 @@ - - /* General parameters */ - extern int xf86DoConfigure; -+extern int xf86DoShowOptions; - extern Bool xf86DoConfigurePass1; - extern int xf86ScreenIndex; /* Index into pScreen.devPrivates */ - extern int xf86CreateRootWindowIndex; /* Index into pScreen.devPrivates */ ---- hw/xfree86/common.orig/xf86Globals.c 2006-08-06 18:01:51.000000000 +0200 -+++ hw/xfree86/common/xf86Globals.c 2006-08-06 18:05:49.000000000 +0200 -@@ -188,6 +188,7 @@ - Bool xf86ProbeFailed = FALSE; - Bool xf86DoProbe = FALSE; - Bool xf86DoConfigure = FALSE; -+Bool xf86DoShowOptions = FALSE; - DriverPtr *xf86DriverList = NULL; - int xf86NumDrivers = 0; - InputDriverPtr *xf86InputDriverList = NULL; ---- hw/xfree86/common/xf86Init.c.orig 2008-05-21 23:51:52.000000000 +0200 -+++ hw/xfree86/common/xf86Init.c 2008-06-16 17:48:54.000000000 +0200 -@@ -500,7 +500,7 @@ - } - - /* Read and parse the config file */ -- if (!xf86DoProbe && !xf86DoConfigure) { -+ if (!xf86DoProbe && !xf86DoConfigure && !xf86DoShowOptions) { - switch (xf86HandleConfigFile(FALSE)) { - case CONFIG_OK: - break; -@@ -526,6 +526,9 @@ - LoaderSetOptions(LDR_OPT_ABI_MISMATCH_NONFATAL); - } - -+ if (xf86DoShowOptions) -+ DoShowOptions(); -+ - xf86OpenConsole(); - - /* Do a general bus probe. This will be a PCI probe for x86 platforms */ -@@ -1680,6 +1683,15 @@ - xf86AllowMouseOpenFail = TRUE; - return 1; - } -+ if (!strcmp(argv[i], "-showopts")) -+ { -+ if (getuid() != 0 && geteuid() == 0) { -+ ErrorF("The '-showopts' option can only be used by root.\n"); -+ exit(1); -+ } -+ xf86DoShowOptions = TRUE; -+ return 1; -+ } - if (!strcmp(argv[i], "-isolateDevice")) - { - int bus, device, func; -@@ -1723,6 +1735,7 @@ - ErrorF("-modulepath paths specify the module search path\n"); - ErrorF("-logfile file specify a log file name\n"); - ErrorF("-configure probe for devices and write an "__XCONFIGFILE__"\n"); -+ ErrorF("-showopts print available options for all installed drivers\n"); - } - ErrorF("-config file specify a configuration file, relative to the\n"); - ErrorF(" "__XCONFIGFILE__" search path, only root can use absolute\n"); ---- hw/xfree86/common.orig/xf86Priv.h 2006-08-06 18:01:51.000000000 +0200 -+++ hw/xfree86/common/xf86Priv.h 2006-08-06 18:02:03.000000000 +0200 -@@ -169,6 +169,7 @@ - /* xf86DoProbe.c */ - void DoProbe(void); - void DoConfigure(void); -+void DoShowOptions(void); - - /* xf86Events.c */ - ---- hw/xfree86/common.orig/xf86ShowOpts.c 1970-01-01 01:00:00.000000000 +0100 -+++ hw/xfree86/common/xf86ShowOpts.c 2006-08-06 18:02:03.000000000 +0200 -@@ -0,0 +1,129 @@ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86ShopwOpts.c,v 3.80 2003/10/08 14:58:27 dawes Exp $ */ -+/* -+ * Copyright 2000-2002 by Alan Hourihane, Flint Mountain, North Wales. -+ * -+ * Permission to use, copy, modify, distribute, and sell this software and its -+ * documentation for any purpose is hereby granted without fee, provided that -+ * the above copyright notice appear in all copies and that both that -+ * copyright notice and this permission notice appear in supporting -+ * documentation, and that the name of Alan Hourihane not be used in -+ * advertising or publicity pertaining to distribution of the software without -+ * specific, written prior permission. Alan Hourihane makes no representations -+ * about the suitability of this software for any purpose. It is provided -+ * "as is" without express or implied warranty. -+ * -+ * ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+ * EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -+ * PERFORMANCE OF THIS SOFTWARE. -+ * -+ * Author: Marcus Schaefer, ms@suse.de -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include "os.h" -+#ifdef XFree86LOADER -+#include "loaderProcs.h" -+#endif -+#include "xf86.h" -+#include "xf86Config.h" -+#include "xf86_OSlib.h" -+#include "xf86Priv.h" -+/* #include "xf86PciData.h" */ -+#define IN_XSERVER -+#include "xf86Parser.h" -+#include "xf86tokens.h" -+#include "Configint.h" -+#include "vbe.h" -+#include "xf86DDC.h" -+#if defined(__sparc__) && !defined(__OpenBSD__) -+#include "xf86Bus.h" -+#include "xf86Sbus.h" -+#endif -+#include "globals.h" -+ -+static const char* -+optionTypeToSting(OptionValueType type) -+{ -+ switch (type) { -+ case OPTV_NONE: -+ return ""; -+ case OPTV_INTEGER: -+ return ""; -+ case OPTV_STRING: -+ return ""; -+ case OPTV_ANYSTR: -+ return ""; -+ case OPTV_REAL: -+ return ""; -+ case OPTV_BOOLEAN: -+ return ""; -+ case OPTV_FREQ: -+ return ""; -+ default: -+ return ""; -+ } -+} -+ -+void DoShowOptions (void) { -+ int i = 0; -+ char **vlist = 0; -+ char *pSymbol = 0; -+ XF86ModuleData *initData = 0; -+ if (! (vlist = xf86DriverlistFromCompile())) { -+ ErrorF("Missing output drivers\n"); -+ goto bail; -+ } -+ xf86LoadModules (vlist,0); -+ xfree (vlist); -+ for (i = 0; i < xf86NumDrivers; i++) { -+ if (xf86DriverList[i]->AvailableOptions) { -+ OptionInfoPtr pOption = (OptionInfoPtr)(*xf86DriverList[i]->AvailableOptions)(0,0); -+ if (! pOption) { -+ ErrorF ("(EE) Couldn't read option table for %s driver\n", -+ xf86DriverList[i]->driverName -+ ); -+ continue; -+ } -+ pSymbol = xalloc ( -+ strlen(xf86DriverList[i]->driverName) + strlen("ModuleData") + 1 -+ ); -+ strcpy (pSymbol, xf86DriverList[i]->driverName); -+ strcat (pSymbol, "ModuleData"); -+ initData = LoaderSymbol (pSymbol); -+ if (initData) { -+ XF86ModuleVersionInfo *vers = initData->vers; -+ ErrorF ("Driver[%d]:%s[%s] {\n", -+ i,xf86DriverList[i]->driverName,vers->vendor -+ ); -+ OptionInfoPtr p; -+ for (p = pOption; p->name != NULL; p++) { -+ const char *opttype = optionTypeToSting(p->type); -+ char *optname = xalloc(strlen(p->name) + 2 + 1); -+ if (!optname) { -+ continue; -+ } -+ sprintf(optname, "%s", p->name); -+ ErrorF ("\t%s:%s\n", optname,opttype); -+ } -+ ErrorF ("}\n"); -+ } -+ } -+ } -+ bail: -+ OsCleanup (TRUE); -+ AbortDDX (); -+ fflush (stderr); -+ exit (0); -+} diff --git a/randr1_1-sig11.diff b/randr1_1-sig11.diff index 180ff49..305396d 100644 --- a/randr1_1-sig11.diff +++ b/randr1_1-sig11.diff @@ -1,14 +1,12 @@ -diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c -index 4432ad9..7e446de 100644 ---- a/hw/xfree86/common/xf86RandR.c -+++ b/hw/xfree86/common/xf86RandR.c -@@ -223,6 +223,9 @@ xf86RandRSetConfig (ScreenPtr pScreen, +--- xorg-server-1.6.0/hw/xfree86/common/xf86RandR.c.orig 2009-02-25 20:12:11.000000000 +0100 ++++ xorg-server-1.6.0/hw/xfree86/common/xf86RandR.c 2009-02-27 17:04:34.000000000 +0100 +@@ -246,6 +246,9 @@ xf86RandRSetConfig (ScreenPtr pScreen, Bool useVirtual = FALSE; Rotation oldRotation = randrp->rotation; + if (!scrp->vtSema) + return FALSE; + - miPointerPosition (&px, &py); + miPointerGetPosition(inputInfo.pointer, &px, &py); for (mode = scrp->modes; ; mode = mode->next) { diff --git a/unplugged_monitor_crashfix.diff b/unplugged_monitor_crashfix.diff deleted file mode 100644 index 035692b..0000000 --- a/unplugged_monitor_crashfix.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- hw/xfree86/modes/xf86Crtc.c.orig 2008-11-05 17:21:08.000000000 +0100 -+++ hw/xfree86/modes/xf86Crtc.c 2008-11-05 17:24:07.000000000 +0100 -@@ -1176,10 +1176,12 @@ xf86InitialOutputPositions (ScrnInfoPtr - output->initial_x += xf86ModeWidth (modes[or], relative->initial_rotation); - break; - case OPTION_ABOVE: -- output->initial_y -= xf86ModeHeight (modes[o], relative->initial_rotation); -+ if (modes[o]) -+ output->initial_y -= xf86ModeHeight (modes[o], output->initial_rotation); - break; - case OPTION_LEFT_OF: -- output->initial_x -= xf86ModeWidth (modes[o], relative->initial_rotation); -+ if (modes[o]) -+ output->initial_x -= xf86ModeWidth (modes[o], output->initial_rotation); - break; - default: - break; diff --git a/xephyr.diff b/xephyr.diff index bff0fec..0331bd2 100644 --- a/xephyr.diff +++ b/xephyr.diff @@ -1,25 +1,19 @@ ---- hw/kdrive/Makefile.am.orig 2006-10-23 16:23:04.000000000 +0200 -+++ hw/kdrive/Makefile.am 2006-10-23 16:23:34.000000000 +0200 -@@ -1,10 +1,9 @@ - if KDRIVEVESA --VESA_SUBDIRS = vesa ati chips epson i810 mach64 mga nvidia pm2 r128 \ -- smi via -+VESA_SUBDIRS = - endif - +--- hw/kdrive/Makefile.am.orig 2008-11-14 22:27:05.000000000 +0100 ++++ hw/kdrive/Makefile.am 2009-02-27 15:45:07.000000000 +0100 +@@ -1,5 +1,5 @@ if BUILD_KDRIVEFBDEVLIB -FBDEV_SUBDIRS = fbdev +FBDEV_SUBDIRS = endif - if XSDLSERVER -@@ -21,8 +20,7 @@ + if XFAKESERVER +@@ -21,8 +21,7 @@ + SERVER_SUBDIRS = \ $(XSDL_SUBDIRS) \ $(FBDEV_SUBDIRS) \ - $(VESA_SUBDIRS) \ - $(XEPHYR_SUBDIRS) \ - $(XFAKE_SUBDIRS) + $(XEPHYR_SUBDIRS) - DIST_SUBDIRS = vesa ati chips epson i810 mach64 mga neomagic nvidia pm2 r128 \ - smi via fbdev sdl ephyr src linux fake sis300 + SUBDIRS = \ + src \ diff --git a/xorg-server-1.5.2.tar.bz2 b/xorg-server-1.5.2.tar.bz2 deleted file mode 100644 index 5ceaa14..0000000 --- a/xorg-server-1.5.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2ff9a6a280aaa8fe887c538e6099c0fdcfa94cb9dac800bde3b584cc9f325dc0 -size 5615666 diff --git a/xorg-server-1.6.0.tar.bz2 b/xorg-server-1.6.0.tar.bz2 new file mode 100644 index 0000000..64a68e6 --- /dev/null +++ b/xorg-server-1.6.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:81a9a02b621e8a3e0bae1ad1b5dd6706a3fdcdbe766d75e1670ab5b3f0d32812 +size 4655422 diff --git a/xorg-server-xf4vnc.patch b/xorg-server-xf4vnc.patch index 0b8256e..dea21ae 100644 --- a/xorg-server-xf4vnc.patch +++ b/xorg-server-xf4vnc.patch @@ -1,9 +1,8 @@ -diff --git a/Makefile.am b/Makefile.am -index e382d58..e655a2b 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -30,6 +30,10 @@ if DBE - DBE_DIR=dbe +diff -u -r -p -N xorg-server-1.6.0.orig//Makefile.am xorg-server-1.6.0/Makefile.am +--- xorg-server-1.6.0.orig//Makefile.am 2009-02-27 16:01:19.000000000 +0100 ++++ xorg-server-1.6.0/Makefile.am 2009-02-27 16:05:03.000000000 +0100 +@@ -17,6 +17,10 @@ if RECORD + RECORD_DIR=record endif +if XCLIPLIST @@ -13,19 +12,18 @@ index e382d58..e655a2b 100644 SUBDIRS = \ doc \ include \ -@@ -54,6 +58,7 @@ SUBDIRS = \ - $(XTRAP_DIR) \ +@@ -36,6 +40,7 @@ SUBDIRS = \ + damageext \ $(COMPOSITE_DIR) \ $(GLX_DIR) \ + $(XCLIPLIST_DIR) \ exa \ config \ hw -diff --git a/configure.ac b/configure.ac -index 5417bbb..5679cba 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -558,6 +558,8 @@ AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils], [Build +diff -u -r -p -N xorg-server-1.6.0.orig//configure.ac xorg-server-1.6.0/configure.ac +--- xorg-server-1.6.0.orig//configure.ac 2009-02-27 16:01:19.000000000 +0100 ++++ xorg-server-1.6.0/configure.ac 2009-02-27 16:07:17.000000000 +0100 +@@ -553,6 +553,8 @@ AC_ARG_ENABLE(xfree86-utils, AS_HELP dnl DDXes. AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto]) @@ -34,7 +32,7 @@ index 5417bbb..5679cba 100644 AC_ARG_ENABLE(dmx, AS_HELP_STRING([--enable-dmx], [Build DMX server (default: no)]), [DMX=$enableval], [DMX=no]) AC_ARG_ENABLE(xvfb, AS_HELP_STRING([--enable-xvfb], [Build Xvfb server (default: yes)]), [XVFB=$enableval], [XVFB=yes]) AC_ARG_ENABLE(xnest, AS_HELP_STRING([--enable-xnest], [Build Xnest server (default: auto)]), [XNEST=$enableval], [XNEST=auto]) -@@ -998,6 +1000,20 @@ XI_INC='-I$(top_srcdir)/Xi' +@@ -987,6 +989,20 @@ XI_INC='-I$(top_srcdir)/Xi' AM_CONDITIONAL(XF86UTILS, test "x$XF86UTILS" = xyes) @@ -55,7 +53,7 @@ index 5417bbb..5679cba 100644 AC_DEFINE(SHAPE, 1, [Support SHAPE extension]) AC_DEFINE(XKB, 1, [Build XKB]) -@@ -1193,6 +1209,40 @@ dnl --------------------------------------------------------------------------- +@@ -1182,6 +1198,40 @@ dnl ------------------------------------ dnl DDX section. dnl --------------------------------------------------------------------------- @@ -96,7 +94,7 @@ index 5417bbb..5679cba 100644 dnl Xvfb DDX AC_MSG_CHECKING([whether to build Xvfb DDX]) -@@ -2123,6 +2173,7 @@ Xext/Makefile +@@ -1824,6 +1874,7 @@ Xext/Makefile Xi/Makefile xfixes/Makefile exa/Makefile @@ -104,15 +102,15 @@ index 5417bbb..5679cba 100644 hw/Makefile hw/xfree86/Makefile hw/xfree86/common/Makefile -@@ -2160,6 +2211,7 @@ hw/xfree86/ramdac/Makefile +@@ -1858,6 +1909,7 @@ hw/xfree86/ramdac/Makefile hw/xfree86/shadowfb/Makefile hw/xfree86/vbe/Makefile hw/xfree86/vgahw/Makefile +hw/xfree86/vnc/Makefile hw/xfree86/x86emu/Makefile hw/xfree86/xaa/Makefile - hw/xfree86/xf1bpp/Makefile -@@ -2178,8 +2230,10 @@ hw/dmx/doc/Makefile + hw/xfree86/xf8_16bpp/Makefile +@@ -1869,8 +1921,10 @@ hw/dmx/doc/Makefile hw/dmx/examples/Makefile hw/dmx/input/Makefile hw/dmx/glxProxy/Makefile @@ -120,15 +118,14 @@ index 5417bbb..5679cba 100644 hw/dmx/Makefile hw/vfb/Makefile +hw/vnc/Makefile - hw/xgl/Makefile - hw/xgl/egl/Makefile - hw/xgl/egl/module/Makefile -diff --git a/hw/Makefile.am b/hw/Makefile.am -index c2b9571..7ad240e 100644 ---- a/hw/Makefile.am -+++ b/hw/Makefile.am -@@ -30,6 +30,10 @@ if XPRINT - XPRINT_SUBDIRS = xprint + hw/xnest/Makefile + hw/xwin/Makefile + hw/xquartz/Makefile +diff -u -r -p -N xorg-server-1.6.0.orig//hw/Makefile.am xorg-server-1.6.0/hw/Makefile.am +--- xorg-server-1.6.0.orig//hw/Makefile.am 2009-02-27 16:01:19.000000000 +0100 ++++ xorg-server-1.6.0/hw/Makefile.am 2009-02-27 16:09:07.000000000 +0100 +@@ -22,6 +22,10 @@ if KDRIVE + KDRIVE_SUBDIRS = kdrive endif +if VNC @@ -138,27 +135,17 @@ index c2b9571..7ad240e 100644 if XQUARTZ XQUARTZ_SUBDIRS = xquartz endif -@@ -40,12 +44,13 @@ SUBDIRS = \ - $(XWIN_SUBDIRS) \ +@@ -32,6 +36,7 @@ SUBDIRS = \ $(XVFB_SUBDIRS) \ $(XNEST_SUBDIRS) \ -- $(DMX_SUBDIRS) \ -- $(KDRIVE_SUBDIRS) \ -+ $(DMX_SUBDIRS) \ -+ $(VNC_SUBDIRS) \ -+ $(KDRIVE_SUBDIRS) \ - $(XQUARTZ_SUBDIRS) \ - $(XPRINT_SUBDIRS) + $(DMX_SUBDIRS) \ ++ $(VNC_SUBDIRS) \ + $(KDRIVE_SUBDIRS) \ + $(XQUARTZ_SUBDIRS) --DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xgl xprint -+DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xgl xprint vnc - - relink: - for i in $(SUBDIRS) ; do $(MAKE) -C $$i relink ; done -diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am -index 8457aea..e7cf89f 100644 ---- a/hw/dmx/Makefile.am -+++ b/hw/dmx/Makefile.am +diff -u -r -p -N xorg-server-1.6.0.orig//hw/dmx/Makefile.am xorg-server-1.6.0/hw/dmx/Makefile.am +--- xorg-server-1.6.0.orig//hw/dmx/Makefile.am 2009-02-27 16:01:19.000000000 +0100 ++++ xorg-server-1.6.0/hw/dmx/Makefile.am 2009-02-27 16:05:03.000000000 +0100 @@ -1,6 +1,6 @@ -DIST_SUBDIRS = input config glxProxy examples doc +DIST_SUBDIRS = input vnc config glxProxy examples doc @@ -168,10 +155,9 @@ index 8457aea..e7cf89f 100644 bin_PROGRAMS = Xdmx if XINERAMA -diff --git a/hw/dmx/dmx-config.h b/hw/dmx/dmx-config.h -index 343fdab..9f7ca47 100644 ---- a/hw/dmx/dmx-config.h -+++ b/hw/dmx/dmx-config.h +diff -u -r -p -N xorg-server-1.6.0.orig//hw/dmx/dmx-config.h xorg-server-1.6.0/hw/dmx/dmx-config.h +--- xorg-server-1.6.0.orig//hw/dmx/dmx-config.h 2009-02-27 16:01:19.000000000 +0100 ++++ xorg-server-1.6.0/hw/dmx/dmx-config.h 2009-02-27 16:05:03.000000000 +0100 @@ -72,6 +72,9 @@ /* Enable the DMX extension */ #define DMXEXT @@ -180,12 +166,11 @@ index 343fdab..9f7ca47 100644 +#define DMXVNC 1 + /* Disable the extensions that are not currently supported */ - #undef BEZIER - #undef PEXEXT -diff --git a/hw/dmx/dmxinit.c b/hw/dmx/dmxinit.c -index 29dc005..f313e7e 100644 ---- a/hw/dmx/dmxinit.c -+++ b/hw/dmx/dmxinit.c + #undef MULTIBUFFER + #undef XV +diff -u -r -p -N xorg-server-1.6.0.orig//hw/dmx/dmxinit.c xorg-server-1.6.0/hw/dmx/dmxinit.c +--- xorg-server-1.6.0.orig//hw/dmx/dmxinit.c 2009-02-27 16:01:19.000000000 +0100 ++++ xorg-server-1.6.0/hw/dmx/dmxinit.c 2009-02-27 16:05:03.000000000 +0100 @@ -77,6 +77,10 @@ extern void GlxSetVisualConfigs( ); #endif /* GLXEXT */ @@ -197,7 +182,7 @@ index 29dc005..f313e7e 100644 /* Global variables available to all Xserver/hw/dmx routines. */ int dmxNumScreens; DMXScreenInfo *dmxScreens; -@@ -812,6 +816,9 @@ void InitOutput(ScreenInfo *pScreenInfo, int argc, char *argv[]) +@@ -805,6 +809,9 @@ void InitOutput(ScreenInfo *pScreenInfo, dmxLog(dmxInfo, "Shadow framebuffer support %s\n", dmxShadowFB ? "enabled" : "disabled"); @@ -207,7 +192,7 @@ index 29dc005..f313e7e 100644 } /* RATS: Assuming the fp string (which comes from the command-line argv -@@ -1045,3 +1052,14 @@ void ddxUseMsg(void) +@@ -1031,3 +1038,14 @@ void ddxUseMsg(void) ErrorF(" Ctrl-Alt-q Quit (core devices only)\n"); ErrorF(" Ctrl-Alt-F* Switch to VC (local only)\n"); } @@ -222,11 +207,10 @@ index 29dc005..f313e7e 100644 + return tp.tv_sec * 1000 + tp.tv_usec / 1000; +} +#endif -diff --git a/hw/dmx/dmxsync.c b/hw/dmx/dmxsync.c -index c1aa431..2498a38 100644 ---- a/hw/dmx/dmxsync.c -+++ b/hw/dmx/dmxsync.c -@@ -99,9 +99,16 @@ static void dmxSyncBlockHandler(pointer blockData, OSTimePtr pTimeout, +diff -u -r -p -N xorg-server-1.6.0.orig//hw/dmx/dmxsync.c xorg-server-1.6.0/hw/dmx/dmxsync.c +--- xorg-server-1.6.0.orig//hw/dmx/dmxsync.c 2009-02-27 16:01:19.000000000 +0100 ++++ xorg-server-1.6.0/hw/dmx/dmxsync.c 2009-02-27 16:05:03.000000000 +0100 +@@ -99,9 +99,16 @@ static void dmxSyncBlockHandler(pointer TimerForce(dmxSyncTimer); } @@ -243,23 +227,21 @@ index c1aa431..2498a38 100644 } /** Request the XSync() batching optimization with the specified \a -diff --git a/hw/dmx/input/Makefile.am b/hw/dmx/input/Makefile.am -index da8de05..1969a0c 100644 ---- a/hw/dmx/input/Makefile.am -+++ b/hw/dmx/input/Makefile.am +diff -u -r -p -N xorg-server-1.6.0.orig//hw/dmx/input/Makefile.am xorg-server-1.6.0/hw/dmx/input/Makefile.am +--- xorg-server-1.6.0.orig//hw/dmx/input/Makefile.am 2009-02-27 16:01:19.000000000 +0100 ++++ xorg-server-1.6.0/hw/dmx/input/Makefile.am 2009-02-27 16:05:03.000000000 +0100 @@ -65,6 +65,7 @@ AM_CFLAGS = $(DIX_CFLAGS) \ - -I$(top_srcdir)/hw/xfree86/common \ + -I$(top_srcdir)/hw/dmx \ $(GLX_INCS) \ -DHAVE_DMX_CONFIG_H \ + -DDMXVNC=1 \ $(GLX_DEFS) \ @DMXMODULES_CFLAGS@ -diff --git a/hw/dmx/input/dmxcommon.c b/hw/dmx/input/dmxcommon.c -index e77bb79..0866c84 100644 ---- a/hw/dmx/input/dmxcommon.c -+++ b/hw/dmx/input/dmxcommon.c -@@ -655,7 +655,6 @@ void dmxCommonRestoreState(pointer private) +diff -u -r -p -N xorg-server-1.6.0.orig//hw/dmx/input/dmxcommon.c xorg-server-1.6.0/hw/dmx/input/dmxcommon.c +--- xorg-server-1.6.0.orig//hw/dmx/input/dmxcommon.c 2009-02-27 16:01:19.000000000 +0100 ++++ xorg-server-1.6.0/hw/dmx/input/dmxcommon.c 2009-02-27 16:05:03.000000000 +0100 +@@ -655,7 +655,6 @@ void dmxCommonRestoreState(pointer priva dmxLogInput(dmxInput, "Keyboard busy, waiting\n"); else dmxLogInput(dmxInput, "Keyboard error, waiting\n"); @@ -267,11 +249,10 @@ index e77bb79..0866c84 100644 /* Don't generate X11 protocol for a bit */ for (tmp = GetTimeInMillis(); GetTimeInMillis() - tmp < 250;) { usleep(250); /* This ends up sleeping only until -diff --git a/hw/dmx/input/dmxinputinit.c b/hw/dmx/input/dmxinputinit.c -index fd4eeaa..7de9546 100644 ---- a/hw/dmx/input/dmxinputinit.c -+++ b/hw/dmx/input/dmxinputinit.c -@@ -393,6 +393,10 @@ static int dmxKeyboardOn(DeviceIntPtr pDevice, DMXLocalInitInfo *info) +diff -u -r -p -N xorg-server-1.6.0.orig//hw/dmx/input/dmxinputinit.c xorg-server-1.6.0/hw/dmx/input/dmxinputinit.c +--- xorg-server-1.6.0.orig//hw/dmx/input/dmxinputinit.c 2009-02-27 16:01:19.000000000 +0100 ++++ xorg-server-1.6.0/hw/dmx/input/dmxinputinit.c 2009-02-27 16:11:48.000000000 +0100 +@@ -391,6 +391,10 @@ static int dmxKeyboardOn(DeviceIntPtr pD DevicePtr pDev = &pDevice->public; #endif @@ -282,32 +263,31 @@ index fd4eeaa..7de9546 100644 #ifdef XKB if (noXkbExtension) { #endif -@@ -480,6 +484,10 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what) +@@ -476,6 +480,10 @@ static int dmxDeviceOnOff(DeviceIntPtr p break; } if (info.keyClass) { +#ifdef DMXVNC -+ vncSetKeyboardDevice(pDevice); ++ vncSetKeyboardDevice(pDevice); +#endif + - #if 00 /*BP*/ - InitKeyClassDeviceStruct(pDevice, &info.keySyms, info.modMap); - #else -@@ -534,6 +542,9 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what) + DevicePtr pDev = (DevicePtr) pDevice; + InitKeyboardDeviceStruct(pDev, + &info.keySyms, +@@ -512,6 +520,9 @@ static int dmxDeviceOnOff(DeviceIntPtr p + info.res[i+1], info.minres[i+1], info.maxres[i+1]); - #endif } +#ifdef DMXVNC + vncSetPointerDevice(pDevice); +#endif } if (info.focusClass) InitFocusClassDeviceStruct(pDevice); - #ifdef XINPUT -diff --git a/hw/dmx/input/dmxinputinit.h b/hw/dmx/input/dmxinputinit.h -index 6f491ed..e6297f0 100644 ---- a/hw/dmx/input/dmxinputinit.h -+++ b/hw/dmx/input/dmxinputinit.h -@@ -290,4 +290,9 @@ extern int dmxInputAttachConsole(const char *name, int isCore, + if (info.proximityClass) InitProximityClassDeviceStruct(pDevice); +diff -u -r -p -N xorg-server-1.6.0.orig//hw/dmx/input/dmxinputinit.h xorg-server-1.6.0/hw/dmx/input/dmxinputinit.h +--- xorg-server-1.6.0.orig//hw/dmx/input/dmxinputinit.h 2009-02-27 16:01:19.000000000 +0100 ++++ xorg-server-1.6.0/hw/dmx/input/dmxinputinit.h 2009-02-27 16:05:03.000000000 +0100 +@@ -290,4 +290,9 @@ extern int dmxInputAttachConsol extern int dmxInputAttachBackend(int physicalScreen, int isCore, int *id); @@ -317,11 +297,9 @@ index 6f491ed..e6297f0 100644 +#endif + #endif -diff --git a/hw/dmx/vnc/.gitignore b/hw/dmx/vnc/.gitignore -new file mode 100644 -index 0000000..d14621f ---- /dev/null -+++ b/hw/dmx/vnc/.gitignore +diff -u -r -p -N xorg-server-1.6.0.orig//hw/dmx/vnc/.gitignore xorg-server-1.6.0/hw/dmx/vnc/.gitignore +--- xorg-server-1.6.0.orig//hw/dmx/vnc/.gitignore 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/dmx/vnc/.gitignore 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,36 @@ +auth.c +cmap.c @@ -359,11 +337,9 @@ index 0000000..d14621f +vncext.c +xistubs.c +zlib.c -diff --git a/hw/dmx/vnc/Makefile.am b/hw/dmx/vnc/Makefile.am -new file mode 100644 -index 0000000..48c07bd ---- /dev/null -+++ b/hw/dmx/vnc/Makefile.am +diff -u -r -p -N xorg-server-1.6.0.orig//hw/dmx/vnc/Makefile.am xorg-server-1.6.0/hw/dmx/vnc/Makefile.am +--- xorg-server-1.6.0.orig//hw/dmx/vnc/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/dmx/vnc/Makefile.am 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,43 @@ +noinst_LIBRARIES = libdmxvnc.a + @@ -408,11 +384,9 @@ index 0000000..48c07bd + @DMXMODULES_CFLAGS@ + +###EXTRA_DIST = dmxdetach.c -diff --git a/hw/dmx/vnc/vncInit.c b/hw/dmx/vnc/vncInit.c -new file mode 100644 -index 0000000..5fdf647 ---- /dev/null -+++ b/hw/dmx/vnc/vncInit.c +diff -u -r -p -N xorg-server-1.6.0.orig//hw/dmx/vnc/vncInit.c xorg-server-1.6.0/hw/dmx/vnc/vncInit.c +--- xorg-server-1.6.0.orig//hw/dmx/vnc/vncInit.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/dmx/vnc/vncInit.c 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,453 @@ +/* + * Copyright (C) 2002 Alan Hourihane. All Rights Reserved. @@ -867,11 +841,9 @@ index 0000000..5fdf647 + rfbCheckFds(pScreen); + httpCheckFds(pScreen); +} -diff --git a/hw/dmx/vnc/vncint.h b/hw/dmx/vnc/vncint.h -new file mode 100644 -index 0000000..afa84f8 ---- /dev/null -+++ b/hw/dmx/vnc/vncint.h +diff -u -r -p -N xorg-server-1.6.0.orig//hw/dmx/vnc/vncint.h xorg-server-1.6.0/hw/dmx/vnc/vncint.h +--- xorg-server-1.6.0.orig//hw/dmx/vnc/vncint.h 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/dmx/vnc/vncint.h 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,153 @@ +/* + * Copyright (C) 2002 Alan Hourihane. All Rights Reserved. @@ -1026,11 +998,9 @@ index 0000000..afa84f8 + +#endif /* _VNCINT_H_ */ + -diff --git a/hw/vnc/LICENCE.TXT b/hw/vnc/LICENCE.TXT -new file mode 100644 -index 0000000..ae3b531 ---- /dev/null -+++ b/hw/vnc/LICENCE.TXT +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/LICENCE.TXT xorg-server-1.6.0/hw/vnc/LICENCE.TXT +--- xorg-server-1.6.0.orig//hw/vnc/LICENCE.TXT 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/LICENCE.TXT 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 @@ -1372,11 +1342,9 @@ index 0000000..ae3b531 +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. -diff --git a/hw/vnc/Makefile.am b/hw/vnc/Makefile.am -new file mode 100644 -index 0000000..9bf90ec ---- /dev/null -+++ b/hw/vnc/Makefile.am +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/Makefile.am xorg-server-1.6.0/hw/vnc/Makefile.am +--- xorg-server-1.6.0.orig//hw/vnc/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/Makefile.am 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,54 @@ +# XXX This Makefile.am probably needs some work. + @@ -1432,11 +1400,9 @@ index 0000000..9bf90ec + +relink: + rm -f Xvnc && $(MAKE) Xvnc -diff --git a/hw/vnc/README b/hw/vnc/README -new file mode 100644 -index 0000000..d65d560 ---- /dev/null -+++ b/hw/vnc/README +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/README xorg-server-1.6.0/hw/vnc/README +--- xorg-server-1.6.0.orig//hw/vnc/README 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/README 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,14 @@ + +This is the directory containing the code specific to the TightVNC X server (Xvnc). @@ -1452,11 +1418,9 @@ index 0000000..d65d560 + +Moved to X.org modular tree by Brian Paul. + -diff --git a/hw/vnc/auth.c b/hw/vnc/auth.c -new file mode 100644 -index 0000000..f91a1ed ---- /dev/null -+++ b/hw/vnc/auth.c +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/auth.c xorg-server-1.6.0/hw/vnc/auth.c +--- xorg-server-1.6.0.orig//hw/vnc/auth.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/auth.c 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,566 @@ +/* + * auth.c - deal with authentication. @@ -2024,11 +1988,9 @@ index 0000000..f91a1ed + return pVNC->rfbAuthTooManyTries; +} + -diff --git a/hw/vnc/cmap.c b/hw/vnc/cmap.c -new file mode 100644 -index 0000000..2e4514a ---- /dev/null -+++ b/hw/vnc/cmap.c +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/cmap.c xorg-server-1.6.0/hw/vnc/cmap.c +--- xorg-server-1.6.0.orig//hw/vnc/cmap.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/cmap.c 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,166 @@ +/* + * cmap.c @@ -2196,11 +2158,9 @@ index 0000000..2e4514a + pmap->pScreen->StoreColors = rfbStoreColors; +#endif +} -diff --git a/hw/vnc/corre.c b/hw/vnc/corre.c -new file mode 100644 -index 0000000..1a9b4d5 ---- /dev/null -+++ b/hw/vnc/corre.c +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/corre.c xorg-server-1.6.0/hw/vnc/corre.c +--- xorg-server-1.6.0.orig//hw/vnc/corre.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/corre.c 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,353 @@ +/* + * corre.c @@ -2555,11 +2515,9 @@ index 0000000..1a9b4d5 + + return maxclr; +} -diff --git a/hw/vnc/cursor.c b/hw/vnc/cursor.c -new file mode 100644 -index 0000000..d355e03 ---- /dev/null -+++ b/hw/vnc/cursor.c +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/cursor.c xorg-server-1.6.0/hw/vnc/cursor.c +--- xorg-server-1.6.0.orig//hw/vnc/cursor.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/cursor.c 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,407 @@ +/* + * cursor.c - support for cursor shape updates. @@ -2968,11 +2926,9 @@ index 0000000..d355e03 +DEFINE_RICH_ENCODE(16) +DEFINE_RICH_ENCODE(32) + -diff --git a/hw/vnc/cutpaste.c b/hw/vnc/cutpaste.c -new file mode 100644 -index 0000000..6f57aca ---- /dev/null -+++ b/hw/vnc/cutpaste.c +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/cutpaste.c xorg-server-1.6.0/hw/vnc/cutpaste.c +--- xorg-server-1.6.0.orig//hw/vnc/cutpaste.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/cutpaste.c 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,87 @@ +/* + * cutpaste.c - routines to deal with cut & paste buffers / selection. @@ -3061,11 +3017,9 @@ index 0000000..6f57aca + if (!inSetXCutText) + rfbSendServerCutText(str, len); +} -diff --git a/hw/vnc/d3des.c b/hw/vnc/d3des.c -new file mode 100644 -index 0000000..a4e145f ---- /dev/null -+++ b/hw/vnc/d3des.c +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/d3des.c xorg-server-1.6.0/hw/vnc/d3des.c +--- xorg-server-1.6.0.orig//hw/vnc/d3des.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/d3des.c 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,437 @@ +/* + * This is D3DES (V5.09) by Richard Outerbridge with the double and @@ -3504,11 +3458,9 @@ index 0000000..a4e145f + * + * d3des V5.0a rwo 9208.07 18:44 Graven Imagery + **********************************************************************/ -diff --git a/hw/vnc/d3des.h b/hw/vnc/d3des.h -new file mode 100644 -index 0000000..ea3da44 ---- /dev/null -+++ b/hw/vnc/d3des.h +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/d3des.h xorg-server-1.6.0/hw/vnc/d3des.h +--- xorg-server-1.6.0.orig//hw/vnc/d3des.h 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/d3des.h 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,51 @@ +/* + * This is D3DES (V5.09) by Richard Outerbridge with the double and @@ -3561,11 +3513,9 @@ index 0000000..ea3da44 + +/* d3des.h V5.09 rwo 9208.04 15:06 Graven Imagery + ********************************************************************/ -diff --git a/hw/vnc/dispcur.c b/hw/vnc/dispcur.c -new file mode 100644 -index 0000000..0ccf0a7 ---- /dev/null -+++ b/hw/vnc/dispcur.c +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/dispcur.c xorg-server-1.6.0/hw/vnc/dispcur.c +--- xorg-server-1.6.0.orig//hw/vnc/dispcur.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/dispcur.c 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,792 @@ +/* + * dispcur.c @@ -4359,11 +4309,9 @@ index 0000000..0ccf0a7 + 0, 0, w, h, x, y); + return TRUE; +} -diff --git a/hw/vnc/dpmsstubs.c b/hw/vnc/dpmsstubs.c -new file mode 100644 -index 0000000..48ee545 ---- /dev/null -+++ b/hw/vnc/dpmsstubs.c +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/dpmsstubs.c xorg-server-1.6.0/hw/vnc/dpmsstubs.c +--- xorg-server-1.6.0.orig//hw/vnc/dpmsstubs.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/dpmsstubs.c 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,52 @@ +/* $Xorg: dpmsstubs.c,v 1.3 2000/08/17 19:47:56 cpqbld Exp $ */ +/***************************************************************** @@ -4417,11 +4365,9 @@ index 0000000..48ee545 +{ + +} -diff --git a/hw/vnc/draw.c b/hw/vnc/draw.c -new file mode 100644 -index 0000000..631aa20 ---- /dev/null -+++ b/hw/vnc/draw.c +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/draw.c xorg-server-1.6.0/hw/vnc/draw.c +--- xorg-server-1.6.0.orig//hw/vnc/draw.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/draw.c 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,2021 @@ +/* + * draw.c - drawing routines for the RFB X server. This is a set of @@ -6444,11 +6390,9 @@ index 0000000..631aa20 + VNCSCREENPTR(pScreen); + SCHEDULE_FB_UPDATE(pScreen, pVNC); +} -diff --git a/hw/vnc/hextile.c b/hw/vnc/hextile.c -new file mode 100644 -index 0000000..eb5e281 ---- /dev/null -+++ b/hw/vnc/hextile.c +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/hextile.c xorg-server-1.6.0/hw/vnc/hextile.c +--- xorg-server-1.6.0.orig//hw/vnc/hextile.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/hextile.c 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,350 @@ +/* + * hextile.c @@ -6800,11 +6744,9 @@ index 0000000..eb5e281 +DEFINE_SEND_HEXTILES(8) +DEFINE_SEND_HEXTILES(16) +DEFINE_SEND_HEXTILES(32) -diff --git a/hw/vnc/httpd.c b/hw/vnc/httpd.c -new file mode 100644 -index 0000000..5f56ad6 ---- /dev/null -+++ b/hw/vnc/httpd.c +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/httpd.c xorg-server-1.6.0/hw/vnc/httpd.c +--- xorg-server-1.6.0.orig//hw/vnc/httpd.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/httpd.c 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,519 @@ +/* + * httpd.c - a simple HTTP server @@ -7325,11 +7267,9 @@ index 0000000..5f56ad6 + return TRUE; +} + -diff --git a/hw/vnc/init.c b/hw/vnc/init.c -new file mode 100644 -index 0000000..a166358 ---- /dev/null -+++ b/hw/vnc/init.c +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/init.c xorg-server-1.6.0/hw/vnc/init.c +--- xorg-server-1.6.0.orig//hw/vnc/init.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/init.c 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,1078 @@ +/* + * init.c @@ -8409,11 +8349,9 @@ index 0000000..a166358 + rfbLog(""); + perror(str); +} -diff --git a/hw/vnc/kbdptr.c b/hw/vnc/kbdptr.c -new file mode 100644 -index 0000000..de31920 ---- /dev/null -+++ b/hw/vnc/kbdptr.c +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/kbdptr.c xorg-server-1.6.0/hw/vnc/kbdptr.c +--- xorg-server-1.6.0.orig//hw/vnc/kbdptr.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/kbdptr.c 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,458 @@ +/* + * kbdptr.c - deal with keyboard and pointer device over TCP & UDP. @@ -8873,11 +8811,9 @@ index 0000000..de31920 + break; + } +} -diff --git a/hw/vnc/keyboard.h b/hw/vnc/keyboard.h -new file mode 100644 -index 0000000..ab5b1b3 ---- /dev/null -+++ b/hw/vnc/keyboard.h +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/keyboard.h xorg-server-1.6.0/hw/vnc/keyboard.h +--- xorg-server-1.6.0.orig//hw/vnc/keyboard.h 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/keyboard.h 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,167 @@ +/* + * Copyright (C) 2002 Alan Hourihane. All Rights Reserved. @@ -9046,11 +8982,9 @@ index 0000000..ab5b1b3 +}; + +#define N_PREDEFINED_KEYS (sizeof(map) / (sizeof(KeySym) * GLYPHS_PER_KEY)) -diff --git a/hw/vnc/loginauth.c b/hw/vnc/loginauth.c -new file mode 100644 -index 0000000..7fd5304 ---- /dev/null -+++ b/hw/vnc/loginauth.c +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/loginauth.c xorg-server-1.6.0/hw/vnc/loginauth.c +--- xorg-server-1.6.0.orig//hw/vnc/loginauth.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/loginauth.c 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,143 @@ +/* + * loginauth.c - deal with login-style Unix authentication. @@ -9195,11 +9129,9 @@ index 0000000..7fd5304 + cl->state = RFB_INITIALISATION; +} + -diff --git a/hw/vnc/rdp.c b/hw/vnc/rdp.c -new file mode 100644 -index 0000000..867e527 ---- /dev/null -+++ b/hw/vnc/rdp.c +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/rdp.c xorg-server-1.6.0/hw/vnc/rdp.c +--- xorg-server-1.6.0.orig//hw/vnc/rdp.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/rdp.c 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,147 @@ +/* + * Copyright (C) 2004 Alan Hourihane. All Rights Reserved. @@ -9348,11 +9280,9 @@ index 0000000..867e527 + rdpNewClient(pScreen, sock); + } +} -diff --git a/hw/vnc/rfb.h b/hw/vnc/rfb.h -new file mode 100644 -index 0000000..8a6d1ec ---- /dev/null -+++ b/hw/vnc/rfb.h +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/rfb.h xorg-server-1.6.0/hw/vnc/rfb.h +--- xorg-server-1.6.0.orig//hw/vnc/rfb.h 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/rfb.h 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,751 @@ +/* + * rfb.h - header file for RFB DDX implementation. @@ -10105,11 +10035,9 @@ index 0000000..8a6d1ec + + +#endif /* RFB_H_INCLUDED */ -diff --git a/hw/vnc/rfbkeyb.c b/hw/vnc/rfbkeyb.c -new file mode 100644 -index 0000000..2405e66 ---- /dev/null -+++ b/hw/vnc/rfbkeyb.c +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/rfbkeyb.c xorg-server-1.6.0/hw/vnc/rfbkeyb.c +--- xorg-server-1.6.0.orig//hw/vnc/rfbkeyb.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/rfbkeyb.c 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,405 @@ +/* + * Copyright (C) 2002 Alan Hourihane. All Rights Reserved. @@ -10516,11 +10444,9 @@ index 0000000..2405e66 + +#endif /* XFree86LOADER */ +#endif -diff --git a/hw/vnc/rfbmouse.c b/hw/vnc/rfbmouse.c -new file mode 100644 -index 0000000..40e6ec6 ---- /dev/null -+++ b/hw/vnc/rfbmouse.c +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/rfbmouse.c xorg-server-1.6.0/hw/vnc/rfbmouse.c +--- xorg-server-1.6.0.orig//hw/vnc/rfbmouse.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/rfbmouse.c 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,260 @@ +/* + * Copyright (C) 2002 Alan Hourihane. All Rights Reserved. @@ -10782,11 +10708,9 @@ index 0000000..40e6ec6 + +#endif /* XFree86LOADER */ +#endif -diff --git a/hw/vnc/rfbproto.h b/hw/vnc/rfbproto.h -new file mode 100644 -index 0000000..5ed86c5 ---- /dev/null -+++ b/hw/vnc/rfbproto.h +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/rfbproto.h xorg-server-1.6.0/hw/vnc/rfbproto.h +--- xorg-server-1.6.0.orig//hw/vnc/rfbproto.h 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/rfbproto.h 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,1362 @@ +/* + * Copyright (C) 2000-2004 Constantin Kaplinsky. All Rights Reserved. @@ -12150,11 +12074,9 @@ index 0000000..5ed86c5 + rfbChromiumStopMsg csd; + rfbChromiumExposeMsg cse; +} rfbClientToServerMsg; -diff --git a/hw/vnc/rfbserver.c b/hw/vnc/rfbserver.c -new file mode 100644 -index 0000000..b93087f ---- /dev/null -+++ b/hw/vnc/rfbserver.c +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/rfbserver.c xorg-server-1.6.0/hw/vnc/rfbserver.c +--- xorg-server-1.6.0.orig//hw/vnc/rfbserver.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/rfbserver.c 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,2308 @@ +/* + * rfbserver.c - deal with server-side of the RFB protocol. @@ -14464,11 +14386,9 @@ index 0000000..b93087f + rfbDisconnectUDPSock(pScreen); + } +} -diff --git a/hw/vnc/rre.c b/hw/vnc/rre.c -new file mode 100644 -index 0000000..09043c8 ---- /dev/null -+++ b/hw/vnc/rre.c +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/rre.c xorg-server-1.6.0/hw/vnc/rre.c +--- xorg-server-1.6.0.orig//hw/vnc/rre.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/rre.c 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,324 @@ +/* + * rre.c @@ -14794,11 +14714,9 @@ index 0000000..09043c8 + + return maxclr; +} -diff --git a/hw/vnc/sockets.c b/hw/vnc/sockets.c -new file mode 100644 -index 0000000..7eff68c ---- /dev/null -+++ b/hw/vnc/sockets.c +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/sockets.c xorg-server-1.6.0/hw/vnc/sockets.c +--- xorg-server-1.6.0.orig//hw/vnc/sockets.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/sockets.c 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,656 @@ +/* + * sockets.c - deal with TCP & UDP sockets. @@ -15456,11 +15374,9 @@ index 0000000..7eff68c + return TRUE; +} +#endif -diff --git a/hw/vnc/sprite.c b/hw/vnc/sprite.c -new file mode 100644 -index 0000000..c1e8685 ---- /dev/null -+++ b/hw/vnc/sprite.c +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/sprite.c xorg-server-1.6.0/hw/vnc/sprite.c +--- xorg-server-1.6.0.orig//hw/vnc/sprite.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/sprite.c 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,2279 @@ +/* + * sprite.c @@ -17741,11 +17657,9 @@ index 0000000..c1e8685 + *py = pScreenPriv->y; +} + -diff --git a/hw/vnc/sprite.h b/hw/vnc/sprite.h -new file mode 100644 -index 0000000..ed34726 ---- /dev/null -+++ b/hw/vnc/sprite.h +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/sprite.h xorg-server-1.6.0/hw/vnc/sprite.h +--- xorg-server-1.6.0.orig//hw/vnc/sprite.h 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/sprite.h 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,141 @@ +/* + * sprite.h @@ -17888,11 +17802,9 @@ index 0000000..ed34726 + int * /*py*/ +#endif +); -diff --git a/hw/vnc/spritest.h b/hw/vnc/spritest.h -new file mode 100644 -index 0000000..8593ee0 ---- /dev/null -+++ b/hw/vnc/spritest.h +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/spritest.h xorg-server-1.6.0/hw/vnc/spritest.h +--- xorg-server-1.6.0.orig//hw/vnc/spritest.h 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/spritest.h 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,138 @@ +/* + * spritest.h @@ -18032,11 +17944,9 @@ index 0000000..8593ee0 + +#define LINE_OVERLAP(pCbox,x1,y1,x2,y2,lw2) \ + BOX_OVERLAP((pCbox), (x1)-(lw2), (y1)-(lw2), (x2)+(lw2), (y2)+(lw2)) -diff --git a/hw/vnc/stats.c b/hw/vnc/stats.c -new file mode 100644 -index 0000000..83366ec ---- /dev/null -+++ b/hw/vnc/stats.c +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/stats.c xorg-server-1.6.0/hw/vnc/stats.c +--- xorg-server-1.6.0.orig//hw/vnc/stats.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/stats.c 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,117 @@ +/* + * stats.c @@ -18155,11 +18065,9 @@ index 0000000..83366ec + cl->rfbLastRectBytesSent)); + } +} -diff --git a/hw/vnc/symlink-vnc.sh b/hw/vnc/symlink-vnc.sh -new file mode 100755 -index 0000000..b4347a1 ---- /dev/null -+++ b/hw/vnc/symlink-vnc.sh +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/symlink-vnc.sh xorg-server-1.6.0/hw/vnc/symlink-vnc.sh +--- xorg-server-1.6.0.orig//hw/vnc/symlink-vnc.sh 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/symlink-vnc.sh 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,198 @@ +#!/bin/sh + @@ -18359,11 +18267,9 @@ index 0000000..b4347a1 +} + +main $1 $2 -diff --git a/hw/vnc/tableinitcmtemplate.c b/hw/vnc/tableinitcmtemplate.c -new file mode 100644 -index 0000000..c65c3d2 ---- /dev/null -+++ b/hw/vnc/tableinitcmtemplate.c +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/tableinitcmtemplate.c xorg-server-1.6.0/hw/vnc/tableinitcmtemplate.c +--- xorg-server-1.6.0.orig//hw/vnc/tableinitcmtemplate.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/tableinitcmtemplate.c 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,93 @@ +/* + * tableinitcmtemplate.c - template for initialising lookup tables for @@ -18458,11 +18364,9 @@ index 0000000..c65c3d2 +#undef OUT_T +#undef SwapOUT +#undef rfbInitColourMapSingleTableOUT -diff --git a/hw/vnc/tableinittctemplate.c b/hw/vnc/tableinittctemplate.c -new file mode 100644 -index 0000000..1af8a06 ---- /dev/null -+++ b/hw/vnc/tableinittctemplate.c +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/tableinittctemplate.c xorg-server-1.6.0/hw/vnc/tableinittctemplate.c +--- xorg-server-1.6.0.orig//hw/vnc/tableinittctemplate.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/tableinittctemplate.c 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,146 @@ +/* + * tableinittctemplate.c - template for initialising lookup tables for @@ -18610,11 +18514,9 @@ index 0000000..1af8a06 +#undef rfbInitTrueColourSingleTableOUT +#undef rfbInitTrueColourRGBTablesOUT +#undef rfbInitOneRGBTableOUT -diff --git a/hw/vnc/tabletranstemplate.c b/hw/vnc/tabletranstemplate.c -new file mode 100644 -index 0000000..d8baa44 ---- /dev/null -+++ b/hw/vnc/tabletranstemplate.c +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/tabletranstemplate.c xorg-server-1.6.0/hw/vnc/tabletranstemplate.c +--- xorg-server-1.6.0.orig//hw/vnc/tabletranstemplate.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/tabletranstemplate.c 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,135 @@ +/* + * tabletranstemplate.c - template for translation using lookup tables. @@ -18751,11 +18653,9 @@ index 0000000..d8baa44 +#undef OUT_T +#undef rfbTranslateWithSingleTableINtoOUT +#undef rfbTranslateWithRGBTablesINtoOUT -diff --git a/hw/vnc/tight.c b/hw/vnc/tight.c -new file mode 100644 -index 0000000..bbe1744 ---- /dev/null -+++ b/hw/vnc/tight.c +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/tight.c xorg-server-1.6.0/hw/vnc/tight.c +--- xorg-server-1.6.0.orig//hw/vnc/tight.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/tight.c 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,1827 @@ +/* + * tight.c @@ -20584,11 +20484,9 @@ index 0000000..bbe1744 + cinfo->dest = &jpegDstManager; +} + -diff --git a/hw/vnc/translate.c b/hw/vnc/translate.c -new file mode 100644 -index 0000000..b9ab53e ---- /dev/null -+++ b/hw/vnc/translate.c +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/translate.c xorg-server-1.6.0/hw/vnc/translate.c +--- xorg-server-1.6.0.orig//hw/vnc/translate.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/translate.c 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,502 @@ +/* + * translate.c - translate between different pixel formats @@ -21092,11 +20990,9 @@ index 0000000..b9ab53e + } + } +} -diff --git a/hw/vnc/vncauth.c b/hw/vnc/vncauth.c -new file mode 100644 -index 0000000..a70cfa5 ---- /dev/null -+++ b/hw/vnc/vncauth.c +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/vncauth.c xorg-server-1.6.0/hw/vnc/vncauth.c +--- xorg-server-1.6.0.orig//hw/vnc/vncauth.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/vncauth.c 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,252 @@ +/* + * Copyright (C) 1999 AT&T Laboratories Cambridge. All Rights Reserved. @@ -21350,11 +21246,9 @@ index 0000000..a70cfa5 + des(bytes+i, bytes+i); + } +} -diff --git a/hw/vnc/vncauth.h b/hw/vnc/vncauth.h -new file mode 100644 -index 0000000..adc280b ---- /dev/null -+++ b/hw/vnc/vncauth.h +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/vncauth.h xorg-server-1.6.0/hw/vnc/vncauth.h +--- xorg-server-1.6.0.orig//hw/vnc/vncauth.h 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/vncauth.h 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,33 @@ +/* + * Copyright (C) 1999 AT&T Laboratories Cambridge. All Rights Reserved. @@ -21389,11 +21283,9 @@ index 0000000..adc280b +extern int vncEncryptAndStorePasswd2(char *passwd, char *passwdViewOnly, char *fname); +extern int vncDecryptPasswdFromFile2(char *fname, char *passwdFullControl, char *passwdViewOnly); + -diff --git a/hw/vnc/vncext.c b/hw/vnc/vncext.c -new file mode 100644 -index 0000000..80a3433 ---- /dev/null -+++ b/hw/vnc/vncext.c +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/vncext.c xorg-server-1.6.0/hw/vnc/vncext.c +--- xorg-server-1.6.0.orig//hw/vnc/vncext.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/vncext.c 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,800 @@ +/* + * Copyright (C) 2002 Alan Hourihane. All Rights Reserved. @@ -22195,11 +22087,9 @@ index 0000000..80a3433 + (EventSwapPtr)SwapVncChromiumConnectedEvent; +#endif +} /* VncExtensionInit */ -diff --git a/hw/vnc/xistubs.c b/hw/vnc/xistubs.c -new file mode 100644 -index 0000000..011ac9e ---- /dev/null -+++ b/hw/vnc/xistubs.c +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/xistubs.c xorg-server-1.6.0/hw/vnc/xistubs.c +--- xorg-server-1.6.0.orig//hw/vnc/xistubs.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/xistubs.c 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,323 @@ +/* $Xorg: stubs.c,v 1.4 2001/02/09 02:04:35 xorgcvs Exp $ */ + @@ -22524,11 +22414,9 @@ index 0000000..011ac9e + return (BadMatch); + } + } -diff --git a/hw/vnc/zlib.c b/hw/vnc/zlib.c -new file mode 100644 -index 0000000..4863fb4 ---- /dev/null -+++ b/hw/vnc/zlib.c +diff -u -r -p -N xorg-server-1.6.0.orig//hw/vnc/zlib.c xorg-server-1.6.0/hw/vnc/zlib.c +--- xorg-server-1.6.0.orig//hw/vnc/zlib.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/vnc/zlib.c 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,310 @@ +/* + * zlib.c @@ -22840,10 +22728,9 @@ index 0000000..4863fb4 +} + + -diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am -index 03c2c3a..06329a8 100644 ---- a/hw/xfree86/Makefile.am -+++ b/hw/xfree86/Makefile.am +diff -u -r -p -N xorg-server-1.6.0.orig//hw/xfree86/Makefile.am xorg-server-1.6.0/hw/xfree86/Makefile.am +--- xorg-server-1.6.0.orig//hw/xfree86/Makefile.am 2009-02-27 16:01:19.000000000 +0100 ++++ xorg-server-1.6.0/hw/xfree86/Makefile.am 2009-02-27 16:13:06.000000000 +0100 @@ -4,6 +4,10 @@ if DRI DRI_SUBDIR = dri endif @@ -22855,27 +22742,26 @@ index 03c2c3a..06329a8 100644 if DRI2 DRI2_SUBDIR = dri2 endif -@@ -24,13 +28,13 @@ DOC_SUBDIR = doc +@@ -16,13 +20,13 @@ DOC_SUBDIR = doc - SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support parser rac \ - ramdac shadowfb vbe vgahw xaa $(MFB_SUBDIR) $(CFB_SUBDIR) \ + SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support parser \ + ramdac shadowfb vbe vgahw xaa \ - xf8_16bpp loader dixmods exa modes \ + xf8_16bpp loader dixmods exa modes $(VNC_SUBDIR) \ $(DRI_SUBDIR) $(DRI2_SUBDIR) $(XF86UTILS_SUBDIR) $(DOC_SUBDIR) DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \ - parser rac ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp \ - xf8_16bpp xf8_32bpp loader dixmods dri dri2 exa modes \ + parser ramdac shadowfb vbe vgahw xaa \ + xf8_16bpp loader dixmods dri dri2 exa modes \ - utils doc + utils doc vnc bin_PROGRAMS = Xorg -diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am -index efc5f4a..98d7302 100644 ---- a/hw/xfree86/dixmods/Makefile.am -+++ b/hw/xfree86/dixmods/Makefile.am -@@ -14,6 +14,10 @@ if DBE +diff -u -r -p -N xorg-server-1.6.0.orig//hw/xfree86/dixmods/Makefile.am xorg-server-1.6.0/hw/xfree86/dixmods/Makefile.am +--- xorg-server-1.6.0.orig//hw/xfree86/dixmods/Makefile.am 2009-02-27 16:01:19.000000000 +0100 ++++ xorg-server-1.6.0/hw/xfree86/dixmods/Makefile.am 2009-02-27 16:14:31.000000000 +0100 +@@ -10,6 +10,10 @@ if DBE DBEMOD = libdbe.la endif @@ -22883,26 +22769,24 @@ index efc5f4a..98d7302 100644 +XCLIPLISTMOD = libxcliplist.la +endif + - if AFB - AFBMOD = libafb.la + if RECORD + RECORDMOD = librecord.la endif -@@ -36,6 +40,7 @@ module_LTLIBRARIES = $(AFBMOD) \ +@@ -21,11 +25,13 @@ module_LTLIBRARIES = libfb.la \ extsmoduledir = $(moduledir)/extensions - extsmodule_LTLIBRARIES = librecord.la \ + extsmodule_LTLIBRARIES = $(RECORDMOD) \ $(DBEMOD) \ -+ $(XCLIPLISTMOD) \ - $(GLXMODS) \ - $(XTRAPMOD) ++ $(XCLIPLISTMOD) \ + $(GLXMODS) -@@ -45,6 +50,7 @@ fontsmodule_LTLIBRARIES = libfreetype.la AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@ INCLUDES = @XORG_INCS@ \ -I$(top_srcdir)/dbe \ + -I$(top_srcdir)/xcliplist \ -I$(top_srcdir)/hw/xfree86/loader \ -I$(top_srcdir)/miext/shadow \ - -I$(top_srcdir)/GL/glx -@@ -69,6 +75,10 @@ libdbe_la_LDFLAGS = -avoid-version + -I$(top_srcdir)/glx +@@ -34,6 +40,10 @@ libdbe_la_LDFLAGS = -avoid-version libdbe_la_LIBADD = $(top_builddir)/dbe/libdbe.la libdbe_la_SOURCES = dbemodule.c @@ -22913,11 +22797,9 @@ index efc5f4a..98d7302 100644 libfb_la_LDFLAGS = -avoid-version libfb_la_LIBADD = $(top_builddir)/fb/libfb.la libfb_la_SOURCES = $(top_builddir)/fb/fbcmap_mi.c fbmodule.c -diff --git a/hw/xfree86/vnc/.gitignore b/hw/xfree86/vnc/.gitignore -new file mode 100644 -index 0000000..d14621f ---- /dev/null -+++ b/hw/xfree86/vnc/.gitignore +diff -u -r -p -N xorg-server-1.6.0.orig//hw/xfree86/vnc/.gitignore xorg-server-1.6.0/hw/xfree86/vnc/.gitignore +--- xorg-server-1.6.0.orig//hw/xfree86/vnc/.gitignore 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/xfree86/vnc/.gitignore 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,36 @@ +auth.c +cmap.c @@ -22955,11 +22837,9 @@ index 0000000..d14621f +vncext.c +xistubs.c +zlib.c -diff --git a/hw/xfree86/vnc/Makefile.am b/hw/xfree86/vnc/Makefile.am -new file mode 100644 -index 0000000..6f5cd76 ---- /dev/null -+++ b/hw/xfree86/vnc/Makefile.am +diff -u -r -p -N xorg-server-1.6.0.orig//hw/xfree86/vnc/Makefile.am xorg-server-1.6.0/hw/xfree86/vnc/Makefile.am +--- xorg-server-1.6.0.orig//hw/xfree86/vnc/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/xfree86/vnc/Makefile.am 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,51 @@ +AM_CFLAGS = $(DIX_CFLAGS) + @@ -23012,18 +22892,14 @@ index 0000000..6f5cd76 + zlib.c + +#sdk_HEADERS = vncint.h -diff --git a/hw/xfree86/vnc/README b/hw/xfree86/vnc/README -new file mode 100644 -index 0000000..64aa888 ---- /dev/null -+++ b/hw/xfree86/vnc/README +diff -u -r -p -N xorg-server-1.6.0.orig//hw/xfree86/vnc/README xorg-server-1.6.0/hw/xfree86/vnc/README +--- xorg-server-1.6.0.orig//hw/xfree86/vnc/README 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/xfree86/vnc/README 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1 @@ +This directory contains the sources for building the vnc.so server extension module. -diff --git a/hw/xfree86/vnc/vncInit.c b/hw/xfree86/vnc/vncInit.c -new file mode 100644 -index 0000000..e07ac8f ---- /dev/null -+++ b/hw/xfree86/vnc/vncInit.c +diff -u -r -p -N xorg-server-1.6.0.orig//hw/xfree86/vnc/vncInit.c xorg-server-1.6.0/hw/xfree86/vnc/vncInit.c +--- xorg-server-1.6.0.orig//hw/xfree86/vnc/vncInit.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/xfree86/vnc/vncInit.c 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,618 @@ +/* + * Copyright (C) 2002 Alan Hourihane. All Rights Reserved. @@ -23643,11 +23519,9 @@ index 0000000..e07ac8f + return (pointer)TRUE; +} +#endif -diff --git a/hw/xfree86/vnc/vncint.h b/hw/xfree86/vnc/vncint.h -new file mode 100644 -index 0000000..43aeaae ---- /dev/null -+++ b/hw/xfree86/vnc/vncint.h +diff -u -r -p -N xorg-server-1.6.0.orig//hw/xfree86/vnc/vncint.h xorg-server-1.6.0/hw/xfree86/vnc/vncint.h +--- xorg-server-1.6.0.orig//hw/xfree86/vnc/vncint.h 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/hw/xfree86/vnc/vncint.h 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,151 @@ +/* + * Copyright (C) 2002 Alan Hourihane. All Rights Reserved. @@ -23800,11 +23674,10 @@ index 0000000..43aeaae + +#endif /* _VNC_H_ */ + -diff --git a/mi/miinitext.c b/mi/miinitext.c -index 3c55eeb..4cb6584 100644 ---- a/mi/miinitext.c -+++ b/mi/miinitext.c -@@ -79,6 +79,18 @@ SOFTWARE. +diff -u -r -p -N xorg-server-1.6.0.orig//mi/miinitext.c xorg-server-1.6.0/mi/miinitext.c +--- xorg-server-1.6.0.orig//mi/miinitext.c 2009-02-27 16:01:19.000000000 +0100 ++++ xorg-server-1.6.0/mi/miinitext.c 2009-02-27 16:05:03.000000000 +0100 +@@ -78,6 +78,18 @@ SOFTWARE. #undef XF86VIDMODE #endif @@ -23823,11 +23696,9 @@ index 3c55eeb..4cb6584 100644 #include "misc.h" #include "extension.h" #include "micmap.h" -diff --git a/xcliplist/Makefile.am b/xcliplist/Makefile.am -new file mode 100644 -index 0000000..3f13acc ---- /dev/null -+++ b/xcliplist/Makefile.am +diff -u -r -p -N xorg-server-1.6.0.orig//xcliplist/Makefile.am xorg-server-1.6.0/xcliplist/Makefile.am +--- xorg-server-1.6.0.orig//xcliplist/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/xcliplist/Makefile.am 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,18 @@ +#noinst_LTLIBRARIES = libxcliplist.la +libxcliplist_la_LTLIBRARIES = libxcliplist.la @@ -23847,11 +23718,9 @@ index 0000000..3f13acc +if XORG +sdk_HEADERS = +endif -diff --git a/xcliplist/cliplist.c b/xcliplist/cliplist.c -new file mode 100644 -index 0000000..290eb79 ---- /dev/null -+++ b/xcliplist/cliplist.c +diff -u -r -p -N xorg-server-1.6.0.orig//xcliplist/cliplist.c xorg-server-1.6.0/xcliplist/cliplist.c +--- xorg-server-1.6.0.orig//xcliplist/cliplist.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/xcliplist/cliplist.c 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,128 @@ +/* + * Server-side code for the Xcliplist extension @@ -23981,11 +23850,9 @@ index 0000000..290eb79 + XClipListErrorBase = extEntry->errorBase; + } +} -diff --git a/xcliplist/cliplistmod.c b/xcliplist/cliplistmod.c -new file mode 100644 -index 0000000..c365ca2 ---- /dev/null -+++ b/xcliplist/cliplistmod.c +diff -u -r -p -N xorg-server-1.6.0.orig//xcliplist/cliplistmod.c xorg-server-1.6.0/xcliplist/cliplistmod.c +--- xorg-server-1.6.0.orig//xcliplist/cliplistmod.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.6.0/xcliplist/cliplistmod.c 2009-02-27 16:05:03.000000000 +0100 @@ -0,0 +1,46 @@ + +#include "../hw/xfree86/common/xf86Module.h" diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 0e9d184..17483db 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Fri Feb 27 12:40:32 CET 2009 - sndirsch@suse.de + +- xorg-server 1.6.0 +- temporarily disabled build of Xvnc/libvnc.so +- obsoletes 64bit-portability-issue.diff, 64bit.diff, + commit-59f9fb4b8.diff, commit-a9e2030.diff, dga_cleanup.diff, + miPointerUpdate-crashfix.diff, p_mouse_misc.diff, + ps_showopts.diff, unplugged_monitor_crashfix.diff +- adjusted 0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch, + bitmap_always_unscaled.diff, confine_to_shape.diff, fbdevhw.diff, + p_ia64-console.diff, randr1_1-sig11.diff, xephyr.diff, + xorg-server-xf4vnc.patch, zap_warning_xserver.diff + ------------------------------------------------------------------- Tue Feb 24 12:08:59 CET 2009 - sndirsch@suse.de diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 3250001..ca73a44 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -19,9 +19,10 @@ Name: xorg-x11-server -%define dirsuffix 1.5.2 +%define dirsuffix 1.6.0 %define fglrx_driver_hack 0 -%define vnc 1 +### FIXME +%define vnc 0 BuildRequires: Mesa-devel bison flex fontconfig-devel freetype2-devel ghostscript-library libdrm-devel libopenssl-devel pkgconfig xorg-x11 xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel %if %vnc BuildRequires: libjpeg-devel @@ -29,7 +30,7 @@ BuildRequires: libjpeg-devel Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.4 -Release: 27 +Release: 28 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -56,13 +57,10 @@ Source5: modprobe.nvidia %endif Source7: xorg-docs-1.4.tar.bz2 Source8: xorg.conf.man-070818.tar -Patch: 64bit.diff Patch1: fpic.diff Patch2: p_default-module-path.diff Patch6: pu_fixes.diff -Patch7: p_mouse_misc.diff Patch8: p_bug96328.diff -Patch11: ps_showopts.diff Patch13: p_xorg_acpi.diff Patch14: p_xkills_wrong_client.diff Patch16: p_xnest-ignore-getimage-errors.diff @@ -101,16 +99,10 @@ Patch106: randr1_1-sig11.diff Patch109: events.diff Patch112: fix-dpi-values.diff Patch113: no-return-in-nonvoid-function.diff -Patch114: 64bit-portability-issue.diff Patch117: acpi-warning.diff Patch118: exa-greedy.diff -Patch120: dga_cleanup.diff -Patch121: miPointerUpdate-crashfix.diff -Patch122: unplugged_monitor_crashfix.diff Patch123: vidmode-sig11.diff -Patch124: commit-59f9fb4b8.diff Patch125: 0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch -Patch126: commit-a9e2030.diff Patch127: dpms_screensaver.diff Patch128: pci-legacy-mem-fallback.diff Patch129: bug474071-fix1.diff @@ -172,13 +164,10 @@ An X Window System server for Virtual Network Computing (VNC). %prep %setup -q -n xorg-server-%{dirsuffix} -a4 -a7 -a8 -%patch %patch1 %patch2 %patch6 -%patch7 -p2 %patch8 -p0 -%patch11 %patch13 %patch14 %patch16 -p2 @@ -224,16 +213,10 @@ popd %patch109 -p1 %patch112 -p0 %patch113 -p0 -%patch114 -p0 %patch117 %patch118 -p1 -%patch120 -p1 -%patch121 -p0 -%patch122 -p0 %patch123 -p0 -%patch124 -p1 %patch125 -p1 -%patch126 -p1 %patch127 -p1 %patch128 pushd hw/xfree86/os-support/bus @@ -509,19 +492,11 @@ exit 0 /usr/bin/dmxwininfo %ifnarch s390 s390x /usr/bin/gtf -/usr/bin/inb -/usr/bin/inl -/usr/bin/inw -/usr/bin/ioport -/usr/bin/outb -/usr/bin/outl -/usr/bin/outw %endif /usr/bin/vdltodmx /usr/bin/xdmx /usr/bin/xdmxconfig %ifnarch s390 s390x -/usr/bin/xorgconfig /usr/%{_lib}/X11/* /usr/%{_lib}/xorg/modules/ %{_mandir}/man4/* @@ -570,6 +545,17 @@ exit 0 %endif %changelog +* Fri Feb 27 2009 sndirsch@suse.de +- xorg-server 1.6.0 +- temporarily disabled build of Xvnc/libvnc.so +- obsoletes 64bit-portability-issue.diff, 64bit.diff, + commit-59f9fb4b8.diff, commit-a9e2030.diff, dga_cleanup.diff, + miPointerUpdate-crashfix.diff, p_mouse_misc.diff, + ps_showopts.diff, unplugged_monitor_crashfix.diff +- adjusted 0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch, + bitmap_always_unscaled.diff, confine_to_shape.diff, fbdevhw.diff, + p_ia64-console.diff, randr1_1-sig11.diff, xephyr.diff, + xorg-server-xf4vnc.patch, zap_warning_xserver.diff * Tue Feb 24 2009 sndirsch@suse.de - bug474071-fix1.diff * fixes Xserver issue of bnc #474071 diff --git a/zap_warning_xserver.diff b/zap_warning_xserver.diff index 96df929..228a217 100644 --- a/zap_warning_xserver.diff +++ b/zap_warning_xserver.diff @@ -1,31 +1,4 @@ diff -ur xorg-server-1.4.0.90-orig//hw/xfree86/common/xf86Config.c xorg-server-1.4.0.90/hw/xfree86/common/xf86Config.c ---- xorg-server-1.4.0.90-orig//hw/xfree86/common/xf86Config.c 2008-03-09 12:36:39.000000000 +0100 -+++ xorg-server-1.4.0.90/hw/xfree86/common/xf86Config.c 2008-03-09 13:33:17.000000000 +0100 -@@ -743,6 +743,7 @@ - FLAG_NOTRAPSIGNALS, - FLAG_DONTVTSWITCH, - FLAG_DONTZAP, -+ FLAG_ZAPWARNING, - FLAG_DONTZOOM, - FLAG_DISABLEVIDMODE, - FLAG_ALLOWNONLOCAL, -@@ -788,6 +789,8 @@ - {0}, FALSE }, - { FLAG_DONTZAP, "DontZap", OPTV_BOOLEAN, - {0}, FALSE }, -+ { FLAG_ZAPWARNING, "ZapWarning", OPTV_BOOLEAN, -+ {0}, FALSE }, - { FLAG_DONTZOOM, "DontZoom", OPTV_BOOLEAN, - {0}, FALSE }, - { FLAG_DISABLEVIDMODE, "DisableVidModeExtension", OPTV_BOOLEAN, -@@ -912,6 +915,7 @@ - xf86GetOptValBool(FlagOptions, FLAG_NOTRAPSIGNALS, &xf86Info.notrapSignals); - xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch); - xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap); -+ xf86GetOptValBool(FlagOptions, FLAG_ZAPWARNING, &xf86Info.ZapWarning); - xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom); - - xf86GetOptValBool(FlagOptions, FLAG_ALLOW_DEACTIVATE_GRABS, diff -ur xorg-server-1.4.0.90-orig//hw/xfree86/common/xf86Events.c xorg-server-1.4.0.90/hw/xfree86/common/xf86Events.c --- xorg-server-1.4.0.90-orig//hw/xfree86/common/xf86Events.c 2008-03-09 13:27:24.000000000 +0100 +++ xorg-server-1.4.0.90/hw/xfree86/common/xf86Events.c 2008-03-09 13:30:18.000000000 +0100 @@ -61,16 +34,6 @@ diff -ur xorg-server-1.4.0.90-orig//hw/xfree86/common/xf86Events.c xorg-server-1 case ACTION_NEXT_MODE: if (!xf86Info.dontZoom) diff -ur xorg-server-1.4.0.90-orig//hw/xfree86/common/xf86Globals.c xorg-server-1.4.0.90/hw/xfree86/common/xf86Globals.c ---- xorg-server-1.4.0.90-orig//hw/xfree86/common/xf86Globals.c 2008-03-09 12:36:39.000000000 +0100 -+++ xorg-server-1.4.0.90/hw/xfree86/common/xf86Globals.c 2008-03-09 13:31:40.000000000 +0100 -@@ -107,6 +107,7 @@ - FALSE, /* inputPending */ - FALSE, /* dontVTSwitch */ - FALSE, /* dontZap */ -+ FALSE, /* ZapWarning */ - FALSE, /* dontZoom */ - FALSE, /* notrapSignals */ - FALSE, /* caughtSignal */ diff -ur xorg-server-1.4.0.90-orig//hw/xfree86/common/xf86Privstr.h xorg-server-1.4.0.90/hw/xfree86/common/xf86Privstr.h --- xorg-server-1.4.0.90-orig//hw/xfree86/common/xf86Privstr.h 2007-12-07 03:38:42.000000000 +0100 +++ xorg-server-1.4.0.90/hw/xfree86/common/xf86Privstr.h 2008-03-09 13:29:43.000000000 +0100 @@ -99,20 +62,74 @@ diff -ur xorg-server-1.4.0.90-orig//hw/xfree86/doc/man/xorg.conf.man.pre xorg-se .BI "Option \*qDontZoom\*q \*q" boolean \*q This disallows the use of the .B Ctrl+Alt+Keypad\-Plus ---- xorg-server-1.4.0.90-orig/hw/xfree86/doc/man/Xorg.man.pre.orig 2008-05-16 16:46:39.000000000 +0200 -+++ xorg-server-1.4.0.90/hw/xfree86/doc/man/Xorg.man.pre 2008-05-16 16:48:50.000000000 +0200 -@@ -461,10 +461,10 @@ - are: - .TP 8 - .B Ctrl+Alt+Backspace --Immediately kills the server -- no questions asked. This can be disabled --with the +--- xorg-server-1.6.0/hw/xfree86/common/xf86Config.c.orig 2009-02-25 20:12:11.000000000 +0100 ++++ xorg-server-1.6.0/hw/xfree86/common/xf86Config.c 2009-02-27 16:28:19.000000000 +0100 +@@ -697,6 +697,7 @@ typedef enum { + FLAG_NOTRAPSIGNALS, + FLAG_DONTVTSWITCH, + FLAG_DONTZAP, ++ FLAG_ZAPWARNING, + FLAG_DONTZOOM, + FLAG_DISABLEVIDMODE, + FLAG_ALLOWNONLOCAL, +@@ -734,6 +735,8 @@ static OptionInfoRec FlagOptions[] = { + {0}, FALSE }, + { FLAG_DONTZAP, "DontZap", OPTV_BOOLEAN, + {0}, TRUE }, ++ { FLAG_ZAPWARNING, "ZapWarning", OPTV_BOOLEAN, ++ {0}, FALSE }, + { FLAG_DONTZOOM, "DontZoom", OPTV_BOOLEAN, + {0}, FALSE }, + { FLAG_DISABLEVIDMODE, "DisableVidModeExtension", OPTV_BOOLEAN, +@@ -847,6 +850,7 @@ configServerFlags(XF86ConfFlagsPtr flags + xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch); + if (!xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap)) + xf86Info.dontZap = !party_like_its_1989; ++ xf86GetOptValBool(FlagOptions, FLAG_ZAPWARNING, &xf86Info.ZapWarning); + xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom); + + xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &xf86Info.ignoreABI); +--- xorg-server-1.6.0/hw/xfree86/common/xf86Globals.c.orig 2009-02-27 16:23:51.000000000 +0100 ++++ xorg-server-1.6.0/hw/xfree86/common/xf86Globals.c 2009-02-27 16:30:19.000000000 +0100 +@@ -106,6 +106,7 @@ xf86InfoRec xf86Info = { + .vtRequestsPending = FALSE, + .dontVTSwitch = FALSE, + .dontZap = FALSE, ++ .ZapWarning = FALSE, + .dontZoom = FALSE, + .notrapSignals = FALSE, + .caughtSignal = FALSE, +--- xorg-server-1.6.0/hw/xfree86/doc/man/Xorg.man.pre.orig 2009-02-25 20:12:11.000000000 +0100 ++++ xorg-server-1.6.0/hw/xfree86/doc/man/Xorg.man.pre 2009-02-27 16:32:45.000000000 +0100 +@@ -452,8 +452,8 @@ are: + Immediately kills the server -- no questions asked. This is disabled by + default. It can be enabled with the -retro command line flag or by setting + the -.B DontZap --__xconfigfile__(__filemansuffix__) file option. -+Immediately kills the server -- no questions asked. This behaviour can -+be changed with the +-__xconfigfile__(__filemansuffix__) file option to a FALSE value. +.B DontZap/ZapWarning -+__xconfigfile__(__filemansuffix__) file options. ++__xconfigfile__(__filemansuffix__) file options to a FALSE value. .TP 8 .B Ctrl+Alt+Keypad-Plus Change video mode to next one specified in the configuration file. +--- xorg-server-1.6.0/hw/xfree86/common/xf86Config.c.orig 2009-02-28 20:29:42.000000000 +0100 ++++ xorg-server-1.6.0/hw/xfree86/common/xf86Config.c 2009-02-28 20:30:44.000000000 +0100 +@@ -734,7 +734,7 @@ static OptionInfoRec FlagOptions[] = { + { FLAG_DONTVTSWITCH, "DontVTSwitch", OPTV_BOOLEAN, + {0}, FALSE }, + { FLAG_DONTZAP, "DontZap", OPTV_BOOLEAN, +- {0}, TRUE }, ++ {0}, FALSE }, + { FLAG_ZAPWARNING, "ZapWarning", OPTV_BOOLEAN, + {0}, FALSE }, + { FLAG_DONTZOOM, "DontZoom", OPTV_BOOLEAN, +@@ -848,8 +848,7 @@ configServerFlags(XF86ConfFlagsPtr flags + + xf86GetOptValBool(FlagOptions, FLAG_NOTRAPSIGNALS, &xf86Info.notrapSignals); + xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch); +- if (!xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap)) +- xf86Info.dontZap = !party_like_its_1989; ++ xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap); + xf86GetOptValBool(FlagOptions, FLAG_ZAPWARNING, &xf86Info.ZapWarning); + xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom); +