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 1S4Ahf-0004NX-58 for garchives@archives.gentoo.org; Sun, 04 Mar 2012 12:38:19 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 78A9FE065A; Sun, 4 Mar 2012 12:38:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 337F4E065A for ; Sun, 4 Mar 2012 12:38:11 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0B90E1B400A for ; Sun, 4 Mar 2012 12:38:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C854BE5401 for ; Sun, 4 Mar 2012 12:38:09 +0000 (UTC) From: "Jens-Malte Gottfried" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jens-Malte Gottfried" Message-ID: <1330864534.b1a67c63567b4cfa7aa8680bcfda77125ecb0de8.jmg@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-mathematics/petsc/files/, sci-mathematics/petsc/ X-VCS-Repository: proj/sci X-VCS-Files: sci-mathematics/petsc/files/petsc-fix-afterimage.patch sci-mathematics/petsc/files/petsc-fix-xops.patch sci-mathematics/petsc/petsc-3.2_p6.ebuild X-VCS-Directories: sci-mathematics/petsc/files/ sci-mathematics/petsc/ X-VCS-Committer: jmg X-VCS-Committer-Name: Jens-Malte Gottfried X-VCS-Revision: b1a67c63567b4cfa7aa8680bcfda77125ecb0de8 X-VCS-Branch: master Date: Sun, 4 Mar 2012 12:38:09 +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: 6df08411-bc67-478b-97f2-2b2ddcec54f7 X-Archives-Hash: 5b8aa0e8f887f7f4579d52ac2cc5186e commit: b1a67c63567b4cfa7aa8680bcfda77125ecb0de8 Author: Jens-Malte Gottfried web de> AuthorDate: Sun Mar 4 12:35:34 2012 +0000 Commit: Jens-Malte Gottfried godefridus de> CommitDate: Sun Mar 4 12:35:34 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3Db1a67c63 fixed undefined reference when using afterimage Still broken (waiting for upstream): - imagemagick - boost - sparse --- .../petsc/files/petsc-fix-afterimage.patch | 71 ++++++++++++++= ++++++ sci-mathematics/petsc/files/petsc-fix-xops.patch | 21 ++++++ sci-mathematics/petsc/petsc-3.2_p6.ebuild | 7 ++- 3 files changed, 98 insertions(+), 1 deletions(-) diff --git a/sci-mathematics/petsc/files/petsc-fix-afterimage.patch b/sci= -mathematics/petsc/files/petsc-fix-afterimage.patch new file mode 100644 index 0000000..27f4d3b --- /dev/null +++ b/sci-mathematics/petsc/files/petsc-fix-afterimage.patch @@ -0,0 +1,71 @@ + +# HG changeset patch +# User Jed Brown +# Date 1330818004 21600 +# Node ID fb79e104b74267c74aa64f125e7eb6a64bce4b14 +# Parent 8242202a123dd2cbfea7a4a2a9a1797951306f8d +Fixes for libAfterImage compilation, ImageMagick is still just a stub + +diff -r 8242202a123d -r fb79e104b742 config/PETSc/packages/afterimage.py +--- a/config/PETSc/packages/afterimage.py Sat Mar 03 16:05:00 2012 -0600 ++++ b/config/PETSc/packages/afterimage.py Sat Mar 03 17:40:04 2012 -0600 +@@ -9,6 +9,7 @@ + self.includedir =3D '' + self.libdir =3D '../../lib' + self.double =3D 0 ++ self.complex =3D 1 +=20 + def setupDependencies(self, framework): + PETSc.package.NewPackage.setupDependencies(self, framework) +diff -r 8242202a123d -r fb79e104b742 config/PETSc/packages/imagemagick.p= y +--- a/config/PETSc/packages/imagemagick.py Sat Mar 03 16:05:00 2012 -060= 0 ++++ b/config/PETSc/packages/imagemagick.py Sat Mar 03 17:40:04 2012 -060= 0 +@@ -4,8 +4,8 @@ + def __init__(self, framework): + PETSc.package.NewPackage.__init__(self, framework) + self.functions =3D ['IsMagickInstantiated'] +- self.includes =3D ['MagicCore/MagickCore.h'] +- self.liblist =3D [['libMagicCore.a']] ++ self.includes =3D ['magick/MagickCore.h'] ++ self.liblist =3D [['libMagickCore.a']] +=20 +=20 +=20 +diff -r 8242202a123d -r fb79e104b742 src/sys/draw/impls/x/xinit.c +--- a/src/sys/draw/impls/x/xinit.c Sat Mar 03 16:05:00 2012 -0600 ++++ b/src/sys/draw/impls/x/xinit.c Sat Mar 03 17:40:04 2012 -0600 +@@ -291,7 +291,7 @@ + #include + #undef __FUNCT__ =20 + #define __FUNCT__ "PetscDrawSave_X"=20 +-PetscErrorCode PetscDrawSave_X(PetscDraw draw,PetscViewer viewer) ++PetscErrorCode PetscDrawSave_X(PetscDraw draw) + { + PetscDraw_X *drawx =3D (PetscDraw_X*)draw->data; + XImage *image; +@@ -328,10 +328,10 @@ + void deflateEnd(void) {;} +=20 + #elif defined(PETSC_HAVE_IMAGEMAGICK) +-#include ++#include + #undef __FUNCT__ =20 + #define __FUNCT__ "PetscDrawSave_X"=20 +-PetscErrorCode PetscDrawSave_X(PetscDraw draw,PetscViewer viewer) ++PetscErrorCode PetscDrawSave_X(PetscDraw draw) + { + PetscDraw_X *drawx =3D (PetscDraw_X*)draw->data; + Image *image; +diff -r 8242202a123d -r fb79e104b742 src/sys/draw/impls/x/xops.c +--- a/src/sys/draw/impls/x/xops.c Sat Mar 03 16:05:00 2012 -0600 ++++ b/src/sys/draw/impls/x/xops.c Sat Mar 03 17:40:04 2012 -0600 +@@ -551,7 +551,7 @@ + PetscFunctionReturn(0); + } +=20 +-PetscErrorCode PetscDrawSave_X(PetscDraw,PetscViewer); ++PetscErrorCode PetscDrawSave_X(PetscDraw); + PetscErrorCode PetscDrawSetSave_X(PetscDraw,const char*); +=20 + static struct _PetscDrawOps DvOps =3D { PetscDrawSetDoubleBuffer_X, + diff --git a/sci-mathematics/petsc/files/petsc-fix-xops.patch b/sci-mathe= matics/petsc/files/petsc-fix-xops.patch new file mode 100644 index 0000000..cd2edeb --- /dev/null +++ b/sci-mathematics/petsc/files/petsc-fix-xops.patch @@ -0,0 +1,21 @@ + +# HG changeset patch +# User Jed Brown +# Date 1330812300 21600 +# Node ID 8242202a123dd2cbfea7a4a2a9a1797951306f8d +# Parent 759927945bb3cdd30ff4265c043264db5286d263 +Fix declaration of PetscDrawSave_X() + +diff -r 759927945bb3 -r 8242202a123d src/sys/draw/impls/x/xops.c +--- a/src/sys/draw/impls/x/xops.c Fri Mar 02 11:10:34 2012 -0600 ++++ b/src/sys/draw/impls/x/xops.c Sat Mar 03 16:05:00 2012 -0600 +@@ -551,7 +551,7 @@ + PetscFunctionReturn(0); + } +=20 +-PetscErrorCode PetscDrawSave_X(PetscDraw); ++PetscErrorCode PetscDrawSave_X(PetscDraw,PetscViewer); + PetscErrorCode PetscDrawSetSave_X(PetscDraw,const char*); +=20 + static struct _PetscDrawOps DvOps =3D { PetscDrawSetDoubleBuffer_X, + diff --git a/sci-mathematics/petsc/petsc-3.2_p6.ebuild b/sci-mathematics/= petsc/petsc-3.2_p6.ebuild index d3aecb0..0d972ed 100644 --- a/sci-mathematics/petsc/petsc-3.2_p6.ebuild +++ b/sci-mathematics/petsc/petsc-3.2_p6.ebuild @@ -16,11 +16,12 @@ LICENSE=3D"petsc" SLOT=3D"0" KEYWORDS=3D"~x86 ~amd64" IUSE=3D"afterimage boost complex-scalars cxx debug doc \ - fortran hdf5 hypre metis mpi sparse threads X" + imagemagick fortran hdf5 hypre metis mpi sparse threads X" =20 REQUIRED_USE=3D" hypre? ( cxx mpi ) hdf5? ( mpi ) + imagemagick? ( X ) afterimage? ( X ) " =20 @@ -33,6 +34,7 @@ RDEPEND=3D"mpi? ( virtual/mpi[cxx?,fortran?] ) hdf5? ( sci-libs/hdf5 ) boost? ( dev-libs/boost ) afterimage? ( media-libs/libafterimage ) + imagemagick? ( media-gfx/imagemagick ) sparse? ( sci-libs/cholmod ) " =20 @@ -47,6 +49,8 @@ src_prepare(){ epatch "${FILESDIR}/${PN}-configure-pic.patch" epatch "${FILESDIR}/${PN}-disable-env-warnings.patch" epatch "${FILESDIR}/${PN}-disable-rpath.patch" + epatch "${FILESDIR}/${PN}-fix-xops.patch" + epatch "${FILESDIR}/${PN}-fix-afterimage.patch" } =20 src_configure(){ @@ -126,6 +130,7 @@ src_configure(){ $(petsc_with boost) \ $(petsc_with hdf5) \ $(petsc_with hypre hypre /usr/$(get_libdir)/libHYPRE.so /usr/include/h= ypre) \ + $(petsc_with imagemagick imagemagick /usr/$(get_libdir)/libMagickCore.= so /usr/include/ImageMagick) \ $(petsc_with metis parmetis) \ $(petsc_with X x) \ $(petsc_with X x11) \