| 1 |
commit: 2757616782a8356b55f704e5e98d894c59a964d9 |
| 2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jul 9 02:53:23 2021 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 9 03:10:11 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27576167 |
| 7 |
|
| 8 |
media-gfx/openvdb: prevent using lib/ by default for glfw |
| 9 |
|
| 10 |
Formerly benign because it'd find nothing and try $(get_libdir) |
| 11 |
next, but glfw now has multilib support. |
| 12 |
|
| 13 |
This simple fix should be safe enough for stable version as well. |
| 14 |
|
| 15 |
Closes: https://bugs.gentoo.org/800200 |
| 16 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 17 |
|
| 18 |
media-gfx/openvdb/files/openvdb-8.0.1-glfw-libdir.patch | 12 ++++++++++++ |
| 19 |
media-gfx/openvdb/openvdb-7.0.0-r1.ebuild | 1 + |
| 20 |
media-gfx/openvdb/openvdb-7.1.0-r1.ebuild | 1 + |
| 21 |
media-gfx/openvdb/openvdb-8.0.1.ebuild | 1 + |
| 22 |
4 files changed, 15 insertions(+) |
| 23 |
|
| 24 |
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 |
| 25 |
new file mode 100644 |
| 26 |
index 00000000000..991c5a6a568 |
| 27 |
--- /dev/null |
| 28 |
+++ b/media-gfx/openvdb/files/openvdb-8.0.1-glfw-libdir.patch |
| 29 |
@@ -0,0 +1,12 @@ |
| 30 |
+Custom cmake file used to find GLFW always looks at lib/cmake first |
| 31 |
+ignoring alternate libdirs and leads to using wrong libraries. |
| 32 |
+https://bugs.gentoo.org/800200 |
| 33 |
+--- a/cmake/OpenVDBGLFW3Setup.cmake |
| 34 |
++++ b/cmake/OpenVDBGLFW3Setup.cmake |
| 35 |
+@@ -84,5 +84,5 @@ |
| 36 |
+ list(APPEND _GLFW3_ROOT_SEARCH_DIR ${SYSTEM_LIBRARY_PATHS}) |
| 37 |
+ |
| 38 |
+-set(_GLFW3_PATH_SUFFIXES "lib/cmake/glfw3" "cmake/glfw3" "glfw3") |
| 39 |
++set(_GLFW3_PATH_SUFFIXES "cmake/glfw3" "glfw3") |
| 40 |
+ |
| 41 |
+ # GLFW 3.1 installs CMake modules into glfw instead of glfw3 |
| 42 |
|
| 43 |
diff --git a/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild b/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild |
| 44 |
index 21735fd515a..10868f647c6 100644 |
| 45 |
--- a/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild |
| 46 |
+++ b/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild |
| 47 |
@@ -66,6 +66,7 @@ BDEPEND=" |
| 48 |
PATCHES=( |
| 49 |
"${FILESDIR}/${PN}-7.1.0-0001-Fix-multilib-header-source.patch" |
| 50 |
"${FILESDIR}/${PN}-7.1.0-0002-Fix-doc-install-dir.patch" |
| 51 |
+ "${FILESDIR}/${PN}-8.0.1-glfw-libdir.patch" |
| 52 |
) |
| 53 |
|
| 54 |
pkg_setup() { |
| 55 |
|
| 56 |
diff --git a/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild b/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild |
| 57 |
index 52e0454b175..ed2847345e4 100644 |
| 58 |
--- a/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild |
| 59 |
+++ b/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild |
| 60 |
@@ -66,6 +66,7 @@ BDEPEND=" |
| 61 |
PATCHES=( |
| 62 |
"${FILESDIR}/${P}-0001-Fix-multilib-header-source.patch" |
| 63 |
"${FILESDIR}/${P}-0002-Fix-doc-install-dir.patch" |
| 64 |
+ "${FILESDIR}/${PN}-8.0.1-glfw-libdir.patch" |
| 65 |
) |
| 66 |
|
| 67 |
pkg_setup() { |
| 68 |
|
| 69 |
diff --git a/media-gfx/openvdb/openvdb-8.0.1.ebuild b/media-gfx/openvdb/openvdb-8.0.1.ebuild |
| 70 |
index 11350d22c91..f6827c2006e 100644 |
| 71 |
--- a/media-gfx/openvdb/openvdb-8.0.1.ebuild |
| 72 |
+++ b/media-gfx/openvdb/openvdb-8.0.1.ebuild |
| 73 |
@@ -65,6 +65,7 @@ BDEPEND=" |
| 74 |
|
| 75 |
PATCHES=( |
| 76 |
"${FILESDIR}/${PN}-7.1.0-0001-Fix-multilib-header-source.patch" |
| 77 |
+ "${FILESDIR}/${P}-glfw-libdir.patch" |
| 78 |
) |
| 79 |
|
| 80 |
pkg_setup() { |
Archives