From nobody Mon Jul 18 12:51:51 2022 X-Original-To: dev-commits-ports-main@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 4LmhgD1jnsz4T4bG; Mon, 18 Jul 2022 12:51:52 +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 4LmhgD0ttqz3mtP; Mon, 18 Jul 2022 12:51:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658148712; 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=7Uj+Ix1nkqIvyqstDVTt2gG0TkG62IKTOMETHkPSyRs=; b=TE25Kb5OMwSgyCOu91E+OSUU9es9uv+R43kb3uW1d1/IBgE/1W8dYhj1CZt9X+pSYrL4c5 oerB11s/qV7o2S+n873J2Pfv/SxFQHMPt8L/5hMbeqMRPQZpeJqlKMqsy5ySdf7oeXJ0e9 XvOqEMiAX6Nn3SVdowhwZLdQdWzEcv3RwkfsX8NtYZ+RoJDquObjeLpgBKnWZK+ggSrwOs oMGCCc2gZFhqp31KCeaVvPVKdDPxgPg+yugBrEeruhkg7TO5yU5hBkhuLhxQOkuLwVLJVH a71kWCEti8rgozhwnOIUP83fOu5mUcBYr4jG7fQ5QIB36c0BRVFTs97yYJf+sQ== 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 4LmhgC5gDhzfWp; Mon, 18 Jul 2022 12:51:51 +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 26ICppu0091949; Mon, 18 Jul 2022 12:51:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26ICppA0091948; Mon, 18 Jul 2022 12:51:51 GMT (envelope-from git) Date: Mon, 18 Jul 2022 12:51:51 GMT Message-Id: <202207181251.26ICppA0091948@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: 7e7034a7fa7d - main - biology/ncbi-vdb: Fix build with HDF5 1.12.0+ List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 7e7034a7fa7d3aa61b31394702d0f88ad504bb6c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658148712; 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=7Uj+Ix1nkqIvyqstDVTt2gG0TkG62IKTOMETHkPSyRs=; b=EVjviNLqFpUImhy4q5ATxdys4XCJ4LR5mJSzJfEnggp7MAbIQ77nHZb3zQTJunTxpJKTAS QIYX9+TttS8zIDwDLK0eYQC7+jiq9Y+hpPWPcBQpLnJzSjARfauvM4F9YJIy9/bLQHuvCQ xwn2SEXuu4nqTEk+gH/A1ugXGJeCDM0kuoWjE6pY7P+ZiYFhK9oAG26j0q7i1SHUg+dOT7 josLOmztSdu6NxsyRRbLSLrpYk/XwIyyKB8EYfWb88eBFebnKJPezIaRlQxKt0vjDsDP+i BrUTum/zCXN0JyOpVgsQ0opXZ4oPbjCiH7kHXZzc73qgPZV5qepiEzDLuyZOrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658148712; a=rsa-sha256; cv=none; b=s2qSpsXqnETUY29dUXKUDNCTDuK5TikvOJ2rxkmC4NcaBCD+f6YNcTZ8UT8dd1dx+OubTc OdrlPRW8ej9PfUG8S4UP5iFhRxXZcajcHxzdl5TPYZkhZjSTtlFn+sQ/VKnq/HavAySCZL K+KY4vxQty+EXr0vXPUGKSOLc2HDSFgDPjcvanXplfpODFfVF+PWOYkgTVb1yDaKSYUmTI by1NTqJsvaOwUPiC1CaezOM97lku0b2FZIqmplmiEir4Jf2CJMtAwo3VyoONDHF79TS/8h 9lUEEiteihFJA2Km9b9tPtKkR4HYTl0tbx8eRwOL1k1k8h7P5NSN5In6gbxByw== 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=7e7034a7fa7d3aa61b31394702d0f88ad504bb6c commit 7e7034a7fa7d3aa61b31394702d0f88ad504bb6c 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/ncbi-vdb: Fix build with HDF5 1.12.0+ --- biology/ncbi-vdb/files/patch-hdf5 | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/biology/ncbi-vdb/files/patch-hdf5 b/biology/ncbi-vdb/files/patch-hdf5 new file mode 100644 index 000000000000..0566ee28dc25 --- /dev/null +++ b/biology/ncbi-vdb/files/patch-hdf5 @@ -0,0 +1,30 @@ +--- interfaces/ext/hdf5/H5Opublic.h.orig 2021-03-15 18:16:43 UTC ++++ 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); +--- libs/hdf5/hdf5dir.c.orig 2021-03-15 18:16:43 UTC ++++ 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 )