Update OpenEXR 3.2.1 to latest versions on Windows. (#942)

NatronGitHub · Feb 1, 2024 · e1654fb · e1654fb
1 parent 43dd019
commit e1654fb
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 12 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,8 +17,8 @@
  Description: OpenEXR image library
  Version: @OPENEXR_VERSION@
 
--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
+-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@
  Cflags: -I${includedir} -I${OpenEXR_includedir} @exr_pthread_cflags@
  Requires: Imath
  Libs.private: @zlib_link@

diff --git a/tools/MINGW-packages/mingw-w64-openexr/0007-export-TypedAttribute-value.patch b/tools/MINGW-packages/mingw-w64-openexr/0007-export-TypedAttribute-value.patch
@@ -0,0 +1,19 @@
+--- a/src/lib/OpenEXR/ImfAttribute.h
++++ b/src/lib/OpenEXR/ImfAttribute.h
+@@ -215,14 +215,14 @@
+ }
+
+ template <class T>
+-inline T&
++T&
+ TypedAttribute<T>::value ()
+ {
+     return _value;
+ }
+
+ template <class T>
+-inline const T&
++const T&
+ TypedAttribute<T>::value () const
+ {
+     return _value;
diff --git a/tools/MINGW-packages/mingw-w64-openexr/PKGBUILD b/tools/MINGW-packages/mingw-w64-openexr/PKGBUILD
@@ -3,16 +3,16 @@
 _realname=openexr
 pkgbase=mingw-w64-natron_${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-natron_${_realname}")
-pkgver=3.1.8
+pkgver=3.2.1
 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/"
-license=('BSD')
+license=('spdx:BSD-3-Clause')
 depends=("${MINGW_PACKAGE_PREFIX}-natron_imath"
-         "${MINGW_PACKAGE_PREFIX}-libwinpthread-git"
-         "${MINGW_PACKAGE_PREFIX}-zlib")
+         "${MINGW_PACKAGE_PREFIX}-libdeflate"
+         "${MINGW_PACKAGE_PREFIX}-libwinpthread-git")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja")
@@ -26,9 +26,11 @@ replaces=(
   "${MINGW_PACKAGE_PREFIX}-pyilmbase"
 )
 source=("https://github.com/openexr/openexr/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
-        0006-cmake-soversion.patch)
-sha256sums=('3ff47111ef7e5da6f69330e66e1e90ae620b79df1cedf2512bb9bffe86c2c617'
-            'e65852ac2e5545472ad90830c97e964aa2c71e1795979a8b9867155d578d45ed')
+        0006-cmake-soversion.patch
+        0007-export-TypedAttribute-value.patch)
+sha256sums=('61e175aa2203399fb3c8c2288752fbea3c2637680d50b6e306ea5f8ffdd46a9b'
+            'a5ce463815e8d05c879dbe6a255e9f8ac2697cd3ef4242dac1e5cb331f78ed02'
+            '204777b48cde1c4d390789f10c5e429d5295be701f68a7937a90d0ecf271c048')
 
 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
@@ -43,7 +45,8 @@ prepare(){
   cd "${srcdir}/${_realname}-${pkgver}"
 
   apply_patch_with_msg \
-    0006-cmake-soversion.patch
+    0006-cmake-soversion.patch \
+    0007-export-TypedAttribute-value.patch
 }
 
 build() {
@@ -70,7 +73,6 @@ build() {
       -DBUILD_SHARED_LIBS=ON \
       -DBUILD_TESTING=OFF \
       -DOPENEXR_INSTALL_EXAMPLES=OFF \
-      -DOPENEXR_INSTALL_PKG_CONFIG=ON \
       ../${_realname}-${pkgver}
 
   ${MINGW_PREFIX}/bin/cmake --build .

diff --git a/tools/MINGW-packages/windows_pacman_repo_version.txt b/tools/MINGW-packages/windows_pacman_repo_version.txt
@@ -1 +1 @@
-20240120-1
+20240201-1