Update openexr to 3.2.4

Signed-off-by: Aaron Colwell <[email protected]>
NatronGitHub · Jul 19, 2024 · 8fefe33 · 8fefe33
1 parent 449e598
commit 8fefe33
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/tools/MINGW-packages/mingw-w64-openexr/0006-cmake-soversion.patch b/tools/MINGW-packages/mingw-w64-openexr/0006-cmake-soversion.patch
@@ -17,11 +17,11 @@
  Description: OpenEXR image library
  Version: @OPENEXR_VERSION@
 
--Libs: @exr_pthread_libs@ -L${libdir} -lOpenEXR${libsuffix} -lOpenEXRUtil${libsuffix} -lOpenEXRCore${libsuffix} -lIex${libsuffix} -lIlmThread${libsuffix} @EXR_DEFLATE_LDFLAGS@
-+Libs: @exr_pthread_libs@ -L${libdir} -lOpenEXR -lOpenEXRUtil -lOpenEXRCore -lIex -lIlmThread @EXR_DEFLATE_LDFLAGS@
+-Libs: @exr_pthread_libs@ -L${libdir} -lOpenEXR${libsuffix} -lOpenEXRUtil${libsuffix} -lOpenEXRCore${libsuffix} -lIex${libsuffix} -lIlmThread${libsuffix}
++Libs: @exr_pthread_libs@ -L${libdir} -lOpenEXR -lOpenEXRUtil -lOpenEXRCore -lIex -lIlmThread
  Cflags: -I${includedir} -I${OpenEXR_includedir} @exr_pthread_cflags@
  Requires: Imath
- Libs.private: @zlib_link@
+ Requires.private: @EXR_DEFLATE_PKGCONFIG_REQUIRES@
 --- a/cmake/OpenEXRLibraryDefine.cmake
 +++ b/cmake/OpenEXRLibraryDefine.cmake
 @@ -49,7 +49,9 @@

diff --git a/tools/MINGW-packages/mingw-w64-openexr/PKGBUILD b/tools/MINGW-packages/mingw-w64-openexr/PKGBUILD
@@ -3,12 +3,18 @@
 _realname=openexr
 pkgbase=mingw-w64-natron_${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-natron_${_realname}")
-pkgver=3.2.1
+pkgver=3.2.4
 pkgrel=99.1
 pkgdesc='A high dynamic-range image file format library (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://www.openexr.com/"
+msys2_repository_url='https://github.com/AcademySoftwareFoundation/openexr'
+msys2_references=(
+  "pypi: OpenEXR"
+  "cpe: cpe:/a:ilm:openexr"
+  "cpe: cpe:/a:openexr:openexr"
+)
 license=('spdx:BSD-3-Clause')
 depends=("${MINGW_PACKAGE_PREFIX}-natron_imath"
          "${MINGW_PACKAGE_PREFIX}-libdeflate"
@@ -28,8 +34,8 @@ replaces=(
 source=("https://github.com/openexr/openexr/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
         0006-cmake-soversion.patch
         0007-export-TypedAttribute-value.patch)
-sha256sums=('61e175aa2203399fb3c8c2288752fbea3c2637680d50b6e306ea5f8ffdd46a9b'
-            'a5ce463815e8d05c879dbe6a255e9f8ac2697cd3ef4242dac1e5cb331f78ed02'
+sha256sums=('81e6518f2c4656fdeaf18a018f135e96a96e7f66dbe1c1f05860dd94772176cc'
+            '5653da878ebbf5f3087bb529213931b48e151aef082b34e19d189e22be0411e7'
             '204777b48cde1c4d390789f10c5e429d5295be701f68a7937a90d0ecf271c048')
 
 # Helper macros to help make tasks easier #
@@ -59,10 +65,6 @@ build() {
     extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
   fi
 
-  if [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]]; then
-    extra_config+=("-DOPENEXR_BUILD_TOOLS=OFF")
-  fi
-
   CXXFLAGS+=" -Wno-ignored-attributes"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
@@ -72,18 +74,18 @@ build() {
       ${extra_config[@]} \
       -DBUILD_SHARED_LIBS=ON \
       -DBUILD_TESTING=OFF \
-      -DOPENEXR_INSTALL_EXAMPLES=OFF \
+      -DOPENEXR_BUILD_EXAMPLES=OFF \
       ../${_realname}-${pkgver}
 
   ${MINGW_PREFIX}/bin/cmake --build .
 }
 
-#check() {
-#  cd "${srcdir}/build-${MSYSTEM}"
-#  ${MINGW_PREFIX}/bin/cmake -DBUILD_TESTING=ON ../${_realname}-${pkgver}
-#  ${MINGW_PREFIX}/bin/cmake --build .
-#  ${MINGW_PREFIX}/bin/ctest.exe ./ || true
-#}
+check() {
+  cd "${srcdir}/build-${MSYSTEM}"
+  ${MINGW_PREFIX}/bin/cmake -DBUILD_TESTING=ON ../${_realname}-${pkgver}
+  ${MINGW_PREFIX}/bin/cmake --build .
+  ${MINGW_PREFIX}/bin/ctest.exe ./ || true
+}
 
 package() {
   cd "${srcdir}/build-${MSYSTEM}"