Hello community, here is the log from the commit of package VirtualGL for openSUSE:Factory checked in at 2014-09-03 18:22:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/VirtualGL (Old) and /work/SRC/openSUSE:Factory/.VirtualGL.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "VirtualGL" Changes: -------- --- /work/SRC/openSUSE:Factory/VirtualGL/VirtualGL.changes 2014-08-25 11:04:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.VirtualGL.new/VirtualGL.changes 2014-09-03 19:30:14.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Aug 29 09:28:04 UTC 2014 - tchvatal@suse.com + +- Version bump to beta1 of 2.4 (2.3.90) +- Fix building with -Wl,-z,now and no-undefined + * VirtualGL-link-libs.patch + +------------------------------------------------------------------- Old: ---- VirtualGL-2.3.3.tar.gz New: ---- VirtualGL-2.3.90.tar.gz VirtualGL-link-libs.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ VirtualGL.spec ++++++ --- /var/tmp/diff_new_pack.4Lf4fV/_old 2014-09-03 19:30:17.000000000 +0200 +++ /var/tmp/diff_new_pack.4Lf4fV/_new 2014-09-03 19:30:17.000000000 +0200 @@ -17,7 +17,7 @@ Name: VirtualGL -Version: 2.3.3 +Version: 2.3.90 Release: 0 Summary: A toolkit for displaying OpenGL applications to thin clients License: WXwindows @@ -25,12 +25,15 @@ Url: http://www.virtualgl.org Source0: http://downloads.sourceforge.net/virtualgl/%{name}-%{version}.tar.gz Source1: baselibs.conf +Patch1: VirtualGL-link-libs.patch BuildRequires: Mesa-devel BuildRequires: Mesa-libGLU-devel BuildRequires: cmake +BuildRequires: fltk-devel BuildRequires: gcc-c++ BuildRequires: glibc-devel BuildRequires: libjpeg-devel +BuildRequires: libopenssl-devel # Fixme: Remove after 13.1 is out of scope, there is broken devel package on older BuildRequires: libturbojpeg0 BuildRequires: xorg-x11-libX11-devel @@ -88,6 +91,7 @@ %prep %setup -q +%patch1 -p1 # Use /var/lib sed -e "s#%{_sysconfdir}/opt#%{_localstatedir}/lib#g" \ @@ -99,19 +103,18 @@ %build %cmake \ - -DUSE_VGL_USESSL=ON \ + -DVGL_SYSTEMFLTK=ON \ + -DVGL_SYSTEMGLX=ON \ + -DVGL_USESSL=ON \ -DVGL_USEXV=ON \ -DTJPEG_INCLUDE_DIR=%{_includedir} \ -DVGL_LIBDIR=%{_libdir} \ -DTJPEG_LIBRARY=%{_libdir}/libturbojpeg.so \ - -DCMAKE_LIBRARY_PATH=%{_libdir} \ - .. + -DCMAKE_LIBRARY_PATH=%{_libdir} make %{?_smp_mflags} %install -cd build -make DESTDIR=%{buildroot} install %{?_smp_mflags} -cd .. +%cmake_install # Fix placement of 64b glxspheres %ifarch x86_64 s390x ppc64 ppc64le aarch64 mv %{buildroot}%{_bindir}/glxspheres* %{buildroot}%{_bindir}/glxspheres @@ -121,7 +124,7 @@ mkdir -p %{buildroot}%{_libdir}/fakelib ln -sf ../librrfaker.so %{buildroot}%{_libdir}/fakelib/libGL.so # Docs had wrong names -chmod 644 doc/LGPL.txt doc/LICENSE.txt doc/LICENSE-PuTTY.txt doc/LICENSE-xauth.txt doc/index.html doc/*.png doc/*.gif doc/*.css +chmod 644 doc/LGPL.txt doc/LICENSE.txt doc/index.html doc/*.png doc/*.gif doc/*.css rm -rf %{buildroot}%{_prefix}/doc mv -f %{buildroot}%{_bindir}/glxinfo %{buildroot}%{_bindir}/glxinfo2 ++++++ VirtualGL-2.3.3.tar.gz -> VirtualGL-2.3.90.tar.gz ++++++ ++++ 148083 lines of diff (skipped) ++++++ VirtualGL-link-libs.patch ++++++ diff -urN VirtualGL-2.3.90.old/server/CMakeLists.txt VirtualGL-2.3.90/server/CMakeLists.txt --- VirtualGL-2.3.90.old/server/CMakeLists.txt 2014-08-29 10:38:25.546968116 +0200 +++ VirtualGL-2.3.90/server/CMakeLists.txt 2014-08-29 11:25:51.529967776 +0200 @@ -84,12 +84,12 @@ \$ENV{DESTDIR}${VGL_FAKELIBDIR}/libGL.so)") add_library(dlfaker SHARED dlfaker.c) -target_link_libraries(dlfaker ${LIBDL}) +target_link_libraries(dlfaker ${LIBDL} rrfaker) install(TARGETS dlfaker DESTINATION ${VGL_LIBDIR}) add_library(gefaker SHARED gefaker.c) set_target_properties(gefaker PROPERTIES LINK_FLAGS "-z defs") -target_link_libraries(gefaker ${LIBDL}) +target_link_libraries(gefaker ${LIBDL} rrfaker) install(TARGETS gefaker DESTINATION ${VGL_LIBDIR}) set(HEADERS ../common/rr.h rrtransport.h) @@ -149,13 +149,14 @@ set_target_properties(vgltrans_test PROPERTIES LINK_FLAGS "-Wl,-Bsymbolic") endif() target_link_libraries(vgltrans_test vglcommon ${FBXFAKERLIB} ${TJPEG_LIBRARY} - vglsocket) + vglsocket rrfaker) if(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND CMAKE_COMPILER_IS_GNUCXX) target_link_libraries(vgltrans_test stdc++) endif() add_library(vgltrans_test2 SHARED testplugin2.cpp X11Trans.cpp) -target_link_libraries(vgltrans_test2 vglcommon ${FBXFAKERLIB} ${TJPEG_LIBRARY}) +target_link_libraries(vgltrans_test2 vglcommon ${FBXFAKERLIB} ${TJPEG_LIBRARY} + rrfaker) if(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND CMAKE_COMPILER_IS_GNUCXX) target_link_libraries(vgltrans_test2 stdc++) endif() -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org