Attachment #184691 for bug #220994

View | Details | Raw Unified | Return to bug 220994
Collapse All | Expand All




# $FreeBSD: head/science/h5utils/Makefile 442050 2017-05-30 02:56:43Z sunpoet $

PORTNAME=	h5utils
PORTVERSION=	1.13
PORTREVISION=	7
CATEGORIES=	science
MASTER_SITES=	http://ab-initio.mit.edu/${PORTNAME}/

MAINTAINER=	aehlig@linta.de
COMMENT=	Set of utilities for visualization and conversion of HDF5 format

LICENSE=	MIT GPLv2
LICENSE_COMB=	multi
LICENSE_FILE=	${WRKSRC}/COPYING

GNU_CONFIGURE=	YES
CFLAGS +=	-L${LOCALBASE}/lib -I${LOCALBASE}/include -lpthread

		libpng.so:graphics/png \
		libmatheval.so:devel/libmatheval

USES=		autoreconf
GNU_CONFIGURE=	yes


USE_GITHUB=	yes
GH_ACCOUNT=	stevengj

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)h5utils/distinfo (-2 / +3 lines)
1	SHA256 (h5utils-1.12.1.tar.gz) = 7290290ca5d5d4451d757a70c86baaa70d23a28edb09c951b6b77c22b924a38d	1	TIMESTAMP = 1500963131
2	SIZE (h5utils-1.12.1.tar.gz) = 156785	2	SHA256 (stevengj-h5utils-1.13_GH0.tar.gz) = 894849f6d107b224bb1694029ad7d469695b0a6f47b564fe16c40f3d20c0b452
		3	SIZE (stevengj-h5utils-1.13_GH0.tar.gz) = 113735

Line 0 Link Here

