From nobody Sun Jun 26 23:09:17 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 3D30B867A96; Sun, 26 Jun 2022 23:09:18 +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 4LWRPn6dyKz4Qv0; Sun, 26 Jun 2022 23:09:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656284958; 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=UAxBsih/k2oN4/by7T9Dr3boUyR7ueXDLJjTF1E2vg4=; b=JNyBjAYePzwE/8LtUo/eOXBOBLY4fD0NQqC1ANxzfVsXVMH+0kBweYejlHP0kx3EiH+oBk vGiAsKC16l6sWS/E0YZH4jh6mYZuep9VnjtF22EyGQ0wQoc65WJPbiL6leHY/ElkHPnfn8 ElSThia1YpYL6lhb1j7prv55Lanc81PiS2AqVZwHqOEwirrIQFsT+kO2I9xjzt568mNnHV dY/Hepr8H8/tMxw5KdY/wrTypsQmto3ESOnSpWmxhmfOKddqh1oxfKfKFOiemhHtxAHN+i EMuAwU8a8eudnEQII2vxOXJpKfH9qZAzbmsrZLSRV1Pm7DUxx+ZwubhNt5xbFA== 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 9D74A1CF87; Sun, 26 Jun 2022 23:09:17 +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 25QN9HEC044754; Sun, 26 Jun 2022 23:09:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25QN9Hwk044753; Sun, 26 Jun 2022 23:09:17 GMT (envelope-from git) Date: Sun, 26 Jun 2022 23:09:17 GMT Message-Id: <202206262309.25QN9Hwk044753@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Stephen Montgomery-Smith Subject: git: 8f5541298099 - main - devel/gdcm: Use latest VTK-9 instead of ancient VTK-6; Add USES=python 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: stephen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f5541298099b722e34632ca9ed388bda91064e7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656284958; 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=UAxBsih/k2oN4/by7T9Dr3boUyR7ueXDLJjTF1E2vg4=; b=GqtRLA78lhZ/aJSeFzDstZW+9YF4WPxNGhD7/vP0TG+yKKpyogHZlk8dq5NQDBwK80tij6 xpQ+R/KJsaoh54/TXxi9jFwiNuFmatPgcP6HO+H75hzOEuVc/C8B+0cOl/chq/Z3c2dQYq pk0Eb0AIzA3AAHD7HvnTq8WMXE3qZJyCcCbDr+WQbRWIoDyJZG9IKJGOiKOiy2ZcVN3cIe qOkS5q/PRLlBVfrS7kceDyQsnCYABcEdpVeOgm3RKAJyqgUqHSBuj92d7q8d4VzVHNa1HY H+I99gVOuFiiCuC5M1WThq2s1zohCfN0RXq+IL6Hvapg+ksJNEmGYVKfTeBrAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656284958; a=rsa-sha256; cv=none; b=YtP4aBh8lxUcDxm1+P4z+uBUeG0s2Cek/+jHVrTalB9rlXBnFgM+Zl3SVX0pK7QV6X2AL4 ofiGV0vYxz8bF7a9/OOmQcNvJasyExQk5EeaJCD5CA1A4ApAVCLVR77THCDU3wOiTFM47f HdnlF5skcqOpAlya8MvC1O7cKFxm+QKmXeAHO6Hq8L/MCZRoXwlFR0bB6UIuF7ejDZL5ph LD9MaMPt1ONvXtNi6zXrCtBT8XYpeCFX9fOUIOQXBfmOSoQzFcfN8bZjZt31aADQ5a+MzL ApTYMjtr76MmdPd0ihsSUFi9P177sH7Z6l2jUFUNMnekvQ641W7v36ozhb4YZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by stephen: URL: https://cgit.FreeBSD.org/ports/commit/?id=8f5541298099b722e34632ca9ed388bda91064e7 commit 8f5541298099b722e34632ca9ed388bda91064e7 Author: Stephen Montgomery-Smith AuthorDate: 2022-06-26 23:03:43 +0000 Commit: Stephen Montgomery-Smith CommitDate: 2022-06-26 23:03:43 +0000 devel/gdcm: Use latest VTK-9 instead of ancient VTK-6; Add USES=python Bump portrevision. PR: 264917 Reported by: yuri@freebsd.org --- devel/gdcm/Makefile | 29 +++++++++++++--------- ...ilities_VTK_vtkImageMapToWindowLevelColors2.cxx | 13 ++++++++++ .../files/patch-Wrapping_Python_CMakeLists.txt | 15 +++++++++++ 3 files changed, 45 insertions(+), 12 deletions(-) diff --git a/devel/gdcm/Makefile b/devel/gdcm/Makefile index ed25fcdf768d..8ec698fca3c1 100644 --- a/devel/gdcm/Makefile +++ b/devel/gdcm/Makefile @@ -2,6 +2,7 @@ PORTNAME= gdcm PORTVERSION= ${GDCM_MAJOR}.${GDCM_MINOR}.${GDCM_PATCH} +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= SF/gdcm/gdcm%20${GDCM_MAJOR}.x/GDCM%20${PORTVERSION} @@ -13,17 +14,20 @@ LICENSE= BSD3CLAUSE LIB_DEPENDS= libopenjp2.so:graphics/openjpeg \ libexpat.so:textproc/expat2 -USES= alias cmake compiler:c++11-lang pkgconfig tar:bzip2 ssl +USES= alias cmake compiler:c++11-lang pkgconfig python:build tar:bzip2 ssl +USE_LDCONFIG= yes -OPTIONS_DEFINE= VTK6 +OPTIONS_DEFINE= VTK OPTIONS_SUB= yes -VTK6_DESC= Build VTK 6 integration classes -VTK6_LIB_DEPENDS= libvtkCommonCore-${VTK6_VERSION}.so:math/vtk6 -VTK6_CMAKE_ON= -DGDCM_USE_VTK:BOOL=ON \ - -DVTK_DIR:PATH=${LOCALBASE}/lib/vtk-${VTK6_VERSION} -VTK6_USES= gl -VTK6_USE= GL=glu +VTK_DESC= Build VTK integration classes +VTK_CXXFLAGS= -I${LOCALBASE}/include/vtk-${VTK_VERSION} +VTK_LIB_DEPENDS= libvtkCommonCore-${VTK_VERSION}.so:math/vtk${VTK_VERSION:R} +VTK_CMAKE_ON= -DGDCM_USE_VTK:BOOL=ON \ + -DVTK_DIR:PATH=${LOCALBASE}/lib/vtk-${VTK_VERSION} +VTK_USES= gl +VTK_USE= GL=glu +#VTK_BROKEN= Fails to compile with VTK-9.1, see https://sourceforge.net/p/gdcm/bugs/537/ # Change this when updating the port GDCM_MAJOR= 3 @@ -31,9 +35,8 @@ GDCM_MINOR= 0 GDCM_PATCH= 14 # Change this whenever VTK is updated -VTK6_VERSION= 6.2 +VTK_VERSION= 9.1 -USE_LDCONFIG= yes CFLAGS+= -I${LOCALBASE}/include CMAKE_ARGS= -DGDCM_USE_SYSTEM_OPENSSL:BOOL=ON \ -DGDCM_USE_SYSTEM_EXPAT:BOOL=ON \ @@ -44,11 +47,13 @@ CMAKE_ARGS= -DGDCM_USE_SYSTEM_OPENSSL:BOOL=ON \ -DGDCM_BUILD_EXAMPLES:BOOL=OFF \ -DGDCM_INSTALL_DATA_DIR:PATH=${DATADIR_REL} \ -DGDCM_DOCUMENTATION:BOOL=OFF \ - -DGDCM_BUILD_DOCBOOK_MANPAGES:BOOL=OFF + -DGDCM_BUILD_DOCBOOK_MANPAGES:BOOL=OFF \ + -DPython3_EXECUTABLE=${PYTHON_CMD} \ + -DGDCM_DEFAULT_PYTHON_VERSION=${PYTHON_VER} .include -.if ${PORT_OPTIONS:MVTK6} +.if ${PORT_OPTIONS:MVTK} DESKTOP_ENTRIES="Gdcmviewer" "Simple DICOM Viewer" "" "gdcmviewer" "" "" PLIST_SUB+= VTK="" .else diff --git a/devel/gdcm/files/patch-Utilities_VTK_vtkImageMapToWindowLevelColors2.cxx b/devel/gdcm/files/patch-Utilities_VTK_vtkImageMapToWindowLevelColors2.cxx new file mode 100644 index 000000000000..74ffcd464f6a --- /dev/null +++ b/devel/gdcm/files/patch-Utilities_VTK_vtkImageMapToWindowLevelColors2.cxx @@ -0,0 +1,13 @@ +- workaround for https://sourceforge.net/p/gdcm/bugs/536/ + +--- Utilities/VTK/vtkImageMapToWindowLevelColors2.cxx.orig 2022-06-26 20:39:45 UTC ++++ Utilities/VTK/vtkImageMapToWindowLevelColors2.cxx +@@ -37,6 +37,8 @@ + #include "vtkScalarsToColors.h" + #include "vtkPointData.h" + ++#include ++ + //vtkCxxRevisionMacro(vtkImageMapToWindowLevelColors2, "$Revision: 1.3 $") + vtkStandardNewMacro(vtkImageMapToWindowLevelColors2) + diff --git a/devel/gdcm/files/patch-Wrapping_Python_CMakeLists.txt b/devel/gdcm/files/patch-Wrapping_Python_CMakeLists.txt new file mode 100644 index 000000000000..922d601e6df6 --- /dev/null +++ b/devel/gdcm/files/patch-Wrapping_Python_CMakeLists.txt @@ -0,0 +1,15 @@ +- Choose exact Python version, see https://sourceforge.net/p/gdcm/bugs/538/ + +--- Wrapping/Python/CMakeLists.txt.orig 2022-06-26 20:16:42 UTC ++++ Wrapping/Python/CMakeLists.txt +@@ -48,8 +48,8 @@ include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ) + +-find_package(PythonInterp ${GDCM_DEFAULT_PYTHON_VERSION} REQUIRED) +-find_package(PythonLibs ${GDCM_DEFAULT_PYTHON_VERSION} REQUIRED) ++find_package(PythonInterp ${GDCM_DEFAULT_PYTHON_VERSION} EXACT REQUIRED) ++find_package(PythonLibs ${GDCM_DEFAULT_PYTHON_VERSION} EXACT REQUIRED) + # TODO Need to check consistency python interp and python libs... + mark_as_advanced(PYTHON_LIBRARY PYTHON_INCLUDE_PATH) + # Lamest excuse ever: