Hello community, here is the log from the commit of package VirtualGL for openSUSE:Leap:15.2 checked in at 2020-06-02 22:26:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/VirtualGL (Old) and /work/SRC/openSUSE:Leap:15.2/.VirtualGL.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "VirtualGL" Tue Jun 2 22:26:34 2020 rev:15 rq:810778 version:2.6.3 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/VirtualGL/VirtualGL.changes 2020-01-15 14:46:12.333242760 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.VirtualGL.new.3606/VirtualGL.changes 2020-06-02 22:26:35.335085066 +0200 @@ -1,0 +2,24 @@ +Mon Jun 1 08:56:08 UTC 2020 - Max Lin <m...@suse.com> + +- Remove conditional of applying glx.patch because we have newer Mesa + in Leap 15.2 +- Use upstream patch fix-Mesa-19.3.0-build.patch to replace glx.patch + * Add fix-Mesa-19.3.0-build.patch + * Remove glx.patch + +------------------------------------------------------------------- +Sun Feb 9 21:26:35 UTC 2020 - Adam Mizerski <a...@mizerski.pl> + +- update to 2.6.3 + * Changelog in packaged ChangeLog.md or at + https://github.com/VirtualGL/virtualgl/blob/2.6.3/ChangeLog.md +- Refreshed patch VirtualGL-link-libs.patch +- Removed patch virtualgl-nodl.patch - resolved upstream +- Added patch glx.patch + +------------------------------------------------------------------- +Mon Nov 4 19:24:54 UTC 2019 - Andreas Schwab <sch...@suse.de> + +- Add riscv64 to the list of 64-bit architectures + +------------------------------------------------------------------- Old: ---- VirtualGL-2.5.2.tar.gz virtualgl-nodl.patch New: ---- VirtualGL-2.6.3.tar.gz fix-Mesa-19.3.0-build.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ VirtualGL.spec ++++++ --- /var/tmp/diff_new_pack.NIGEqW/_old 2020-06-02 22:26:35.687086167 +0200 +++ /var/tmp/diff_new_pack.NIGEqW/_new 2020-06-02 22:26:35.691086179 +0200 @@ -1,7 +1,7 @@ # # spec file for package VirtualGL # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,21 +12,21 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: VirtualGL -Version: 2.5.2 +Version: 2.6.3 Release: 0 Summary: A toolkit for displaying OpenGL applications to thin clients License: LGPL-2.1-only AND SUSE-wxWidgets-3.1 Group: Productivity/Networking/Other -Url: http://www.virtualgl.org -Source0: http://downloads.sourceforge.net/virtualgl/%{name}-%{version}.tar.gz +URL: http://www.virtualgl.org +Source0: https://sourceforge.net/projects/virtualgl/files/%{version}/%{name}-%{version}.tar.gz Source1: baselibs.conf Patch1: VirtualGL-link-libs.patch -Patch2: virtualgl-nodl.patch +Patch2: fix-Mesa-19.3.0-build.patch BuildRequires: Mesa-devel BuildRequires: Mesa-libGLU-devel BuildRequires: cmake @@ -34,13 +34,17 @@ BuildRequires: gcc-c++ BuildRequires: glibc-devel BuildRequires: libjpeg-devel +BuildRequires: opencl-headers BuildRequires: pkgconfig +BuildRequires: pkgconfig(OpenCL) BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(glproto) BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11-xcb) BuildRequires: pkgconfig(xcb-keysyms) BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xtst) BuildRequires: pkgconfig(xv) %description @@ -117,7 +121,7 @@ %install %cmake_install # Fix placement of 64b glxspheres -%ifarch x86_64 s390x ppc64 ppc64le aarch64 +%ifarch x86_64 s390x ppc64 ppc64le aarch64 riscv64 mv %{buildroot}%{_bindir}/glxspheres* %{buildroot}%{_bindir}/glxspheres %endif # Fix fakelib placement @@ -154,6 +158,7 @@ %{_libdir}/libvglfaker.so %{_libdir}/libdlfaker.so %{_libdir}/libvglfaker-nodl.so +%{_libdir}/libvglfaker-opencl.so %{_libdir}/libgefaker.so %files devel ++++++ VirtualGL-2.5.2.tar.gz -> VirtualGL-2.6.3.tar.gz ++++++ ++++ 183359 lines of diff (skipped) ++++++ VirtualGL-link-libs.patch ++++++ --- /var/tmp/diff_new_pack.NIGEqW/_old 2020-06-02 22:26:35.987087106 +0200 +++ /var/tmp/diff_new_pack.NIGEqW/_new 2020-06-02 22:26:35.987087106 +0200 @@ -1,11 +1,15 @@ -Index: VirtualGL-2.5.2/server/CMakeLists.txt +From: tchva...@suse.com +Date: 2014-08-29T09:28:04+00:00 +Subject: Fix building with -Wl,-z,now and no-undefined + +Index: VirtualGL-2.6.3/server/CMakeLists.txt =================================================================== ---- VirtualGL-2.5.2.orig/server/CMakeLists.txt -+++ VirtualGL-2.5.2/server/CMakeLists.txt -@@ -114,12 +114,12 @@ foreach(fakerlib ${VGL_FAKER_NAME} ${VGL - endforeach() - - add_library(${VGL_DLFAKER_NAME} SHARED dlfaker.c) +--- VirtualGL-2.6.3.orig/server/CMakeLists.txt ++++ VirtualGL-2.6.3/server/CMakeLists.txt +@@ -143,12 +143,12 @@ add_library(${VGL_DLFAKER_NAME} SHARED d + if(VGL_FAKEOPENCL) + target_compile_definitions(${VGL_DLFAKER_NAME} PUBLIC -DFAKEOPENCL) + endif() -target_link_libraries(${VGL_DLFAKER_NAME} ${LIBDL}) +target_link_libraries(${VGL_DLFAKER_NAME} ${LIBDL} vglfaker) install(TARGETS ${VGL_DLFAKER_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) @@ -17,7 +21,7 @@ install(TARGETS ${VGL_GEFAKER_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) set(HEADERS ../common/rr.h rrtransport.h) -@@ -183,13 +183,14 @@ if(VGL_USESSL AND CMAKE_SYSTEM_NAME STRE +@@ -222,13 +222,14 @@ if(VGL_USESSL AND CMAKE_SYSTEM_NAME STRE set_target_properties(vgltrans_test PROPERTIES LINK_FLAGS "-Wl,-Bsymbolic") endif() target_link_libraries(vgltrans_test vglcommon ${FBXFAKERLIB} ${TJPEG_LIBRARY} ++++++ fix-Mesa-19.3.0-build.patch ++++++ >From faedcc1e36b4ed89a325e01822447900840a0b77 Mon Sep 17 00:00:00 2001 From: DRC <informat...@virtualgl.org> Date: Thu, 13 Feb 2020 19:11:46 -0600 Subject: [PATCH] Faker: Fix build issue w/ Mesa 19.3.0+ headers Mesa changed the signatures for glXGetTransparentIndexSUN() and glXQueryGLXPbufferSGIX() to match the official GLX extension specs: https://www.khronos.org/registry/OpenGL/extensions/SUN/GLX_SUN_get_transparent_index.txt https://www.khronos.org/registry/OpenGL/extensions/SGIX/GLX_SGIX_pbuffer.txt Reference: https://gitlab.freedesktop.org/mesa/mesa/commit/3dd299c3d5b88114894ec30d1fac85fba688201f Fixes #109 --- ChangeLog.md | 2 ++ server/faker-glx.cpp | 14 +++++++++++++- server/faker-sym.h | 8 +++++++- 3 files changed, 22 insertions(+), 2 deletions(-) Index: b/ChangeLog.md =================================================================== --- a/ChangeLog.md +++ b/ChangeLog.md @@ -40,6 +40,8 @@ features are, for the most part, EOL. 6. `vglserver_config` now works properly with FreeBSD systems running GDM v3. +2. VirtualGL can now be built using the GLX headers from Mesa 19.3.0 and later. + 2.6.2 ===== Index: b/server/faker-glx.cpp =================================================================== --- a/server/faker-glx.cpp +++ b/server/faker-glx.cpp @@ -1,6 +1,6 @@ // Copyright (C)2004 Landmark Graphics Corporation // Copyright (C)2005, 2006 Sun Microsystems, Inc. -// Copyright (C)2009, 2011-2019 D. R. Commander +// Copyright (C)2009, 2011-2020 D. R. Commander // // This library is free software and may be redistributed and/or modified under // the terms of the wxWindows Library License, Version 3.1 or (at your option) @@ -2192,11 +2192,18 @@ void glXQueryDrawable(Display *dpy, GLXD CATCH(); } +#if defined(GLX_GLXEXT_VERSION) && GLX_GLXEXT_VERSION >= 20190000 +void glXQueryGLXPbufferSGIX(Display *dpy, GLXPbuffer pbuf, int attribute, + unsigned int *value) +#else int glXQueryGLXPbufferSGIX(Display *dpy, GLXPbuffer pbuf, int attribute, unsigned int *value) +#endif { glXQueryDrawable(dpy, pbuf, attribute, value); + #if !defined(GLX_GLXEXT_VERSION) || GLX_GLXEXT_VERSION < 20190000 return 0; + #endif } @@ -2358,8 +2365,13 @@ void glXSwapBuffers(Display *dpy, GLXDra // Returns the transparent index from the overlay visual on the 2D X server +#if defined(GLX_GLXEXT_VERSION) && GLX_GLXEXT_VERSION >= 20190000 +int glXGetTransparentIndexSUN(Display *dpy, Window overlay, Window underlay, + unsigned long *transparentIndex) +#else int glXGetTransparentIndexSUN(Display *dpy, Window overlay, Window underlay, long *transparentIndex) +#endif { int retval = False; XWindowAttributes xwa; Index: b/server/faker-sym.h =================================================================== --- a/server/faker-sym.h +++ b/server/faker-sym.h @@ -1,6 +1,6 @@ // Copyright (C)2004 Landmark Graphics Corporation // Copyright (C)2005, 2006 Sun Microsystems, Inc. -// Copyright (C)2009, 2011, 2013-2016, 2018-2019 D. R. Commander +// Copyright (C)2009, 2011, 2013-2016, 2018-2020 D. R. Commander // // This library is free software and may be redistributed and/or modified under // the terms of the wxWindows Library License, Version 3.1 or (at your option) @@ -535,8 +535,15 @@ FUNCDEF2(GLXFBConfigSGIX, glXGetFBConfig // GLX_SUN_get_transparent_index + +#if defined(GLX_GLXEXT_VERSION) && GLX_GLXEXT_VERSION >= 20190000 +FUNCDEF4(int, glXGetTransparentIndexSUN, Display *, dpy, Window, overlay, + Window, underlay, unsigned long *, transparentIndex, + glXGetTransparentIndexSUN); +#else FUNCDEF4(int, glXGetTransparentIndexSUN, Display *, dpy, Window, overlay, Window, underlay, long *, transparentIndex, glXGetTransparentIndexSUN); +#endif // GL functions
