From nobody Mon Jul 18 12:51:52 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4LmhgF52x2z4T4kr; Mon, 18 Jul 2022 12:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LmhgF4C2gz3n0C; Mon, 18 Jul 2022 12:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658148713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OKA7LcKXk+eU9rCTKXCzI5hcGUwjfkYsXW6Kax8vb0g=; b=D3UAWbUQRoNoxyKQlyRZ28x+KmWpNSg9wjB0+vUbvfjin0nNnTDz4IWDhqr0cSVBAGFMFL semFmuOdeEIIXzL2Ta9io9HDR2MY67+Wh9l7Af7iGzDXWMzrPmVLPK6/T5AZnvFtHoydtK QDiJDDc4UkJRGO5241Fe4S6gmpUBczTbq68infuUxKQ5J5JVAjeI+YSUUusZh3GRpr0Ti/ 5AvSl+dVMRWVgizWLqN962sfkKG1jMd7mUzff9NhchJDeGleM4rq3aNr4ra0KzBiTY25TJ XPr6H/e3qwB/c52MNgCx8m9lIMKFrF7A/Kw9VnMkWHzhizkPZ7256Ljt4pv9tQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4LmhgD6zbfzgGl; Mon, 18 Jul 2022 12:51:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26ICpq8i091973; Mon, 18 Jul 2022 12:51:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26ICpqVP091972; Mon, 18 Jul 2022 12:51:52 GMT (envelope-from git) Date: Mon, 18 Jul 2022 12:51:52 GMT Message-Id: <202207181251.26ICpqVP091972@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: ba66c05b01ae - main - biology/sra-tools: Fix build with HDF5 1.12.0+ List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba66c05b01aeb7d0000c13193536d283e6e55077 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658148713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OKA7LcKXk+eU9rCTKXCzI5hcGUwjfkYsXW6Kax8vb0g=; b=UlFnGRWDzcnd7IsiPYtgtXYAYDxvO25eAu9rJzCIXPTMJJqkPxiVC90ThZicEz1IwVIlZg UcpsrEycV+VE8E22VhJT6N8fZ9mYk/oYQLLFRV5X4YqbuFzr3yN520CZcwbHH2WOaK8obZ oS3Dq02DvKXYXmqoI50SHOQKYho5Ax9GsJRvPNcX/pyFiKwMEXc2Dp1DxpzQsU+D497Fi2 quLXZrR2BxOih90iMouO0i87053mWrf4jK06cP30sLWP/DL61czkr+fDKPnYdOnvcDsj+N bHSKNGEyhRBCr7aKA44oWmoMQY7iXCvDLG7+tPvD5LPTTMiKmg7vVrM1LqopLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658148713; a=rsa-sha256; cv=none; b=bz6zA+C2kb055RqKVZsgQhl9Y09qws3uiGEt/fb/+qU9tj97kgokXeD1SsJ3pgtyY79eCf Ut5/CGpilSRHedcviw31pXZTH+VvFSiL2THrQBCgGggLMYy23H38cP2csMmVX65cWgDrIn 1L5MZXjyTSk1XIzG2M8oM7Jxjl24FX3rLCAc0RmKpv9GHw4m/bFHibQR2z7xnitTo+tA/S kEQDa4ewF83F/IcXbY4RVCtaK3JqdO6mTot4W29V1ZDaDjZTWrop0sJqD6y4J9dm4uOLTK CuXDYUCcC5p7TCQQg245sp56axU8gIlycMfuOK4Qq88hobQX4HP9r5tK7GYEvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=ba66c05b01aeb7d0000c13193536d283e6e55077 commit ba66c05b01aeb7d0000c13193536d283e6e55077 Author: Po-Chuan Hsieh AuthorDate: 2022-07-18 12:50:17 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-07-18 12:50:17 +0000 biology/sra-tools: Fix build with HDF5 1.12.0+ --- biology/sra-tools/files/patch-hdf5 | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/biology/sra-tools/files/patch-hdf5 b/biology/sra-tools/files/patch-hdf5 new file mode 100644 index 000000000000..a99f56d25e46 --- /dev/null +++ b/biology/sra-tools/files/patch-hdf5 @@ -0,0 +1,30 @@ +--- ncbi-vdb/interfaces/ext/hdf5/H5Opublic.h.orig 2021-03-15 18:16:43 UTC ++++ ncbi-vdb/interfaces/ext/hdf5/H5Opublic.h +@@ -150,8 +150,13 @@ H5_DLL hid_t H5Oopen_by_idx(hid_t loc_id, const char * + H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t lapl_id); + H5_DLL htri_t H5Oexists_by_name(hid_t loc_id, const char *name, hid_t lapl_id); + H5_DLL herr_t H5Oget_info(hid_t loc_id, H5O_info_t *oinfo); ++#if H5_VERSION_GE(1,12,0) ++H5_DLL herr_t H5Oget_info_by_name(hid_t loc_id, const char *name, H5O_info_t *oinfo, unsigned fields, ++ hid_t lapl_id); ++#else + H5_DLL herr_t H5Oget_info_by_name(hid_t loc_id, const char *name, H5O_info_t *oinfo, + hid_t lapl_id); ++#endif + H5_DLL herr_t H5Oget_info_by_idx(hid_t loc_id, const char *group_name, + H5_index_t idx_type, H5_iter_order_t order, hsize_t n, H5O_info_t *oinfo, + hid_t lapl_id); +--- ncbi-vdb/libs/hdf5/hdf5dir.c.orig 2021-03-15 18:16:43 UTC ++++ ncbi-vdb/libs/hdf5/hdf5dir.c +@@ -292,7 +292,11 @@ rc_t CC HDF5DirVisitUpdate ( HDF5Dir *self, bool recur + static uint32_t HDF5DirPathTypeOnBuffer( const HDF5Dir *self, const char *buffer ) + { + H5O_info_t obj_info; ++#if H5_VERSION_GE(1,12,0) ++ herr_t h5e = H5Oget_info_by_name( self->hdf5_handle, buffer, &obj_info, H5O_INFO_BASIC, H5P_DEFAULT ); ++#else + herr_t h5e = H5Oget_info_by_name( self->hdf5_handle, buffer, &obj_info, H5P_DEFAULT ); ++#endif + if ( h5e >= 0 ) + { + switch( obj_info.type )