diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-20 14:27:17 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-20 14:27:17 +0000 |
commit | 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (patch) | |
tree | 66e860a5099bcad013f1cf667255dc372a7c11b3 /sci-misc/h5utils | |
parent | 7218e1b46bceac05841e90472501742d905fb3fc (diff) |
gentoo resync : 20.03.2021
Diffstat (limited to 'sci-misc/h5utils')
-rw-r--r-- | sci-misc/h5utils/Manifest | 4 | ||||
-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 | 41 |
4 files changed, 0 insertions, 151 deletions
diff --git a/sci-misc/h5utils/Manifest b/sci-misc/h5utils/Manifest index f8eaa09e020b..d3b10953e17b 100644 --- a/sci-misc/h5utils/Manifest +++ b/sci-misc/h5utils/Manifest @@ -1,8 +1,4 @@ -AUX h5utils-1.12.1-automagic.patch 2226 BLAKE2B 3c4aac896c971870274410f467943fb4068da96d0cee9a356b98a0c94234d7c101d6cf5951b1f1ca998c692a5efceff183f83fb4e19428331e126f37c60cdb7c SHA512 ae8513c6c214fdd17886b65e77c707c08c97b7c72943ea0608cd8f4d269a4f2ef7df579b5746b76b307a77d68b9993860b6cce8cb6793da21123ad9892769999 -AUX h5utils-1.12.1-png15.patch 1420 BLAKE2B 99144644c0ea10ed9be48a40cbe8651eac1620d5b8d42f1cd9c170649e40df38066f585b6f0a59470fe15894a1b0d293ac0f4e98f79510377410c819a2e4b251 SHA512 babc34ab9d585468dabae50d16b7cb59a9326f541c69be5f347189bc6386273a61b9ec3a8a09e00fb2da386ee1fd592f0c85d2c3290134c74d8aa5d1057bd563 AUX h5utils-1.13.1-automagic.patch 2261 BLAKE2B c9aed879b096c95cf6c17c15d13d6a4a2f0f47afb96e00d382971676cfd34fc53ed802c8070f4d6a19f18165f828746a87efbe845ef89ddeaeee35bcff2eeb87 SHA512 c13621ada5c4f2e2e247bff5d4bd94d19ec888c6fd4b5dde1591ce06a96d346942392c1c3e33bcbd17d30e3d13d4799a7d54a456aa6b52a7123bcad05754d6d9 -DIST h5utils-1.12.1.tar.gz 156785 BLAKE2B 55fd5df6ce593261ffb889de1cc575da28d0006e46b5e50c3d5f49caa93b2f9f229e9c8f8444e67b30d7e19a619815dd9d8d46d33c9c25f9fae979a5caaced53 SHA512 b4295ac52ddfe922ed9f0a9079c69d6fdba5a261558d8c820a8feae592db3bd57a3394ab1fc9ceead00038a80bc70f32e0a8aa437cb33182899553bfdbf1f547 DIST h5utils-1.13.1.tar.gz 113754 BLAKE2B db8fbd51d93aaafbecdf549e9e40fd1e39284cc90301f098f552f80bef6f7edb33b45b91ad1dee502ad9c0c44f49ebbb589025511acc0f160980eab94da1afa3 SHA512 cd04997c3f1392f4755f78df67555ac43a3287cc482e47c11ef8c29edf4aac7915d89d550a0b0585ca90527bad532bbb139bb0162c49fc2a27c292c9dc5ecbe4 -EBUILD h5utils-1.12.1-r2.ebuild 782 BLAKE2B 0f758aad9e1c88aeec5a2c2513abe178d19a99686f76c286f5b1e7577de2d5e92f7b6c760e5f579e78bed508b2793801d575a08752de94c65a48a7e589c86ee2 SHA512 45c664a647f17326dc16cf28cfbfe75ad4685122ad9ccfd1ed952d6e4ed2fefd6a234875ebeccea5d063e1210eeaae5f4e3ddbe5430437ec59dff9f3c72ad29c EBUILD h5utils-1.13.1.ebuild 737 BLAKE2B 32ba75cd8d4979f1a00d82f12631e9a26dc851db27964353044152814dadf42eaab8995e9027262b4233a44a374093d9dcb9ab88d553a6473e446c98830ba391 SHA512 898174d2a2b5593d0887ddc16cae82aef6c7a51efcac2b61876c84e4f33aa8226d29e66ec1a4df78334cb3e507152fd0c9aacdc7fda201dd1135d1323825bff3 MISC metadata.xml 776 BLAKE2B 4e2af756ae62083753d5204c1524d42b3ebc3a01026a6354b583902c2bd730f1c256bb4c1f63fae9e6ce0ee016bc2d6a0d9aede6117dbbca7ddc47577411653a SHA512 12bda28a2fd9022d8472f81afc827b1329ab84598e8a91a7170bfeffb4b55953b37a9504bffc58933c352ebbdd25beb781e570d5f8de9759a290c4476a40afd1 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 8de8580cfe38..000000000000 --- 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 e611310145eb..000000000000 --- 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 21e5cd401489..000000000000 --- 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 -} |