* [gentoo-commits] repo/gentoo:master commit in: sci-misc/h5utils/files/, sci-misc/h5utils/
@ 2021-01-24 13:49 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2021-01-24 13:49 UTC (permalink / raw
To: gentoo-commits
commit: 2afadf2e1c5f6ce1c7abc35fa6833f35d89bc1ff
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sun Jan 24 13:48:25 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 13:48:25 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2afadf2e
sci-misc/h5utils: Bump to 1.13.1
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sci-misc/h5utils/Manifest | 1 +
.../h5utils/files/h5utils-1.13.1-automagic.patch | 64 ++++++++++++++++++++++
sci-misc/h5utils/h5utils-1.13.1.ebuild | 39 +++++++++++++
3 files changed, 104 insertions(+)
diff --git a/sci-misc/h5utils/Manifest b/sci-misc/h5utils/Manifest
index 4a979d4a4b0..3cf11f1a7a2 100644
--- a/sci-misc/h5utils/Manifest
+++ b/sci-misc/h5utils/Manifest
@@ -1 +1,2 @@
DIST h5utils-1.12.1.tar.gz 156785 BLAKE2B 55fd5df6ce593261ffb889de1cc575da28d0006e46b5e50c3d5f49caa93b2f9f229e9c8f8444e67b30d7e19a619815dd9d8d46d33c9c25f9fae979a5caaced53 SHA512 b4295ac52ddfe922ed9f0a9079c69d6fdba5a261558d8c820a8feae592db3bd57a3394ab1fc9ceead00038a80bc70f32e0a8aa437cb33182899553bfdbf1f547
+DIST h5utils-1.13.1.tar.gz 113754 BLAKE2B db8fbd51d93aaafbecdf549e9e40fd1e39284cc90301f098f552f80bef6f7edb33b45b91ad1dee502ad9c0c44f49ebbb589025511acc0f160980eab94da1afa3 SHA512 cd04997c3f1392f4755f78df67555ac43a3287cc482e47c11ef8c29edf4aac7915d89d550a0b0585ca90527bad532bbb139bb0162c49fc2a27c292c9dc5ecbe4
diff --git a/sci-misc/h5utils/files/h5utils-1.13.1-automagic.patch b/sci-misc/h5utils/files/h5utils-1.13.1-automagic.patch
new file mode 100644
index 00000000000..7c166040cb4
--- /dev/null
+++ b/sci-misc/h5utils/files/h5utils-1.13.1-automagic.patch
@@ -0,0 +1,64 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -75,44 +75,25 @@ fi
+
+ ###########################################################################
+
+-# 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
++AC_ARG_WITH([hdf], AS_HELP_STRING([--with-hdf], [build hdf4 utils even if h4toh5 and h5toh4 are present]))
++
++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)
++])
+
+-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="doc/man/h5fromh4.1 $MORE_H5UTILS_MANS"
+- fi
+- if test "x$H5TOH4" != xh5toh4; then
+- MORE_H5UTILS="h4fromh5\$(EXEEXT) $MORE_H5UTILS"
+- # MORE_H5UTILS_MANS="doc/man/h4fromh5.1 $MORE_H5UTILS_MANS"
+- fi
+- fi
+-fi
+-AC_CHECK_HEADERS(hdf.h hdf/hdf.h)
+
+-AC_SUBST(H4_LIBS)
+
+ ###########################################################################
+
diff --git a/sci-misc/h5utils/h5utils-1.13.1.ebuild b/sci-misc/h5utils/h5utils-1.13.1.ebuild
new file mode 100644
index 00000000000..3055754da18
--- /dev/null
+++ b/sci-misc/h5utils/h5utils-1.13.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Utilities for visualization and conversion of HDF5 files"
+HOMEPAGE="https://github.com/NanoComp/h5utils"
+SRC_URI="https://github.com/NanoComp/h5utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="hdf octave"
+
+DEPEND="
+ media-libs/libpng:0=
+ sci-libs/hdf5:0=
+ sys-libs/zlib
+ hdf? (
+ sci-libs/hdf:0=
+ virtual/jpeg:0
+ )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-automagic.patch )
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --without-v5d \
+ $(use_with octave) \
+ $(use_with hdf)
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-misc/h5utils/files/, sci-misc/h5utils/
@ 2021-03-13 20:19 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2021-03-13 20:19 UTC (permalink / raw
To: gentoo-commits
commit: b28edec9611a9a68e94c8c1d4586a1123564c0ae
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 13 20:18:48 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Mar 13 20:18:48 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b28edec9
sci-misc/h5utils: Remove old 1.12.1-r2
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sci-misc/h5utils/Manifest | 1 -
.../h5utils/files/h5utils-1.12.1-automagic.patch | 63 ----------------------
sci-misc/h5utils/files/h5utils-1.12.1-png15.patch | 43 ---------------
sci-misc/h5utils/h5utils-1.12.1-r2.ebuild | 41 --------------
4 files changed, 148 deletions(-)
diff --git a/sci-misc/h5utils/Manifest b/sci-misc/h5utils/Manifest
index 3cf11f1a7a2..98fe48a4743 100644
--- a/sci-misc/h5utils/Manifest
+++ b/sci-misc/h5utils/Manifest
@@ -1,2 +1 @@
-DIST h5utils-1.12.1.tar.gz 156785 BLAKE2B 55fd5df6ce593261ffb889de1cc575da28d0006e46b5e50c3d5f49caa93b2f9f229e9c8f8444e67b30d7e19a619815dd9d8d46d33c9c25f9fae979a5caaced53 SHA512 b4295ac52ddfe922ed9f0a9079c69d6fdba5a261558d8c820a8feae592db3bd57a3394ab1fc9ceead00038a80bc70f32e0a8aa437cb33182899553bfdbf1f547
DIST h5utils-1.13.1.tar.gz 113754 BLAKE2B db8fbd51d93aaafbecdf549e9e40fd1e39284cc90301f098f552f80bef6f7edb33b45b91ad1dee502ad9c0c44f49ebbb589025511acc0f160980eab94da1afa3 SHA512 cd04997c3f1392f4755f78df67555ac43a3287cc482e47c11ef8c29edf4aac7915d89d550a0b0585ca90527bad532bbb139bb0162c49fc2a27c292c9dc5ecbe4
diff --git a/sci-misc/h5utils/files/h5utils-1.12.1-automagic.patch b/sci-misc/h5utils/files/h5utils-1.12.1-automagic.patch
deleted file mode 100644
index 8de8580cfe3..00000000000
--- a/sci-misc/h5utils/files/h5utils-1.12.1-automagic.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- 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
deleted file mode 100644
index e611310145e..00000000000
--- a/sci-misc/h5utils/files/h5utils-1.12.1-png15.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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
deleted file mode 100644
index 21e5cd40148..00000000000
--- a/sci-misc/h5utils/h5utils-1.12.1-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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:0
- )"
-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
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-03-13 20:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-13 20:19 [gentoo-commits] repo/gentoo:master commit in: sci-misc/h5utils/files/, sci-misc/h5utils/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2021-01-24 13:49 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox