summaryrefslogtreecommitdiff
path: root/extra/source/tigervnc/patches/tigervnc11-xorg113.patch
diff options
context:
space:
mode:
Diffstat (limited to 'extra/source/tigervnc/patches/tigervnc11-xorg113.patch')
-rw-r--r--extra/source/tigervnc/patches/tigervnc11-xorg113.patch171
1 files changed, 0 insertions, 171 deletions
diff --git a/extra/source/tigervnc/patches/tigervnc11-xorg113.patch b/extra/source/tigervnc/patches/tigervnc11-xorg113.patch
deleted file mode 100644
index 12ce549d..00000000
--- a/extra/source/tigervnc/patches/tigervnc11-xorg113.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-diff -up xserver/hw/vnc/Makefile.am.xorg113 xserver/hw/vnc/Makefile.am
---- xserver/hw/vnc/Makefile.am.xorg113 2012-07-19 21:42:46.297455970 -0400
-+++ xserver/hw/vnc/Makefile.am 2012-07-19 21:19:22.526005528 -0400
-@@ -62,7 +62,7 @@ EXTRA_DIST = Xvnc.man
- BUILT_SOURCES = $(nodist_Xvnc_SOURCES)
-
- fb.h: $(top_srcdir)/fb/fb.h
-- cat $(top_srcdir)/fb/fb.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fb.h
-+ cat $(top_srcdir)/fb/fb.h | sed -e 's,and,c_and,g' -e 's,xor,c_xor,g' > $(srcdir)/fb.h
-
- pixman.h: $(includedir)/pixman-1/pixman.h
- cat $(includedir)/pixman-1/pixman.h | sed 's/xor/c_xor/' > $(srcdir)/pixman.h
-diff -up xserver/hw/vnc/vncHooks.cc.xorg113 xserver/hw/vnc/vncHooks.cc
---- xserver/hw/vnc/vncHooks.cc.xorg113 2012-07-19 21:31:37.191820942 -0400
-+++ xserver/hw/vnc/vncHooks.cc 2012-07-19 21:36:00.327531293 -0400
-@@ -116,7 +116,7 @@ static DevPrivateKeyRec vncHooksGCKeyRec
-
- // screen functions
-
--static Bool vncHooksCloseScreen(int i, ScreenPtr pScreen);
-+static Bool vncHooksCloseScreen(ScreenPtr pScreen);
- static Bool vncHooksCreateGC(GCPtr pGC);
- static void vncHooksCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg,
- RegionPtr pOldRegion);
-@@ -133,7 +133,7 @@ static Bool vncHooksDisplayCursor(
- DeviceIntPtr pDev,
- #endif
- ScreenPtr pScreen, CursorPtr cursor);
--static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout,
-+static void vncHooksBlockHandler(ScreenPtr pScreen_, pointer pTimeout,
- pointer pReadmask);
- #ifdef RENDER
- static void vncHooksComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask,
-@@ -335,7 +335,7 @@ Bool vncHooksInit(ScreenPtr pScreen, Xse
- // CloseScreen - unwrap the screen functions and call the original CloseScreen
- // function
-
--static Bool vncHooksCloseScreen(int i, ScreenPtr pScreen_)
-+static Bool vncHooksCloseScreen(ScreenPtr pScreen_)
- {
- SCREEN_UNWRAP(pScreen_, CloseScreen);
-
-@@ -366,7 +366,7 @@ static Bool vncHooksCloseScreen(int i, S
-
- DBGPRINT((stderr,"vncHooksCloseScreen: unwrapped screen functions\n"));
-
-- return (*pScreen->CloseScreen)(i, pScreen);
-+ return (*pScreen->CloseScreen)(pScreen);
- }
-
- // CreateGC - wrap the "GC funcs"
-@@ -531,14 +531,14 @@ static Bool vncHooksDisplayCursor(
- // BlockHandler - ignore any changes during the block handler - it's likely
- // these are just drawing the cursor.
-
--static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout,
-+static void vncHooksBlockHandler(ScreenPtr pScreen_, pointer pTimeout,
- pointer pReadmask)
- {
-- SCREEN_UNWRAP(screenInfo.screens[i], BlockHandler);
-+ SCREEN_UNWRAP(pScreen_, BlockHandler);
-
- vncHooksScreen->desktop->ignoreHooks(true);
-
-- (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
-+ (*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask);
-
- vncHooksScreen->desktop->ignoreHooks(false);
-
-diff -up xserver/hw/vnc/xf86vncModule.cc.xorg113 xserver/hw/vnc/xf86vncModule.cc
---- xserver/hw/vnc/xf86vncModule.cc.xorg113 2012-07-19 21:19:27.558942606 -0400
-+++ xserver/hw/vnc/xf86vncModule.cc 2012-07-19 21:19:27.574942408 -0400
-@@ -53,8 +53,6 @@ ExtensionModule vncExt =
- {
- vncExtensionInitWithParams,
- "VNC",
-- NULL,
-- NULL,
- NULL
- };
-
-diff -up xserver/hw/vnc/xorg-version.h.xorg113 xserver/hw/vnc/xorg-version.h
---- xserver/hw/vnc/xorg-version.h.xorg113 2012-07-19 21:19:27.560942582 -0400
-+++ xserver/hw/vnc/xorg-version.h 2012-07-19 21:19:27.576942382 -0400
-@@ -40,6 +40,8 @@
- #define XORG 111
- #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (12 * 100000) + (99 * 1000))
- #define XORG 112
-+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (13 * 100000) + (99 * 1000))
-+#define XORG 113
- #else
- #error "X.Org newer than 1.10 is not supported"
- #endif
-diff -up xserver/hw/vnc/xvnc.cc.xorg113 xserver/hw/vnc/xvnc.cc
---- xserver/hw/vnc/xvnc.cc.xorg113 2012-07-19 21:36:33.078121854 -0400
-+++ xserver/hw/vnc/xvnc.cc 2012-07-19 21:39:49.685663920 -0400
-@@ -267,7 +267,7 @@ OsVendorInit()
- }
-
- void
--OsVendorFatalError()
-+OsVendorFatalError(const char *f, va_list args)
- {
- }
-
-@@ -1135,9 +1135,9 @@ static Bool vncRandRSetConfig (ScreenPtr
- #endif
-
- static Bool
--vfbCloseScreen(int index, ScreenPtr pScreen)
-+vfbCloseScreen(ScreenPtr pScreen)
- {
-- vfbScreenInfoPtr pvfb = &vfbScreens[index];
-+ vfbScreenInfoPtr pvfb = &vfbScreens[pScreen->myNum];
- int i;
-
- pScreen->CloseScreen = pvfb->closeScreen;
-@@ -1149,13 +1149,13 @@ vfbCloseScreen(int index, ScreenPtr pScr
- for (i = 0; i < MAXSCREENS; i++)
- InstalledMaps[i] = NULL;
-
-- return pScreen->CloseScreen(index, pScreen);
-+ return pScreen->CloseScreen(pScreen);
- }
-
- static Bool
--vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
-+vfbScreenInit(ScreenPtr pScreen, int argc, char **argv)
- {
-- vfbScreenInfoPtr pvfb = &vfbScreens[index];
-+ vfbScreenInfoPtr pvfb = &vfbScreens[pScreen->myNum];
- int dpi;
- int ret;
- void *pbits;
-@@ -1167,8 +1167,8 @@ vfbScreenInit(int index, ScreenPtr pScre
-
- pbits = vfbAllocateFramebufferMemory(&pvfb->fb);
- if (!pbits) return FALSE;
-- vncFbptr[index] = pbits;
-- vncFbstride[index] = pvfb->fb.paddedWidth;
-+ vncFbptr[pScreen->myNum] = pbits;
-+ vncFbstride[pScreen->myNum] = pvfb->fb.paddedWidth;
-
- miSetPixmapDepths();
-
-diff -up xserver/include/screenint.h.xorg113 xserver/include/screenint.h
---- xserver/include/screenint.h.xorg113 2012-07-19 21:30:38.258557709 -0400
-+++ xserver/include/screenint.h 2012-07-19 21:30:45.415468235 -0400
-@@ -72,18 +72,18 @@ extern _X_EXPORT int AddGPUScreen(Bool (
- extern _X_EXPORT void RemoveGPUScreen(ScreenPtr pScreen);
-
- extern _X_EXPORT void
--AttachUnboundGPU(ScreenPtr pScreen, ScreenPtr newScreen);
-+AttachUnboundGPU(ScreenPtr pScreen, ScreenPtr);
- extern _X_EXPORT void
- DetachUnboundGPU(ScreenPtr unbound);
-
- extern _X_EXPORT void
--AttachOutputGPU(ScreenPtr pScreen, ScreenPtr newScreen);
-+AttachOutputGPU(ScreenPtr pScreen, ScreenPtr);
-
- extern _X_EXPORT void
- DetachOutputGPU(ScreenPtr output);
-
- extern _X_EXPORT void
--AttachOffloadGPU(ScreenPtr pScreen, ScreenPtr newScreen);
-+AttachOffloadGPU(ScreenPtr pScreen, ScreenPtr);
-
- extern _X_EXPORT void
- DetachOffloadGPU(ScreenPtr slave);
-
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-17 20:51:37 +0000