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.

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

[openexr] Update to 3.1.4 #20957

Closed
wants to merge 52 commits into from
Closed
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
02c2316
Update openexr to 3.1.2
chausner Oct 23, 2021
32d3d13
Update CI baseline
chausner Oct 23, 2021
7acc150
Try to fix git FetchContent issue on Windows
chausner Oct 24, 2021
37df542
Update git-tree hash
chausner Oct 24, 2021
ae0acae
Workaround Imath find_dependency issue
chausner Oct 24, 2021
90b8edd
Update git-tree hash
chausner Oct 24, 2021
2b7d178
Use separate imath dependency
chausner Oct 24, 2021
454a9c8
Merge branch 'master' into openexr-3.1.2
chausner Oct 29, 2021
4ae84bf
Make freeimage compatible with openexr and imath
chausner Oct 30, 2021
0814c91
Update CI baseline
chausner Oct 30, 2021
16f9452
Merge branch 'freeimage-openexr-3.1.2' into openexr-3.1.2
chausner Oct 30, 2021
b187747
Remove unused patch
chausner Oct 30, 2021
6e2f3cc
Fix openexr dependency in osg
chausner Oct 30, 2021
b145213
Update CI baseline
chausner Oct 30, 2021
04f39a0
Increment port-version of osg
chausner Oct 30, 2021
3309a8e
Update CI baseline
chausner Oct 30, 2021
67af2d7
Modernize osg
chausner Oct 30, 2021
2fa8d07
Update CI baseline
chausner Oct 30, 2021
2c37a7e
Fix osg build
chausner Oct 30, 2021
bfbeba5
Update CI baseline
chausner Oct 30, 2021
be907e5
Update to 3.1.3
chausner Nov 5, 2021
4161569
Update git-tree hash
chausner Nov 5, 2021
221948d
Merge branch 'master' into openexr-3.1.2
chausner Jan 10, 2022
e0e1dd7
Update git-tree hash
chausner Jan 10, 2022
1a65106
Merge remote-tracking branch 'upstream/master' into openexr-3.1.2
chausner Feb 10, 2022
fd133ad
Bump port-version of freeimage
chausner Feb 10, 2022
fd8991b
Update CI baseline
chausner Feb 10, 2022
0894cc8
Bump port-version of osg
chausner Feb 10, 2022
df8988e
Update CI baseline
chausner Feb 10, 2022
7919c2d
Add license metadata to freeimage, openexr and osg
chausner Feb 10, 2022
d4df444
Update CI baseline
chausner Feb 10, 2022
99be26c
Update CI baseline
chausner Feb 10, 2022
1f68325
Remove license attribute for osg again
chausner Feb 10, 2022
53de3f6
Remove vcpkg_fail_port_install from openexr port
chausner Feb 10, 2022
b5d1a71
Update CI baseline
chausner Feb 10, 2022
384551c
Revert "Remove license attribute for osg again"
chausner Feb 11, 2022
e66d454
Update CI baseline
chausner Feb 11, 2022
d602bb3
Merge remote-tracking branch 'upstream/master' into openexr-3.1.2
chausner Apr 8, 2022
43fb373
Update to openexr 3.1.4
chausner Apr 8, 2022
d667556
Update CI baseline
chausner Apr 8, 2022
09db442
Clean up openexr versions
chausner Apr 8, 2022
dda6fb2
Fix MSVC2022 builds
chausner Apr 9, 2022
a0b939b
Update CI baseline
chausner Apr 9, 2022
5fb72aa
Fix OpenEXR compatibility in ogre
chausner Apr 9, 2022
57ab113
Update CI baseline
chausner Apr 9, 2022
552ea4b
osg: Switch back to vcpkg_configure_cmake
chausner Apr 9, 2022
45be7aa
Various fixes in osg
chausner Apr 10, 2022
d8d099f
Update CI baseline
chausner Apr 10, 2022
9d35fed
Fix OpenEXR in devil
chausner Apr 10, 2022
1feecb0
Update CI baseline
chausner Apr 10, 2022
f84687b
Fix devil on macOS
chausner Apr 10, 2022
347a52e
Update CI baseline
chausner Apr 10, 2022
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
5 changes: 4 additions & 1 deletion ports/freeimage/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ find_package(WebP REQUIRED)
find_package(JXR REQUIRED)
find_package(LibRaw REQUIRED)
find_package(OpenEXR REQUIRED)
find_package(Imath REQUIRED)

