Skip to content

Commit

Permalink
graphics/openexr: Fix some CPUTYPE builds.
Browse files Browse the repository at this point in the history
Reported by:	jkim@FreeBSD.org
Obtained from:	AcademySoftwareFoundation/openexr#1507
MFH:		2023Q3
  • Loading branch information
mandree committed Aug 5, 2023
1 parent 52f03d7 commit db2c219
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 3 deletions.
4 changes: 1 addition & 3 deletions graphics/openexr/Makefile
@@ -1,6 +1,6 @@
PORTNAME= openexr
PORTVERSION= 3.1.10
PORTREVISION= 0
PORTREVISION= 1
CATEGORIES= graphics devel

MAINTAINER= mandree@FreeBSD.org
Expand All @@ -23,8 +23,6 @@ CPPFLAGS+= -I.
# must be linked with -l{thr|pthread} explicitly
LDFLAGS+= -lpthread

PATCH_STRIP= -p1

_MAJORVER= 3_1
_VER= 30
_MINVER= 10
Expand Down
24 changes: 24 additions & 0 deletions graphics/openexr/files/patch-lib_OpenEXRCore_internal__cpuid.h
@@ -0,0 +1,24 @@
https://github.com/AcademySoftwareFoundation/openexr/pull/1507/files

--- src/lib/OpenEXRCore/internal_cpuid.h.orig 2023-07-31 18:17:50 UTC
+++ src/lib/OpenEXRCore/internal_cpuid.h
@@ -39,14 +39,16 @@ static inline void check_for_x86_simd (int *f16c, int
*f16c = 0;
# endif

-#elif OPENEXR_ENABLE_X86_SIMD_CHECK
+#elif defined(__AVX__) && defined(__F16C__)

// shortcut if everything is turned on / compiled in
-# if defined(__AVX__) && defined(__F16C__)
*f16c = 1;
*avx = 1;
*sse2 = 1;
-# elif defined(_MSC_VER) && defined(_WIN32)
+
+#elif OPENEXR_ENABLE_X86_SIMD_CHECK
+
+# if defined(_MSC_VER) && defined(_WIN32)
int regs[4], osxsave;

__cpuid (regs, 0);

0 comments on commit db2c219

Please sign in to comment.