[arch-commits] Commit in vtk/trunk (10 files)

Andrzej Giniewicz aginiewicz at archlinux.org
Mon Nov 24 19:50:12 UTC 2014


    Date: Monday, November 24, 2014 @ 20:50:11
  Author: aginiewicz
Revision: 123082

upgpkg: vtk 6.1.0-1

rebuild for hdf5 1.8.4, update to 6.1.0

Added:
  vtk/trunk/hdf5.diff
  vtk/trunk/mesa.diff
Modified:
  vtk/trunk/PKGBUILD
Deleted:
  vtk/trunk/ffmpeg-0.11.diff
  vtk/trunk/ffmpeg-0.8.diff
  vtk/trunk/ffmpeg-2.0.diff
  vtk/trunk/ffmpeg-2.4.diff
  vtk/trunk/freetype.diff
  vtk/trunk/python-destdir.diff
  vtk/trunk/tcl-8.6.diff

---------------------+
 PKGBUILD            |   66 ++++++++++++++++----------------------------------
 ffmpeg-0.11.diff    |   46 ----------------------------------
 ffmpeg-0.8.diff     |   66 --------------------------------------------------
 ffmpeg-2.0.diff     |   21 ---------------
 ffmpeg-2.4.diff     |   59 --------------------------------------------
 freetype.diff       |   16 ------------
 hdf5.diff           |   11 ++++++++
 mesa.diff           |   11 ++++++++
 python-destdir.diff |   11 --------
 tcl-8.6.diff        |   13 ---------
 10 files changed, 44 insertions(+), 276 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-24 18:53:02 UTC (rev 123081)
+++ PKGBUILD	2014-11-24 19:50:11 UTC (rev 123082)
@@ -11,8 +11,9 @@
 # Qt5 support status: http://vtk.org/Bug/view.php?id=12945
 
 pkgname=vtk
-pkgver=5.10.1
-pkgrel=13
+pkgver=6.1.0
+_majorver=6.1
+pkgrel=1
 pkgdesc='A software system for 3D computer graphics, image processing, and visualization.'
 arch=('i686' 'x86_64')
 url='http://www.vtk.org/'
@@ -24,31 +25,22 @@
             'tk: tcl bindings'
             'gnuplot: plotting tools'
             'graphviz: drawing tools')
