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

[openexr] Fix openexr using unrequested intrinsics #29996

Merged
merged 5 commits into from
Mar 15, 2023
Merged

[openexr] Fix openexr using unrequested intrinsics #29996

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a9f5321
[openexr] fix usage of unrequested intrinsics
Neumann-A Mar 3, 2023
43d6077
v db
Neumann-A Mar 3, 2023
b125fb8
remove intrin patch
Neumann-A Mar 3, 2023
d842e5b
v db
Neumann-A Mar 3, 2023
5a0d4a0
Merge branch 'master' of https://github.com/microsoft/vcpkg into fix_…
Mar 14, 2023
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
13 changes: 13 additions & 0 deletions ports/openexr/avx.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/src/lib/OpenEXRCore/unpack.c b/src/lib/OpenEXRCore/unpack.c
index 7587eb2..79061b8 100644
--- a/src/lib/OpenEXRCore/unpack.c
+++ b/src/lib/OpenEXRCore/unpack.c
@@ -37,7 +39,7 @@ half_to_float8 (float* out, const uint16_t* src)
}
#endif

-#if (defined(__x86_64__) || defined(_M_X64)) && \
+#if (defined(__x86_64__) || defined(_M_X64)) && defined(__AVX__) && \
(defined(__F16C__) || defined(__GNUC__) || defined(__clang__))

# if defined(__F16C__)
1 change: 1 addition & 0 deletions ports/openexr/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ vcpkg_from_github(
REF v3.1.5
SHA512 01ef16eacd2dde83c67b81522bae87f47ba272a41ce7d4e35d865dbdcaa03093e7ac504b95d2c1b3a19535f2364a4f937b0e0570c74243bb1c6e021fce7b620c
HEAD_REF master
PATCHES avx.patch
)

vcpkg_check_features(OUT_FEATURE_OPTIONS OPTIONS
Expand Down
1 change: 1 addition & 0 deletions ports/openexr/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "openexr",
"version": "3.1.5",
"port-version": 1,
"description": "OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications",
"homepage": "https://www.openexr.com/",
"license": "BSD-3-Clause",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5705,7 +5705,7 @@
},
"openexr": {
"baseline": "3.1.5",
"port-version": 0
"port-version": 1
},
"openfbx": {
"baseline": "2022-07-18",
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/openexr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1bdfd5d68efb96110d15fb1244b7413f1a5edcfe",
"version": "3.1.5",
"port-version": 1
},
{
"git-tree": "1426fa9af15b03db5bacc50dcdd4569da1c18bde",
"version": "3.1.5",
Expand Down