Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update OpenEXR 3.2.1 to latest versions on Windows. #942

Merged
merged 6 commits into from
Feb 1, 2024
Merged

Update OpenEXR 3.2.1 to latest versions on Windows. #942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ab824a4
Update OpenEXR to latest versions on Windows.
TodicaIonut Feb 1, 2024
594242d
cmake
TodicaIonut Feb 1, 2024
04cf0f0
export-TypedAttribute-value.patch
TodicaIonut Feb 1, 2024
066bfb6
export Typed Attribute
TodicaIonut Feb 1, 2024
dffba92
Fix
TodicaIonut Feb 1, 2024
086141c
Update OpenEXR 3.2.1
TodicaIonut Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tools/MINGW-packages/mingw-w64-openexr/0006-cmake-soversion.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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@
Expand Down
19 changes: 19 additions & 0 deletions tools/MINGW-packages/mingw-w64-openexr/0007-export-TypedAttribute-value.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
20 changes: 11 additions & 9 deletions tools/MINGW-packages/mingw-w64-openexr/PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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')
acolwell marked this conversation as resolved.
Show resolved Hide resolved

# Helper macros to help make tasks easier #
apply_patch_with_msg() {
Expand All @@ -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() {
Expand All @@ -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 .
Expand Down
2 changes: 1 addition & 1 deletion tools/MINGW-packages/windows_pacman_repo_version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20240120-1
20240201-1
Loading