[gentoo-commits] proj/sci:master commit in: sci-mathematics/petsc/files/, sci-mathematics/petsc/

[Jens-Malte Gottfried]

commit:     b1a67c63567b4cfa7aa8680bcfda77125ecb0de8
Author:     Jens-Malte Gottfried <jmgottfried <AT> web <DOT> de>
AuthorDate: Sun Mar  4 12:35:34 2012 +0000
Commit:     Jens-Malte Gottfried <jmg <AT> godefridus <DOT> de>
CommitDate: Sun Mar  4 12:35:34 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b1a67c63

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 <jed@××××.org>
+# 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    = ''
+     self.libdir        = '../../lib'
+     self.double        = 0
++    self.complex       = 1
+ 
+   def setupDependencies(self, framework):
+     PETSc.package.NewPackage.setupDependencies(self, framework)
+diff -r 8242202a123d -r fb79e104b742 config/PETSc/packages/imagemagick.py
+--- a/config/PETSc/packages/imagemagick.py	Sat Mar 03 16:05:00 2012 -0600
++++ b/config/PETSc/packages/imagemagick.py	Sat Mar 03 17:40:04 2012 -0600
+@@ -4,8 +4,8 @@
+   def __init__(self, framework):
+     PETSc.package.NewPackage.__init__(self, framework)
+     self.functions     = ['IsMagickInstantiated']
+-    self.includes      = ['MagicCore/MagickCore.h']
+-    self.liblist       = [['libMagicCore.a']]
++    self.includes      = ['magick/MagickCore.h']
++    self.liblist       = [['libMagickCore.a']]
+ 
+ 
+ 
+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 <afterimage.h>
+ #undef __FUNCT__  
+ #define __FUNCT__ "PetscDrawSave_X" 
+-PetscErrorCode PetscDrawSave_X(PetscDraw draw,PetscViewer viewer)
++PetscErrorCode PetscDrawSave_X(PetscDraw draw)
+ {
+   PetscDraw_X              *drawx = (PetscDraw_X*)draw->data;
+   XImage                   *image;
+@@ -328,10 +328,10 @@
+ void deflateEnd(void) {;}
+ 
+ #elif defined(PETSC_HAVE_IMAGEMAGICK)
+-#include <MagicCore/MagickCore.h>
++#include <magick/MagickCore.h>
+ #undef __FUNCT__  
+ #define __FUNCT__ "PetscDrawSave_X" 
+-PetscErrorCode PetscDrawSave_X(PetscDraw draw,PetscViewer viewer)
++PetscErrorCode PetscDrawSave_X(PetscDraw draw)
+ {
+   PetscDraw_X  *drawx = (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);
+ }
+ 
+-PetscErrorCode PetscDrawSave_X(PetscDraw,PetscViewer);
++PetscErrorCode PetscDrawSave_X(PetscDraw);
+ PetscErrorCode PetscDrawSetSave_X(PetscDraw,const char*);
+ 
+ static struct _PetscDrawOps DvOps = { PetscDrawSetDoubleBuffer_X,
+

diff --git a/sci-mathematics/petsc/files/petsc-fix-xops.patch b/sci-mathematics/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 <jed@××××.org>
+# 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);
+ }
+ 
+-PetscErrorCode PetscDrawSave_X(PetscDraw);
++PetscErrorCode PetscDrawSave_X(PetscDraw,PetscViewer);
+ PetscErrorCode PetscDrawSetSave_X(PetscDraw,const char*);
+ 
+ static struct _PetscDrawOps DvOps = { 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="petsc"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE="afterimage boost complex-scalars cxx debug doc \
-	fortran hdf5 hypre metis mpi sparse threads X"
+	imagemagick fortran hdf5 hypre metis mpi sparse threads X"
 
 REQUIRED_USE="
 	hypre? ( cxx mpi )
 	hdf5? ( mpi )
+	imagemagick? ( X )
 	afterimage? ( X )
 "
 
@@ -33,6 +34,7 @@ RDEPEND="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 )
 "
 
@@ -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"
 }
 
 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/hypre) \
+		$(petsc_with imagemagick imagemagick /usr/$(get_libdir)/libMagickCore.so /usr/include/ImageMagick) \
 		$(petsc_with metis parmetis) \
 		$(petsc_with X x) \
 		$(petsc_with X x11) \