From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 72D9515800F for ; Sat, 31 Dec 2022 15:36:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A8AF2E0874; Sat, 31 Dec 2022 15:36:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8C2A0E0874 for ; Sat, 31 Dec 2022 15:36:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 87F5033BF53 for ; Sat, 31 Dec 2022 15:36:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 29D697FA for ; Sat, 31 Dec 2022 15:36:48 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1672500967.3a10bb3a17cd9fa3929de46ca53d76adff94adbd.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/opencascade/opencascade-7.6.3-r1.ebuild sci-libs/opencascade/opencascade-7.6.3.ebuild X-VCS-Directories: sci-libs/opencascade/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3a10bb3a17cd9fa3929de46ca53d76adff94adbd X-VCS-Branch: master Date: Sat, 31 Dec 2022 15:36:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5c766e98-0d35-4301-990a-1ebee8f7ee2f X-Archives-Hash: b0fed09e0a3b7cae36eb45087ac3f827 commit: 3a10bb3a17cd9fa3929de46ca53d76adff94adbd Author: Bernd Waibel posteo net> AuthorDate: Sun Dec 18 16:12:35 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Dec 31 15:36:07 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a10bb3a sci-libs/opencascade: build 7.6.3 against vtk-9.2 Backport patch from v7.7.0 Bug: https://bugs.gentoo.org/886343 Signed-off-by: Bernd Waibel posteo.net> Closes: https://github.com/gentoo/gentoo/pull/28704 Signed-off-by: Sam James gentoo.org> ...de-7.6.3.ebuild => opencascade-7.6.3-r1.ebuild} | 25 +++++++++++----------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/sci-libs/opencascade/opencascade-7.6.3.ebuild b/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild similarity index 88% rename from sci-libs/opencascade/opencascade-7.6.3.ebuild rename to sci-libs/opencascade/opencascade-7.6.3-r1.ebuild index cd7888f8818b..2090e9b45195 100644 --- a/sci-libs/opencascade/opencascade-7.6.3.ebuild +++ b/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild @@ -38,7 +38,7 @@ RDEPEND=" media-libs/ftgl virtual/glu virtual/opengl - x11-libs/libXmu + x11-libs/libX11 examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -49,7 +49,7 @@ RDEPEND=" ffmpeg? ( =sci-libs/vtk-9.1.0"; then - mycmakeargs+=( - -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr - -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1 - -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir) - ) + mycmakeargs+=( + -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr + -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir) + ) + if has_version ">=sci-libs/vtk-9.2.0"; then + mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.2 ) + elif has_version ">=sci-libs/vtk-9.1.0"; then + mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1 ) elif has_version ">=sci-libs/vtk-9.0.0"; then - mycmakeargs+=( - -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr - -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.0 - -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir) - ) + mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.0 ) fi fi