-source=("http://www.vtk.org/files/release/${pkgver:0:4}/vtk-${pkgver}.tar.gz"
-        "http://www.vtk.org/files/release/${pkgver:0:4}/vtkdata-${pkgver}.tar.gz"
-        ffmpeg-0.8.diff ffmpeg-0.11.diff ffmpeg-2.0.diff ffmpeg-2.4.diff
-        tcl-8.6.diff python-destdir.diff freetype.diff)
-md5sums=('264b0052e65bd6571a84727113508789'
-         'b6355063264cd56bcd1396c92f6ca59a'
-         'e992321c9d1def6034d0fa6607b40c5a'
-         '81922ea61989e5591135f233a0400694'
-         '4ff5668957336709dcd096fbac102558'
-         '731e870919314d7512a6586210e79165'
-         'a804a9f034e24ef1a8b28542c15ce1a1'
-         'f7aba715bcc10de93a6ecf1cd6b0c560'
-         '1e45b3664b395c70017ff46d3370c84d')
+source=("http://www.vtk.org/files/release/${_majorver}/VTK-${pkgver}.tar.gz"
+        "http://www.vtk.org/files/release/${_majorver}/VTKData-${pkgver}.tar.gz"
+        "http://www.vtk.org/files/release/${_majorver}/VTKLargeData-${pkgver}.tar.gz"
+        mesa.diff hdf5.diff)
+md5sums=('25e4dfb3bad778722dcaec80cd5dab7d'
+         'f82c8fe151279c0422ab8a6cfe991c94'
+         '5bc47885923ef30e3ac77fcdf6d4e599'
+         '381921f3169facf5d6ef22de3cb3fbe5'
+         '1cf6b69312ed424a3595c3c11c82750d')
 
 prepare() {
-  cd "${srcdir}"/VTK$pkgver
+  cd "${srcdir}"/VTK-$pkgver
 
   # fix compilation errors:
-  patch -Np1 -i "${srcdir}/ffmpeg-0.8.diff"
-  patch -Np1 -i "${srcdir}/ffmpeg-0.11.diff"
-  patch -Np1 -i "${srcdir}/ffmpeg-2.0.diff"
-  patch -Np1 -i "${srcdir}/ffmpeg-2.4.diff"
-  patch -Np1 -i "${srcdir}/tcl-8.6.diff"
-  patch -Np1 -i "${srcdir}/python-destdir.diff"
-  patch -Np1 -i "${srcdir}/freetype.diff"
+  patch -Np1 -i "${srcdir}/mesa.diff"
+  patch -Np1 -i "${srcdir}/hdf5.diff"
 
   sed -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
       -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
@@ -62,6 +54,9 @@
   mkdir build
   cd build
 
+  # to help cmake find java
+  export JAVA_HOME=/usr/lib/jvm/default
+
   # flags to enable using system libs
   local cmake_system_flags=""
   for lib in HDF5 EXPAT FREETYPE JPEG PNG TIFF ZLIB LIBXML2 OGGTHEORA; do
@@ -75,31 +70,18 @@
     -Wno-dev \
     -DBUILD_SHARED_LIBS:BOOL=ON \
     -DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
-    -DVTK_DATA_ROOT:FILEPATH="${srcdir}/VTKData$pkgver" \
     -DBUILD_DOCUMENTATION:BOOL=ON \
     -DDOCUMENTATION_HTML_HELP:BOOL=ON \
     -DDOCUMENTATION_HTML_TARZ:BOOL=ON \
     -DBUILD_EXAMPLES:BOOL=ON \
-    -DVTK_USE_CHEMISTRY:BOOL=ON \
-    -DVTK_USE_HYBRID:BOOL=ON \
-    -DVTK_USE_PARALLEL:BOOL=ON \
-    -DVTK_USE_PATENTED:BOOL=ON \
-    -DVTK_USE_BOOST:BOOL=ON \
-    -DVTK_USE_INFOVIS:BOOL=ON \
-    -DVTK_USE_GL2PS:BOOL=ON \
-    -DVTK_USE_MYSQL:BOOL=ON \
     -DVTK_USE_FFMPEG_ENCODER:BOOL=ON \
-    -DVTK_USE_TEXT_ANALYSIS:BOOL=ON \
     -DVTK_WRAP_JAVA:BOOL=ON \
     -DVTK_WRAP_PYTHON:BOOL=ON \
     -DVTK_WRAP_TCL:BOOL=ON \
-    -DVTK_USE_QT:BOOL=ON \
-    -DVTK_INSTALL_QT_PLUGIN_DIR:STRING="/usr/lib/qt4/plugins" \
-    -DVTK_USE_GUISUPPORT:BOOL=ON \
     -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \
     ${cmake_system_flags} \
     ${cmake_system_python_flags} \
-    "${srcdir}/VTK$pkgver"
+    "${srcdir}/VTK-$pkgver"
 
   make
 }
@@ -111,17 +93,13 @@
 
   # Move the vtk.jar to the arch-specific location
   install -dv "${pkgdir}/usr/share/java/vtk"
-  mv -v "${pkgdir}/usr/lib/vtk-${pkgver:0:4}/java/vtk.jar" \
+  mv -v "${pkgdir}/usr/lib/vtk.jar" \
     "${pkgdir}/usr/share/java/vtk"
-  rm -rf "${pkgdir}/usr/lib/vtk-${pkgver:0:4}/java"
+  rm -rf "${pkgdir}/usr/lib/vtk-${_majorver}/java"
 
   # Install license
   install -dv "${pkgdir}/usr/share/licenses/vtk"
