From 65f8fc831596dfcbea8d989954c46e90113c40204072a4b9a2add03aaad2b3b8 Mon Sep 17 00:00:00 2001 From: Dmitry Roshchin Date: Tue, 12 Mar 2013 12:14:40 +0000 Subject: [PATCH] Accepting request 158611 from home:badshah400:branches:science Update to version 3.98.1 OBS-URL: https://build.opensuse.org/request/show/158611 OBS-URL: https://build.opensuse.org/package/show/science/paraview?expand=0&rev=15 --- ParaView-3.98.0-src.tgz | 3 -- ParaView-3.98.1-source.tar.gz | 3 ++ paraview-fix-build-with-system-jpeg.patch | 53 +++++++++++++++++++++++ paraview.changes | 11 +++++ paraview.spec | 28 +++--------- 5 files changed, 74 insertions(+), 24 deletions(-) delete mode 100644 ParaView-3.98.0-src.tgz create mode 100644 ParaView-3.98.1-source.tar.gz create mode 100644 paraview-fix-build-with-system-jpeg.patch diff --git a/ParaView-3.98.0-src.tgz b/ParaView-3.98.0-src.tgz deleted file mode 100644 index 5a6a98a..0000000 --- a/ParaView-3.98.0-src.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:582ac0d87360a05c471164c718d95f718388edf8b9349cf544c09f8a87660d2a -size 42160789 diff --git a/ParaView-3.98.1-source.tar.gz b/ParaView-3.98.1-source.tar.gz new file mode 100644 index 0000000..a7939a4 --- /dev/null +++ b/ParaView-3.98.1-source.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b7dbc4c513d7e3eb4a41b8d6365e75bddf8c40d8bfb9c17fa080304a981cf844 +size 43595288 diff --git a/paraview-fix-build-with-system-jpeg.patch b/paraview-fix-build-with-system-jpeg.patch new file mode 100644 index 0000000..8ef024e --- /dev/null +++ b/paraview-fix-build-with-system-jpeg.patch @@ -0,0 +1,53 @@ +commit 1d79220a5a9cad512a2ed980c85b3f67b1b25573 +Author: Nikhil Shetty +Date: Tue Feb 19 10:02:26 2013 -0500 + + Fix to use newer libjpeg API. + + Newer API uses jMemSrc instead of jpeg_mem_src. We check if the version + is >=80 or or MEM_SRCDST_SUPPORTED is defined and use the newer API + where appropriate. + + Change-Id: I89d1129c656539a3e748fbbebae5130aece6e4c1 + +diff --git VTK/IO/Image/vtkJPEGReader.cxx VTK/IO/Image/vtkJPEGReader.cxx +index db3c0da..9604952 100644 +--- VTK/IO/Image/vtkJPEGReader.cxx ++++ VTK/IO/Image/vtkJPEGReader.cxx +@@ -92,7 +92,11 @@ extern "C" void skip_input_data (j_decompress_ptr cinfo, long num_bytes) + } + + // Read JPEG image from a memory buffer ++#if JPEG_LIB_VERSION >= 80 || defined(MEM_SRCDST_SUPPORTED) ++extern "C" void jMemSrc (j_decompress_ptr cinfo, void* buffer, long nbytes) ++#else + extern "C" void jpeg_mem_src (j_decompress_ptr cinfo, void* buffer, long nbytes) ++#endif + { + cinfo->src = (struct jpeg_source_mgr *) + (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, +@@ -184,7 +188,11 @@ void vtkJPEGReader::ExecuteInformation() + } + else + { ++#if JPEG_LIB_VERSION >= 80 || defined(MEM_SRCDST_SUPPORTED) ++ jMemSrc(&cinfo, this->MemoryBuffer, this->MemoryBufferLength); ++#else + jpeg_mem_src(&cinfo, this->MemoryBuffer, this->MemoryBufferLength); ++#endif + } + + // read the header +@@ -264,7 +272,11 @@ int vtkJPEGReaderUpdate2(vtkJPEGReader *self, OT *outPtr, + } + else + { ++#if JPEG_LIB_VERSION >= 80 || defined(MEM_SRCDST_SUPPORTED) ++ jMemSrc(&cinfo, self->GetMemoryBuffer(), self->GetMemoryBufferLength()); ++#else + jpeg_mem_src(&cinfo, self->GetMemoryBuffer(), self->GetMemoryBufferLength()); ++#endif + } + + // read the header + diff --git a/paraview.changes b/paraview.changes index 5ac649a..73cb41c 100644 --- a/paraview.changes +++ b/paraview.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Mar 12 00:43:02 UTC 2013 - badshah400@gmail.com + +- Update to version 3.98.1: + + See full list of changes at + http://paraview.org/Bug/changelog_page.php?version_id=99. +- Add paraview-fix-build-with-system-jpeg.patch to fix build + errors when compiled with recent jpeg headers (libjpeg8-devel >= + 8.0) +- Use smp flags for make to speed up build. + ------------------------------------------------------------------- Wed Feb 27 14:11:42 UTC 2013 - badshah400@gmail.com diff --git a/paraview.spec b/paraview.spec index ed2cc6f..45adccb 100644 --- a/paraview.spec +++ b/paraview.spec @@ -18,19 +18,21 @@ %define major_ver 3.98 Name: paraview -Version: 3.98.0 +Version: 3.98.1 Release: 1 License: BSD-3-Clause Summary: Data analysis and visualization application Url: http://www.paraview.org Group: Productivity/Scientific/Physics -Source0: ParaView-%{version}-src.tgz +Source0: ParaView-%{version}-source.tar.gz # PATCH-FIX-UPSTREAM paraview-default-qtstyle.patch badshah400@gmail.com -- Make paraview inherit default qt gui look and feel, instead of using the Plastique theme Patch0: paraview-default-qtstyle.patch # PATCH-FIX-UPSTREAM paraview-SciberQuestToolKit-install-path.patch badshah400@gmail.com -- Fix install path of SciberQuestToolkit plugin Patch1: paraview-SciberQuestToolKit-install-path.patch # PATCH-FIX-UPSTREAM paraview-no-return-in-nonvoid-function.patch badshah400@gmail.com -- Fix a non-void function that returns no value Patch3: paraview-no-return-in-nonvoid-function.patch +# PATCH-FIX-UPSTREAM paraview-fix-build-with-system-jpeg.patch badshah400@gmail.com -- Fix build errors when compiling with new libjpeg; patch came from upstream +Patch4: paraview-fix-build-with-system-jpeg.patch BuildRequires: Mesa-devel BuildRequires: boost-devel BuildRequires: cmake >= 2.8.8 @@ -104,10 +106,11 @@ This package provides the SciberQuestToolKit plugin for paraview. %prep -%setup -q -n ParaView-%{version}-src +%setup -q -n ParaView-%{version}-source %patch0 -p1 %patch1 -p1 %patch3 -p1 +%patch4 -p0 # GCC 4.7 only available for openSUSE > 12.1 #%if 0%{?suse_version} > 1210 #%patch2 -p1 @@ -125,27 +128,11 @@ export CXXFLAGS="%{optflags}" -DCMAKE_CXX_COMPILER:FILEPATH=$CXX \\\ -DCMAKE_C_COMPILER:FILEPATH=$CC \\\ -DCMAKE_BUILD_TYPE=Release \\\ - -DTCL_LIBRARY:PATH=tcl \\\ - -DTK_LIBRARY:PATH=tk \\\ - -DPARAVIEW_INSTALL_DEVELOPMENT:BOOL=OFF \\\ -DPARAVIEW_BUILD_QT_GUI:BOOL=ON \\\ -DPARAVIEW_QT_QMAKE_EXECUTABLE=%{_bindir}/qmake \\\ - -DPARAVIEW_BUILD_StreamingParaView:BOOL=ON \\\ - -DPARAVIEW_BUILD_PLUGIN_Streaming:BOOL=ON \\\ - -DPARAVIEW_BUILD_PLUGIN_Array:BOOL=ON \\\ - -DPARAVIEW_BUILD_PLUGIN_CosmoFilters:BOOL=ON \\\ - -DPARAVIEW_BUILD_PLUGIN_Infovis:BOOL=ON \\\ - -DPARAVIEW_BUILD_PLUGIN_netCDFReaders:BOOL=ON \\\ - -DPARAVIEW_BUILD_PLUGIN_pvblot:BOOL=ON \\\ -DPARAVIEW_BUILD_PLUGIN_SLACTools:BOOL=ON \\\ - -DPARAVIEW_BUILD_PLUGIN_VisItReaderPlugin:BOOL=OFF \\\ -DPARAVIEW_ENABLE_PYTHON:BOOL=OFF \\\ - -DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF \\\ - -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=OFF \\\ -DVTK_OPENGL_HAS_OSMESA:BOOL=OFF \\\ - -DVTK_USE_INFOVIS:BOOL=OFF \\\ - -DVTK_USE_N_WAY_ARRAYS:BOOL=ON \\\ - -DVTK_USE_RPATH:BOOL=OFF \\\ -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \\\ -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \\\ -DVTK_USE_SYSTEM_JPEG:BOOL=ON \\\ @@ -153,7 +140,6 @@ export CXXFLAGS="%{optflags}" -DVTK_USE_SYSTEM_TIFF:BOOL=ON \\\ -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \\\ -DBUILD_DOCUMENTATION:BOOL=ON \\\ - -DVTK_USE_BOOST:BOOL=ON \\\ -DBUILD_EXAMPLES:BOOL=ON \\\ -DVTK_INSTALL_INCLUDE_DIR:PATH=include/%{name} \\\ -DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib}/%{name} \\\ @@ -165,7 +151,7 @@ cmake .. \ -DPV_INSTALL_LIB_DIR:PATH=%{_lib}/paraview \ %{paraview_cmake_options} -make +make %{?_smp_mflags} popd %install