# HG changeset patch
# User Jay Cotton <Jay.Cotton@Oracle.com>
# Date 1475609862 25200
# Node ID d048e72d9d75d552ace75aa16ade46c7557fa20b
# Parent  49393c8f82364959654156c2d955408ab5f03513
24797462 GLX extension is no longer initialized by DIX layer

diff -r 49393c8f8236 -r d048e72d9d75 open-src/xserver/xvnc/0001-GLX-is-no-longer-initialised-by-the-dix.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xvnc/0001-GLX-is-no-longer-initialised-by-the-dix.patch	Tue Oct 04 12:37:42 2016 -0700
@@ -0,0 +1,51 @@
+From 87524d2c77702d247228f11f801518eb8f6e865b Mon Sep 17 00:00:00 2001
+From: Pierre Ossman <ossman@cendio.se>
+Date: Tue, 9 Apr 2013 14:50:15 +0000
+Subject: [PATCH] GLX is no longer initialised by the dix. Patch originally by
+ Adam Tkac for Fedora.
+
+git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@5067 3789f03b-4d11-0410-bbf8-ca57d06f2519
+---
+ unix/xserver/hw/vnc/xvnc.cc | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+diff --git a/unix/xserver/hw/vnc/xvnc.cc b/unix/xserver/hw/vnc/xvnc.cc
+index 9bd8171..a52c945 100644
+--- a/unix/xserver/hw/vnc/xvnc.cc
++++ b/unix/xserver/hw/vnc/xvnc.cc
+@@ -1563,6 +1563,18 @@ vfbScreenInit(ScreenPtr pScreen, int argc, char **argv)
+ static void vfbClientStateChange(CallbackListPtr*, pointer, pointer) {
+   dispatchException &= ~DE_RESET;
+ }
++ 
++#if XORG >= 113
++#ifdef GLXEXT
++extern "C" void GlxExtensionInit(void);
++
++static ExtensionModule glxExt = {
++    GlxExtensionInit,
++    "GLX",
++    &noGlxExtension
++};
++#endif
++#endif
+ 
+ void
+ InitOutput(ScreenInfo *screenInfo, int argc, char **argv)
+@@ -1573,6 +1585,13 @@ InitOutput(ScreenInfo *screenInfo, int argc, char **argv)
+     int i;
+     int NumFormats = 0;
+ 
++#if XORG >= 113
++#ifdef GLXEXT
++    if (serverGeneration == 1)
++        LoadExtension(&glxExt, TRUE);
++#endif
++#endif
++
+     /* initialize pixmap formats */
+ 
+     /* must have a pixmap depth to match every screen depth */
+-- 
+2.7.4
+
diff -r 49393c8f8236 -r d048e72d9d75 open-src/xserver/xvnc/0001-LoadExtensionList.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xvnc/0001-LoadExtensionList.patch	Tue Oct 04 12:37:42 2016 -0700
@@ -0,0 +1,16 @@
+--- ba/unix/xserver/hw/vnc/xvnc.cc	2016-10-03 22:04:56.283365605 -0700
++++ aa/unix/xserver/hw/vnc/xvnc.cc	2016-10-03 22:06:47.633748568 -0700
+@@ -1311,9 +1311,13 @@
+ #if XORG >= 113
+ #ifdef GLXEXT
+     if (serverGeneration == 1)
++#if XORG >= 116
++	LoadExtensionList(&glxExt,1,TRUE);
++#else
+         LoadExtension(&glxExt, TRUE);
+ #endif
+ #endif
++#endif
+ 
+     /* initialize pixmap formats */
+ 
diff -r 49393c8f8236 -r d048e72d9d75 open-src/xserver/xvnc/Makefile
--- a/open-src/xserver/xvnc/Makefile	Tue Oct 04 10:09:30 2016 -0700
+++ b/open-src/xserver/xvnc/Makefile	Tue Oct 04 12:37:42 2016 -0700
@@ -67,6 +67,8 @@
 SOURCE_URL_SET=yes
 
 # Patches to apply to source after unpacking, in order
+SOURCE_PATCHES += 0001-GLX-is-no-longer-initialised-by-the-dix.patch,-p1
+SOURCE_PATCHES += 0001-LoadExtensionList.patch,-p1
 SOURCE_PATCHES += $(SOURCE_DIR)/unix/xserver118.patch,'-p0 -d unix'
 SOURCE_PATCHES += tigervnc11-xorg111.patch,-p1
 SOURCE_PATCHES += tigervnc11-xorg112.patch,'-p0 -d unix'