From nobody Wed Jun 22 14:39:54 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 D45B2870B4C; Wed, 22 Jun 2022 14:39:54 +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 4LSmHt5XP1z3vd2; Wed, 22 Jun 2022 14:39:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655908794; 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=ES7fWpDLA9qAQayp0/yzS0vVQ54q5Dm4DOG4W/FMIUg=; b=DLTPk3l7GXg9Qbf/5A38xcNomfDSG6MUpyMyo7iZNGrg2AzpWaylTwiFA7fgvaAIgepBx6 jL6IlNHp95ZhMD0BYMQPQooLIQKSdUx5vhqfshNA3qWaXZHaVmTATndyyuT5jAA5qx4G1T 9JWxmfHEZ6B5ugHrzpGfGJMYkhqqiwkgnw7Kypa4fx8SdT9fbGCgtLBsqM4B/A6r4R14Zv sNNy3mm9k9zTHhsHs6FLtjelz90Gg3U+yLPWy78RD0qBt1JRYPyChHQxDvMYTRCYaNcxwo IxzE0NUzwmcLyDXnvQDHf5t8c1dISNwqS2oW3/chgWue86VhrrtB+9c4znL+LQ== 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 8BF5027F8E; Wed, 22 Jun 2022 14:39:54 +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 25MEds9r057596; Wed, 22 Jun 2022 14:39:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25MEdsDW057595; Wed, 22 Jun 2022 14:39:54 GMT (envelope-from git) Date: Wed, 22 Jun 2022 14:39:54 GMT Message-Id: <202206221439.25MEdsDW057595@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: 4eed11387fbf - main - math/vtk9: fix build after d1e8146547 (netcdf 4.9.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: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4eed11387fbfb134d1e20aa9b429a573e627d4e0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655908794; 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=ES7fWpDLA9qAQayp0/yzS0vVQ54q5Dm4DOG4W/FMIUg=; b=IJzgC1TcmAr7nT4B2im39L9/C2tL8mxB4z7VYbByNfQzNv33WlAJO7MjhQY8fcG3aT6ybQ xIxvfZy/BKsHwJP11114wE5B+2iD/EDwDcah5T39b6CuwvQnUKl52/wIM/LWARU3zfC2AV z8k+wWd3XLhi0NQAqvKVevZczAINgFVkUVUxT4TjH63dbteQDS2k+eYxcHghLXjfcDW1Ru HLSdPG/Njg6rSAUz22+wOtJR0WXiogdSX0fqZhbrJeHIiBhmbQ0EAOA3dSZtPq6azEou30 o0bCw7KamVj6uRQuxgtjhNzErJOY2cfQjRZ/hriCsixLUICbca7Bsgu/MhBqSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655908794; a=rsa-sha256; cv=none; b=oOAm8j/9dkSISZRLEQuFD7CEYqEBFjWlODBDOnpYgGUkGwRB5veMyWHk+Ojhr2e3bw+f9t yvAgxpP29cdXJqmts79Y4yLfR4JoBwqEo1NgMOihGuZ76txtXARbKQLORmFxOZe+o1Oa6L yYWfOQ90AO2EhmS8opsODMqCk3tN1lKJAkTvW0tMtSXWuRSEQxCFfN6Z+iL07QgIbaxQpS 8CXC6AAbXnqcIs0NunnHCcanTT92iXpKlm8wY3uQU87lk7TP4YA4usdn+XJrHfUQtEIvjV d2JZYeoiGPGctxcKWcmCqtbnw90sD0wUJakC6hw9+kcJn5O1oa3J0Pr5iINcOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=4eed11387fbfb134d1e20aa9b429a573e627d4e0 commit 4eed11387fbfb134d1e20aa9b429a573e627d4e0 Author: Christoph Moench-Tegeder AuthorDate: 2022-06-22 14:36:13 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2022-06-22 14:39:46 +0000 math/vtk9: fix build after d1e8146547 (netcdf 4.9.0) NC_SZIP_NN is not #define'd in netcdf.h, so it cannot be the target of an assignment anymore. Fortunately NC_SZIP_NN is now defined to the same value (32) as it was set to by vtk9 before (and it was declared const int before), so just hide the old const int if NC_SZIP_NN is already defined. No functional change, no bumps. --- .../patch-ThirdParty_exodusII_vtkexodusII_src_ex__utils.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/math/vtk9/files/patch-ThirdParty_exodusII_vtkexodusII_src_ex__utils.c b/math/vtk9/files/patch-ThirdParty_exodusII_vtkexodusII_src_ex__utils.c new file mode 100644 index 000000000000..e52da58e3878 --- /dev/null +++ b/math/vtk9/files/patch-ThirdParty_exodusII_vtkexodusII_src_ex__utils.c @@ -0,0 +1,12 @@ +--- ThirdParty/exodusII/vtkexodusII/src/ex_utils.c.orig 2022-06-22 15:58:58.543731000 +0200 ++++ ThirdParty/exodusII/vtkexodusII/src/ex_utils.c 2022-06-22 16:00:28.263448000 +0200 +@@ -1770,7 +1770,9 @@ + */ + + /* const int NC_SZIP_EC = 4; */ /* Selects entropy coding method for szip. */ ++#if !defined(NC_SZIP_NN) + const int NC_SZIP_NN = 32; /* Selects nearest neighbor coding method for szip. */ ++#endif + /* Even and between 4 and 32; typical values are 8, 10, 16, 32 */ + const int SZIP_PIXELS_PER_BLOCK = + file->compression_level == 0 ? 32 : file->compression_level;