(-)h5utils/files/patch-configure.ac (+11 lines)
	1	--- configure.ac.orig 2017-07-25 06:31:48 UTC
	2	+++ configure.ac
	3	@@ -68,7 +68,7 @@ AC_CHECK_LIB(matheval, evaluator_get_var
	4
	5	if test $H5MATH = yes; then
	6	MORE_H5UTILS="h5math\$(EXEEXT) $MORE_H5UTILS"
	7	- MORE_H5UTILS_MANS="h5math.1 $MORE_H5UTILS_MANS"
	8	+ MORE_H5UTILS_MANS="doc/man/h5math.1 $MORE_H5UTILS_MANS"
	9	else
	10	AC_MSG_WARN([can't find libmatheval: won't be able to compile h5math])
	11	fi




$NetBSD: patch-writepng.c,v 1.1 2011/02/01 09:05:31 wiz Exp $

Fix build with png-1.5.

--- writepng.c.orig	2009-06-12 20:58:50.000000000 +0000
+++ writepng.c
@@ -240,6 +240,8 @@ void writepng(char *filename,
      double skewsin = sin(skew), skewcos = cos(skew);
      REAL minoverlay = 0, maxoverlay = 0;
      png_byte mask_byte;
+     png_colorp palette = NULL;
+
 
      /* we must use direct color for translucent overlays */
      if (overlay)
@@ -309,7 +311,7 @@ void writepng(char *filename,
      }
      /* Set error handling.  REQUIRED if you aren't supplying your own *
       * error hadnling functions in the png_create_write_struct() call. */
-     if (setjmp(png_ptr->jmpbuf)) {
+     if (setjmp(png_jmpbuf(png_ptr))) {
 	  /* If we get here, we had a problem reading the file */
 	  fclose(fp);
 	  png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
@@ -334,8 +336,6 @@ void writepng(char *filename,
 		       PNG_INTERLACE_NONE,
 		       PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
      else {
-	  png_colorp palette;
-
 	  png_set_IHDR(png_ptr, info_ptr, width, height, 8 /* bit_depth */ ,
 		       PNG_COLOR_TYPE_PALETTE,
 		       PNG_INTERLACE_NONE,
@@ -434,7 +434,7 @@ void writepng(char *filename,
      png_write_end(png_ptr, info_ptr);
 
      /* if you malloced the palette, free it here */
-     free(info_ptr->palette);
+     free(palette);
 
      /* if you allocated any text comments, free them here */
 

Lines 6-9 Link Here

(-)h5utils/pkg-descr (-1 / +1 lines)
6	required by other free visualization software (e.g. plain text, Vis5d,	6	required by other free visualization software (e.g. plain text, Vis5d,
7	and VTK).	7	and VTK).
8		8
9	WWW: http://ab-initio.mit.edu/wiki/index.php/H5utils	9	WWW: https://github.com/stevengj/h5utils

Lines 8-13 Link Here

(-)h5utils/pkg-plist (+4 lines)
8	man/man1/h5topng.1.gz	8	man/man1/h5topng.1.gz
9	man/man1/h5totxt.1.gz	9	man/man1/h5totxt.1.gz
10	man/man1/h5tovtk.1.gz	10	man/man1/h5tovtk.1.gz
		11	%%DATADIR%%/colormaps/BrBG
		12	%%DATADIR%%/colormaps/RdBu
11	%%DATADIR%%/colormaps/autumn	13	%%DATADIR%%/colormaps/autumn
12	%%DATADIR%%/colormaps/bluered	14	%%DATADIR%%/colormaps/bluered
13	%%DATADIR%%/colormaps/bone	15	%%DATADIR%%/colormaps/bone
Lines 19-24 Link Here
19	%%DATADIR%%/colormaps/green	21	%%DATADIR%%/colormaps/green
20	%%DATADIR%%/colormaps/hot	22	%%DATADIR%%/colormaps/hot
21	%%DATADIR%%/colormaps/hsv	23	%%DATADIR%%/colormaps/hsv
		24	%%DATADIR%%/colormaps/inferno
22	%%DATADIR%%/colormaps/jet	25	%%DATADIR%%/colormaps/jet
23	%%DATADIR%%/colormaps/lines	26	%%DATADIR%%/colormaps/lines
24	%%DATADIR%%/colormaps/pink	27	%%DATADIR%%/colormaps/pink
Lines 26-31 Link Here
26	%%DATADIR%%/colormaps/spring	29	%%DATADIR%%/colormaps/spring
27	%%DATADIR%%/colormaps/summer	30	%%DATADIR%%/colormaps/summer
28	%%DATADIR%%/colormaps/vga	31	%%DATADIR%%/colormaps/vga
		32	%%DATADIR%%/colormaps/viridis
29	%%DATADIR%%/colormaps/winter	33	%%DATADIR%%/colormaps/winter
30	%%DATADIR%%/colormaps/yarg	34	%%DATADIR%%/colormaps/yarg
31	%%DATADIR%%/colormaps/yellow	35	%%DATADIR%%/colormaps/yellow

Return to bug 220994

Lines 2-18 Link Here

(-)h5utils/Makefile (-4 / +9 lines)
2	# $FreeBSD: head/science/h5utils/Makefile 442050 2017-05-30 02:56:43Z sunpoet $	2	# $FreeBSD: head/science/h5utils/Makefile 442050 2017-05-30 02:56:43Z sunpoet $
3		3
4	PORTNAME= h5utils	4	PORTNAME= h5utils
5	PORTVERSION= 1.12.1	5	PORTVERSION= 1.13
6	PORTREVISION= 7
7	CATEGORIES= science	6	CATEGORIES= science
8	MASTER_SITES= http://ab-initio.mit.edu/${PORTNAME}/
9		7
10	MAINTAINER= aehlig@linta.de	8	MAINTAINER= aehlig@linta.de
11	COMMENT= Set of utilities for visualization and conversion of HDF5 format	9	COMMENT= Set of utilities for visualization and conversion of HDF5 format
12		10
13	LICENSE= MIT GPLv2	11	LICENSE= MIT GPLv2
14	LICENSE_COMB= multi	12	LICENSE_COMB= multi
15	LICENSE_FILE= ${WRKSRC}/LICENSE	13	LICENSE_FILE= ${WRKSRC}/COPYING
16		14
17	GNU_CONFIGURE= YES	15	GNU_CONFIGURE= YES
18	CFLAGS += -L${LOCALBASE}/lib -I${LOCALBASE}/include -lpthread	16	CFLAGS += -L${LOCALBASE}/lib -I${LOCALBASE}/include -lpthread
Lines 22-25 Link Here
22	libpng.so:graphics/png \	20	libpng.so:graphics/png \
23	libmatheval.so:devel/libmatheval	21	libmatheval.so:devel/libmatheval
24		22
		23	USES= autoreconf
		24	GNU_CONFIGURE= yes
		25
		26
		27	USE_GITHUB= yes
		28	GH_ACCOUNT= stevengj
		29
25	.include <bsd.port.mk>	30	.include <bsd.port.mk>

Lines 1-42 Link Here

(-)h5utils/files/patch-writepng.c (-42 lines)
1	$NetBSD: patch-writepng.c,v 1.1 2011/02/01 09:05:31 wiz Exp $
2
3	Fix build with png-1.5.
4
5	--- writepng.c.orig 2009-06-12 20:58:50.000000000 +0000
6	+++ writepng.c
7	@@ -240,6 +240,8 @@ void writepng(char *filename,
8	double skewsin = sin(skew), skewcos = cos(skew);
9	REAL minoverlay = 0, maxoverlay = 0;
10	png_byte mask_byte;
11	+ png_colorp palette = NULL;
12	+
13
14	/* we must use direct color for translucent overlays */
15	if (overlay)
16	@@ -309,7 +311,7 @@ void writepng(char *filename,
17	}
18	/* Set error handling. REQUIRED if you aren't supplying your own *
19	* error hadnling functions in the png_create_write_struct() call. */
20	- if (setjmp(png_ptr->jmpbuf)) {
21	+ if (setjmp(png_jmpbuf(png_ptr))) {
22	/* If we get here, we had a problem reading the file */
23	fclose(fp);
24	png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
25	@@ -334,8 +336,6 @@ void writepng(char *filename,
26	PNG_INTERLACE_NONE,
27	PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
28	else {
29	- png_colorp palette;
30	-
31	png_set_IHDR(png_ptr, info_ptr, width, height, 8 /* bit_depth */ ,
32	PNG_COLOR_TYPE_PALETTE,
33	PNG_INTERLACE_NONE,
34	@@ -434,7 +434,7 @@ void writepng(char *filename,
35	png_write_end(png_ptr, info_ptr);
36
37	/* if you malloced the palette, free it here */
38	- free(info_ptr->palette);
39	+ free(palette);
40
41	/* if you allocated any text comments, free them here */
42