rpms/paraview/devel paraview-2.4.3-xopengl.patch, NONE, 1.1 paraview.spec, 1.3, 1.4
Orion Poplawski (orion)
fedora-extras-commits at redhat.com
Thu Jun 29 21:00:09 UTC 2006
- Previous message: rpms/qt4/devel assistant.desktop, 1.2, 1.3 designer.desktop, 1.1, 1.2 linguist.desktop, 1.1, 1.2 qt-x11-opensource-src-4.1.2-assistant4.patch, 1.1, 1.2 qt4.spec, 1.11, 1.12 qtconfig.desktop, 1.1, 1.2 qtdemo.desktop, 1.1, 1.2
- Next message: rpms/gtk-qt-engine/FC-5 gtk-qt-engine-cvs.sh, NONE, 1.1 gtk-qt-engine-dt.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 gtk-qt-engine.spec, 1.20, 1.21 sources, 1.3, 1.4 gtk-qt-engine-gcc29.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: orion
Update of /cvs/extras/rpms/paraview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29007
Modified Files:
paraview.spec
Added Files:
paraview-2.4.3-xopengl.patch
Log Message:
- No OSMesa support in FC5
- Make data sub-package pull in main package (bug #193837)
- A patch from CVS to fix vtkXOpenRenderWindow.cxx
paraview-2.4.3-xopengl.patch:
--- NEW FILE paraview-2.4.3-xopengl.patch ---
--- paraview-2.4.3/VTK/Rendering/vtkXOpenGLRenderWindow.cxx 2006-02-01 07:57:40.000000000 -0700
+++ ParaView/VTK/Rendering/vtkXOpenGLRenderWindow.cxx 2006-06-05 15:16:05.000000000 -0600
@@ -23,6 +23,7 @@
#include "vtkOpenGLPolyDataMapper.h"
#include <GL/gl.h>
#include "GL/glx.h"
+#include "vtkgl.h"
#else
#include "MangleMesaInclude/osmesa.h"
#endif
@@ -39,7 +40,6 @@
#include "vtkObjectFactory.h"
#include "vtkRendererCollection.h"
#include "vtkOpenGLExtensionManager.h"
-#include "vtkgl.h"
#include <X11/Xlib.h>
#include <X11/Xutil.h>
@@ -63,9 +63,12 @@
GLXContext PixmapContextId;
Window PixmapWindowId;
+
// support for Pbuffer based offscreen rendering
GLXContext PbufferContextId;
+#ifndef VTK_IMPLEMENT_MESA_CXX
vtkglX::GLXPbuffer Pbuffer;
+#endif
// store previous settings of on screen window
int ScreenDoubleBuffer;
@@ -87,7 +90,9 @@
this->PixmapWindowId = 0;
this->PbufferContextId = NULL;
+#ifndef VTK_IMPLEMENT_MESA_CXX
this->Pbuffer = 0;
+#endif
this->ScreenMapped = rw->GetMapped();
this->ScreenDoubleBuffer = rw->GetDoubleBuffer();
@@ -101,7 +106,7 @@
#ifndef VTK_IMPLEMENT_MESA_CXX
-vtkCxxRevisionMacro(vtkXOpenGLRenderWindow, "$Revision: 1.61.2.3 $");
+vtkCxxRevisionMacro(vtkXOpenGLRenderWindow, "$Revision: 1.61.2.4 $");
vtkStandardNewMacro(vtkXOpenGLRenderWindow);
#endif
@@ -123,6 +128,8 @@
#endif
+#ifndef VTK_IMPLEMENT_MESA_CXX
+
vtkglX::GLXFBConfig* vtkXOpenGLRenderWindowTryForFBConfig(Display *DisplayId,
int drawable_type,
int doublebuff, int stereo,
@@ -176,6 +183,8 @@
return fb;
}
+#endif
+
XVisualInfo *vtkXOpenGLRenderWindowTryForVisual(Display *DisplayId,
int doublebuff, int stereo,
@@ -225,6 +234,7 @@
return glXChooseVisual(DisplayId, DefaultScreen(DisplayId), attributes );
}
+#ifndef VTK_IMPLEMENT_MESA_CXX
vtkglX::GLXFBConfig *vtkXOpenGLRenderWindowGetDesiredFBConfig(
Display* DisplayId,
int& win_stereo, int& win_multisamples, int& win_doublebuffer, int& win_alphaplanes,
@@ -281,6 +291,7 @@
}
return ( fbc );
}
+#endif
XVisualInfo *vtkXOpenGLRenderWindow::GetDesiredVisualInfo()
{
@@ -418,6 +429,7 @@
}
}
+#ifndef VTK_IMPLEMENT_MESA_CXX
static int PbufferAllocFail = 0;
extern "C"
{
@@ -427,6 +439,7 @@
return 1;
}
}
+#endif
// Initialize the window for rendering.
void vtkXOpenGLRenderWindow::WindowInitialize (void)
@@ -615,6 +628,7 @@
this->OwnDisplay = 1;
}
+#ifndef VTK_IMPLEMENT_MESA_CXX
int v1, v2;
glXQueryVersion(this->DisplayId, &v1, &v2);
@@ -665,6 +679,8 @@
}
}
}
+
+#endif
// GLX 1.3 doesn't exist or failed to allocate Pbuffer
// fallback on GLX 1.0 GLXPixmap offscreen support
@@ -845,10 +861,12 @@
{
if(this->OffScreenRendering && this->Internal->PbufferContextId)
{
+#ifndef VTK_IMPLEMENT_MESA_CXX
vtkglX::DestroyPbuffer(this->DisplayId, this->Internal->Pbuffer);
this->Internal->Pbuffer = 0;
glXDestroyContext(this->DisplayId, this->Internal->PbufferContextId);
this->Internal->PbufferContextId = NULL;
+#endif
}
else if(this->OffScreenRendering && this->Internal->PixmapContextId)
{
@@ -1051,6 +1069,7 @@
#endif
if(this->OffScreenRendering && this->Internal->PbufferContextId)
{
+#ifndef VTK_IMPLEMENT_MESA_CXX
// Disconnect renderers from this render window.
// Done to release graphic resources.
vtkRenderer *ren;
@@ -1067,6 +1086,7 @@
glXDestroyContext(this->DisplayId, this->Internal->PbufferContextId);
this->Internal->PbufferContextId = NULL;
this->WindowInitialize();
+#endif
}
else if(this->OffScreenRendering && this->Internal->PixmapContextId)
{
@@ -1202,6 +1222,7 @@
}
else
#endif
+#ifndef VTK_IMPLEMENT_MESA_CXX
if(this->OffScreenRendering && this->Internal->PbufferContextId)
{
if (((this->Internal->PbufferContextId != glXGetCurrentContext()) || this->ForceMakeCurrent))
@@ -1211,7 +1232,9 @@
this->ForceMakeCurrent = 0;
}
}
- if(this->OffScreenRendering && this->Internal->PixmapContextId)
+ else
+#endif
+ if(this->OffScreenRendering && this->Internal->PixmapContextId)
{
if (((this->Internal->PixmapContextId != glXGetCurrentContext()) || this->ForceMakeCurrent))
{
@@ -1788,10 +1811,12 @@
{
if(this->Internal->PbufferContextId)
{
+#ifndef VTK_IMPLEMENT_MESA_CXX
vtkglX::DestroyPbuffer(this->DisplayId, this->Internal->Pbuffer);
this->Internal->Pbuffer = 0;
glXDestroyContext(this->DisplayId, this->Internal->PbufferContextId);
this->Internal->PbufferContextId = NULL;
+#endif
}
else if(this->Internal->PixmapContextId)
{
--- paraview-2.4.3/VTK/Rendering/vtkXMesaRenderWindow.h.xopengl 2006-06-05 16:39:59.000000000 -0600
+++ paraview-2.4.3/VTK/Rendering/vtkXMesaRenderWindow.h 2006-06-05 16:40:27.000000000 -0600
@@ -122,6 +122,10 @@
virtual int *GetScreenSize();
// Description:
+ // Get the size of the window
+ virtual int *GetSize();
+
+ // Description:
// Get the position in screen coordinates (pixels) of the window.
virtual int *GetPosition();
Index: paraview.spec
===================================================================
RCS file: /cvs/extras/rpms/paraview/devel/paraview.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- paraview.spec 21 Apr 2006 16:05:21 -0000 1.3
+++ paraview.spec 29 Jun 2006 21:00:09 -0000 1.4
@@ -1,6 +1,6 @@
Name: paraview
Version: 2.4.3
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Parallel visualization application
Group: Applications/Engineering
@@ -12,6 +12,7 @@
Patch0: paraview-2.4.2-tcltk.patch
Patch1: paraview-2.4.3-png.patch
Patch2: paraview-2.4.3-python.patch
+Patch3: paraview-2.4.3-xopengl.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cmake, lam
@@ -74,6 +75,7 @@
%package data
Summary: Data files for ParaView
Group: Applications/Engineering
+Requires: %{name} = %{version}-%{release}
Requires(post): /usr/bin/update-mime-database
Requires(postun): /usr/bin/update-mime-database
@@ -95,6 +97,7 @@
%patch -p1 -b .tcltk
%patch1 -p1 -b .png
%patch2 -p1 -b .python
+%patch3 -p1 -b .xopengl
rm -rf Utilities/TclTk
sed -i -e 's,INSTALL_FILES(/man/,INSTALL_FILES(/share/man/,' Utilities/IceT/doc/man/CMakeLists.txt
@@ -119,7 +122,6 @@
-DTCL_LIBRARY:PATH=tcl \
-DTK_LIBRARY:PATH=tk \
-DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \
- -DVTK_USE_MAGLED_MESA:BOOL=ON \
-DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
-DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
-DVTK_USE_SYSTEM_JPEG:BOOL=ON \
@@ -154,7 +156,6 @@
-DVTK_USE_MPI:BOOL=ON \
-DMPI_INCLUDE_PATH:PATH=%{_includedir}/lam \
-DMPI_LIBRARY:STRING="-L%{_libdir}/lam -llammpio -llammpi++ -llamf77mpi -lmpi -llam -laio -lutil -ldl" \
- -DVTK_USE_MAGLED_MESA:BOOL=ON \
-DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
-DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
-DVTK_USE_SYSTEM_JPEG:BOOL=ON \
@@ -309,6 +310,11 @@
%changelog
+* Thu Jun 29 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.3-8
+- No OSMesa support in FC5
+- Make data sub-package pull in main package (bug #193837)
+- A patch from CVS to fix vtkXOpenRenderWindow.cxx
+
* Fri Apr 21 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.3-7
- Re-enable ppc
- Previous message: rpms/qt4/devel assistant.desktop, 1.2, 1.3 designer.desktop, 1.1, 1.2 linguist.desktop, 1.1, 1.2 qt-x11-opensource-src-4.1.2-assistant4.patch, 1.1, 1.2 qt4.spec, 1.11, 1.12 qtconfig.desktop, 1.1, 1.2 qtdemo.desktop, 1.1, 1.2
- Next message: rpms/gtk-qt-engine/FC-5 gtk-qt-engine-cvs.sh, NONE, 1.1 gtk-qt-engine-dt.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 gtk-qt-engine.spec, 1.20, 1.21 sources, 1.3, 1.4 gtk-qt-engine-gcc29.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list