From nobody Thu Feb 22 09:38:51 2024 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 4TgSl00Lqqz5CHMt; Thu, 22 Feb 2024 09:38: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 4TgSkz4pKyz4dLF; Thu, 22 Feb 2024 09:38:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708594731; 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=GHjzHn1CMCH745tdwvTF2HNJiFaZVjpUVPL0raz49rw=; b=Rj0suThsohjYrce5l4xRw9E9yGTe3c0X69cKFDFjG6uvREA6NPaVvPoikLnFyHg0uauuA3 G8Yvsxc2GjMylPY9YhtJXhIlQXkUs7IGCXefj3r4Rn1g6CxDWXqsL6c98ABa58eitmhcWL pdBZqIrEcmWq5mvLowJTzIMuYr7IZsLzORNnQ46molGA9FZu5eIUJL57dmL7HSag6U+lLD 2VNkcqbUUoKVJkKqfJPsu18pN8EYvrRlwdWyVVXq6hWF+fT3hy5aHoYPRM5d8zjVSqWfuu ccE9OmduFgjJEPGrJgFsM2OXfatbV5umq5m893dacD355aabdpvW7xhYAED5Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708594731; 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=GHjzHn1CMCH745tdwvTF2HNJiFaZVjpUVPL0raz49rw=; b=Es72vu5H1vx0fvkCW1cx7HGEXWICl6s/+Nj4/KgNFY9I0NWsmsJBsPLr3Q7Gt+dScPCMF5 YmkEBSHxEOAPnRmDBtQMCUbnH7Iwnk0ggNoWYGBtgFWXxJSAjdrMkiaKSqVLptMWWsDd42 18TM5J4tvf4obB2ClJfz0TnKIl9HnHaI7tvab0BqSVwteGRVBCV/pa3Uq2qfwK8j2/7XRU QzfY0v7nqBtKK7fdv6f5+oqN7r3NCGfRFLro9tWr6BLPlLeMYef5xva7VelHax4DLcoMmT +oUqP6AE9MVSEs7hT7E2GcejETAUfX4dYgIxcVGCainzQYgz051+pp8Xjp708w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708594731; a=rsa-sha256; cv=none; b=hEwCG5pKaY9A9sV76TnjDff2BMejTqAvxzCLQDKx9jO6oCY7nRMG9VfGucuBNad5RKKqwA ZY0IY+leecM3yKMhNvBiS70di3FUO7/vfd/rCbatPuTW19LWXllo/asRzKKTScrdxAZG2j aMplxwdO6e2WAdNd/Xt9AUTUHeNd0fFTCR3fjuwBm1AW8FuAlMuGSHCZIRlGhpgg3C2VBk 32BFhIHdQpwghP7NIjxRnmqyo68uvFrX+5pqsENyVWzhsvZibNB7sq9BCh+bhxfPzNrluw wy70Ptzk3BlmnPOoWbuoWXNOYkGVStsk0g6RL5ZV/NIguocP0RQ80w3DKyKSrQ== 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 4TgSkz2pX1zR59; Thu, 22 Feb 2024 09:38:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41M9cpw5020578; Thu, 22 Feb 2024 09:38:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41M9cp5d020575; Thu, 22 Feb 2024 09:38:51 GMT (envelope-from git) Date: Thu, 22 Feb 2024 09:38:51 GMT Message-Id: <202402220938.41M9cp5d020575@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 35b87f5972e2 - main - math/vtk9: Fix build with OSMESA and JAVA option 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35b87f5972e2a55f4dd6704665eca9de71011ef3 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=35b87f5972e2a55f4dd6704665eca9de71011ef3 commit 35b87f5972e2a55f4dd6704665eca9de71011ef3 Author: Hiroo Ono AuthorDate: 2024-02-22 09:24:21 +0000 Commit: Yuri Victorovich CommitDate: 2024-02-22 09:38:42 +0000 math/vtk9: Fix build with OSMESA and JAVA option PR: 277216 --- math/vtk9/Makefile | 6 +++--- math/vtk9/files/patch-ThirdParty_glew_vtkglew_src_glew.c | 10 ++++++++++ math/vtk9/files/patch-ThirdParty_glew_vtkglew_src_glewinfo.c | 10 ++++++++++ 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/math/vtk9/Makefile b/math/vtk9/Makefile index 69729940f2ee..dd192c6800fc 100644 --- a/math/vtk9/Makefile +++ b/math/vtk9/Makefile @@ -1,6 +1,6 @@ PORTNAME= vtk DISTVERSION= 9.2.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math graphics MASTER_SITES= https://vtk.org/files/release/${VTK_SHORT_VER}/ PKGNAMESUFFIX= 9 @@ -22,7 +22,7 @@ LIB_DEPENDS= \ libpng.so:graphics/png \ libtiff.so:graphics/tiff -USES= alias cmake compiler:c++11-lang gl jpeg localbase xorg +USES= alias cmake compiler:c++11-lang jpeg localbase xorg USE_LDCONFIG= ${PREFIX}/lib/vtk-${VTK_SHORT_VER} USE_XORG= ice x11 xt xext sm xcursor xfixes xrender @@ -104,7 +104,7 @@ JAVA_VARS= USE_JAVA=yes JAVA_CMAKE_BOOL= VTK_WRAP_JAVA JAVA_CMAKE_ON= -DJAVA_INCLUDE_PATH:PATH=${JAVA_HOME}/include \ -DJAVA_AWT_LIBRARY:PATH=${JAVA_HOME}/jre/lib/${ARCH}/libjawt.so \ - -DJAVA_JVM_LIBRARY:PATH=${JAVA_HOME}/jre/lib/${ATCH}/libjava.so + -DJAVA_JVM_LIBRARY:PATH=${JAVA_HOME}/jre/lib/${ARCH}/libjava.so TCLTK_USES= tk TCLTK_CMAKE_ON= -DVTK_GROUP_ENABLE_Tk:STRING=YES \ diff --git a/math/vtk9/files/patch-ThirdParty_glew_vtkglew_src_glew.c b/math/vtk9/files/patch-ThirdParty_glew_vtkglew_src_glew.c new file mode 100644 index 000000000000..65889826bdd6 --- /dev/null +++ b/math/vtk9/files/patch-ThirdParty_glew_vtkglew_src_glew.c @@ -0,0 +1,10 @@ +--- ThirdParty/glew/vtkglew/src/glew.c.orig 2024-02-21 22:29:42 UTC ++++ ThirdParty/glew/vtkglew/src/glew.c +@@ -38,6 +38,7 @@ + + #if defined(GLEW_OSMESA) + # define GLAPI extern ++# define APIENTRY __stdcall + # include + #elif defined(GLEW_EGL) + # include diff --git a/math/vtk9/files/patch-ThirdParty_glew_vtkglew_src_glewinfo.c b/math/vtk9/files/patch-ThirdParty_glew_vtkglew_src_glewinfo.c new file mode 100644 index 000000000000..0ea9659d6ec5 --- /dev/null +++ b/math/vtk9/files/patch-ThirdParty_glew_vtkglew_src_glewinfo.c @@ -0,0 +1,10 @@ +--- ThirdParty/glew/vtkglew/src/glewinfo.c.orig 2024-02-21 22:29:54 UTC ++++ ThirdParty/glew/vtkglew/src/glewinfo.c +@@ -38,6 +38,7 @@ + #include + #elif defined(GLEW_OSMESA) + #define GLAPI extern ++#define APIENTRY __stdcall + #include + #elif defined(_WIN32) + #include