diff --git a/xorg-docs-1.4.tar.bz2 b/xorg-docs-1.4.tar.bz2 deleted file mode 100644 index 00fb7a3..0000000 --- a/xorg-docs-1.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fffc67e50ce396e6ddd95e842fa8351954b8f09cb729a9a062e0496a8bda4925 -size 8300321 diff --git a/xorg-docs-1.5.99.901.tar.bz2 b/xorg-docs-1.5.99.901.tar.bz2 new file mode 100644 index 0000000..253c496 --- /dev/null +++ b/xorg-docs-1.5.99.901.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5382270cc181e315b762706d031de9f6f382d7b96dfff1e3d05426a53411ca96 +size 1688013 diff --git a/xorg-docs.diff b/xorg-docs.diff index 0c895e8..ce589a6 100644 --- a/xorg-docs.diff +++ b/xorg-docs.diff @@ -1,34 +1,29 @@ -Index: Makefile.am -================================================================================ ---- Makefile.am -+++ Makefile.am -@@ -20,11 +20,9 @@ - # - # Process this file with autoconf to create configure. - --SUBDIRS = hardcopy man sgml -+SUBDIRS = man - x11docdir = @X11DOCDIR@ - --dist_x11doc_DATA = MAINTAINERS -- - EXTRA_DIST = \ - MAINTAINERS \ - misc/xlogo.epsi \ ---- man/general/Makefile.am -+++ man/general/Makefile.am -@@ -23,13 +23,8 @@ +--- man/Makefile.am.orig 2010-09-14 01:25:46.000000000 +0200 ++++ man/Makefile.am 2010-11-12 13:28:31.000000000 +0100 +@@ -23,12 +23,8 @@ miscmandir = $(MISC_MAN_DIR) - miscman_PRE = \ -- Consortium.man \ - security.man \ -- Standards.man \ -- X.man \ -- XOrgFoundation.man \ -- Xprint.man \ + miscman_PRE = \ +- Consortium.man \ + Xsecurity.man \ +- Standards.man \ +- X.man \ +- XOrgFoundation.man \ - XProjectTeam.man + X.man miscman_DATA = $(miscman_PRE:man=@MISC_MAN_SUFFIX@) +--- Makefile.am.orig 2010-11-12 13:45:19.000000000 +0100 ++++ Makefile.am 2010-11-12 13:45:32.000000000 +0100 +@@ -20,9 +20,7 @@ + # + # Process this file with autoconf to create configure. + +-SUBDIRS = general man specs +- +-dist_doc_DATA = MAINTAINERS ++SUBDIRS = man + + MAINTAINERCLEANFILES = ChangeLog INSTALL + EXTRA_DIST = \ diff --git a/xorg-server-1.9.2.901.tar.bz2 b/xorg-server-1.9.2.901.tar.bz2 new file mode 100644 index 0000000..7e09499 --- /dev/null +++ b/xorg-server-1.9.2.901.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3be7ce1be0df04a73ee01c98ad54e1eec0694836371d4aef34098b514a51872b +size 5282093 diff --git a/xorg-server-1.9.2.tar.bz2 b/xorg-server-1.9.2.tar.bz2 deleted file mode 100644 index 37722b3..0000000 --- a/xorg-server-1.9.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8b30800004c98fc7a8e6ff31a339f28451be5132e774443be22bf226e1791e34 -size 5274463 diff --git a/xorg-server-xf4vnc-fixes_1_9.diff b/xorg-server-xf4vnc-fixes_1_9.diff new file mode 100644 index 0000000..9b02e01 --- /dev/null +++ b/xorg-server-xf4vnc-fixes_1_9.diff @@ -0,0 +1,528 @@ +Index: xorg-server-1.9.2/hw/vnc/rfb.h +=================================================================== +--- xorg-server-1.9.2.orig/hw/vnc/rfb.h ++++ xorg-server-1.9.2/hw/vnc/rfb.h +@@ -189,8 +189,8 @@ typedef struct + + CloseScreenProcPtr CloseScreen; + CreateGCProcPtr CreateGC; +- PaintWindowBackgroundProcPtr PaintWindowBackground; +- PaintWindowBorderProcPtr PaintWindowBorder; ++// PaintWindowBackgroundProcPtr PaintWindowBackground; ++// PaintWindowBorderProcPtr PaintWindowBorder; + CopyWindowProcPtr CopyWindow; + ClearToBackgroundProcPtr ClearToBackground; + RestoreAreasProcPtr RestoreAreas; +Index: xorg-server-1.9.2/hw/vnc/draw.c +=================================================================== +--- xorg-server-1.9.2.orig/hw/vnc/draw.c ++++ xorg-server-1.9.2/hw/vnc/draw.c +@@ -217,8 +217,8 @@ rfbCloseScreen (int i, ScreenPtr pScreen + + pScreen->CloseScreen = pVNC->CloseScreen; + pScreen->CreateGC = pVNC->CreateGC; +- pScreen->PaintWindowBackground = pVNC->PaintWindowBackground; +- pScreen->PaintWindowBorder = pVNC->PaintWindowBorder; ++// pScreen->PaintWindowBackground = pVNC->PaintWindowBackground; ++// pScreen->PaintWindowBorder = pVNC->PaintWindowBorder; + pScreen->CopyWindow = pVNC->CopyWindow; + pScreen->ClearToBackground = pVNC->ClearToBackground; + pScreen->RestoreAreas = pVNC->RestoreAreas; +@@ -252,7 +252,7 @@ rfbEnableDisableFBAccess (int index, Boo + * control even when switched away. + */ + if (!enable) { +- WindowPtr pWin = WindowTable[index]; ++ WindowPtr pWin = pScrn->pScreen->root; + ScreenPtr pScreen = pWin->drawable.pScreen; + GCPtr pGC; + xRectangle rect; +@@ -268,7 +268,7 @@ rfbEnableDisableFBAccess (int index, Boo + CARD32 attributes[2]; + attributes[0] = pScreen->whitePixel; + attributes[1] = pScreen->blackPixel; +- (void)ChangeGC(pGC, GCForeground | GCBackground, attributes); ++ (void)ChangeGC(NullClient, pGC, GCForeground | GCBackground, attributes); + + ValidateGC((DrawablePtr)pWin, pGC); + +@@ -317,6 +317,7 @@ rfbCreateGC (GCPtr pGC) + return ret; + } + ++#if 0 + /* + * PaintWindowBackground - the region being modified is just the given region. + */ +@@ -356,6 +357,7 @@ rfbPaintWindowBorder (WindowPtr pWin, Re + + SCREEN_EPILOGUE(PaintWindowBorder,rfbPaintWindowBorder); + } ++#endif + + #ifdef CHROMIUM + Bool +Index: xorg-server-1.9.2/hw/vnc/init.c +=================================================================== +--- xorg-server-1.9.2.orig/hw/vnc/init.c ++++ xorg-server-1.9.2/hw/vnc/init.c +@@ -670,8 +670,8 @@ rfbScreenInit(index, pScreen, argc, argv + prfb->CloseScreen = pScreen->CloseScreen; + prfb->WakeupHandler = pScreen->WakeupHandler; + prfb->CreateGC = pScreen->CreateGC; +- prfb->PaintWindowBackground = pScreen->PaintWindowBackground; +- prfb->PaintWindowBorder = pScreen->PaintWindowBorder; ++// prfb->PaintWindowBackground = pScreen->PaintWindowBackground; ++// prfb->PaintWindowBorder = pScreen->PaintWindowBorder; + prfb->CopyWindow = pScreen->CopyWindow; + prfb->ClearToBackground = pScreen->ClearToBackground; + prfb->RestoreAreas = pScreen->RestoreAreas; +@@ -691,8 +691,8 @@ rfbScreenInit(index, pScreen, argc, argv + pScreen->CloseScreen = rfbCloseScreen; + pScreen->WakeupHandler = rfbWakeupHandler; + pScreen->CreateGC = rfbCreateGC; +- pScreen->PaintWindowBackground = rfbPaintWindowBackground; +- pScreen->PaintWindowBorder = rfbPaintWindowBorder; ++// pScreen->PaintWindowBackground = rfbPaintWindowBackground; ++// pScreen->PaintWindowBorder = rfbPaintWindowBorder; + pScreen->CopyWindow = rfbCopyWindow; + pScreen->ClearToBackground = rfbClearToBackground; + pScreen->RestoreAreas = rfbRestoreAreas; +Index: xorg-server-1.9.2/hw/vnc/sprite.c +=================================================================== +--- xorg-server-1.9.2.orig/hw/vnc/sprite.c ++++ xorg-server-1.9.2/hw/vnc/sprite.c +@@ -96,8 +96,10 @@ static void rfbSpriteInstallColormap + static void rfbSpriteStoreColors(ColormapPtr pMap, int ndef, + xColorItem *pdef); + ++#if 0 + static void rfbSpritePaintWindowBackground(WindowPtr pWin, + RegionPtr pRegion, int what); ++#endif + static void rfbSpritePaintWindowBorder(WindowPtr pWin, + RegionPtr pRegion, int what); + static void rfbSpriteCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, +@@ -329,7 +331,7 @@ rfbSpriteInitialize (pScreen, cursorFunc + rfbSpriteScreenPtr pPriv; + VisualPtr pVisual; + +- if (!dixRequestPrivate(rfbSpriteGCKey, sizeof(rfbSpriteGCRec))) ++ if (!dixRegisterPrivateKey(rfbSpriteGCKey, PRIVATE_CLIENT, sizeof(rfbSpriteGCRec))) + return FALSE; + + pPriv = (rfbSpriteScreenPtr) xalloc (sizeof (rfbSpriteScreenRec)); +@@ -357,8 +359,8 @@ rfbSpriteInitialize (pScreen, cursorFunc + pPriv->StoreColors = pScreen->StoreColors; + pPriv->DisplayCursor = pScreen->DisplayCursor; + +- pPriv->PaintWindowBackground = pScreen->PaintWindowBackground; +- pPriv->PaintWindowBorder = pScreen->PaintWindowBorder; ++// pPriv->PaintWindowBackground = pScreen->PaintWindowBackground; ++// pPriv->PaintWindowBorder = pScreen->PaintWindowBorder; + pPriv->CopyWindow = pScreen->CopyWindow; + pPriv->ClearToBackground = pScreen->ClearToBackground; + +@@ -393,8 +395,8 @@ rfbSpriteInitialize (pScreen, cursorFunc + pScreen->InstallColormap = rfbSpriteInstallColormap; + pScreen->StoreColors = rfbSpriteStoreColors; + +- pScreen->PaintWindowBackground = rfbSpritePaintWindowBackground; +- pScreen->PaintWindowBorder = rfbSpritePaintWindowBorder; ++// pScreen->PaintWindowBackground = rfbSpritePaintWindowBackground; ++// pScreen->PaintWindowBorder = rfbSpritePaintWindowBorder; + pScreen->CopyWindow = rfbSpriteCopyWindow; + pScreen->ClearToBackground = rfbSpriteClearToBackground; + +@@ -435,8 +437,8 @@ rfbSpriteCloseScreen (i, pScreen) + pScreen->InstallColormap = pScreenPriv->InstallColormap; + pScreen->StoreColors = pScreenPriv->StoreColors; + +- pScreen->PaintWindowBackground = pScreenPriv->PaintWindowBackground; +- pScreen->PaintWindowBorder = pScreenPriv->PaintWindowBorder; ++// pScreen->PaintWindowBackground = pScreenPriv->PaintWindowBackground; ++// pScreen->PaintWindowBorder = pScreenPriv->PaintWindowBorder; + pScreen->CopyWindow = pScreenPriv->CopyWindow; + pScreen->ClearToBackground = pScreenPriv->ClearToBackground; + +@@ -809,6 +811,7 @@ rfbSpriteRestoreAreas (pWin, prgnExposed + * Window wrappers + */ + ++#if 0 + static void + rfbSpritePaintWindowBackground (pWin, pRegion, what) + WindowPtr pWin; +@@ -866,6 +869,7 @@ rfbSpritePaintWindowBorder (pWin, pRegio + + SCREEN_EPILOGUE (pScreen, PaintWindowBorder, rfbSpritePaintWindowBorder); + } ++#endif + + static void + rfbSpriteCopyWindow (pWin, ptOldOrg, pRegion) +Index: xorg-server-1.9.2/hw/vnc/spritest.h +=================================================================== +--- xorg-server-1.9.2.orig/hw/vnc/spritest.h ++++ xorg-server-1.9.2/hw/vnc/spritest.h +@@ -70,8 +70,8 @@ typedef struct { + ScreenBlockHandlerProcPtr BlockHandler; + InstallColormapProcPtr InstallColormap; + StoreColorsProcPtr StoreColors; +- PaintWindowBackgroundProcPtr PaintWindowBackground; +- PaintWindowBorderProcPtr PaintWindowBorder; ++// PaintWindowBackgroundProcPtr PaintWindowBackground; ++// PaintWindowBorderProcPtr PaintWindowBorder; + CopyWindowProcPtr CopyWindow; + ClearToBackgroundProcPtr ClearToBackground; + SaveDoomedAreasProcPtr SaveDoomedAreas; +Index: xorg-server-1.9.2/hw/vnc/cutpaste.c +=================================================================== +--- xorg-server-1.9.2.orig/hw/vnc/cutpaste.c ++++ xorg-server-1.9.2/hw/vnc/cutpaste.c +@@ -54,7 +54,7 @@ rfbSetXCutText(char *str, int len) + Selection *pSel; + + inSetXCutText = TRUE; +- ChangeWindowProperty(WindowTable[0], XA_CUT_BUFFER0, XA_STRING, ++ ChangeWindowProperty(screenInfo.screens[0]->root, XA_CUT_BUFFER0, XA_STRING, + 8, PropModeReplace, len, + (pointer)str, TRUE); + +Index: xorg-server-1.9.2/hw/vnc/dispcur.c +=================================================================== +--- xorg-server-1.9.2.orig/hw/vnc/dispcur.c ++++ xorg-server-1.9.2/hw/vnc/dispcur.c +@@ -340,7 +340,7 @@ rfbDCRealize (ScreenPtr pScreen, CursorP + 0, 0, pCursor->bits->width, pCursor->bits->height, + 0, XYPixmap, (char *)pCursor->bits->source); + gcvals[0] = GXand; +- ChangeGC (pGC, GCFunction, gcvals); ++ ChangeGCXIDs (NullClient, pGC, GCFunction, gcvals); + ValidateGC ((DrawablePtr)pPriv->sourceBits, pGC); + (*pGC->ops->PutImage) ((DrawablePtr)pPriv->sourceBits, pGC, 1, + 0, 0, pCursor->bits->width, pCursor->bits->height, +@@ -348,13 +348,13 @@ rfbDCRealize (ScreenPtr pScreen, CursorP + + /* mask bits -- pCursor->mask & ~pCursor->source */ + gcvals[0] = GXcopy; +- ChangeGC (pGC, GCFunction, gcvals); ++ ChangeGCXIDs (NullClient, pGC, GCFunction, gcvals); + ValidateGC ((DrawablePtr)pPriv->maskBits, pGC); + (*pGC->ops->PutImage) ((DrawablePtr)pPriv->maskBits, pGC, 1, + 0, 0, pCursor->bits->width, pCursor->bits->height, + 0, XYPixmap, (char *)pCursor->bits->mask); + gcvals[0] = GXandInverted; +- ChangeGC (pGC, GCFunction, gcvals); ++ ChangeGCXIDs (NullClient, pGC, GCFunction, gcvals); + ValidateGC ((DrawablePtr)pPriv->maskBits, pGC); + (*pGC->ops->PutImage) ((DrawablePtr)pPriv->maskBits, pGC, 1, + 0, 0, pCursor->bits->width, pCursor->bits->height, +@@ -396,7 +396,7 @@ rfbDCPutBits (DrawablePtr pDrawable, rfb + if (sourceGC->fgPixel != source) + { + gcvals[0] = source; +- DoChangeGC (sourceGC, GCForeground, gcvals, 0); ++ ChangeGCXIDs (NullClient, sourceGC, GCForeground, gcvals); + } + if (sourceGC->serialNumber != pDrawable->serialNumber) + ValidateGC (pDrawable, sourceGC); +@@ -404,7 +404,7 @@ rfbDCPutBits (DrawablePtr pDrawable, rfb + if (maskGC->fgPixel != mask) + { + gcvals[0] = mask; +- DoChangeGC (maskGC, GCForeground, gcvals, 0); ++ ChangeGCXIDs (NullClient, maskGC, GCForeground, gcvals); + } + if (maskGC->serialNumber != pDrawable->serialNumber) + ValidateGC (pDrawable, maskGC); +@@ -451,7 +451,7 @@ rfbDCPutUpCursor (pScreen, pCursor, x, y + } + pScreenPriv = (rfbDCScreenPtr)dixLookupPrivate(&pScreen->devPrivates, + rfbDCScreenKey); +- pWin = WindowTable[pScreen->myNum]; ++ pWin = pScreen->root; + #ifdef ARGB_CURSOR + if (pPriv->pPicture) + { +@@ -498,7 +498,7 @@ rfbDCSaveUnderCursor (pScreen, x, y, w, + pScreenPriv = (rfbDCScreenPtr)dixLookupPrivate(&pScreen->devPrivates, + rfbDCScreenKey); + pSave = pScreenPriv->pSave; +- pWin = WindowTable[pScreen->myNum]; ++ pWin = pScreen->root; + if (!pSave || pSave->drawable.width < w || pSave->drawable.height < h) + { + if (pSave) +@@ -531,7 +531,7 @@ rfbDCRestoreUnderCursor (pScreen, x, y, + pScreenPriv = (rfbDCScreenPtr)dixLookupPrivate(&pScreen->devPrivates, + rfbDCScreenKey); + pSave = pScreenPriv->pSave; +- pWin = WindowTable[pScreen->myNum]; ++ pWin = pScreen->root; + if (!pSave) + return FALSE; + if (!EnsureGC(pScreenPriv->pRestoreGC, pWin)) +@@ -558,7 +558,7 @@ rfbDCChangeSave (pScreen, x, y, w, h, dx + pScreenPriv = (rfbDCScreenPtr)dixLookupPrivate(&pScreen->devPrivates, + rfbDCScreenKey); + pSave = pScreenPriv->pSave; +- pWin = WindowTable[pScreen->myNum]; ++ pWin = pScreen->root; + /* + * restore the bits which are about to get trashed + */ +@@ -702,7 +702,7 @@ rfbDCMoveCursor (pScreen, pCursor, x, y, + } + pScreenPriv = (rfbDCScreenPtr)dixLookupPrivate(&pScreen->devPrivates, + rfbDCScreenKey); +- pWin = WindowTable[pScreen->myNum]; ++ pWin = pScreen->root; + pTemp = pScreenPriv->pTemp; + if (!pTemp || + pTemp->drawable.width != pScreenPriv->pSave->drawable.width || +Index: xorg-server-1.9.2/hw/vnc/kbdptr.c +=================================================================== +--- xorg-server-1.9.2.orig/hw/vnc/kbdptr.c ++++ xorg-server-1.9.2/hw/vnc/kbdptr.c +@@ -153,7 +153,7 @@ KbdAddEvent(Bool down, KeySym keySym, rf + #ifdef CORBA + if (cl) { + CARD32 clientId = cl->sock; +- ChangeWindowProperty(WindowTable[0], VNC_LAST_CLIENT_ID, XA_INTEGER, ++ ChangeWindowProperty(screenInfo.screens[0]->root, VNC_LAST_CLIENT_ID, XA_INTEGER, + 32, PropModeReplace, 1, (pointer)&clientId, TRUE); + } + #endif +@@ -310,7 +310,7 @@ PtrAddEvent(int buttonMask, int x, int y + #ifdef CORBA + if (cl) { + CARD32 clientId = cl->sock; +- ChangeWindowProperty(WindowTable[0], VNC_LAST_CLIENT_ID, XA_INTEGER, ++ ChangeWindowProperty(screenInfo.screens[0]->root, VNC_LAST_CLIENT_ID, XA_INTEGER, + 32, PropModeReplace, 1, (pointer)&clientId, TRUE); + } + #endif +Index: xorg-server-1.9.2/hw/vnc/rfbserver.c +=================================================================== +--- xorg-server-1.9.2.orig/hw/vnc/rfbserver.c ++++ xorg-server-1.9.2/hw/vnc/rfbserver.c +@@ -82,7 +82,7 @@ void + rfbRootPropertyChange(ScreenPtr pScreen) + { + PropertyPtr pProp; +- WindowPtr pWin = WindowTable[pScreen->myNum]; ++ WindowPtr pWin = pScreen->root; + + pProp = wUserProps (pWin); + +@@ -1068,7 +1068,7 @@ rfbProcessClientNormalMessage(cl) + GenerateVncChromiumConnectedEvent(cl->sock); + if (enc == rfbEncodingChromium) { + /* Generate exposures for all windows */ +- WindowPtr pWin = WindowTable[cl->pScreen->myNum]; ++ WindowPtr pWin = cl->pScreen->root; + rfbSetClip(pWin, 1); + } + else { +@@ -1866,13 +1866,13 @@ rfbSendSetColourMapEntries(cl, firstColo + + /* PseudoColor */ + #if XFREE86VNC +- if (miInstalledMaps[cl->pScreen->myNum]->class == PseudoColor) { ++ if (GetInstalledmiColormap(cl->pScreen)->class == PseudoColor) { + #else + if (pVNC->rfbInstalledColormap->class == PseudoColor) { + #endif + scme->firstColour = Swap16IfLE(firstColour); + #if XFREE86VNC +- pent = (EntryPtr)&miInstalledMaps[cl->pScreen->myNum]->red[firstColour]; ++ pent = (EntryPtr)&GetInstalledmiColormap(cl->pScreen)->red[firstColour]; + #else + pent = (EntryPtr)&pVNC->rfbInstalledColormap->red[firstColour]; + #endif +@@ -1894,12 +1894,12 @@ rfbSendSetColourMapEntries(cl, firstColo + + /* Break the DirectColor pixel into its r/g/b components */ + #if XFREE86VNC +- redPart = (firstColour & miInstalledMaps[cl->pScreen->myNum]->pVisual->redMask) +- >> miInstalledMaps[cl->pScreen->myNum]->pVisual->offsetRed; +- greenPart = (firstColour & miInstalledMaps[cl->pScreen->myNum]->pVisual->greenMask) +- >> miInstalledMaps[cl->pScreen->myNum]->pVisual->offsetGreen; +- bluePart = (firstColour & miInstalledMaps[cl->pScreen->myNum]->pVisual->blueMask) +- >> miInstalledMaps[cl->pScreen->myNum]->pVisual->offsetBlue; ++ redPart = (firstColour & GetInstalledmiColormap(cl->pScreen)->pVisual->redMask) ++ >> GetInstalledmiColormap(cl->pScreen)->pVisual->offsetRed; ++ greenPart = (firstColour & GetInstalledmiColormap(cl->pScreen)->pVisual->greenMask) ++ >> GetInstalledmiColormap(cl->pScreen)->pVisual->offsetGreen; ++ bluePart = (firstColour & GetInstalledmiColormap(cl->pScreen)->pVisual->blueMask) ++ >> GetInstalledmiColormap(cl->pScreen)->pVisual->offsetBlue; + #else + redPart = (firstColour & pVNC->rfbInstalledColormap->pVisual->redMask) + >> pVNC->rfbInstalledColormap->pVisual->offsetRed; +@@ -1918,9 +1918,9 @@ rfbSendSetColourMapEntries(cl, firstColo + scme->firstColour = Swap16IfLE((greenPart << 8) | bluePart); + + #if XFREE86VNC +- redEntry = (EntryPtr)&miInstalledMaps[cl->pScreen->myNum]->red[redPart]; +- greenEntry = (EntryPtr)&miInstalledMaps[cl->pScreen->myNum]->green[greenPart]; +- blueEntry = (EntryPtr)&miInstalledMaps[cl->pScreen->myNum]->blue[bluePart]; ++ redEntry = (EntryPtr)&GetInstalledmiColormap(cl->pScreen)->red[redPart]; ++ greenEntry = (EntryPtr)&GetInstalledmiColormap(cl->pScreen)->green[greenPart]; ++ blueEntry = (EntryPtr)&GetInstalledmiColormap(cl->pScreen)->blue[bluePart]; + #else + redEntry = (EntryPtr)&pVNC->rfbInstalledColormap->red[redPart]; + greenEntry = (EntryPtr)&pVNC->rfbInstalledColormap->green[greenPart]; +Index: xorg-server-1.9.2/hw/vnc/tabletranstemplate.c +=================================================================== +--- xorg-server-1.9.2.orig/hw/vnc/tabletranstemplate.c ++++ xorg-server-1.9.2/hw/vnc/tabletranstemplate.c +@@ -67,7 +67,7 @@ rfbTranslateWithSingleTableINtoOUT (Scre + OUT_T *op = (OUT_T *)optr; + OUT_T *opLineEnd; + OUT_T *t = (OUT_T *)table; +- DrawablePtr pDraw = (DrawablePtr)WindowTable[pScreen->myNum]; ++ DrawablePtr pDraw = (DrawablePtr)pScreen->root; + int truewidth = PixmapBytePad(width, in->bitsPerPixel); + unsigned char *iptr = malloc(truewidth * height * in->bitsPerPixel / 8); + int ipextra = truewidth - width; +@@ -107,7 +107,7 @@ rfbTranslateWithRGBTablesINtoOUT (Screen + OUT_T *redTable = (OUT_T *)table; + OUT_T *greenTable = redTable + in->redMax + 1; + OUT_T *blueTable = greenTable + in->greenMax + 1; +- DrawablePtr pDraw = (DrawablePtr)WindowTable[pScreen->myNum]; ++ DrawablePtr pDraw = (DrawablePtr)pScreen->root; + int truewidth = PixmapBytePad(width, in->bitsPerPixel); + unsigned char *iptr = malloc(truewidth * height * in->bitsPerPixel / 8); + int ipextra = truewidth - width; +Index: xorg-server-1.9.2/hw/vnc/translate.c +=================================================================== +--- xorg-server-1.9.2.orig/hw/vnc/translate.c ++++ xorg-server-1.9.2/hw/vnc/translate.c +@@ -167,7 +167,7 @@ rfbTranslateNone(ScreenPtr pScreen, char + int width, int height, int x, int y) + { + VNCSCREENPTR(pScreen); +- DrawablePtr pDraw = (DrawablePtr)WindowTable[pScreen->myNum]; ++ DrawablePtr pDraw = (DrawablePtr)pScreen->root; + int truewidth = PixmapBytePad(width, in->bitsPerPixel); + + if ((x + width > pVNC->width) || truewidth != width * in->bitsPerPixel / 8) { +@@ -227,7 +227,7 @@ rfbSetTranslateFunction(cl) + if (!pVNC->rfbServerFormat.trueColour && + (pVNC->rfbServerFormat.bitsPerPixel != 8) && + #if XFREE86VNC +- (miInstalledMaps[cl->pScreen->myNum]->class == PseudoColor)) { ++ (GetInstalledmiColormap(cl->pScreen)->class == PseudoColor)) { + #else + (pVNC->rfbInstalledColormap->class == PseudoColor)) { + #endif +@@ -241,7 +241,7 @@ rfbSetTranslateFunction(cl) + if (!cl->format.trueColour && + (cl->format.bitsPerPixel != 8) && + #if XFREE86VNC +- (miInstalledMaps[cl->pScreen->myNum]->class == PseudoColor)) { ++ (GetInstalledmiColormap(cl->pScreen)->class == PseudoColor)) { + #else + (pVNC->rfbInstalledColormap->class == PseudoColor) ) { + #endif +@@ -265,7 +265,7 @@ rfbSetTranslateFunction(cl) + /* colour map -> colour map */ + + #if XFREE86VNC +- if (miInstalledMaps[cl->pScreen->myNum]->class == DirectColor) { ++ if (GetInstalledmiColormap(cl->pScreen)->class == DirectColor) { + #else + if (pVNC->rfbInstalledColormap->class == DirectColor) { + #endif +@@ -433,7 +433,7 @@ rfbSetClientColourMap(cl, firstColour, n + + if (nColours == 0) { + #if XFREE86VNC +- nColours = miInstalledMaps[cl->pScreen->myNum]->pVisual->ColormapEntries; ++ nColours = GetInstalledmiColormap(cl->pScreen)->pVisual->ColormapEntries; + #else + nColours = pVNC->rfbInstalledColormap->pVisual->ColormapEntries; + #endif +Index: xorg-server-1.9.2/hw/dmx/vnc/vncint.h +=================================================================== +--- xorg-server-1.9.2.orig/hw/dmx/vnc/vncint.h ++++ xorg-server-1.9.2/hw/dmx/vnc/vncint.h +@@ -114,8 +114,8 @@ typedef struct { + + CloseScreenProcPtr CloseScreen; + CreateGCProcPtr CreateGC; +- PaintWindowBackgroundProcPtr PaintWindowBackground; +- PaintWindowBorderProcPtr PaintWindowBorder; ++// PaintWindowBackgroundProcPtr PaintWindowBackground; ++// PaintWindowBorderProcPtr PaintWindowBorder; + CopyWindowProcPtr CopyWindow; + ClearToBackgroundProcPtr ClearToBackground; + RestoreAreasProcPtr RestoreAreas; +Index: xorg-server-1.9.2/hw/xfree86/vnc/vncint.h +=================================================================== +--- xorg-server-1.9.2.orig/hw/xfree86/vnc/vncint.h ++++ xorg-server-1.9.2/hw/xfree86/vnc/vncint.h +@@ -112,8 +112,8 @@ typedef struct { + + CloseScreenProcPtr CloseScreen; + CreateGCProcPtr CreateGC; +- PaintWindowBackgroundProcPtr PaintWindowBackground; +- PaintWindowBorderProcPtr PaintWindowBorder; ++// PaintWindowBackgroundProcPtr PaintWindowBackground; ++// PaintWindowBorderProcPtr PaintWindowBorder; + CopyWindowProcPtr CopyWindow; + ClearToBackgroundProcPtr ClearToBackground; + RestoreAreasProcPtr RestoreAreas; +Index: xorg-server-1.9.2/hw/vnc/vncext.c +=================================================================== +--- xorg-server-1.9.2.orig/hw/vnc/vncext.c ++++ xorg-server-1.9.2/hw/vnc/vncext.c +@@ -763,7 +763,7 @@ VncExtensionInit(void) + vncExtGeneration = serverGeneration; + + // no allocation needed for screen privates +- if (!dixRequestPrivate(rfbGCKey, sizeof(rfbGCRec))) ++ if (!dixRegisterPrivateKey(rfbGCKey, PRIVATE_CLIENT, sizeof(rfbGCRec))) + return; + + #if XFREE86VNC +Index: xorg-server-1.9.2/hw/vnc/tableinitcmtemplate.c +=================================================================== +--- xorg-server-1.9.2.orig/hw/vnc/tableinitcmtemplate.c ++++ xorg-server-1.9.2/hw/vnc/tableinitcmtemplate.c +@@ -61,7 +61,7 @@ rfbInitColourMapSingleTableOUT (ScreenPt + t = (OUT_T *)*table; + + #if XFREE86VNC +- pent = (EntryPtr)&miInstalledMaps[pScreen->myNum]->red[0]; ++ pent = (EntryPtr)&GetInstalledmiColormap(pScreen)->red[0]; + #else + pent = (EntryPtr)&pVNC->rfbInstalledColormap->red[0]; + #endif +Index: xorg-server-1.9.2/hw/xfree86/vnc/vncInit.c +=================================================================== +--- xorg-server-1.9.2.orig/hw/xfree86/vnc/vncInit.c ++++ xorg-server-1.9.2/hw/xfree86/vnc/vncInit.c +@@ -286,8 +286,8 @@ VNCInit(ScreenPtr pScreen, unsigned char + + pScreenPriv->CloseScreen = pScreen->CloseScreen; + pScreenPriv->CreateGC = pScreen->CreateGC; +- pScreenPriv->PaintWindowBackground = pScreen->PaintWindowBackground; +- pScreenPriv->PaintWindowBorder = pScreen->PaintWindowBorder; ++// pScreenPriv->PaintWindowBackground = pScreen->PaintWindowBackground; ++// pScreenPriv->PaintWindowBorder = pScreen->PaintWindowBorder; + pScreenPriv->CopyWindow = pScreen->CopyWindow; + pScreenPriv->ClearToBackground = pScreen->ClearToBackground; + pScreenPriv->RestoreAreas = pScreen->RestoreAreas; +@@ -313,8 +313,8 @@ VNCInit(ScreenPtr pScreen, unsigned char + #endif + pScreen->CloseScreen = rfbCloseScreen; + pScreen->CreateGC = rfbCreateGC; +- pScreen->PaintWindowBackground = rfbPaintWindowBackground; +- pScreen->PaintWindowBorder = rfbPaintWindowBorder; ++// pScreen->PaintWindowBackground = rfbPaintWindowBackground; ++// pScreen->PaintWindowBorder = rfbPaintWindowBorder; + pScreen->CopyWindow = rfbCopyWindow; + pScreen->ClearToBackground = rfbClearToBackground; + pScreen->RestoreAreas = rfbRestoreAreas; diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index c39df4a..d4d7eca 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Sun Nov 14 09:15:22 UTC 2010 - sndirsch@novell.com + +- xorg-server 1.9.2.901 (1.9.3 RC1) + * many buildfixes and bugfixes + +------------------------------------------------------------------- +Fri Nov 12 12:52:01 UTC 2010 - sndirsch@novell.com + +- xorg-docs 1.5.99.901 (1.6 RC1) +- adjusted xorg-x11-doc.diff + +------------------------------------------------------------------- +Fri Nov 12 12:06:22 UTC 2010 - sndirsch@novell.com + +- xorg-docs-1.5 +- adjusted xorg-docs.diff + +------------------------------------------------------------------- +Tue Nov 9 23:49:23 UTC 2010 - sndirsch@novell.com + +- disabled again vnc build due to immediate assertion during + startup of Xvnc + +------------------------------------------------------------------- +Tue Nov 9 23:46:17 UTC 2010 - sndirsch@novell.com + +- uncommented non-existing + xorg-server-xf4vnc-bug605015-vnc-umlauts.diff + +------------------------------------------------------------------- +Tue Nov 9 18:40:57 UTC 2010 - mhopf@novell.com + +- xorg-server-xf4vnc-fixes_1_9.diff: + Fix build of vnc server for 1.9 Xserver series. + ------------------------------------------------------------------- Mon Nov 1 23:47:32 UTC 2010 - sndirsch@novell.com diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 387cb15..b3327e6 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -20,7 +20,7 @@ %define moblin 0 Name: xorg-x11-server -%define dirsuffix 1.9.2 +%define dirsuffix 1.9.2.901 %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-fonts-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 ### udev support (broken on openSUSE 11.2, see also bnc #589997) @@ -53,7 +53,7 @@ Source1: sysconfig.displaymanager.template Source3: README.updates Source4: xorgcfg.tar.bz2 Source5: modprobe.nvidia -Source7: xorg-docs-1.4.tar.bz2 +Source7: xorg-docs-1.5.99.901.tar.bz2 Source8: xorg-backtrace Patch1: fpic.diff Patch2: p_default-module-path.diff @@ -78,6 +78,8 @@ Patch46: xorg-server-xf4vnc-busyloop.diff Patch47: xorg-server-xf4vnc-clientTimeout.diff Patch48: xorg-server-xf4vnc-fix.diff Patch49: xorg-server-xf4vnc-fixes_1_8.diff +Patch50: xorg-server-xf4vnc-fixes_1_9.diff +#Patch51: xorg-server-xf4vnc-bug605015-vnc-umlauts.diff %endif Patch45: bug-197858_dpms.diff Patch67: xorg-docs.diff @@ -199,6 +201,8 @@ An X Window System server for Virtual Network Computing (VNC). %patch47 -p1 %patch48 -p1 %patch49 -p0 +%patch50 -p1 +#%patch51 -p1 chmod 755 hw/vnc/symlink-vnc.sh %endif %patch45 -p0