From d804e0ee1141d076e71f3caa9e2ad954c31ed58d Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 10 Aug 2012 14:19:24 +1000 Subject: [PATCH] fix build against newer X server --- tigervnc.spec | 5 ++++- tigervnc11-xorg113.patch | 25 ------------------------- 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/tigervnc.spec b/tigervnc.spec index f412565..bce5e30 100644 --- a/tigervnc.spec +++ b/tigervnc.spec @@ -1,6 +1,6 @@ Name: tigervnc Version: 1.1.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A TigerVNC remote display system Group: User Interface/Desktops @@ -301,6 +301,9 @@ fi %doc LICENCE.TXT %changelog +* Fri Aug 10 2012 Dave Airlie 1.1.0-10 +- fix build against newer X server + * Mon Jul 23 2012 Adam Jackson 1.1.0-9 - Build with the Composite extension for feature parity with other X servers diff --git a/tigervnc11-xorg113.patch b/tigervnc11-xorg113.patch index 556d93f..d5692e9 100644 --- a/tigervnc11-xorg113.patch +++ b/tigervnc11-xorg113.patch @@ -143,28 +143,3 @@ diff -up xserver/hw/vnc/xvnc.cc.xorg113 xserver/hw/vnc/xvnc.cc 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 new); -+AttachUnboundGPU(ScreenPtr pScreen, ScreenPtr); - extern _X_EXPORT void - DetachUnboundGPU(ScreenPtr unbound); - - extern _X_EXPORT void --AttachOutputGPU(ScreenPtr pScreen, ScreenPtr new); -+AttachOutputGPU(ScreenPtr pScreen, ScreenPtr); - - extern _X_EXPORT void - DetachOutputGPU(ScreenPtr output); - - extern _X_EXPORT void --AttachOffloadGPU(ScreenPtr pScreen, ScreenPtr new); -+AttachOffloadGPU(ScreenPtr pScreen, ScreenPtr); - - extern _X_EXPORT void - DetachOffloadGPU(ScreenPtr slave);