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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 33E4613933E for ; Fri, 9 Jul 2021 03:12:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 75C04E0DC4; Fri, 9 Jul 2021 03:11:59 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 148FFE0DC4 for ; Fri, 9 Jul 2021 03:11:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7868A342A65 for ; Fri, 9 Jul 2021 03:11:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B82467C0 for ; Fri, 9 Jul 2021 03:11:55 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1625800211.2757616782a8356b55f704e5e98d894c59a964d9.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/, media-gfx/openvdb/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/openvdb/files/openvdb-8.0.1-glfw-libdir.patch media-gfx/openvdb/openvdb-7.0.0-r1.ebuild media-gfx/openvdb/openvdb-7.1.0-r1.ebuild media-gfx/openvdb/openvdb-8.0.1.ebuild X-VCS-Directories: media-gfx/openvdb/files/ media-gfx/openvdb/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 2757616782a8356b55f704e5e98d894c59a964d9 X-VCS-Branch: master Date: Fri, 9 Jul 2021 03:11:55 +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: 6fd377e5-2719-4b98-ad7d-f691cc09f73d X-Archives-Hash: f9e3a564a4f0ef11e642c74dbb3f186c commit: 2757616782a8356b55f704e5e98d894c59a964d9 Author: Ionen Wolkens gentoo org> AuthorDate: Fri Jul 9 02:53:23 2021 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Fri Jul 9 03:10:11 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27576167 media-gfx/openvdb: prevent using lib/ by default for glfw Formerly benign because it'd find nothing and try $(get_libdir) next, but glfw now has multilib support. This simple fix should be safe enough for stable version as well. Closes: https://bugs.gentoo.org/800200 Signed-off-by: Ionen Wolkens gentoo.org> media-gfx/openvdb/files/openvdb-8.0.1-glfw-libdir.patch | 12 ++++++++++++ media-gfx/openvdb/openvdb-7.0.0-r1.ebuild | 1 + media-gfx/openvdb/openvdb-7.1.0-r1.ebuild | 1 + media-gfx/openvdb/openvdb-8.0.1.ebuild | 1 + 4 files changed, 15 insertions(+) diff --git a/media-gfx/openvdb/files/openvdb-8.0.1-glfw-libdir.patch b/media-gfx/openvdb/files/openvdb-8.0.1-glfw-libdir.patch new file mode 100644 index 00000000000..991c5a6a568 --- /dev/null +++ b/media-gfx/openvdb/files/openvdb-8.0.1-glfw-libdir.patch @@ -0,0 +1,12 @@ +Custom cmake file used to find GLFW always looks at lib/cmake first +ignoring alternate libdirs and leads to using wrong libraries. +https://bugs.gentoo.org/800200 +--- a/cmake/OpenVDBGLFW3Setup.cmake ++++ b/cmake/OpenVDBGLFW3Setup.cmake +@@ -84,5 +84,5 @@ + list(APPEND _GLFW3_ROOT_SEARCH_DIR ${SYSTEM_LIBRARY_PATHS}) + +-set(_GLFW3_PATH_SUFFIXES "lib/cmake/glfw3" "cmake/glfw3" "glfw3") ++set(_GLFW3_PATH_SUFFIXES "cmake/glfw3" "glfw3") + + # GLFW 3.1 installs CMake modules into glfw instead of glfw3 diff --git a/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild b/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild index 21735fd515a..10868f647c6 100644 --- a/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild +++ b/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild @@ -66,6 +66,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-7.1.0-0001-Fix-multilib-header-source.patch" "${FILESDIR}/${PN}-7.1.0-0002-Fix-doc-install-dir.patch" + "${FILESDIR}/${PN}-8.0.1-glfw-libdir.patch" ) pkg_setup() { diff --git a/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild b/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild index 52e0454b175..ed2847345e4 100644 --- a/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild +++ b/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild @@ -66,6 +66,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${P}-0001-Fix-multilib-header-source.patch" "${FILESDIR}/${P}-0002-Fix-doc-install-dir.patch" + "${FILESDIR}/${PN}-8.0.1-glfw-libdir.patch" ) pkg_setup() { diff --git a/media-gfx/openvdb/openvdb-8.0.1.ebuild b/media-gfx/openvdb/openvdb-8.0.1.ebuild index 11350d22c91..f6827c2006e 100644 --- a/media-gfx/openvdb/openvdb-8.0.1.ebuild +++ b/media-gfx/openvdb/openvdb-8.0.1.ebuild @@ -65,6 +65,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-7.1.0-0001-Fix-multilib-header-source.patch" + "${FILESDIR}/${P}-glfw-libdir.patch" ) pkg_setup() {