-  install -m644 "${srcdir}/VTK$pkgver/Copyright.txt" \
+  install -m644 "${srcdir}/VTK-$pkgver/Copyright.txt" \
     "${pkgdir}/usr/share/licenses/vtk"
-
-  # Put an entry in /etc/ld.so.conf.d
-  install -dv "${pkgdir}/etc/ld.so.conf.d"
-  echo "/usr/lib/vtk-${pkgver:0:4}" > "${pkgdir}/etc/ld.so.conf.d/vtk.conf"
 }
 

Deleted: ffmpeg-0.11.diff
===================================================================
--- ffmpeg-0.11.diff	2014-11-24 18:53:02 UTC (rev 123081)
+++ ffmpeg-0.11.diff	2014-11-24 19:50:11 UTC (rev 123082)
@@ -1,46 +0,0 @@
---- VTK/IO/vtkFFMPEGWriter.cxx.orig	2012-07-08 13:40:55.000000000 +0200
-+++ VTK/IO/vtkFFMPEGWriter.cxx	2012-07-08 13:59:37.000000000 +0200
-@@ -192,13 +192,6 @@
-     c->bit_rate_tolerance = this->Writer->GetBitRateTolerance();
-     }
- 
--  //apply the chosen parameters
--  if (av_set_parameters(this->avFormatContext, NULL) < 0)
--    {
--    vtkGenericWarningMacro (<< "Invalid output format parameters." );
--    return 0;
--    }
--
-   //manufacture a codec with the chosen parameters
-   AVCodec *codec = avcodec_find_encoder(c->codec_id);
-   if (!codec) 
-@@ -259,14 +252,14 @@
- 
- 
-   //Finally, open the file and start it off.
--  if (url_fopen(&this->avFormatContext->pb, this->avFormatContext->filename, URL_WRONLY) < 0) 
-+  if (avio_open(&this->avFormatContext->pb, this->avFormatContext->filename, AVIO_FLAG_WRITE) < 0) 
-     {
-     vtkGenericWarningMacro (<< "Could not open " << this->Writer->GetFileName() << "." );
-     return 0;
-     }
-   this->openedFile = 1;
- 
--  av_write_header(this->avFormatContext);
-+  avformat_write_header(this->avFormatContext, NULL);
-   return 1;
- }
- 
-@@ -388,11 +381,7 @@
-     if (this->openedFile)
-       {
-       av_write_trailer(this->avFormatContext);
--#ifdef VTK_FFMPEG_OLD_URL_FCLOSE
--      url_fclose(&this->avFormatContext->pb);
--#else
--      url_fclose(this->avFormatContext->pb);
--#endif
-+      avio_close(this->avFormatContext->pb);
-       this->openedFile = 0;
-       }
- 

