Build: update 3.6 libraries to address CVEs and bugs #112528

Merged
Brecht Van Lommel merged 11 commits from brecht/blender:fix-cves-3.6 into blender-v3.6-release 2023-10-09 14:24:44 +02:00

11 Commits

Author SHA1 Message Date
Brecht Van Lommel ba241d377c Add OpenImageIO patch for DDS loading issue 2023-10-06 19:09:46 +02:00
Brecht Van Lommel 07da1ae4ba Backport OSL patches 2023-10-06 18:50:57 +02:00
Brecht Van Lommel ad020c2b95 Merge branch 'blender-v3.6-release' into fix-cves-3.6 2023-10-06 18:00:28 +02:00
Ray molenkamp c64ec7fc2f deps_builder: Fix zlib URI
zlib's uri is a bit unstable as when they release a new version they
move the last release "elsewhere"

This change switches the upstream URI over to github, which should be
a bit more reliable.
2023-10-06 17:32:32 +02:00
Brecht Van Lommel 879f234342 Update OIIO hash for repository rename 2023-10-06 17:32:12 +02:00
Ray molenkamp 50228cabb8 CMake: Update platform_win32.cmake with webp 1.3 support
buildbot/vexp-code-patch-coordinator Build done. Details
WebP 1.3 changed the library filenames to include a lib prefix and
added an additional library.
2023-09-28 15:25:02 +02:00
Ray molenkamp 9646c8fc9f deps_builder: Fix missing Webp support in OIIO build on windows
webp 1.3 changed the filenames on windows to include a `lib` prefix
(ie libwebp.lib rather than webp.lib) now this is a common thing
on linux and cmake has a `CMAKE_FIND_LIBRARY_PREFIXES` variable that
has a list of prefixes to look for during a `find_library` call.

`CMAKE_FIND_LIBRARY_PREFIXES` gets set during the call to the
`project` method in the main CMakeLists of a project. Now for windows
`lib` is *not* a common prefix by CMake, and it doesn't add "lib" to
CMAKE_FIND_LIBRARY_PREFIXES during that call.

so find library doesn't look for it, the libs are not found and an
unhappy time is had by all. Now the most obvious solution would be to
pass `-DCMAKE_FIND_LIBRARY_PREFIXES=lib` to CMake to sidestep this
however, the `project` call will set the variable overwriting
anything you passed through the CLI.

So the fix here is to have `find_library` counter-intuitively look
for both `libwebp` and `webp`
2023-09-28 15:25:02 +02:00
Ray molenkamp c7f6e65242 deps_builder: OIIO validate deps at configure time
The last webp update changed the filenames of the webp libraries
on windows causing oiio not to find them and oiio silently build
without webp support, which only came to light after all of
blender was build and a test failed.

This change makes the OIIO validate and error out if certain
dependencies are not found at configure time so these mistakes
are caught early.
2023-09-28 15:25:02 +02:00
Brecht Van Lommel 54cd1998d9 Fix Python not finding SSL library 2023-09-21 16:00:51 +02:00
Brecht Van Lommel ff52e746c9 Add OIIO patch to solve #112275 2023-09-18 20:57:50 +02:00
Brecht Van Lommel 3c70464807 Build: update 3.6 libraries to address CVEs
And ignore a few CVEs that do not affect Blender.

openimageio 2.4.15
openssl 3.1.2
python 3.10.13
sndfile 1.2.2
webp 1.3.2
2023-09-18 15:32:41 +02:00