| 1 |
jlec 12/02/10 19:36:06 |
| 2 |
|
| 3 |
Modified: ChangeLog vtk-5.8.0.ebuild |
| 4 |
Log: |
| 5 |
Backport patch for boost-4.48, #400901 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha85/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.94 sci-libs/vtk/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.94&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.94&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?r1=1.93&r2=1.94 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v |
| 19 |
retrieving revision 1.93 |
| 20 |
retrieving revision 1.94 |
| 21 |
diff -u -r1.93 -r1.94 |
| 22 |
--- ChangeLog 10 Feb 2012 18:55:37 -0000 1.93 |
| 23 |
+++ ChangeLog 10 Feb 2012 19:36:06 -0000 1.94 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for sci-libs/vtk |
| 26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.93 2012/02/10 18:55:37 jlec Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.94 2012/02/10 19:36:06 jlec Exp $ |
| 29 |
+ |
| 30 |
+ 10 Feb 2012; Justin Lecher <jlec@g.o> vtk-5.8.0.ebuild, |
| 31 |
+ +files/vtk-5.8.0-boost.patch: |
| 32 |
+ Backport patch for boost-4.48, #400901 |
| 33 |
|
| 34 |
10 Feb 2012; Justin Lecher <jlec@g.o> -vtk-5.4.2-r1.ebuild, |
| 35 |
-vtk-5.6.0-r2.ebuild, -vtk-5.6.0-r3.ebuild, vtk-5.6.1.ebuild, |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.5 sci-libs/vtk/vtk-5.8.0.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild?rev=1.5&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild?rev=1.5&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild?r1=1.4&r2=1.5 |
| 44 |
|
| 45 |
Index: vtk-5.8.0.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild,v |
| 48 |
retrieving revision 1.4 |
| 49 |
retrieving revision 1.5 |
| 50 |
diff -u -r1.4 -r1.5 |
| 51 |
--- vtk-5.8.0.ebuild 10 Feb 2012 18:55:37 -0000 1.4 |
| 52 |
+++ vtk-5.8.0.ebuild 10 Feb 2012 19:36:06 -0000 1.5 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2012 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild,v 1.4 2012/02/10 18:55:37 jlec Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild,v 1.5 2012/02/10 19:36:06 jlec Exp $ |
| 58 |
|
| 59 |
EAPI=3 |
| 60 |
|
| 61 |
@@ -74,6 +74,7 @@ |
| 62 |
"${FILESDIR}"/${PN}-5.6.0-odbc.patch |
| 63 |
"${FILESDIR}"/${PN}-5.6.1-ffmpeg.patch |
| 64 |
"${FILESDIR}"/${PN}-5.6.1-libav-0.8.patch |
| 65 |
+ "${FILESDIR}"/${P}-boost.patch |
| 66 |
) |
| 67 |
|
| 68 |
pkg_setup() { |
| 69 |
@@ -97,8 +98,8 @@ |
| 70 |
-DCMAKE_SKIP_RPATH=YES |
| 71 |
-DVTK_DIR="${S}" |
| 72 |
-DVTK_INSTALL_LIB_DIR=/$(get_libdir)/ |
| 73 |
- -DVTK_DATA_ROOT:PATH="${EPREFIX}"/usr/share/${PN}/data |
| 74 |
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr |
| 75 |
+ -DVTK_DATA_ROOT:PATH="${EPREFIX}/usr/share/${PN}/data" |
| 76 |
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" |
| 77 |
-DBUILD_SHARED_LIBS=ON |
| 78 |
-DVTK_USE_SYSTEM_EXPAT=ON |
| 79 |
-DVTK_USE_SYSTEM_FREETYPE=ON |
| 80 |
@@ -108,8 +109,8 @@ |
| 81 |
-DVTK_USE_SYSTEM_TIFF=ON |
| 82 |
-DVTK_USE_SYSTEM_ZLIB=ON |
| 83 |
-DVTK_USE_SYSTEM_HDF5=ON |
| 84 |
- -DHDF5_LIBRARY="${EPREFIX}"/usr/$(get_libdir) |
| 85 |
- -DHDF5_INCLUDE_DIRS="${EPREFIX}"/usr/include |
| 86 |
+ -DHDF5_LIBRARY="${EPREFIX}/usr/$(get_libdir)" |
| 87 |
+ -DHDF5_INCLUDE_DIRS="${EPREFIX}/usr/include" |
| 88 |
-DBUILD_TESTING=OFF |
| 89 |
-DBUILD_EXAMPLES=OFF |
| 90 |
-DVTK_USE_HYBRID=ON |
| 91 |
@@ -143,10 +144,10 @@ |
| 92 |
mycmakeargs+=( |
| 93 |
-DVTK_WRAP_TCL=ON |
| 94 |
-DVTK_WRAP_TK=ON |
| 95 |
- -DVTK_TCL_INCLUDE_DIR="${EPREFIX}"/usr/include |
| 96 |
- -DVTK_TCL_LIBRARY="${EPREFIX}"/usr/$(get_libdir) |
| 97 |
- -DVTK_TK_INCLUDE_DIR="${EPREFIX}"/usr/include |
| 98 |
- -DVTK_TK_LIBRARY="${EPREFIX}"/usr/$(get_libdir) |
| 99 |
+ -DVTK_TCL_INCLUDE_DIR="${EPREFIX}/usr/include" |
| 100 |
+ -DVTK_TCL_LIBRARY="${EPREFIX}/usr/$(get_libdir)" |
| 101 |
+ -DVTK_TK_INCLUDE_DIR="${EPREFIX}/usr/include" |
| 102 |
+ -DVTK_TK_LIBRARY="${EPREFIX}/usr/$(get_libdir)" |
| 103 |
) |
| 104 |
|
| 105 |
use theora && |
| 106 |
@@ -178,9 +179,9 @@ |
| 107 |
-DVTK_WRAP_PYTHON_SIP=ON |
| 108 |
-DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip" |
| 109 |
-DSIP_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)" |
| 110 |
- -DPYTHON_INCLUDE_DIR="${EPREFIX}"$(python_get_includedir) |
| 111 |
+ -DPYTHON_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)" |
| 112 |
-DPYTHON_LIBRARY="${EPREFIX}$(python_get_library)" |
| 113 |
- -DVTK_PYTHON_INCLUDE_DIR="${EPREFIX}"$(python_get_includedir) |
| 114 |
+ -DVTK_PYTHON_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)" |
| 115 |
-DVTK_PYTHON_LIBRARY="${EPREFIX}$(python_get_library)" |
| 116 |
-DVTK_PYTHON_SETUP_ARGS:STRING=--root="${D}") |
| 117 |
fi |
| 118 |
@@ -195,10 +196,10 @@ |
| 119 |
-DQT_WRAP_UI=ON |
| 120 |
-DVTK_INSTALL_QT_DIR=/$(get_libdir)/qt4/plugins/${PN} |
| 121 |
-DDESIRED_QT_VERSION=4 |
| 122 |
- -DQT_MOC_EXECUTABLE="${EPREFIX}"/usr/bin/moc |
| 123 |
- -DQT_UIC_EXECUTABLE="${EPREFIX}"/usr/bin/uic |
| 124 |
- -DQT_INCLUDE_DIR="${EPREFIX}"/usr/include/qt4 |
| 125 |
- -DQT_QMAKE_EXECUTABLE="${EPREFIX}"/usr/bin/qmake) |
| 126 |
+ -DQT_MOC_EXECUTABLE="${EPREFIX}/usr/bin/moc" |
| 127 |
+ -DQT_UIC_EXECUTABLE="${EPREFIX}/usr/bin/uic" |
| 128 |
+ -DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt4" |
| 129 |
+ -DQT_QMAKE_EXECUTABLE="${EPREFIX}/usr/bin/qmake") |
| 130 |
fi |
| 131 |
|
| 132 |
cmake-utils_src_configure |
Archives