summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-gfx/openvdb/files/openvdb-8.0.1-glfw-libdir.patch12
-rw-r--r--media-gfx/openvdb/openvdb-7.0.0-r1.ebuild1
-rw-r--r--media-gfx/openvdb/openvdb-7.1.0-r1.ebuild1
-rw-r--r--media-gfx/openvdb/openvdb-8.0.1.ebuild1
4 files changed, 15 insertions, 0 deletions
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 000000000000..991c5a6a568d
--- /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 21735fd515a3..10868f647c6b 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 52e0454b1757..ed2847345e4e 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 11350d22c911..f6827c2006ec 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() {