From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QB35w-0003wM-Qr for garchives@archives.gentoo.org; Sat, 16 Apr 2011 10:51:17 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 30BC01C016; Sat, 16 Apr 2011 10:51:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E6DB81C016 for ; Sat, 16 Apr 2011 10:51:09 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 67F8E1B405E for ; Sat, 16 Apr 2011 10:51:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id C7DFA80065 for ; Sat, 16 Apr 2011 10:51:08 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/vtk/files/, sci-libs/vtk/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/vtk/ChangeLog sci-libs/vtk/files/vtk-5.6.1-ffmpeg.patch sci-libs/vtk/vtk-5.6.1.ebuild X-VCS-Directories: sci-libs/vtk/files/ sci-libs/vtk/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: d3993511db935821b54229eb37e6af6007e29e96 Date: Sat, 16 Apr 2011 10:51:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 552f11ada6cf7d84aa7c93141b79665c commit: d3993511db935821b54229eb37e6af6007e29e96 Author: Justin Lecher gentoo org> AuthorDate: Sat Apr 16 10:46:44 2011 +0000 Commit: Justin Lecher gentoo org> CommitDate: Sat Apr 16 10:46:44 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3Dd3993511 Made ebuild tree ready (Portage version: 2.2.0_alpha30/git/Linux x86_64, signed Manifest commit = with key 70EB7916) --- sci-libs/vtk/ChangeLog | 4 ++ sci-libs/vtk/files/vtk-5.6.1-ffmpeg.patch | 42 ++++++++++++++++++++ sci-libs/vtk/vtk-5.6.1.ebuild | 61 +++++++++++------------= ------ 3 files changed, 69 insertions(+), 38 deletions(-) diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog index 397a606..d8f4cfb 100644 --- a/sci-libs/vtk/ChangeLog +++ b/sci-libs/vtk/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.78 2010/07= /24 18:25:18 jlec Exp $ =20 + 16 Apr 2011; Justin Lecher vtk-5.6.1.ebuild, + +files/vtk-5.6.1-ffmpeg.patch: + Made ebuild tree ready + 07 Mar 2011; Justin Lecher vtk-5.6.1.ebuild: Correct Slots for gtk 3 introduction to tree =20 diff --git a/sci-libs/vtk/files/vtk-5.6.1-ffmpeg.patch b/sci-libs/vtk/fil= es/vtk-5.6.1-ffmpeg.patch new file mode 100644 index 0000000..0a34777 --- /dev/null +++ b/sci-libs/vtk/files/vtk-5.6.1-ffmpeg.patch @@ -0,0 +1,42 @@ + CMake/vtkFFMPEGTestAvAlloc.cxx | 2 +- + CMake/vtkFFMPEGTestURLFClose.cxx | 2 +- + IO/vtkFFMPEGWriter.cxx | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/CMake/vtkFFMPEGTestAvAlloc.cxx b/CMake/vtkFFMPEGTestAvAlloc= .cxx +index ad691e3..32489d5 100644 +--- a/CMake/vtkFFMPEGTestAvAlloc.cxx ++++ b/CMake/vtkFFMPEGTestAvAlloc.cxx +@@ -1,6 +1,6 @@ + extern "C" { + #ifdef HAS_OLD_HEADER +-# include ++# include + #else + # include + #endif +diff --git a/CMake/vtkFFMPEGTestURLFClose.cxx b/CMake/vtkFFMPEGTestURLFC= lose.cxx +index 0bf4314..1c10a93 100644 +--- a/CMake/vtkFFMPEGTestURLFClose.cxx ++++ b/CMake/vtkFFMPEGTestURLFClose.cxx +@@ -1,6 +1,6 @@ + extern "C" { + #ifdef HAS_OLD_HEADER +-# include ++# include + #else + # include + #endif +diff --git a/IO/vtkFFMPEGWriter.cxx b/IO/vtkFFMPEGWriter.cxx +index 52673ef..ffbb78f 100644 +--- a/IO/vtkFFMPEGWriter.cxx ++++ b/IO/vtkFFMPEGWriter.cxx +@@ -22,7 +22,7 @@ +=20 + extern "C" { + #ifdef VTK_FFMPEG_HAS_OLD_HEADER +-# include ++# include + #else + # include + #endif diff --git a/sci-libs/vtk/vtk-5.6.1.ebuild b/sci-libs/vtk/vtk-5.6.1.ebuil= d index 0310b79..e282aff 100644 --- a/sci-libs/vtk/vtk-5.6.1.ebuild +++ b/sci-libs/vtk/vtk-5.6.1.ebuild @@ -26,7 +26,7 @@ RDEPEND=3D" examples? ( x11-libs/qt-core:4[qt3support] x11-libs/qt-gui:4[qt3support] ) - ffmpeg? ( media-video/ffmpeg ) + ffmpeg? ( virtual/ffmpeg ) java? ( >=3Dvirtual/jre-1.5 ) mpi? ( virtual/mpi[cxx,romio] ) mysql? ( virtual/mysql ) @@ -38,9 +38,9 @@ RDEPEND=3D" x11-libs/qt-opengl:4 x11-libs/qt-sql:4 x11-libs/qt-webkit:4 ) - tcl? ( >=3Ddev-lang/tcl-8.2.3 ) + tcl? ( dev-lang/tcl ) theora? ( media-libs/libtheora ) - tk? ( >=3Ddev-lang/tk-8.2.3 ) + tk? ( dev-lang/tk ) R? ( dev-lang/R ) dev-libs/expat dev-libs/libxml2:2 @@ -57,8 +57,7 @@ RDEPEND=3D" DEPEND=3D"${RDEPEND} java? ( >=3Dvirtual/jdk-1.5 ) boost? ( >=3Ddev-libs/boost-1.40.0[mpi?] ) - mpi? ( >=3Ddev-util/cmake-2.8.1-r2 ) - >=3Ddev-util/cmake-2.6" + dev-util/cmake" =20 S=3D"${WORKDIR}"/VTK =20 @@ -76,12 +75,15 @@ pkg_setup() { } =20 src_prepare() { - epatch "${FILESDIR}"/${PN}-5.6.0-cg-path.patch - epatch "${FILESDIR}"/${PN}-5.2.0-tcl-install.patch - epatch "${FILESDIR}"/${PN}-5.6.0-boost-property_map.patch - epatch "${FILESDIR}"/${PN}-5.6.0-libpng14.patch - epatch "${FILESDIR}"/${PN}-5.6.0-R.patch - epatch "${FILESDIR}"/${PN}-5.6.0-odbc.patch + epatch \ + "${FILESDIR}"/${PN}-5.6.0-cg-path.patch \ + "${FILESDIR}"/${PN}-5.2.0-tcl-install.patch \ + "${FILESDIR}"/${PN}-5.6.0-boost-property_map.patch \ + "${FILESDIR}"/${PN}-5.6.0-libpng14.patch \ + "${FILESDIR}"/${PN}-5.6.0-R.patch \ + "${FILESDIR}"/${PN}-5.6.0-odbc.patch \ + "${FILESDIR}"/${P}-ffmpeg.patch + # Fix sure buffer overflow on some processors as reported by Flameyes i= n #338819 sed -e "s:CHIPNAME_STRING_LENGTH (48 + 1):CHIPNAME_STRING_LENGTH = (79 + 1):" \ -i Utilities/kwsys/SystemInformation.cxx \ @@ -199,30 +201,11 @@ src_install() { =20 # install examples if use examples; then - dodir /usr/share/${PN} || \ - die "Failed to create data/examples directory" - - cp -pPR "${S}"/Examples "${D}"/usr/share/${PN}/examples || \ - die "Failed to copy example files" - - # fix example's permissions - find "${D}"/usr/share/${PN}/examples -type d -exec \ - chmod 0755 {} \; || \ - die "Failed to fix example directories permissions" - find "${D}"/usr/share/${PN}/examples -type f -exec \ - chmod 0644 {} \; || \ - die "Failed to fix example files permissions" - - cp -pPR "${WORKDIR}"/VTKData "${D}"/usr/share/${PN}/data || \ - die "Failed to copy data files" - - # fix data's permissions - find "${D}"/usr/share/${PN}/data -type d -exec \ - chmod 0755 {} \; || \ - die "Failed to fix data directories permissions" - find "${D}"/usr/share/${PN}/data -type f -exec \ - chmod 0644 {} \; || \ - die "Failed to fix data files permissions" + insinto /usr/share/${PN} + mv -v Examples examples + doins -r examples || die + mv -v VTKData data || die + doins -r data || die fi =20 #install big docs @@ -235,9 +218,11 @@ src_install() { fi =20 # environment - echo "VTK_DATA_ROOT=3D/usr/share/${PN}/data" >> "${T}"/40${PN} - echo "VTK_DIR=3D/usr/$(get_libdir)/${PN}-${SPV}" >> "${T}"/40${PN} - echo "VTKHOME=3D/usr" >> "${T}"/40${PN} + cat >> "${T}"/40${PN} <<- EOF + VTK_DATA_ROOT=3D${EPREFIX}/usr/share/${PN}/data + VTK_DIR=3D${EPREFIX}/usr/$(get_libdir)/${PN}-${SPV} + VTKHOME=3D${EPREFIX}/usr + EOF doenvd "${T}"/40${PN} } =20