[arch-commits] Commit in vtk/trunk (PKGBUILD python-destdir.diff)

[Andrzej Giniewicz]

    Date: Saturday, February 2, 2013 @ 13:56:19
  Author: aginiewicz
Revision: 83520

upgpkg: vtk 5.10.1-3

removed pkgdir from build

Added:
  vtk/trunk/python-destdir.diff
Modified:
  vtk/trunk/PKGBUILD

---------------------+
 PKGBUILD            |    9 +++++----
 python-destdir.diff |   11 +++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-02 12:19:37 UTC (rev 83519)
+++ PKGBUILD	2013-02-02 12:56:19 UTC (rev 83520)
@@ -10,7 +10,7 @@
 
 pkgname=vtk
 pkgver=5.10.1
-pkgrel=2
+pkgrel=3
 pkgdesc='A software system for 3D computer graphics, image processing, and visualization.'
 arch=('i686' 'x86_64')
 url='http://www.vtk.org/'
@@ -24,12 +24,13 @@
             '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 tcl-8.6.diff)
+        ffmpeg-0.8.diff ffmpeg-0.11.diff tcl-8.6.diff python-destdir.diff)
 md5sums=('264b0052e65bd6571a84727113508789'
          'b6355063264cd56bcd1396c92f6ca59a'
          'e992321c9d1def6034d0fa6607b40c5a'
          '81922ea61989e5591135f233a0400694'
-         'a804a9f034e24ef1a8b28542c15ce1a1')
+         'a804a9f034e24ef1a8b28542c15ce1a1'
+         'f7aba715bcc10de93a6ecf1cd6b0c560')
 
 build() {
   cd "${srcdir}"/VTK$pkgver
@@ -38,6 +39,7 @@
   patch -Np1 -i "${srcdir}/ffmpeg-0.8.diff"
   patch -Np1 -i "${srcdir}/ffmpeg-0.11.diff"
   patch -Np1 -i "${srcdir}/tcl-8.6.diff"
+  patch -Np1 -i "${srcdir}/python-destdir.diff"
 
   cd "${srcdir}"
 
@@ -75,7 +77,6 @@
     -DVTK_WRAP_JAVA:BOOL=ON \
     -DVTK_WRAP_PYTHON:BOOL=ON \
     -DVTK_WRAP_TCL:BOOL=ON \
-    -DVTK_PYTHON_SETUP_ARGS:STRING="--root='${pkgdir}'" \
     -DVTK_USE_QT:BOOL=ON \
     -DVTK_INSTALL_QT_PLUGIN_DIR:STRING="/usr/lib/qt/plugins" \
     -DVTK_USE_GUISUPPORT:BOOL=ON \

Added: python-destdir.diff
===================================================================
--- python-destdir.diff	                        (rev 0)
+++ python-destdir.diff	2013-02-02 12:56:19 UTC (rev 83520)
@@ -0,0 +1,11 @@
+--- 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)