diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /sci-misc/h5utils | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sci-misc/h5utils')
-rw-r--r-- | sci-misc/h5utils/Manifest | 1 | ||||
-rw-r--r-- | sci-misc/h5utils/files/h5utils-1.12.1-automagic.patch | 63 | ||||
-rw-r--r-- | sci-misc/h5utils/files/h5utils-1.12.1-png15.patch | 43 | ||||
-rw-r--r-- | sci-misc/h5utils/h5utils-1.12.1-r2.ebuild | 42 | ||||
-rw-r--r-- | sci-misc/h5utils/metadata.xml | 17 |
5 files changed, 166 insertions, 0 deletions
diff --git a/sci-misc/h5utils/Manifest b/sci-misc/h5utils/Manifest new file mode 100644 index 000000000000..e19bb57225ab --- /dev/null +++ b/sci-misc/h5utils/Manifest @@ -0,0 +1 @@ +DIST h5utils-1.12.1.tar.gz 156785 SHA256 7290290ca5d5d4451d757a70c86baaa70d23a28edb09c951b6b77c22b924a38d SHA512 b4295ac52ddfe922ed9f0a9079c69d6fdba5a261558d8c820a8feae592db3bd57a3394ab1fc9ceead00038a80bc70f32e0a8aa437cb33182899553bfdbf1f547 WHIRLPOOL c717c41545533eb0ba9f7d4813c42e3fbbec3ef292f8461ead0f0dcbe4e7530d64740dffb94cf25e839420ac4633082c06833ea5013a1a9eb276ef516d632f14 diff --git a/sci-misc/h5utils/files/h5utils-1.12.1-automagic.patch b/sci-misc/h5utils/files/h5utils-1.12.1-automagic.patch new file mode 100644 index 000000000000..8de8580cfe38 --- /dev/null +++ b/sci-misc/h5utils/files/h5utils-1.12.1-automagic.patch @@ -0,0 +1,63 @@ +--- configure.ac ++++ configure.ac +@@ -74,44 +74,23 @@ + + ########################################################################### + +-# Only build h5fromh4 if we are using a version of HDF5 prior to 1.4, and +-# thus don't have the superior h4toh5 utility. Similarly for h5toh4. +-AC_CHECK_PROG(H4TOH5, h4toh5, h4toh5) +-AC_CHECK_PROG(H5TOH4, h5toh4, h5toh4) +- +-AC_ARG_WITH(hdf4, +- [AC_HELP_STRING([--with-hdf4], [build hdf4 utils even if h4toh5 and h5toh4 are present])], +- ok=$withval, ok=maybe) +-if test "x$ok" = xyes; then +- H4TOH5="" +- H5TOH4="" +-elif test "x$ok" = xno; then +- H4TOH5="h4toh5" +- H5TOH4="h5toh4" +-fi +- +-HDF4=no +-if test "x$H4TOH5" != xh4toh5 -o "x$H5TOH4" != xh5toh4; then +- AC_CHECK_LIB(jpeg, jpeg_start_compress, +- [AC_CHECK_LIB(df, DFSDgetdata, +- [H4_LIBS="-ldf -ljpeg"; HDF4=yes], +- [AC_MSG_WARN([can't find libdf (HDF4): won't be able to compile h5fromh4 or h4fromh5])], -ljpeg)], +- [AC_MSG_WARN([can't find libjpeg: won't be able to compile h5fromh4 or h4fromh5])]) +- +- if test $HDF4 = yes; then +- if test "x$H4TOH5" != xh4toh5; then +- MORE_H5UTILS="h5fromh4\$(EXEEXT) $MORE_H5UTILS" +- MORE_H5UTILS_MANS="h5fromh4.1 $MORE_H5UTILS_MANS" +- fi +- if test "x$H5TOH4" != xh5toh4; then +- MORE_H5UTILS="h4fromh5\$(EXEEXT) $MORE_H5UTILS" +- # MORE_H5UTILS_MANS="h4fromh5.1 $MORE_H5UTILS_MANS" +- fi +- fi +-fi +-AC_CHECK_HEADERS(hdf.h hdf/hdf.h) ++AC_ARG_WITH([hdf], AS_HELP_STRING([--with-hdf], [build hdf4 utils even if h4toh5 and h5toh4 are present])) + +-AC_SUBST(H4_LIBS) ++AS_IF([test "x$with_hdf" = "xyes"], [ ++ AC_CHECK_HEADERS(hdf.h hdf/hdf.h) ++ AC_CHECK_LIB(jpeg, jpeg_start_compress, ++ [AC_CHECK_LIB(df, DFSDgetdata, ++ [H4_LIBS="-ldf -ljpeg"; HDF4=yes], ++ [AC_MSG_WARN([can't find libdf (HDF4): won't be able to compile h5fromh4 or h4fromh5])], -ljpeg)], ++ [AC_MSG_WARN([can't find libjpeg: won't be able to compile h5fromh4 or h4fromh5])]) ++ if test $HDF4 = yes; then ++ MORE_H5UTILS="h5fromh4\$(EXEEXT) $MORE_H5UTILS" ++ MORE_H5UTILS_MANS="h5fromh4.1 $MORE_H5UTILS_MANS" ++ MORE_H5UTILS="h4fromh5\$(EXEEXT) $MORE_H5UTILS" ++ fi ++ ++ AC_SUBST(H4_LIBS) ++]) + + ########################################################################### + diff --git a/sci-misc/h5utils/files/h5utils-1.12.1-png15.patch b/sci-misc/h5utils/files/h5utils-1.12.1-png15.patch new file mode 100644 index 000000000000..e611310145eb --- /dev/null +++ b/sci-misc/h5utils/files/h5utils-1.12.1-png15.patch @@ -0,0 +1,43 @@ +Fix build with png-1.5. + +https://bugs.gentoo.org/show_bug.cgi?id=378919 + +Patch stolen from NetBSD +--- writepng.c ++++ 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 */ + diff --git a/sci-misc/h5utils/h5utils-1.12.1-r2.ebuild b/sci-misc/h5utils/h5utils-1.12.1-r2.ebuild new file mode 100644 index 000000000000..80ddd86d1730 --- /dev/null +++ b/sci-misc/h5utils/h5utils-1.12.1-r2.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=true + +inherit autotools-utils + +DESCRIPTION="Utilities for visualization and conversion of HDF5 files" +HOMEPAGE="http://ab-initio.mit.edu/h5utils/" +SRC_URI="http://ab-initio.mit.edu/h5utils/${P}.tar.gz" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux" +IUSE="hdf octave" + +DEPEND=" + media-libs/libpng:0= + sci-libs/hdf5:0= + sys-libs/zlib:0= + hdf? ( + sci-libs/hdf:0= + virtual/jpeg + )" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-automagic.patch + "${FILESDIR}"/${P}-png15.patch +) + +src_configure() { + local myeconfargs=( + --without-v5d + $(use_with octave) + $(use_with hdf) + ) + autotools-utils_src_configure +} diff --git a/sci-misc/h5utils/metadata.xml b/sci-misc/h5utils/metadata.xml new file mode 100644 index 000000000000..3b1e1069c1a3 --- /dev/null +++ b/sci-misc/h5utils/metadata.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>sci</herd> +<longdescription> + h5utils is a set of utilities for visualization and conversion of + scientific data in the free, portable HDF5 format. + Besides providing a simple tool for batch visualization as PNG images, + h5utils also includes programs to convert HDF5 datasets into the + formats required by other free visualization software (e.g. plain + text, Vis5d, and VTK). +</longdescription> +<use> + <flag name="octave">Build Octave plugins</flag> + <flag name="hdf">Build hdf to hdf5 (and vice-versa) converter</flag> +</use> +</pkgmetadata> |