diff options
| author | Antoine Brodin <antoine@FreeBSD.org> | 2014-12-24 09:03:34 +0000 |
|---|---|---|
| committer | Antoine Brodin <antoine@FreeBSD.org> | 2014-12-24 09:03:34 +0000 |
| commit | 439d4a07a8e9ba5508f320214810a79d188a6891 (patch) | |
| tree | a90d9364703b03cc4c46af737d15588e0d261e24 /math/py-matplotlib | |
| parent | - Update to 1.595 (diff) | |
Properly support png15
Notes
Notes:
svn path=/head/; revision=375422
Diffstat (limited to 'math/py-matplotlib')
| -rw-r--r-- | math/py-matplotlib/Makefile | 2 | ||||
| -rw-r--r-- | math/py-matplotlib/files/patch-_png.cpp | 23 |
2 files changed, 1 insertions, 24 deletions
diff --git a/math/py-matplotlib/Makefile b/math/py-matplotlib/Makefile index a59a83dfb221..cffb03c86bd0 100644 --- a/math/py-matplotlib/Makefile +++ b/math/py-matplotlib/Makefile @@ -15,7 +15,7 @@ LICENSE= PSFL BUILD_DEPENDS= ${PYNUMPY} LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \ - libpng15.so:${PORTSDIR}/graphics/png + libpng.so:${PORTSDIR}/graphics/png RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=1.4:${PORTSDIR}/devel/py-dateutil \ ${PYTHON_PKGNAMEPREFIX}pytz>=0:${PORTSDIR}/devel/py-pytz \ diff --git a/math/py-matplotlib/files/patch-_png.cpp b/math/py-matplotlib/files/patch-_png.cpp deleted file mode 100644 index cfa0202a92c0..000000000000 --- a/math/py-matplotlib/files/patch-_png.cpp +++ /dev/null @@ -1,23 +0,0 @@ ---- src/_png.cpp.orig 2010-10-12 18:14:42.000000000 +0200 -+++ src/_png.cpp 2012-05-06 06:33:48.000000000 +0200 -@@ -20,6 +20,7 @@ - # include "Python.h" - - # include <png.h> -+# include <pngpriv.h> - #endif - - // TODO: Un CXX-ify this module -@@ -459,10 +460,10 @@ - - //free the png memory - png_read_end(png_ptr, info_ptr); --#ifndef png_infopp_NULL -+#ifndef NULL - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - #else -- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL); -+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - #endif - if (close_file) - { |