[VirtualGL/f16] import (#834127).
Gary Gatling
gsgatlin at fedoraproject.org
Thu Jan 17 21:46:34 UTC 2013
commit 6c3c635eb253285a1188dad2135057e3faa09522
Author: Gary Gatling <gsgatlin at ncsu.edu>
Date: Thu Jan 17 16:45:04 2013 -0500
import (#834127).
.gitignore | 1 +
VirtualGL-fltk.patch | 17 +++++
VirtualGL-glx.patch | 12 ++++
VirtualGL-redhatpathsmultilibfix.patch | 12 ++++
VirtualGL.spec | 111 ++++++++++++++++++++++---------
sources | 2 +-
6 files changed, 122 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d76f026..8c7d5c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/VirtualGL-2.3.1.tar.gz
/VirtualGL-2.3.tar.gz
+/VirtualGL-2.3.2.tar.gz
diff --git a/VirtualGL-fltk.patch b/VirtualGL-fltk.patch
new file mode 100644
index 0000000..8decd3b
--- /dev/null
+++ b/VirtualGL-fltk.patch
@@ -0,0 +1,17 @@
+diff -up VirtualGL-2.3.1/server/CMakeLists.txt.fltk VirtualGL-2.3.1/server/CMakeLists.txt
+--- VirtualGL-2.3.1/server/CMakeLists.txt.fltk 2012-02-08 13:11:50.000000000 -0700
++++ VirtualGL-2.3.1/server/CMakeLists.txt 2012-07-10 11:23:17.574740534 -0600
+@@ -1,4 +1,3 @@
+-add_subdirectory(fltk)
+
+
+ #
+@@ -67,7 +66,7 @@ set(HEADERS ../common/rr.h rrtransport.h
+ install(FILES ${HEADERS} DESTINATION ${VGL_INCDIR})
+
+ add_executable(vglconfig vglconfig.cpp fakerconfig.cpp)
+-target_link_libraries(vglconfig ${X11_X11_LIB} fltk_static pthread rrutil)
++target_link_libraries(vglconfig ${X11_X11_LIB} fltk pthread rrutil)
+ if(VGL_USEXV)
+ target_link_libraries(vglconfig ${X11_Xv_LIB})
+ endif()
diff --git a/VirtualGL-glx.patch b/VirtualGL-glx.patch
new file mode 100644
index 0000000..6bf0823
--- /dev/null
+++ b/VirtualGL-glx.patch
@@ -0,0 +1,12 @@
+diff -up VirtualGL-2.3.1/util/glreadtest.cpp.glx VirtualGL-2.3.1/util/glreadtest.cpp
+--- VirtualGL-2.3.1/util/glreadtest.cpp.glx 2011-12-22 11:27:13.000000000 -0700
++++ VirtualGL-2.3.1/util/glreadtest.cpp 2012-07-10 11:19:56.904891622 -0600
+@@ -23,7 +23,7 @@
+ #include "rrerror.h"
+ #include <errno.h>
+ #define GL_GLEXT_PROTOTYPES
+-#include "../common/glx.h"
++#include <GL/glx.h>
+ #ifdef MESAGLU
+ #include <mesa/glu.h>
+ #else
diff --git a/VirtualGL-redhatpathsmultilibfix.patch b/VirtualGL-redhatpathsmultilibfix.patch
new file mode 100644
index 0000000..4d49ed8
--- /dev/null
+++ b/VirtualGL-redhatpathsmultilibfix.patch
@@ -0,0 +1,12 @@
+diff -up VirtualGL-2.3.2/server/vglrun.redhatpathsmultilibfix VirtualGL-2.3.2/server/vglrun
+--- VirtualGL-2.3.2/server/vglrun.redhatpathsmultilibfix 2013-01-13 11:52:09.971951341 -0500
++++ VirtualGL-2.3.2/server/vglrun 2013-01-13 11:54:05.809955713 -0500
+@@ -288,6 +288,8 @@ exec ${1+"$@"}
+
+ *)
+
++LD_LIBRARY_PATH=/usr/lib64/VirtualGL:/usr/lib/VirtualGL:$LD_LIBRARY_PATH
++
+ if [ -z "$LD_PRELOAD" ]; then
+ LD_PRELOAD=librrfaker.so
+ else
diff --git a/VirtualGL.spec b/VirtualGL.spec
index eb27d85..2b8a23b 100644
--- a/VirtualGL.spec
+++ b/VirtualGL.spec
@@ -1,24 +1,28 @@
Summary: A toolkit for displaying OpenGL applications to thin clients
Name: VirtualGL
-Version: 2.3
-Vendor: The VirtualGL Project
+Version: 2.3.2
URL: http://www.virtualgl.org/
Group: Applications/System
-Source0: http://prdownloads.sourceforge.net/virtualgl/VirtualGL-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/project/virtualgl/VirtualGL/%{version}/VirtualGL-%{version}.tar.gz
+# Fix vglrun to be able to load the lib*faker libs
+Patch0: %{name}-redhatpathsmultilibfix.patch
+# Use system fltk
+Patch1: %{name}-fltk.patch
+# Use system glx.h
+Patch2: %{name}-glx.patch
Release: 2%{?dist}
License: wxWidgets
-%if 0%{?fedora} >=13
-BuildRequires: cmake
+%if 0%{?rhel} == 6
+BuildRequires: cmake28
%else
-BuildRequires: cmake28
+BuildRequires: cmake
%endif
+BuildRequires: fltk-devel
BuildRequires: openssl-devel
BuildRequires: turbojpeg-devel
-BuildRequires: libX11-devel
-BuildRequires: libXext-devel
-BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
BuildRequires: libXv-devel
+Requires: fltk
%description
VirtualGL is a toolkit that allows most Unix/Linux OpenGL applications to be
@@ -51,46 +55,55 @@ Ertl 2000.)
%package devel
Summary: Development headers and libraries for VirtualGL
-BuildArch: noarch
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: openssl-devel
-Requires: turbojpeg-devel
-Requires: libX11-devel
-Requires: libXext-devel
-Requires: mesa-libGL-devel
-Requires: mesa-libGLU-devel
-Requires: libXv-devel
+Requires: openssl-devel%{?_isa}
+Requires: turbojpeg-devel%{?_isa}
+Requires: mesa-libGLU-devel%{?_isa}
+Requires: libXv-devel%{?_isa}
%description devel
Development headers and libraries for VirtualGL.
%prep
%setup -q
+%patch0 -p1 -b .redhatpathsmultilibfix
+%patch1 -p1 -b .fltk
+%patch2 -p1 -b .glx
+sed -i -e 's,"glx.h",<GL/glx.h>,' server/*.[hc]*
+# Remove bundled libraries
+rm -r client/{putty,x11windows} common/glx* include/FL server/fltk
+rm doc/LICENSE-*.txt
%build
-%cmake -DTJPEG_INCLUDE_DIR=%{_includedir} \
- -DTJPEG_LIBRARY=%{_libdir}/libturbojpeg.so \
- -DVGL_USESSL=ON -DVGL_LIBDIR=%{_libdir} \
- -DVGL_DOCDIR=%{_docdir}/%{name}-%{version}/ \
- -DVGL_FAKELIBDIR=%{_libdir}/fakelib/ .
+%if 0%{?rhel} == 6
+%cmake28 \
+%else
+%cmake \
+%endif
+ -DTJPEG_INCLUDE_DIR=%{_includedir} \
+ -DTJPEG_LIBRARY=%{_libdir}/libturbojpeg.so \
+ -DVGL_USESSL=ON -DVGL_LIBDIR=%{_libdir} \
+ -DVGL_DOCDIR=%{_docdir}/%{name}-%{version}/ \
+ -DVGL_FAKELIBDIR=%{_libdir}/fakelib/ .
make %{?_smp_mflags}
%install
make install DESTDIR=$RPM_BUILD_ROOT
-# renamed from glxinfo which provided by glx-utils
-mv $RPM_BUILD_ROOT%{_bindir}/{,v}glxinfo
+mkdir $RPM_BUILD_ROOT%{_libdir}/VirtualGL
+rm $RPM_BUILD_ROOT%{_bindir}/glxinfo
+mv $RPM_BUILD_ROOT%{_libdir}/libdlfaker.so $RPM_BUILD_ROOT%{_libdir}/VirtualGL/libdlfaker.so
+mv $RPM_BUILD_ROOT%{_libdir}/libgefaker.so $RPM_BUILD_ROOT%{_libdir}/VirtualGL/libgefaker.so
+mv $RPM_BUILD_ROOT%{_libdir}/librrfaker.so $RPM_BUILD_ROOT%{_libdir}/VirtualGL/librrfaker.so
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%files -n %{name}
+%files
%{_docdir}/%{name}-%{version}/
%{_bindir}/tcbench
%{_bindir}/nettest
%{_bindir}/cpustat
-# renamed from glxinfo which provided by glx-utils
-%{_bindir}/vglxinfo
%{_bindir}/vglclient
%{_bindir}/vglconfig
%{_bindir}/vglconnect
@@ -99,9 +112,7 @@ mv $RPM_BUILD_ROOT%{_bindir}/{,v}glxinfo
%{_bindir}/vglserver_config
%{_bindir}/vglrun
%{_bindir}/glxspheres
-%{_libdir}/libdlfaker.so
-%{_libdir}/libgefaker.so
-%{_libdir}/librrfaker.so
+%{_libdir}/VirtualGL/
%{_libdir}/fakelib/
%files devel
@@ -110,8 +121,44 @@ mv $RPM_BUILD_ROOT%{_bindir}/{,v}glxinfo
%changelog
+* Thu Jan 17 2013 Gary Gatling <gsgatlin at eos.ncsu.edu> - 2.3.2-1
+- rebuilding.
+
+* Sun Jan 13 2013 Gary Gatling <gsgatlin at eos.ncsu.edu> - 2.3.2-2
+- update to 2.3.2.
+
+* Tue Oct 23 2012 Gary Gatling <gsgatlin at eos.ncsu.edu> - 2.3.1-9
+- Fix problems with multilib support. Fix created by Andy Kwong.
+
+* Sun Jul 22 2012 Gary Gatling <gsgatlin at eos.ncsu.edu> - 2.3.1-8
+- removed BuildRequires: mxml-devel. see BZ839060. (#839060)
+
+* Sat Jul 14 2012 Gary Gatling <gsgatlin at eos.ncsu.edu> - 2.3.1-7
+- added BuildRequires: mxml-devel for fedora builds only.
+
+* Thu Jul 12 2012 Gary Gatling <gsgatlin at eos.ncsu.edu> - 2.3.1-6
+- removed BuildArch: noarch from "devel" subpackage
+
+* Thu Jul 12 2012 Gary Gatling <gsgatlin at eos.ncsu.edu> - 2.3.1-5
+- change to cmake macros in the build section of specfile
+
+* Tue Jul 10 2012 Gary Gatling <gsgatlin at eos.ncsu.edu> - 2.3.1-4
+- fix vglrun patch to use uname -i to determine platform.
+- fix cmake macro problems on rhel 6.
+- remove Vendor tag from specfile
+
+* Tue Jul 10 2012 Orion Poplawski <orion at nwra.com> - 2.3.1-3
+- Use system glx, fltk
+- Don't ship glxinfo
+
+* Fri Jul 6 2012 Gary Gatling <gsgatlin at eos.ncsu.edu> - 2.3.1-2
+- Added patch for library paths within the vglrun script.
+
+* Thu Jul 5 2012 Gary Gatling <gsgatlin at eos.ncsu.edu> - 2.3.1-1
+- Upgrade to 2.3.1 and made changes to better follow packaging guidelines for fedora project.
+
* Wed Jun 6 2012 Gary Gatling <gsgatlin at eos.ncsu.edu> - 2.3-2
-- Very minor edit for building on older fedora or RHEL 6 with the same specfile
- as newer fedora.
+- Very minor edit for building on RHEL 6 with the same specfile as newer fedora.
+
* Thu Feb 16 2012 Robin Lee <cheeselee at fedoraproject.org> - 2.3-1
- Specfile based on upstream and Mandriva specfiles
diff --git a/sources b/sources
index e9c63e8..3eec22a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e4c5f3b4e887bfc0abe761735fa0bbda VirtualGL-2.3.tar.gz
+29aaf0607a1031fa326444ff0321bcec VirtualGL-2.3.2.tar.gz
More information about the scm-commits
mailing list