Hello community, here is the log from the commit of package VirtualGL for openSUSE:Factory checked in at 2017-12-23 12:19:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/VirtualGL (Old) and /work/SRC/openSUSE:Factory/.VirtualGL.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "VirtualGL" Sat Dec 23 12:19:44 2017 rev:8 rq:548081 version:2.5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/VirtualGL/VirtualGL.changes 2016-08-29 15:36:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.VirtualGL.new/VirtualGL.changes 2017-12-23 12:19:45.854770411 +0100 @@ -1,0 +2,14 @@ +Mon Dec 4 12:53:39 UTC 2017 - tchvatal@suse.com + +- Disable ssl feature as we can tunnel via ssh and the openssl-1.1 + is not compatible at all currently + +------------------------------------------------------------------- +Mon Dec 4 08:56:50 UTC 2017 - tchvatal@suse.com + +- Version update 2.5.2: + * Various compat fixes all around +- Remove merged gcc6_literal_suffixes.patch +- Refresh VirtualGL-link-libs.patch and virtualgl-nodl.patch + +------------------------------------------------------------------- Old: ---- VirtualGL-2.5.tar.gz gcc6_literal_suffixes.patch New: ---- VirtualGL-2.5.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ VirtualGL.spec ++++++ --- /var/tmp/diff_new_pack.QvMvT5/_old 2017-12-23 12:19:46.682730041 +0100 +++ /var/tmp/diff_new_pack.QvMvT5/_new 2017-12-23 12:19:46.686729845 +0100 @@ -1,7 +1,7 @@ # # spec file for package VirtualGL # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,17 +17,16 @@ Name: VirtualGL -Version: 2.5 +Version: 2.5.2 Release: 0 Summary: A toolkit for displaying OpenGL applications to thin clients -License: LGPL-2.1 and SUSE-wxWidgets-3.1 +License: LGPL-2.1 AND SUSE-wxWidgets-3.1 Group: Productivity/Networking/Other Url: http://www.virtualgl.org Source0: http://downloads.sourceforge.net/virtualgl/%{name}-%{version}.tar.gz Source1: baselibs.conf Patch1: VirtualGL-link-libs.patch -Patch2: gcc6_literal_suffixes.patch -Patch3: virtualgl-nodl.patch +Patch2: virtualgl-nodl.patch BuildRequires: Mesa-devel BuildRequires: Mesa-libGLU-devel BuildRequires: cmake @@ -38,15 +37,11 @@ BuildRequires: pkgconfig BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glu) -BuildRequires: pkgconfig(libcrypto) -BuildRequires: pkgconfig(libssl) -BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11-xcb) BuildRequires: pkgconfig(xcb-keysyms) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xv) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description VirtualGL is a library which allows most Linux OpenGL applications to be @@ -97,7 +92,6 @@ %setup -q %patch1 -p1 %patch2 -p1 -%patch3 -p1 # Use /var/lib sed -e "s#%{_sysconfdir}/opt#%{_localstatedir}/lib#g" \ @@ -112,7 +106,7 @@ -DVGL_SYSTEMFLTK=ON \ -DVGL_SYSTEMGLX=ON \ -DVGL_SYSTEMXCB=ON \ - -DVGL_USESSL=ON \ + -DVGL_USESSL=OFF \ -DVGL_USEXV=ON \ -DTJPEG_INCLUDE_DIR=%{_includedir} \ -DVGL_LIBDIR=%{_libdir} \ @@ -132,15 +126,14 @@ ln -sf ../libvglfaker.so %{buildroot}%{_libdir}/fakelib/libGL.so # Docs had wrong names chmod 644 doc/LGPL.txt doc/LICENSE.txt doc/index.html doc/*.png doc/*.gif doc/*.css -rm -rf %{buildroot}%{_prefix}/doc +rm -rf %{buildroot}%{_datadir}/doc mv -f %{buildroot}%{_bindir}/glxinfo %{buildroot}%{_bindir}/vglxinfo %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc LGPL.txt LICENSE.txt ChangeLog.txt doc/index.html doc/legalinfo.txt doc/*.png doc/*.gif doc/*.css +%doc LGPL.txt LICENSE.txt ChangeLog.md doc/index.html doc/legalinfo.txt doc/*.png doc/*.gif doc/*.css %dir %{_libdir}/fakelib %{_bindir}/tcbench %{_bindir}/nettest @@ -169,7 +162,6 @@ %{_libdir}/libgefaker.so %files devel -%defattr(-,root,root) %{_includedir}/rrtransport.h %{_includedir}/rr.h ++++++ VirtualGL-2.5.tar.gz -> VirtualGL-2.5.2.tar.gz ++++++ ++++ 11955 lines of diff (skipped) ++++++ VirtualGL-link-libs.patch ++++++ --- /var/tmp/diff_new_pack.QvMvT5/_old 2017-12-23 12:19:46.954716779 +0100 +++ /var/tmp/diff_new_pack.QvMvT5/_new 2017-12-23 12:19:46.954716779 +0100 @@ -1,29 +1,29 @@ -Index: VirtualGL-2.5/server/CMakeLists.txt +Index: VirtualGL-2.5.2/server/CMakeLists.txt =================================================================== ---- VirtualGL-2.5.orig/server/CMakeLists.txt -+++ VirtualGL-2.5/server/CMakeLists.txt -@@ -102,12 +102,12 @@ foreach(fakerlib ${VGL_FAKER_NAME} ${VGL +--- 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) -target_link_libraries(${VGL_DLFAKER_NAME} ${LIBDL}) +target_link_libraries(${VGL_DLFAKER_NAME} ${LIBDL} vglfaker) - install(TARGETS ${VGL_DLFAKER_NAME} DESTINATION ${VGL_LIBDIR}) + install(TARGETS ${VGL_DLFAKER_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) add_library(${VGL_GEFAKER_NAME} SHARED gefaker.c) - set_target_properties(${VGL_GEFAKER_NAME} PROPERTIES LINK_FLAGS "-z defs") + set_target_properties(${VGL_GEFAKER_NAME} PROPERTIES LINK_FLAGS "${MINUSZ}defs") -target_link_libraries(${VGL_GEFAKER_NAME} ${LIBDL}) +target_link_libraries(${VGL_GEFAKER_NAME} ${LIBDL} vglfaker) - install(TARGETS ${VGL_GEFAKER_NAME} DESTINATION ${VGL_LIBDIR}) + install(TARGETS ${VGL_GEFAKER_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) set(HEADERS ../common/rr.h rrtransport.h) -@@ -165,13 +165,14 @@ if(VGL_USESSL AND CMAKE_SYSTEM_NAME STRE +@@ -183,13 +183,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} - vglsocket) + vglsocket vglfaker) - if(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND CMAKE_COMPILER_IS_GNUCXX) + if(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND GNUCXX) target_link_libraries(vgltrans_test stdc++) endif() @@ -31,6 +31,6 @@ -target_link_libraries(vgltrans_test2 vglcommon ${FBXFAKERLIB} ${TJPEG_LIBRARY}) +target_link_libraries(vgltrans_test2 vglcommon ${FBXFAKERLIB} ${TJPEG_LIBRARY} + vglfaker) - if(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND CMAKE_COMPILER_IS_GNUCXX) + if(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND GNUCXX) target_link_libraries(vgltrans_test2 stdc++) endif() ++++++ virtualgl-nodl.patch ++++++ --- /var/tmp/diff_new_pack.QvMvT5/_old 2017-12-23 12:19:46.978715609 +0100 +++ /var/tmp/diff_new_pack.QvMvT5/_new 2017-12-23 12:19:46.978715609 +0100 @@ -1,7 +1,7 @@ -Index: VirtualGL-2.5/server/CMakeLists.txt +Index: VirtualGL-2.5.2/server/CMakeLists.txt =================================================================== ---- VirtualGL-2.5.orig/server/CMakeLists.txt -+++ VirtualGL-2.5/server/CMakeLists.txt +--- VirtualGL-2.5.2.orig/server/CMakeLists.txt ++++ VirtualGL-2.5.2/server/CMakeLists.txt @@ -78,6 +78,7 @@ if(VGL_USEXV) set(FAKER_SOURCES ${FAKER_SOURCES};XVTrans.cpp) endif() @@ -9,13 +9,13 @@ +set(GLLIB -Wl,--no-as-needed ${OPENGL_gl_LIBRARY} -Wl,--as-needed) foreach(fakerlib ${VGL_FAKER_NAME} ${VGL_FAKER_NAME}-nodl) add_library(${fakerlib} SHARED ${FAKER_SOURCES}) - if(MAPFLAG) -@@ -91,7 +92,7 @@ foreach(fakerlib ${VGL_FAKER_NAME} ${VGL + if(${fakerlib} STREQUAL ${VGL_FAKER_NAME} AND +@@ -102,7 +103,7 @@ foreach(fakerlib ${VGL_FAKER_NAME} ${VGL target_link_libraries(${fakerlib} vglcommon ${FBXFAKERLIB} vglsocket m ${LIBDL}) if(${fakerlib} STREQUAL ${VGL_FAKER_NAME}) - target_link_libraries(${fakerlib} ${OPENGL_gl_LIBRARY}) + target_link_libraries(${fakerlib} ${GLLIB}) endif() - if(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND CMAKE_COMPILER_IS_GNUCXX) + if(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND GNUCXX) # For some reason, on SunOS/GCC CMake tries to use the C compiler to link