diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-10 11:18:50 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-10 11:18:50 -0300 |
| commit | be51ad4280764191b91e8c27baca29a30475e483 (patch) | |
| tree | 0794eb362f0c718d1c199efef58eb7248d27f311 /community/vtk | |
| parent | 06a22f3bf7a44edf24bd02b6023cf05a6bc77256 (diff) | |
| parent | 8634a064b17334eb58699897220aeed2fc9a54db (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/solfege/PKGBUILD
core/udev/PKGBUILD
testing/moc/PKGBUILD
testing/mod_perl/PKGBUILD
testing/pidgin/PKGBUILD
Diffstat (limited to 'community/vtk')
| -rw-r--r-- | community/vtk/PKGBUILD | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD index de7c26dba..585ffb34a 100644 --- a/community/vtk/PKGBUILD +++ b/community/vtk/PKGBUILD @@ -1,4 +1,5 @@ # Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Christofer Bertonha <christoferbertonha at gmail dot com> # Contributor: leepesjee <lpeschier at xs4all dot nl> # Contributor: Olivier Medoc # Contributor: ignotus @@ -7,7 +8,7 @@ pkgname=vtk pkgver=5.6.1 -pkgrel=6 +pkgrel=7 pkgdesc='A software system for 3D computer graphics, image processing, and visualization which supports a wide variety of visualization algorithms and advanced modeling techniques.' arch=('i686' 'x86_64' 'mips64el') url='http://www.vtk.org' @@ -32,7 +33,7 @@ build() { # remove next time version bump sed -i '31 i#include <vtksys/cstddef>' Common/vtkPythonUtil.cxx - # fix for libpng 1.4 + # fix for libpng 1.4 - remove next time version bump for _FILE in `grep -Rl "png_set_gray_1_2_4_to_8" *` do sed -i 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' ${_FILE} @@ -72,9 +73,9 @@ build() { -DVTK_WRAP_JAVA:BOOL=ON \ -DVTK_WRAP_PYTHON:BOOL=ON \ -DVTK_WRAP_TCL:BOOL=ON \ - -DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=${pkgdir}/usr" \ + -DVTK_PYTHON_SETUP_ARGS:STRING="--root=${pkgdir}" \ -DVTK_USE_QT:BOOL=ON \ - -DDESIRED_QT_VERSION:STRING=4 \ + -DVTK_INSTALL_QT_PLUGIN_DIR:STRING="/usr/lib/qt/plugins" \ -DVTK_USE_GUISUPPORT:BOOL=ON \ -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \ -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \ @@ -95,11 +96,6 @@ package() { mv -v ${pkgdir}/usr/lib/${pkgname}-${pkgver:0:3}/java/${pkgname}.jar \ ${pkgdir}/usr/share/java/${pkgname} - # Move the qt-designer plugin to the appropriate location - install -dv ${pkgdir}/usr/lib/qt - mv -v ${pkgdir}/usr/plugins \ - ${pkgdir}/usr/lib/qt - # Install license install -dv ${pkgdir}/usr/share/licenses/${pkgname} install -m644 ${srcdir}/VTK/Copyright.txt \ |