Annotation of /trunk/tigervnc/patches/tigervnc-1.2.0-xserver113-glx.patch
Parent Directory | Revision Log
Revision 2079 -
(hide annotations)
(download)
Mon Feb 18 15:20:23 2013 UTC (11 years, 7 months ago) by niro
File size: 2352 byte(s)
Mon Feb 18 15:20:23 2013 UTC (11 years, 7 months ago) by niro
File size: 2352 byte(s)
-added patches for tigervnc-1.2.0
1 | niro | 2079 | diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/Makefile.am tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am |
2 | --- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/Makefile.am 2011-10-31 09:14:40.000000000 +0100 | ||
3 | +++ tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am 2013-01-21 03:39:14.924841615 +0100 | ||
4 | @@ -7,6 +7,10 @@ | ||
5 | XREGION_LIB=$(LIB_DIR)/Xregion/libXregion.la | ||
6 | COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB) | ||
7 | |||
8 | +if GLX | ||
9 | +GLX_LIB = $(top_srcdir)/glx/libglx.la | ||
10 | +endif | ||
11 | + | ||
12 | noinst_LTLIBRARIES = libvnccommon.la | ||
13 | |||
14 | HDRS = RegionHelper.h vncExtInit.h vncHooks.h XserverDesktop.h xorg-version.h \ | ||
15 | @@ -34,7 +38,8 @@ | ||
16 | -UHAVE_CONFIG_H \ | ||
17 | -DXFree86Server -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ | ||
18 | -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common \ | ||
19 | - -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} -I$(includedir) | ||
20 | + -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} -I$(includedir) \ | ||
21 | + -I$(top_srcdir)/glx | ||
22 | |||
23 | Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(COMMON_LIBS) \ | ||
24 | $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XVNC_SYS_LIBS) -lX11 | ||
25 | @@ -55,7 +60,7 @@ | ||
26 | |||
27 | libvnc_la_LDFLAGS = -module -avoid-version | ||
28 | |||
29 | -libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) | ||
30 | +libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(GLX_LIB) | ||
31 | |||
32 | EXTRA_DIST = Xvnc.man | ||
33 | |||
34 | diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xvnc.cc tigervnc-1.2.0/unix/xserver/hw/vnc/xvnc.cc | ||
35 | --- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xvnc.cc 2012-03-09 21:34:29.000000000 +0100 | ||
36 | +++ tigervnc-1.2.0/unix/xserver/hw/vnc/xvnc.cc 2013-01-21 03:38:38.187300899 +0100 | ||
37 | @@ -87,6 +87,17 @@ | ||
38 | #include "version-config.h" | ||
39 | #include "site.h" | ||
40 | #endif | ||
41 | + | ||
42 | +#if XORG >= 113 | ||
43 | +#ifdef GLXEXT | ||
44 | +/* C++ really is the worst */ | ||
45 | +#define private _private | ||
46 | +#include "glxserver.h" | ||
47 | +#undef private | ||
48 | +#include "glx_extinit.h" | ||
49 | +#endif | ||
50 | +#endif | ||
51 | + | ||
52 | #undef class | ||
53 | #undef public | ||
54 | } | ||
55 | @@ -1305,6 +1316,16 @@ | ||
56 | dispatchException &= ~DE_RESET; | ||
57 | } | ||
58 | |||
59 | +#if XORG >= 113 | ||
60 | +#ifdef GLXEXT | ||
61 | +static ExtensionModule vnc_glx_ext = { | ||
62 | + GlxExtensionInit, | ||
63 | + "GLX", | ||
64 | + &noGlxExtension | ||
65 | +}; | ||
66 | +#endif | ||
67 | +#endif | ||
68 | + | ||
69 | void | ||
70 | InitOutput(ScreenInfo *screenInfo, int argc, char **argv) | ||
71 | { | ||
72 | @@ -1314,6 +1335,13 @@ | ||
73 | int i; | ||
74 | int NumFormats = 0; | ||
75 | |||
76 | +#if XORG >= 113 | ||
77 | +#ifdef GLXEXT | ||
78 | + if (serverGeneration == 1) | ||
79 | + LoadExtension(&vnc_glx_ext, TRUE); | ||
80 | +#endif | ||
81 | +#endif | ||
82 | + | ||
83 | /* initialize pixmap formats */ | ||
84 | |||
85 | /* must have a pixmap depth to match every screen depth */ |