Hello community, here is the log from the commit of package VirtualGL for openSUSE:Factory checked in at 2020-02-10 21:54:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/VirtualGL (Old) and /work/SRC/openSUSE:Factory/.VirtualGL.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "VirtualGL" Mon Feb 10 21:54:13 2020 rev:11 rq:772621 version:2.6.3 Changes: -------- --- /work/SRC/openSUSE:Factory/VirtualGL/VirtualGL.changes 2019-11-06 14:05:17.588734984 +0100 +++ /work/SRC/openSUSE:Factory/.VirtualGL.new.26092/VirtualGL.changes 2020-02-10 21:54:14.686218232 +0100 @@ -1,0 +2,10 @@ +Sun Feb 9 21:26:35 UTC 2020 - Adam Mizerski <[email protected]> + +- 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 + +------------------------------------------------------------------- Old: ---- VirtualGL-2.5.2.tar.gz virtualgl-nodl.patch New: ---- VirtualGL-2.6.3.tar.gz glx.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ VirtualGL.spec ++++++ --- /var/tmp/diff_new_pack.ytrNxQ/_old 2020-02-10 21:54:15.646218762 +0100 +++ /var/tmp/diff_new_pack.ytrNxQ/_new 2020-02-10 21:54:15.650218765 +0100 @@ -1,7 +1,7 @@ # # spec file for package VirtualGL # -# Copyright (c) 2019 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 @@ -17,16 +17,16 @@ 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: glx.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 @@ -91,7 +95,9 @@ %prep %setup -q %patch1 -p1 +%if %{suse_version} > 1500 %patch2 -p1 +%endif # Use /var/lib sed -e "s#%{_sysconfdir}/opt#%{_localstatedir}/lib#g" \ @@ -154,6 +160,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.ytrNxQ/_old 2020-02-10 21:54:15.966218939 +0100 +++ /var/tmp/diff_new_pack.ytrNxQ/_new 2020-02-10 21:54:15.966218939 +0100 @@ -1,11 +1,15 @@ -Index: VirtualGL-2.5.2/server/CMakeLists.txt +From: [email protected] +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} ++++++ glx.patch ++++++ From: Adam Mizerski <[email protected]> Date: 2020-02-09T22:21:50+01:00 References: https://github.com/VirtualGL/virtualgl/issues/109 Upstream: sent Subject: fix after "glx Sync <GL/glxext.h> with Khronos" in Mesa Index: VirtualGL-2.6.3/server/faker-glx.cpp =================================================================== --- VirtualGL-2.6.3.orig/server/faker-glx.cpp +++ VirtualGL-2.6.3/server/faker-glx.cpp @@ -2192,11 +2192,10 @@ void glXQueryDrawable(Display *dpy, GLXD CATCH(); } -int glXQueryGLXPbufferSGIX(Display *dpy, GLXPbuffer pbuf, int attribute, +void glXQueryGLXPbufferSGIX(Display *dpy, GLXPbuffer pbuf, int attribute, unsigned int *value) { glXQueryDrawable(dpy, pbuf, attribute, value); - return 0; } @@ -2359,7 +2358,7 @@ void glXSwapBuffers(Display *dpy, GLXDra // Returns the transparent index from the overlay visual on the 2D X server int glXGetTransparentIndexSUN(Display *dpy, Window overlay, Window underlay, - long *transparentIndex) + unsigned long *transparentIndex) { int retval = False; XWindowAttributes xwa; Index: VirtualGL-2.6.3/server/faker-sym.h =================================================================== --- VirtualGL-2.6.3.orig/server/faker-sym.h +++ VirtualGL-2.6.3/server/faker-sym.h @@ -536,7 +536,7 @@ FUNCDEF2(GLXFBConfigSGIX, glXGetFBConfig // GLX_SUN_get_transparent_index FUNCDEF4(int, glXGetTransparentIndexSUN, Display *, dpy, Window, overlay, - Window, underlay, long *, transparentIndex, glXGetTransparentIndexSUN); + Window, underlay, unsigned long *, transparentIndex, glXGetTransparentIndexSUN); // GL functions
