From ce7a1c8f6371649045c87fb83386319307a18ecb Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 30 Aug 2024 14:59:59 +0200 Subject: [PATCH 1/2] Build: LibPNG: Update to 1.6.43 Fixes issue with EXIF after IDAT. The change also includes new libraries for macos for PNG and OIIO which were needed to fix the original bug. Ref #123620 Ref #125241 --- build_files/build_environment/cmake/versions.cmake | 4 ++-- lib/macos_arm64 | 2 +- lib/macos_x64 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index b7dfc0eea06..b2e4432528b 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -37,9 +37,9 @@ set(OPENAL_HASH_TYPE MD5) set(OPENAL_FILE openal-soft-${OPENAL_VERSION}.tar.bz2) set(OPENAL_HOMEPAGE https://openal-soft.org/) -set(PNG_VERSION 1.6.37) +set(PNG_VERSION 1.6.43) set(PNG_URI http://prdownloads.sourceforge.net/libpng/libpng-${PNG_VERSION}.tar.xz) -set(PNG_HASH 505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca) +set(PNG_HASH 6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c) set(PNG_HASH_TYPE SHA256) set(PNG_FILE libpng-${PNG_VERSION}.tar.xz) set(PNG_CPE "cpe:2.3:a:libpng:libpng:${PNG_VERSION}:*:*:*:*:*:*:*") diff --git a/lib/macos_arm64 b/lib/macos_arm64 index 24582b3b18e..b14563841a8 160000 --- a/lib/macos_arm64 +++ b/lib/macos_arm64 @@ -1 +1 @@ -Subproject commit 24582b3b18ea9b4201e1c95c775b9c1312687596 +Subproject commit b14563841a8962cb4a95efeabe4de02ad9fd3a17 diff --git a/lib/macos_x64 b/lib/macos_x64 index d57361a7ccd..5406195f5ed 160000 --- a/lib/macos_x64 +++ b/lib/macos_x64 @@ -1 +1 @@ -Subproject commit d57361a7ccd54cc95f75a89e63e01e4028b107ad +Subproject commit 5406195f5ed2dfa54056f0fbd741426b4feb4dd3 -- 2.30.2 From fcac7502d52d74c8c904c661953f1fa3e4d8a1ad Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 6 Sep 2024 11:49:41 +0200 Subject: [PATCH 2/2] Update OSL after OIIO is recompiled Mainly to ensures all (in)directly affected libraries are updated after PNG update. --- lib/macos_arm64 | 2 +- lib/macos_x64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/macos_arm64 b/lib/macos_arm64 index b14563841a8..caed2fa208f 160000 --- a/lib/macos_arm64 +++ b/lib/macos_arm64 @@ -1 +1 @@ -Subproject commit b14563841a8962cb4a95efeabe4de02ad9fd3a17 +Subproject commit caed2fa208ff4e2f8f558022c430e0be75dd735d diff --git a/lib/macos_x64 b/lib/macos_x64 index 5406195f5ed..da965956e5b 160000 --- a/lib/macos_x64 +++ b/lib/macos_x64 @@ -1 +1 @@ -Subproject commit 5406195f5ed2dfa54056f0fbd741426b4feb4dd3 +Subproject commit da965956e5b6f7917cf6db70316b35cc31c2af3a -- 2.30.2