gsgatlin pushed to VirtualGL (f20). "add patch for ppc64 rhel 6 builds, fix (#1198149) and (#1198135)"

[notifications at fedoraproject.org]

>From b0943a2871e8befbf1bc5621d50af5d45cad0926 Mon Sep 17 00:00:00 2001
From: Gary Gatling <gsgatlin at ncsu.edu>
Date: Tue, 5 May 2015 15:26:17 -0400
Subject: add patch for ppc64 rhel 6 builds, fix (#1198149) and (#1198135)


diff --git a/VirtualGL-gccrhel6fix.patch b/VirtualGL-gccrhel6fix.patch
new file mode 100644
index 0000000..8a3df50
--- /dev/null
+++ b/VirtualGL-gccrhel6fix.patch
@@ -0,0 +1,35 @@
+diff -up VirtualGL-2.4/server/CMakeLists.txt.gccrhel6fix VirtualGL-2.4/server/CMakeLists.txt
+--- VirtualGL-2.4/server/CMakeLists.txt.gccrhel6fix	2015-05-01 15:01:36.045572578 -0400
++++ VirtualGL-2.4/server/CMakeLists.txt	2015-05-01 16:26:21.144993198 -0400
+@@ -72,9 +72,9 @@ if(MAPFLAG)
+ 	set_source_files_properties(faker-sym.cpp PROPERTIES
+ 		OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile)
+ 	set_target_properties(rrfaker PROPERTIES
+-		LINK_FLAGS "-z defs ${MAPFLAG}${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile")
++		LINK_FLAGS "-Wl,-z,defs ${MAPFLAG}${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile")
+ else()
+-	set_target_properties(rrfaker PROPERTIES LINK_FLAGS "-z defs")
++	set_target_properties(rrfaker PROPERTIES LINK_FLAGS "-Wl,-z,defs")
+ endif()
+ if(VGL_FAKEXCB)
+ 	set(LIBXCB xcb xcb-glx xcb-keysyms X11-xcb)
+@@ -98,7 +98,7 @@ target_link_libraries(dlfaker ${LIBDL})
+ install(TARGETS dlfaker DESTINATION ${VGL_LIBDIR})
+ 
+ add_library(gefaker SHARED gefaker.c)
+-set_target_properties(gefaker PROPERTIES LINK_FLAGS "-z defs")
++set_target_properties(gefaker PROPERTIES LINK_FLAGS "-Wl,-z,defs")
+ target_link_libraries(gefaker ${LIBDL})
+ install(TARGETS gefaker DESTINATION ${VGL_LIBDIR})
+ 
+@@ -149,8 +149,8 @@ target_link_libraries(dlfakerut ${X11_X1
+ add_library(GLdlfakerut SHARED libGLdlfakerut.c)
+ 
+ add_executable(fakerut fakerut.cpp)
+-target_link_libraries(fakerut "-z now ${OPENGL_gl_LIBRARY}"
+-	${OPENGL_glu_LIBRARY} "-z now ${X11_X11_LIB}" ${LIBDL} vglutil)
++target_link_libraries(fakerut "-Wl,-z,now ${OPENGL_gl_LIBRARY}"
++	${OPENGL_glu_LIBRARY} "-Wl,-z,now ${X11_X11_LIB}" ${LIBDL} vglutil)
+ 
+ add_library(vgltrans_test SHARED testplugin.cpp VGLTrans.cpp)
+ if(VGL_USESSL AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
diff --git a/VirtualGL.spec b/VirtualGL.spec
index 2775ca5..4c0ca6f 100644
--- a/VirtualGL.spec
+++ b/VirtualGL.spec
@@ -10,7 +10,9 @@ Patch1:         %{name}-glx.patch
 Patch2:         %{name}-redhatpathsfix.patch
 # fix for bz1088475
 Patch3:         %{name}-redhatlibexecpathsfix.patch
-Release:        2%{?dist}
+# Fix for ppc64 rhel 6 build.
+Patch4:         %{name}-gccrhel6fix.patch
+Release:        4%{?dist}
 License:        wxWidgets
 %if 0%{?rhel} == 6
 BuildRequires: cmake28
@@ -23,6 +25,7 @@ BuildRequires:  turbojpeg-devel
 BuildRequires:  mesa-libGLU-devel
 BuildRequires:  libXv-devel
 BuildRequires:  gcc-c++
+BuildRequires:  xcb-util-keysyms-devel
 Requires:       fltk
 Provides:       bumblebee-bridge
 
@@ -58,7 +61,6 @@ Ertl 2000.)
 %package devel
 Summary:    Development headers and libraries for VirtualGL
 Requires:   %{name}%{?_isa} = %{version}-%{release}
-Requires:   openssl-devel%{?_isa}
 Requires:   turbojpeg-devel%{?_isa}
 Requires:   mesa-libGLU-devel%{?_isa}
 Requires:   libXv-devel%{?_isa}
@@ -72,6 +74,11 @@ Development headers and libraries for VirtualGL.
 %patch2 -p1 -b .redhatpathsfix
 %patch3 -p1 -b .redhatlibexecpathsfix
 
+%if 0%{?rhel} == 6
+%patch4 -p1 -b .gccrhel6fix
+%endif
+
+
 sed -i -e 's,"glx.h",<GL/glx.h>,' server/*.[hc]*
 # Remove bundled libraries
 rm -r common/glx* server/fltk
@@ -86,9 +93,10 @@ rm doc/LICENSE-*.txt
          -DVGL_SYSTEMFLTK=1 \
          -DTJPEG_INCLUDE_DIR=%{_includedir} \
          -DTJPEG_LIBRARY=%{_libdir}/libturbojpeg.so \
-         -DVGL_USESSL=ON -DVGL_LIBDIR=%{_libdir} \
+         -DVGL_LIBDIR=%{_libdir} \
          -DVGL_DOCDIR=%{_docdir}/%{name}/ \
          -DVGL_LIBDIR=%{_libdir}/VirtualGL/ \
+         -DVGL_FAKEXCB=1 \
          -DVGL_FAKELIBDIR=%{_libdir}/fakelib/ .
 make %{?_smp_mflags}
 
@@ -137,13 +145,21 @@ mv $RPM_BUILD_ROOT%{_bindir}/.vglrun.vars32 $RPM_BUILD_ROOT%{_libexecdir}/vglrun
 
 
 %changelog
+
+* Fri May 1 2015 Gary Gatling <gsgatlin at eos.ncsu.edu> - 2.4-4
+- Fix (#1198149) Disable SSL support.
+- Fix (#1198135) add -DVGL_FAKEXCB=1 to build options.
+
+* Wed Apr 29 2015 Gary Gatling <gsgatlin at eos.ncsu.edu> - 2.4-3
+- Fix problems with build on ppc rhel 6.
+
 * Tue Apr 28 2015 Gary Gatling <gsgatlin at eos.ncsu.edu> - 2.4-2
 - Fix problems in changelog.
 
 * Tue Apr 28 2015 Gary Gatling <gsgatlin at eos.ncsu.edu> - 2.4-1
 - Fix (#1198135) Update to 2.4.
 
--* Wed Feb 18 2015 Rex Dieter <rdieter at fedoraproject.org> 2.3.3-6
+* Wed Feb 18 2015 Rex Dieter <rdieter at fedoraproject.org> 2.3.3-6
 - rebuild (fltk,gcc5)
 
 * Fri Aug 15 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.3-5
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/VirtualGL.git/commit/?h=f20&id=b0943a2871e8befbf1bc5621d50af5d45cad0926