SHA256
1
0
forked from pool/vtk

applied patches provided by

Marcel Witte <wittemar@googlemail.com>

OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=19
This commit is contained in:
Werner Hoch 2010-05-08 18:18:59 +00:00 committed by Git OBS Bridge
parent c851b18e24
commit b6cd012e0d
2 changed files with 52 additions and 0 deletions

20
vtk-libpng-1.4.0.patch Normal file
View File

@ -0,0 +1,20 @@
--- VTK/IO/vtkPNGReader.cxx.orig 2010-02-04 01:49:09.000000000 +0100
+++ VTK/IO/vtkPNGReader.cxx 2010-02-04 01:52:56.000000000 +0100
@@ -116,7 +116,7 @@
// minimum of a byte per pixel
if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
{
- png_set_gray_1_2_4_to_8(png_ptr);
+ png_set_expand_gray_1_2_4_to_8(png_ptr);
}
// add alpha if any alpha found
@@ -225,7 +225,7 @@
// minimum of a byte per pixel
if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
{
- png_set_gray_1_2_4_to_8(png_ptr);
+ png_set_expand_gray_1_2_4_to_8(png_ptr);
}
// add alpha if any alpha found

View File

@ -10,6 +10,9 @@ URL: http://www.vtk.org
Source0: vtk-%{version}.tar.gz Source0: vtk-%{version}.tar.gz
Patch0: vtk-5.4.2-pythondestdir.patch Patch0: vtk-5.4.2-pythondestdir.patch
Patch1: vtk-5.4.2-string-len.patch Patch1: vtk-5.4.2-string-len.patch
%if 0%{?suse_version} >= 1130
Patch2: vtk-libpng-1.4.0.patch
%endif
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: cmake tcl-devel tk-devel libqt4-devel python-devel BuildRequires: cmake tcl-devel tk-devel libqt4-devel python-devel
@ -21,6 +24,7 @@ BuildRequires: chrpath
%if 0%{?suse_version} >= 1110 %if 0%{?suse_version} >= 1110
BuildRequires: freeglut-devel BuildRequires: freeglut-devel
%endif %endif
BuildRequires: java-devel
%description %description
VTK is an open-source software system for image processing, 3D VTK is an open-source software system for image processing, 3D
@ -59,6 +63,14 @@ Provides: vtk-python
%description -n python-vtk %description -n python-vtk
python bindings for VTK python bindings for VTK
%package java
Summary: Java VTK bindings
Requires: vtk = %{version}
Group: Development/Libraries/Java
%description java
The Java-bindings for VTK
%package qt %package qt
Summary: QT VTK widget Summary: QT VTK widget
Requires: vtk = %{version} Requires: vtk = %{version}
@ -92,6 +104,9 @@ Testing programs for VTK
%setup -n VTK -q %setup -n VTK -q
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%if 0%{?suse_version} >= 1130
%patch2 -p1
%endif
# Replace relative path ../../../VTKData with %{_datadir}/vtkdata # Replace relative path ../../../VTKData with %{_datadir}/vtkdata
# otherwise it will break on symlinks. # otherwise it will break on symlinks.
@ -112,6 +127,7 @@ cmake . \
-DVTK_DATA_ROOT:PATH=%{_datadir}/%{name}-data \ -DVTK_DATA_ROOT:PATH=%{_datadir}/%{name}-data \
-DVTK_WRAP_PYTHON:BOOL=ON \ -DVTK_WRAP_PYTHON:BOOL=ON \
-DVTK_WRAP_TCL:BOOL=ON \ -DVTK_WRAP_TCL:BOOL=ON \
-DVTK_WRAP_JAVA:BOOL=ON \
-DVTK_USE_PARALLEL:BOOL=ON \ -DVTK_USE_PARALLEL:BOOL=ON \
-DVTK_USE_RENDERING:BOOL=ON \ -DVTK_USE_RENDERING:BOOL=ON \
-DBUILD_DOCUMENTATION:BOOL=OFF \ -DBUILD_DOCUMENTATION:BOOL=OFF \
@ -239,6 +255,8 @@ rm -rf $RPM_BUILD_ROOT
%post qt -p /sbin/ldconfig %post qt -p /sbin/ldconfig
%post java -p /sbin/ldconfig
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%postun tcl -p /sbin/ldconfig %postun tcl -p /sbin/ldconfig
@ -247,6 +265,8 @@ rm -rf $RPM_BUILD_ROOT
%postun qt -p /sbin/ldconfig %postun qt -p /sbin/ldconfig
%postun java -p /sbin/ldconfig
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libvtkCommon.so.* %{_libdir}/libvtkCommon.so.*
@ -304,6 +324,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libvtkexoIIc.so %{_libdir}/libvtkexoIIc.so
%{_libdir}/libvtk*TCL.so %{_libdir}/libvtk*TCL.so
%{_libdir}/libvtk*Python*.so %{_libdir}/libvtk*Python*.so
%{_libdir}/libvtk*Java*.so
%{_libdir}/libQVTK.so %{_libdir}/libQVTK.so
%{_libdir}/libvtkInfovis.so %{_libdir}/libvtkInfovis.so
%{_libdir}/libvtkViews.so %{_libdir}/libvtkViews.so
@ -361,11 +382,22 @@ rm -rf $RPM_BUILD_ROOT
%dir %{qtdir}/plugins/designer %dir %{qtdir}/plugins/designer
%{qtdir}/plugins/designer/libQVTKWidgetPlugin.so %{qtdir}/plugins/designer/libQVTKWidgetPlugin.so
%files java
%defattr(-,root,root,-)
%dir %{_libdir}/java/vtk
%{_libdir}/java/vtk/vtk.jar
%{_libdir}/libvtk*Java.so.*
%{_bindir}/vtkWrapJava
%files examples %files examples
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_datadir}/%{name}-examples %{_datadir}/%{name}-examples
%changelog %changelog
* Sat Mai 08 2010 Werner Hoch <werner.ho@gmx.de> - 5.4.2
- applied patches provided by Marcel Witte <wittemar@googlemail.com>
- enable java bindings
- patch to fix png-support for factory
* Mon Jun 08 2009 Andrea Florio <andrea@opensuse.org> - 5.4.2 * Mon Jun 08 2009 Andrea Florio <andrea@opensuse.org> - 5.4.2
- made rpmlint happy (using fdupes) - made rpmlint happy (using fdupes)
- fixed rpm Group using real ones, please check here: http://en.opensuse.org/SUSE_Package_Conventions/RPM_Groups - fixed rpm Group using real ones, please check here: http://en.opensuse.org/SUSE_Package_Conventions/RPM_Groups