commit: 2757616782a8356b55f704e5e98d894c59a964d9 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Fri Jul 9 02:53:23 2021 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> 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 <ionen <AT> 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() {