option(BUILD_SHARED_LIBS "Build shared libraries" ON)
option(INSTALL_HEADERS "Install the development headers" ON)
Expand Down Expand Up @@ -108,7 +109,8 @@ target_link_libraries(FreeImage ${ZLIB_LIBRARIES}
${WEBP_LIBRARIES}
${JXR_LIBRARIES}
${LibRaw_LIBRARIES}
OpenEXR::IlmImf)
OpenEXR::OpenEXR
Imath::Imath)

target_compile_definitions(FreeImage PRIVATE ${PNG_DEFINITIONS})

Expand Down Expand Up @@ -154,6 +156,7 @@ find_dependency(WebP)
find_dependency(JXR)
find_dependency(LibRaw)
find_dependency(OpenEXR)
find_dependency(Imath)
include(\"\${CMAKE_CURRENT_LIST_DIR}/freeimage-targets.cmake\")
")

Expand Down
32 changes: 30 additions & 2 deletions ports/freeimage/use-external-openexr.patch
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,38 @@ index b286430..82b3b72 100644
+#include <OpenEXR/ImfRgba.h>
+#include <OpenEXR/ImfArray.h>
+#include <OpenEXR/ImfPreviewImage.h>
+#include <OpenEXR/half.h>
+#include <Imath/half.h>


// ==========================================================
@@ -66,11 +66,11 @@ public:
return ((unsigned)n != _io->read_proc(c, 1, n, _handle));
}

- virtual Imath::Int64 tellg() {
+ virtual uint64_t tellg() {
return _io->tell_proc(_handle);
}

- virtual void seekg(Imath::Int64 pos) {
+ virtual void seekg(uint64_t pos) {
_io->seek_proc(_handle, (unsigned)pos, SEEK_SET);
}

@@ -100,11 +100,11 @@ public:
}
}

- virtual Imath::Int64 tellp() {
+ virtual uint64_t tellp() {
return _io->tell_proc(_handle);
}

- virtual void seekp(Imath::Int64 pos) {
+ virtual void seekp(uint64_t pos) {
_io->seek_proc(_handle, (unsigned)pos, SEEK_SET);
}
};
diff --git a/Source/FreeImage/PluginTIFF.cpp b/Source/FreeImage/PluginTIFF.cpp
index 562fdd7..ce12649 100644
--- a/Source/FreeImage/PluginTIFF.cpp
Expand All @@ -38,7 +66,7 @@ index 562fdd7..ce12649 100644
#include <tiffio.h>
#include "../Metadata/FreeImageTag.h"
-#include "../OpenEXR/Half/half.h"
+#include <OpenEXR/half.h>
+#include <Imath/half.h>

#include "FreeImageIO.h"
#include "PSDParser.h"
3 changes: 2 additions & 1 deletion ports/freeimage/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{
"name": "freeimage",
"version": "3.18.0",
"port-version": 21,
"port-version": 22,
"description": "Support library for graphics image formats",
"homepage": "https://sourceforge.net/projects/freeimage/",
"dependencies": [
"imath",
"jxrlib",
"libjpeg-turbo",
"libpng",
Expand Down
87 changes: 0 additions & 87 deletions ports/openexr/0001-remove_find_package_macro.patch

This file was deleted.

78 changes: 0 additions & 78 deletions ports/openexr/0002-fixup_cmake_exports_path.patch

This file was deleted.

40 changes: 0 additions & 40 deletions ports/openexr/0003-remove_symlinks.patch

This file was deleted.

This file was deleted.

Loading