gentoo resync : 12.07.2021

5 files changed, 19 insertions, 3 deletions

diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index c49431777234..a2ee2ea0af34 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -1,9 +1,10 @@
 AUX openvdb-7.1.0-0001-Fix-multilib-header-source.patch 2825 BLAKE2B 089bc79bbb8bd4544889c65d8bf064bf95869990778cb66595a19be402db85b569acb836b5918c902e6f6a10011a1480ef89e03636f951e30e5833eb667478cb SHA512 6968a60737b08bbec96beb8ec3796b7d99a713a798e37d8cd4015eacce7e7197b5befcd6721b310a4cdcfaca1781ab0cd7165958b14b487796a4159e9e214499
 AUX openvdb-7.1.0-0002-Fix-doc-install-dir.patch 1014 BLAKE2B 380c26e69da18479266201fd1233d19f3c39b13ee67d11cadca5bba900c470218a7563590f12a400a1f954155bfdfacc00862511ef05f3a61a54679924c57cae SHA512 21d4abf1cae31dfa8e59b6648a7c40f6f5f9572bdb87e6410144b427244ede488e059bf572344efc4e4cea91e7fb59b56364a7df6041f717db759002d09e8ee7
+AUX openvdb-8.0.1-glfw-libdir.patch 495 BLAKE2B 6a47bd300b3cd2186be8b749abd1e1fcbcb50e24d1965a783d8f2cec07ef8737ee6287018f40fed4ea4520c2c6be20b5936bdf0bd95ab07f277e728b6fccbb07 SHA512 29cd8d4dfd24f262c8e03a4d55502839a99bdac8eae1738b99cd667292034ea5cddec60303daf3a0c0d76a68021b3b4d6fc2f0e5be108d94243f5c11308c194d
 DIST openvdb-7.0.0.tar.gz 1872744 BLAKE2B e3a8c8d51f77e115d3d397abde0860a6322d56eb6c4795c1ba39539a23aab6cf37602ce7122965fbc3098b15b118b25010263f567e8003363b78c9b7d9d5dfd8 SHA512 f5321b22b10e192012d544cc02921d3d52f621778ec5aa21ba6d450f3e29f2fdbd76486ad390a0c008394dbc6ee4aeecc04527ef30e73adf71c1a08a021746b7
 DIST openvdb-7.1.0.tar.gz 1956052 BLAKE2B 7778d67bcc65ecb17b86f6e67a9e5f2d6574de5869a0a9c675ad7bc8540154c0f249a91c68a9da9068a3951b3e919e5676450fcaf13921c6263e7c87012a2f29 SHA512 49806375f7e6d7b12eaba24e672a068531d2f8a05f12eba29069710d2682f9983f9e6ad26047eed4b28e337f8d0e738b90130582863c710e8dd1e720bf0addad
 DIST openvdb-8.0.1.tar.gz 2299276 BLAKE2B e65bd4710ff65e20570013399d1e71a32e8f80c5e3b5527fc17d23c7f86ead7e04483cf7ba5266f26343604677d3a0dcafc01474baf7ef09b98f1f41a66119a2 SHA512 6a5a8b637429295efa72494aef82ff92dd83092591b713f56930ccf4aab3a33806d1263bfd090c27239eab97b4fdc053288dc545e631f8a7d4ca180a32331be2
-EBUILD openvdb-7.0.0-r1.ebuild 2805 BLAKE2B 077df7ddf81711bafc1021cd9255fa7e8413fd2d97c3a824f11145b1faafa5f6d2bb2c1e3731a6ed993b1a0b0603feed02a4d801c9d162a2fb2e53942549f3eb SHA512 a8917f92a8cd316a3dc49c784707ba63692251141aad32821465e5d46b8033c00906e426a54adba9402a56d946ebe8cbb5522625239c35cc16e0d2d7cde3338f
-EBUILD openvdb-7.1.0-r1.ebuild 2735 BLAKE2B 0e9347c59b0f1404db23e63635a4c3fdda3be0d34bda329de8b65507a3037692206a3d0573984bee7a9f937d5c9f425decd94b00214001e8792317af45f39b1b SHA512 2ce5ea094c66437efdd17279a3a2740cfab364775cede0986e9a65e35871cf90cb443c354b6590f82153b2d4acaadb0bfb44f8b2a72b632be64640e5094d7a15
-EBUILD openvdb-8.0.1.ebuild 2769 BLAKE2B db8c781c1d61337e9669c7ab245abfdd926f22c0605d4cbfddc95b826d705ceb4bf7590d0fe658c8b0a099b46b05d5eb1f49b594bd35aa1f6b61da5aa56808e9 SHA512 6ae5eb57763fdd15f3ce6d527785305cb1d69f359eb5f6ac8ebcbcaddeec9c4bc00ed10c6b82f0e22458135220a335b5c9743d3ec55f988bdc69108e1e0fc3c6
+EBUILD openvdb-7.0.0-r1.ebuild 2850 BLAKE2B 042072b65ba212949817da393ca0816be24f6ed00e5dc8f685241e0edbc3ca4d7225ff551624d9340ebce2c8a0c51edcb58c9043542458ac40f9cba4320828ca SHA512 e2ca1e6f279b45a63643e098c7bd3d92117ee1373ce02ae25ca090abcc1577005dc4303a7ea94b5ab7cba1fe72c4aeb4f9f63b8f8c4b3396cf5eda1be585dc92
+EBUILD openvdb-7.1.0-r1.ebuild 2780 BLAKE2B 4183344ab52862ba20546b358e267c1525b01b3ab77a3043cd102d33252760cf61e3a66d913ffc6857dc86b1445b1deb2bd1dc9226545a969689906cd687305a SHA512 7ace5d72a976f3925e7c62a90c51af81c746f7280ffaa424abcf4a1b6e4f5dda0a88ae9f06a60a331f1528780074db1a0ba94dc53b71498c827e4819d43a460d
+EBUILD openvdb-8.0.1.ebuild 2807 BLAKE2B 50388b1d5c3d401cf4a3849431240478c531cd0f5120a45140fb79edcfe454ed9dce276b41d6c7a5ff8814a18d0bb573b7a1079e1587b23dbbd5a5201e9f0c14 SHA512 fa2079ed52041b9591e719563f1c3477b7bf3afe64de00d70c756f30580871086c5da7e692e54dc4e1eea2ea72cdd4eb8d743a49e9760cf8699920294e12a891
 MISC metadata.xml 1548 BLAKE2B f6a9752e3535febae4a9aeddc13b036fe8f964b02371060389edf83ce25932e36a53856eea891dbf9734ffab5e3eff9ad10d31a592ddc5b7816375179e0cbd1f SHA512 77036fce5e1217d4d47547fa925006b4a605d43d4473fe8cebc7d768c5770d8faf25a2e2fe46498cbf53071bf67e2d99286a8f59d5a8d389b2a8cd14b98341fc
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() {