Contents of /trunk/tigervnc/patches/tigervnc-1.2.0-xserver113-glx-2.patch
Parent Directory | Revision Log
Revision 2079 -
(show annotations)
(download)
Mon Feb 18 15:20:23 2013 UTC (11 years, 7 months ago) by niro
File size: 2514 byte(s)
Mon Feb 18 15:20:23 2013 UTC (11 years, 7 months ago) by niro
File size: 2514 byte(s)
-added patches for tigervnc-1.2.0
1 | diff -Naur tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am tigervnc-1.2.0-magellan/unix/xserver/hw/vnc/Makefile.am |
2 | --- tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am 2013-02-18 17:21:34.262000000 +0000 |
3 | +++ tigervnc-1.2.0-magellan/unix/xserver/hw/vnc/Makefile.am 2013-02-18 17:26:42.771000000 +0000 |
4 | @@ -8,6 +8,10 @@ |
5 | OS_LIB=$(LIB_DIR)/os/libos.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 | @@ -32,10 +36,8 @@ |
16 | nodist_Xvnc_SOURCES = fbrop.h fb.h pixman.h |
17 | |
18 | Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DTIGERVNC -DNO_MODULE_EXTS \ |
19 | - -UHAVE_CONFIG_H \ |
20 | - -DXFree86Server -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ |
21 | - -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common \ |
22 | - -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} -I$(includedir) |
23 | + -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} -I$(includedir) \ |
24 | + -I$(top_srcdir)/glx |
25 | |
26 | Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(COMMON_LIBS) \ |
27 | $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XVNC_SYS_LIBS) -lX11 |
28 | @@ -56,7 +58,7 @@ |
29 | |
30 | libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now |
31 | |
32 | -libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(OS_LIB) |
33 | +libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(OS_LIB) $(GLX_LIB) |
34 | |
35 | EXTRA_DIST = Xvnc.man |
36 | |
37 | diff -Naur tigervnc-1.2.0/unix/xserver/hw/vnc/xvnc.cc tigervnc-1.2.0-magellan/unix/xserver/hw/vnc/xvnc.cc |
38 | --- tigervnc-1.2.0/unix/xserver/hw/vnc/xvnc.cc 2013-02-18 17:21:41.375000000 +0000 |
39 | +++ tigervnc-1.2.0-magellan/unix/xserver/hw/vnc/xvnc.cc 2013-02-18 17:28:30.183000000 +0000 |
40 | @@ -87,6 +87,17 @@ |
41 | #include "version-config.h" |
42 | #include "site.h" |
43 | #endif |
44 | + |
45 | +#if XORG >= 113 |
46 | +#ifdef GLXEXT |
47 | +/* C++ really is the worst */ |
48 | +#define private _private |
49 | +#include "glxserver.h" |
50 | +#undef private |
51 | +#include "glx_extinit.h" |
52 | +#endif |
53 | +#endif |
54 | + |
55 | #undef class |
56 | #undef public |
57 | } |
58 | @@ -1392,6 +1403,16 @@ |
59 | dispatchException &= ~DE_RESET; |
60 | } |
61 | |
62 | +#if XORG >= 113 |
63 | +#ifdef GLXEXT |
64 | +static ExtensionModule vnc_glx_ext = { |
65 | + GlxExtensionInit, |
66 | + "GLX", |
67 | + &noGlxExtension |
68 | +}; |
69 | +#endif |
70 | +#endif |
71 | + |
72 | void |
73 | InitOutput(ScreenInfo *screenInfo, int argc, char **argv) |
74 | { |
75 | @@ -1401,6 +1422,13 @@ |
76 | int i; |
77 | int NumFormats = 0; |
78 | |
79 | +#if XORG >= 113 |
80 | +#ifdef GLXEXT |
81 | + if (serverGeneration == 1) |
82 | + LoadExtension(&vnc_glx_ext, TRUE); |
83 | +#endif |
84 | +#endif |
85 | + |
86 | /* initialize pixmap formats */ |
87 | |
88 | /* must have a pixmap depth to match every screen depth */ |