Deleted: ffmpeg-0.8.diff
===================================================================
--- ffmpeg-0.8.diff	2014-11-24 18:53:02 UTC (rev 123081)
+++ ffmpeg-0.8.diff	2014-11-24 19:50:11 UTC (rev 123082)
@@ -1,66 +0,0 @@
-Description: Upstream changes introduced in version 5.6.1-6.1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- vtk (5.6.1-6.1) unstable; urgency=low
- .
-   [ Michael Schutte ]
-   * Non-maintainer upload.
-   * Remove absolute paths to required libraries from
-     /usr/lib/vtk-5.6/VTKLibraryDepends.cmake after building, closes:
-     #506992.  Due to the multiarch transition, the original behavior
-     frequently causes reverse build-deps to FTBFS.  This change should
-     probably be reverted once all required libraries are multiarched.
- .
-   [ Steve M. Robbins ]
-   * Override lintian diagnostic about embedded libraries ftgl and sqlite.
-   * IO/vtkFFMPEGWriter.cxx: Applied fix from #638246 to build with libav
-     0.7.
- .
- The person named in the Author field signed this changelog entry.
-Author: Steve M. Robbins <smr at debian.org>
-Bug-Debian: http://bugs.debian.org/506992
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- vtk-5.6.1.orig/IO/vtkFFMPEGWriter.cxx
-+++ vtk-5.6.1/IO/vtkFFMPEGWriter.cxx
-@@ -123,7 +123,7 @@ int vtkFFMPEGWriterInternal::Start()
-     }
- 
-   //choose avi media file format
--  this->avOutputFormat = guess_format("avi", NULL, NULL);
-+  this->avOutputFormat = av_guess_format("avi", NULL, NULL);
-   if (!this->avOutputFormat) 
-     {
-     vtkGenericWarningMacro (<< "Could not open the avi media file format.");
-@@ -150,7 +150,7 @@ int vtkFFMPEGWriterInternal::Start()
-   //Set up the codec.
-   AVCodecContext *c = this->avStream->codec;
-   c->codec_id = (CodecID)this->avOutputFormat->video_codec;
--  c->codec_type = CODEC_TYPE_VIDEO;
-+  c->codec_type = AVMEDIA_TYPE_VIDEO;
-   c->width = this->Dim[0];
-   c->height = this->Dim[1];
-   c->pix_fmt = PIX_FMT_YUVJ420P;
-@@ -329,7 +329,7 @@ int vtkFFMPEGWriterInternal::Write(vtkIm
-     pkt.stream_index = this->avStream->index;
-     if (cc->coded_frame->key_frame) //treat keyframes well
-       {
--      pkt.flags |= PKT_FLAG_KEY;
-+      pkt.flags |= AV_PKT_FLAG_KEY;
-       }
-     pkt.duration = 0; //presentation duration in time_base units or 0 if NA
-     pkt.pos = -1; //byte position in stream or -1 if NA

Deleted: ffmpeg-2.0.diff
===================================================================
--- ffmpeg-2.0.diff	2014-11-24 18:53:02 UTC (rev 123081)
+++ ffmpeg-2.0.diff	2014-11-24 19:50:11 UTC (rev 123082)
@@ -1,21 +0,0 @@
-diff -rupN a/IO/vtkFFMPEGWriter.cxx b/IO/vtkFFMPEGWriter.cxx
---- a/IO/vtkFFMPEGWriter.cxx	2013-07-22 18:29:24.625362910 +0000
-+++ b/IO/vtkFFMPEGWriter.cxx	2013-07-22 18:39:16.184515101 +0000
-@@ -149,7 +149,7 @@ int vtkFFMPEGWriterInternal::Start()
-   
-   //Set up the codec.
-   AVCodecContext *c = this->avStream->codec;
--  c->codec_id = (CodecID)this->avOutputFormat->video_codec;
-+  c->codec_id = (AVCodecID)this->avOutputFormat->video_codec;
-   c->codec_type = AVMEDIA_TYPE_VIDEO;
-   c->width = this->Dim[0];
-   c->height = this->Dim[1];
-@@ -199,7 +199,7 @@ int vtkFFMPEGWriterInternal::Start()
-     vtkGenericWarningMacro (<< "Codec not found." );
-     return 0;
-     }
--  if (avcodec_open(c, codec) < 0) 
-+  if (avcodec_open2(c, codec, NULL) < 0) 
-     {
-     vtkGenericWarningMacro (<< "Could not open codec.");
-     return 0;

Deleted: ffmpeg-2.4.diff
===================================================================
--- ffmpeg-2.4.diff	2014-11-24 18:53:02 UTC (rev 123081)
+++ ffmpeg-2.4.diff	2014-11-24 19:50:11 UTC (rev 123082)
@@ -1,59 +0,0 @@
-diff -rupN VTK5.10.1.orig/IO/vtkFFMPEGWriter.cxx VTK5.10.1/IO/vtkFFMPEGWriter.cxx
---- VTK5.10.1.orig/IO/vtkFFMPEGWriter.cxx	2014-09-16 21:06:54.681786419 +0200
-+++ VTK5.10.1/IO/vtkFFMPEGWriter.cxx	2014-09-16 21:36:23.589177218 +0200
-@@ -140,12 +140,13 @@ int vtkFFMPEGWriterInternal::Start()
-   strcpy(this->avFormatContext->filename, this->Writer->GetFileName());
- 
-   //create a stream for that file
--  this->avStream = av_new_stream(this->avFormatContext, 0);
-+  this->avStream = avformat_new_stream(this->avFormatContext, NULL);
-   if (!this->avStream) 
-     {
-     vtkGenericWarningMacro (<< "Could not create video stream.");
-     return 0;
-     }
-+  this->avStream->id = 0;
-   
-   //Set up the codec.
-   AVCodecContext *c = this->avStream->codec;
-@@ -217,7 +218,7 @@ int vtkFFMPEGWriterInternal::Start()
-     }
- 
-   //for the output of the writer's input...
--  this->rgbInput = avcodec_alloc_frame();
-+  this->rgbInput = av_frame_alloc();
-   if (!this->rgbInput)
-     {
-     vtkGenericWarningMacro (<< "Could not make rgbInput avframe." );
-@@ -234,7 +235,7 @@ int vtkFFMPEGWriterInternal::Start()
-   avpicture_fill((AVPicture *)this->rgbInput, rgb, PIX_FMT_RGB24, c->width, c->height);
- 
-   //and for the output to the codec's input.
--  this->yuvOutput = avcodec_alloc_frame();
-+  this->yuvOutput = av_frame_alloc();
-   if (!this->yuvOutput)
-     {
-     vtkGenericWarningMacro (<< "Could not make yuvOutput avframe." );
-@@ -314,12 +315,17 @@ int vtkFFMPEGWriterInternal::Write(vtkIm
-     }
- #endif
- 
--
-   //run the encoder
--  int toAdd = avcodec_encode_video(cc, 
--                                   this->codecBuf, 
--                                   this->codecBufSize, 
--                                   this->yuvOutput);
-+  AVPacket avpacket;
-+  int got_packet;
-+  av_init_packet(&avpacket);
-+  avpacket.data = this->codecBuf;
-+  avpacket.size = this->codecBufSize;
-+  int toAdd = avcodec_encode_video2(cc,
-+                                   &avpacket,
-+                                   this->yuvOutput,
-+                                   &got_packet);
-+  if (!toAdd && got_packet) toAdd = avpacket.size;
- 
-   //dump the compressed result to file
-   if (toAdd) 

Deleted: freetype.diff
===================================================================
--- freetype.diff	2014-11-24 18:53:02 UTC (rev 123081)
+++ freetype.diff	2014-11-24 19:50:11 UTC (rev 123082)
@@ -1,16 +0,0 @@
---- VTK5.10.1/CMake/FindFREETYPE.cmake.orig	2014-01-30 12:40:11.252760741 +0100
-+++ VTK5.10.1/CMake/FindFREETYPE.cmake	2014-01-30 12:40:43.235853875 +0100
-@@ -10,9 +10,11 @@
- # also defined, but not for general use are
- # FREETYPE_LIBRARY, where to find the FREETYPE library.
- 
--FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h)
-+FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h
-+  /usr/include/freetype2
-+)
- 
--FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER freetype/config/ftheader.h
-+FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER config/ftheader.h
-   /usr/include/freetype2
-   /usr/local/include/freetype2
-   PATH_SUFFIXES freetype2  

Added: hdf5.diff
===================================================================
--- hdf5.diff	                        (rev 0)
+++ hdf5.diff	2014-11-24 19:50:11 UTC (rev 123082)
@@ -0,0 +1,11 @@
+--- a/ThirdParty/netcdf/vtknetcdf/CMakeLists.txt.orig	2014-11-24 19:29:00.084619157 +0100
++++ b/ThirdParty/netcdf/vtknetcdf/CMakeLists.txt	2014-11-24 19:29:22.824443117 +0100
+@@ -233,7 +233,7 @@
+ if (NOT VTK_USE_SYSTEM_HDF5)
+   # using VTK's HDF5, we always build that with HL support.
+   set (USE_NETCDF4 ON)
+-elseif(HDF5_HL_LIBRARY OR HDF5_hdf5_hl_LIBRARY)
++elseif(HDF5_HL_LIBRARY OR HDF5_hdf5_hl_LIBRARY OR HDF5_hdf5_hl_LIBRARY_RELEASE)
+   set (USE_NETCDF4 ON)
+ else()
+   message(STATUS "Disabling NETCDF4 support since HDF5_HL or HDF5_hdf5_hl is missing.")

Added: mesa.diff
===================================================================
--- mesa.diff	                        (rev 0)
+++ mesa.diff	2014-11-24 19:50:11 UTC (rev 123082)
@@ -0,0 +1,11 @@
+--- a/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx.orig	2014-11-23 22:16:50.000000000 +0100
++++ b/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx	2014-11-23 22:16:59.000000000 +0100
+@@ -27,7 +27,7 @@
+ 
+ // define GLX_GLXEXT_LEGACY to prevent glx.h to include glxext.h provided by
+ // the system
+-//#define GLX_GLXEXT_LEGACY
++#define GLX_GLXEXT_LEGACY
+ #include "GL/glx.h"
+ 
+ #include "vtkgl.h"

Deleted: python-destdir.diff
===================================================================
--- python-destdir.diff	2014-11-24 18:53:02 UTC (rev 123081)
+++ python-destdir.diff	2014-11-24 19:50:11 UTC (rev 123082)
@@ -1,11 +0,0 @@
---- VTK/Wrapping/Python/CMakeLists.txt.orig	2013-02-02 12:56:08.067142089 +0100
-+++ VTK/Wrapping/Python/CMakeLists.txt	2013-02-02 12:58:16.182794679 +0100
-@@ -558,7 +558,7 @@
- 
-     # Create default python setup arguments if they are not set.
-     IF(NOT DEFINED VTK_PYTHON_SETUP_ARGS)
--      SET(VTK_PYTHON_SETUP_ARGS "--prefix=\"${DOLLAR}{CMAKE_INSTALL_PREFIX}\""
-+      SET(VTK_PYTHON_SETUP_ARGS "--root=\"${DOLLAR}DESTDIR\" --prefix=\"${DOLLAR}{CMAKE_INSTALL_PREFIX}\""
-         CACHE STRING "Arguments passed to \"python setup.py install ...\" during installation.")
-       MARK_AS_ADVANCED(VTK_PYTHON_SETUP_ARGS)
-     ENDIF(NOT DEFINED VTK_PYTHON_SETUP_ARGS)

Deleted: tcl-8.6.diff
===================================================================
--- tcl-8.6.diff	2014-11-24 18:53:02 UTC (rev 123081)
+++ tcl-8.6.diff	2014-11-24 19:50:11 UTC (rev 123082)
@@ -1,13 +0,0 @@
---- VTK5.10.1/Common/vtkTcl.h	2012-10-15 22:33:21.000000000 +0200
-+++ VTK5.10.1/Common/vtkTcl.h.new	2012-12-22 12:27:56.176482722 +0100
-@@ -17,6 +17,10 @@
- 
- #include "vtkConfigure.h"
- 
-+// see http://paraview.org/Bug/view.php?id=11810
-+#define USE_INTERP_RESULT
-+#define USE_INTERP_ERRORLINE
-+
- #ifdef VTK_TCL_TK_STATIC
- # ifndef STATIC_BUILD
- #  define STATIC_BUILD


More information about the arch-commits mailing list