rpm/tigervnc
SHA256
1
0
Fork 0
forked from pool/tigervnc
Code Pull Requests Activity

- Updated u_add-support-for-X-server-1.20.0.patch to version sent

Browse Source 
upstream. Fixes GLX initialization.

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=143
This commit is contained in:
Michal Srb 2018-06-08 09:11:10 +00:00 committed by Git OBS Bridge
parent bba730b0f0
commit 7f75486b03
2 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tigervnc.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jun 8 09:09:38 UTC 2018 - msrb@suse.com
- Updated u_add-support-for-X-server-1.20.0.patch to version sent
upstream. Fixes GLX initialization.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 6 09:07:23 UTC 2018 - msrb@suse.com Wed Jun 6 09:07:23 UTC 2018 - msrb@suse.com

37
u_add-support-for-X-server-1.20.0.patch
View File

@ -1,13 +1,16 @@
From 9529b2fbc248165da493422376d591f5ec736ca5 Mon Sep 17 00:00:00 2001 Git-commit: 25520b9b4680ac56f43d9b03929dd87093a3d06d
From: Michal Srb <msrb@suse.com> Author: Michal Srb <msrb@suse.com>
Date: Wed, 6 Jun 2018 13:33:37 +0200 Subject: Add support for X server 1.20.0.
Subject: [PATCH] Add support for X server 1.20.0. Patch-mainline: To be upstreamed
In-server GLVND requires xorgGlxCreateVendor call from InitOutput.
DPMS functions were moved to another location and no longer need to be faked.
xserver120.patch is a copy of xserver119.patch with refreshed contexts.
--- ---
unix/xserver/hw/vnc/xorg-version.h | 4 +- unix/xserver/hw/vnc/xorg-version.h | 4 +-
unix/xserver/hw/vnc/xvnc.c | 2 + unix/xserver/hw/vnc/xvnc.c | 8 ++++
unix/xserver120.patch | 82 ++++++++++++++++++++++++++++++++++++++ unix/xserver120.patch | 82 ++++++++++++++++++++++++++++++++++++++
3 files changed, 87 insertions(+), 1 deletion(-) 3 files changed, 93 insertions(+), 1 deletion(-)
create mode 100644 unix/xserver120.patch create mode 100644 unix/xserver120.patch
diff --git a/unix/xserver/hw/vnc/xorg-version.h b/unix/xserver/hw/vnc/xorg-version.h diff --git a/unix/xserver/hw/vnc/xorg-version.h b/unix/xserver/hw/vnc/xorg-version.h
@ -27,7 +30,7 @@ index 9d1c0eb8..16145711 100644
#endif #endif
diff --git a/unix/xserver/hw/vnc/xvnc.c b/unix/xserver/hw/vnc/xvnc.c diff --git a/unix/xserver/hw/vnc/xvnc.c b/unix/xserver/hw/vnc/xvnc.c
index 57152cd5..06b6da5d 100644 index 57152cd5..9a61b1ef 100644
--- a/unix/xserver/hw/vnc/xvnc.c --- a/unix/xserver/hw/vnc/xvnc.c
+++ b/unix/xserver/hw/vnc/xvnc.c +++ b/unix/xserver/hw/vnc/xvnc.c
@@ -202,6 +202,7 @@ vfbBitsPerPixel(int depth) @@ -202,6 +202,7 @@ vfbBitsPerPixel(int depth)
@ -46,6 +49,26 @@ index 57152cd5..06b6da5d 100644
#if XORG < 111 #if XORG < 111
void ddxGiveUp() void ddxGiveUp()
@@ -1738,6 +1740,10 @@ InitOutput(ScreenInfo *scrInfo, int argc, char **argv)
vncPrintBanner();
+#if XORG >= 120
+ xorgGlxCreateVendor();
+#else
+
#if XORG >= 113
#ifdef GLXEXT
if (serverGeneration == 1)
@@ -1749,6 +1755,8 @@ InitOutput(ScreenInfo *scrInfo, int argc, char **argv)
#endif
#endif
+#endif
+
/* initialize pixmap formats */
/* must have a pixmap depth to match every screen depth */
diff --git a/unix/xserver120.patch b/unix/xserver120.patch diff --git a/unix/xserver120.patch b/unix/xserver120.patch
new file mode 100644 new file mode 100644
index 00000000..d8598494 index 00000000..d8598494