gsgatlin pushed to VirtualGL (master). "Update to 2.4.(#1198135)"

[notifications at fedoraproject.org]

>From adba8c3a694f79ea8326d8f480c40108e92a6a03 Mon Sep 17 00:00:00 2001
From: Gary Gatling <gsgatlin at ncsu.edu>
Date: Tue, 28 Apr 2015 17:01:25 -0400
Subject: Update to 2.4.(#1198135)


diff --git a/.gitignore b/.gitignore
index 1773004..1068f38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /VirtualGL-2.3.1.tar.gz
 /VirtualGL-2.3.2.tar.gz
 /VirtualGL-2.3.3.tar.gz
+/VirtualGL-2.4.tar.gz
diff --git a/VirtualGL-fltk.patch b/VirtualGL-fltk.patch
deleted file mode 100644
index 8decd3b..0000000
--- a/VirtualGL-fltk.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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
index 3ec81e5..2d1f2d7 100644
--- a/VirtualGL-glx.patch
+++ b/VirtualGL-glx.patch
@@ -37,14 +37,14 @@ diff -up VirtualGL-2.3.3/glxdemos/texture_from_pixmap.c.glx VirtualGL-2.3.3/glxd
  #include <stdio.h>
  #include <stdlib.h>
 diff -up VirtualGL-2.3.3/util/glreadtest.cpp.glx VirtualGL-2.3.3/util/glreadtest.cpp
---- VirtualGL-2.3.3/util/glreadtest.cpp.glx	2013-10-14 14:22:44.626122603 -0400
-+++ VirtualGL-2.3.3/util/glreadtest.cpp	2013-10-14 14:23:19.548258768 -0400
+--- VirtualGL-2.4/util/glreadtest.cpp.orig	2014-07-17 12:22:19.000000000 +0200
++++ VirtualGL-2.4/util/glreadtest.cpp	2015-02-11 17:06:17.434346722 +0100
 @@ -23,7 +23,7 @@
- #include "rrerror.h"
+ #include "Error.h"
  #include <errno.h>
  #define GL_GLEXT_PROTOTYPES
 -#include "../common/glx.h"
 +#include <GL/glx.h>
- #ifdef MESAGLU
- #include <mesa/glu.h>
- #else
+ #include <GL/glu.h>
+ #include "x11err.h"
+ #ifdef USEIFR
diff --git a/VirtualGL.spec b/VirtualGL.spec
index 55b4eef..b6e924f 100644
--- a/VirtualGL.spec
+++ b/VirtualGL.spec
@@ -1,18 +1,16 @@
 Summary:        A toolkit for displaying OpenGL applications to thin clients
 Name:           VirtualGL
-Version:        2.3.3
+Version:        2.4
 URL:            http://www.virtualgl.org/
 Group:          Applications/System
 Source0:        http://downloads.sourceforge.net/project/virtualgl/VirtualGL/%{version}/VirtualGL-%{version}.tar.gz
-# Use system fltk
-Patch0:         %{name}-fltk.patch
 # Use system glx.h
 Patch1:         %{name}-glx.patch
 # fix for bz923961
 Patch2:         %{name}-redhatpathsfix.patch
 # fix for bz1088475
 Patch3:         %{name}-redhatlibexecpathsfix.patch
-Release:        6%{?dist}
+Release:        1%{?dist}
 License:        wxWidgets
 %if 0%{?rhel} == 6
 BuildRequires: cmake28
@@ -24,6 +22,7 @@ BuildRequires:  openssl-devel
 BuildRequires:  turbojpeg-devel
 BuildRequires:  mesa-libGLU-devel
 BuildRequires:  libXv-devel
+BuildRequires:  gcc-c++
 Requires:       fltk
 Provides:       bumblebee-bridge
 
@@ -69,14 +68,13 @@ Development headers and libraries for VirtualGL.
 
 %prep
 %setup -q
-%patch0 -p1 -b .fltk
 %patch1 -p1 -b .glx
 %patch2 -p1 -b .redhatpathsfix
 %patch3 -p1 -b .redhatlibexecpathsfix
 
 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 -r common/glx* server/fltk
 rm doc/LICENSE-*.txt
 
 %build
@@ -85,6 +83,7 @@ rm doc/LICENSE-*.txt
 %else
 %cmake \
 %endif
+         -DVGL_SYSTEMFLTK=1 \
          -DTJPEG_INCLUDE_DIR=%{_includedir} \
          -DTJPEG_LIBRARY=%{_libdir}/libturbojpeg.so \
          -DVGL_USESSL=ON -DVGL_LIBDIR=%{_libdir} \
@@ -138,8 +137,8 @@ mv $RPM_BUILD_ROOT%{_bindir}/.vglrun.vars32 $RPM_BUILD_ROOT%{_libexecdir}/vglrun
 
 
 %changelog
-* Wed Feb 18 2015 Rex Dieter <rdieter at fedoraproject.org> 2.3.3-6
-- rebuild (fltk,gcc5)
+* Tue Apr 28 2015 Gary Gatling <gsgatlin at eos.ncsu.edu> - 2.4-1
+- Fix (#1198135) Update to 2.4.
 
 * Fri Aug 15 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/sources b/sources
index d3753df..55ecdee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c0bc355a17d88b4b7109525188cfb0e6  VirtualGL-2.3.3.tar.gz
+ed690ed983397eac202531a920b37fce  VirtualGL-2.4.tar.gz
-- 
cgit v0.10.2


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