On Feb 6, 2:49 am, mabshoff <mabsh...@googlemail.com> wrote:
> On Feb 6, 1:47 am, mhampton <hampto...@gmail.com> wrote:
>
> > Three cheers! Hooray! Hooray! Hooray!
>
> > I think I've had things related to this crop up several times, and I
> > am glad you have resolved it (crossing my fingers!).
>
> > -Marshall
>
> Well, we are not quite there yet, but if you don't want to do any more
> development on a Sage install at least on OSX 10.5 you just delete
> libpng.* and all is well, i.e. Sage passes its doctests and you can
> execute any code that is linked against frameworks without penalty.
Ok, since this issue is impeding the needed bits for the new multiedge
plotting code for graphs due to dependencies on the MPL.spkg update I
took a gamble and it turned out that my guess was correct: We need
three trivial patches and an spkg update. Since I am updating the
linpng.spkg anyway in 3.3.rc1 I might as well do the other three
fixes.
For the record, but I will open the three remaining tickets in the
next couple hours.
Cheers,
Michael
libpng12 Changes
* delete libpng.* on $SAGE_LOCAL/lib/ in the libpng.spkg
* patch matplotlib's libpng detection code to
diff -r e9c8b372cab7 patches/setupext.py
--- a/patches/setupext.py Mon Jan 19 06:47:20 2009 -0500
+++ b/patches/setupext.py Fri Feb 13 03:48:59 2009 -0800
@@ -574,7 +574,7 @@
module.include_dirs.append(numpy.get_include())
def add_png_flags(module):
- try_pkgconfig(module, 'libpng', 'png')
+ try_pkgconfig(module, 'libpng12', 'png12')
add_base_flags(module)
add_numpy_flags(module)
module.libraries.append('z')
* path the Sage library's matrix_mod2_dense to link against png12:
# HG changeset patch
# User michaelabsh...@sprocketer.local
# Date 1234523512 28800
# Node ID fc08a7e8da116f9596376a1205670b410ea84145
# Parent 038b84f34083060e79bdfa442493d1b56314b2a3
Link matrix_mod2_dense against libpng12 instead of libpng
diff -r 038b84f34083 -r fc08a7e8da11 module_list.py
--- a/module_list.py Wed Feb 11 00:01:24 2009 -0800
+++ b/module_list.py Fri Feb 13 03:11:52 2009 -0800
@@ -581,7 +581,7 @@
Extension('sage.matrix.matrix_mod2_dense',
sources = ['sage/matrix/matrix_mod2_dense.pyx'],
- libraries = ['gmp','m4ri', 'png', 'gd']),
+ libraries = ['gmp','m4ri', 'png12', 'gd']),
Extension('sage.matrix.matrix_modn_dense',
sources = ['sage/matrix/matrix_modn_dense.pyx'],
* tachyon - in src/unix/Make-config change -lpng to -lpng12
USEPNG= -DUSEPNG
PNGINC= -I$(SAGE_LOCAL)/include
PNGLIB= -L$(SAGE_LOCAL)/lib -lpng12 -lz
We can probably set PNGLIB in spkg-install, so we don't have to edit
any build system files.
--~--~---------~--~----~------------~-------~--~----~
To post to this group, send email to sage-devel@googlegroups.com
To unsubscribe from this group, send email to
sage-devel-unsubscr...@googlegroups.com
For more options, visit this group at http://groups.google.com/group/sage-devel
URLs: http://www.sagemath.org
-~----------~----~----~----~------~----~------~--~---
