Attachment #151374 for bug #196014

Lines 79-85 Link Here

(-)Makefile (-1 lines)
79	${ECHO_CMD} "* same C++ std. library before trying to build OpenEXR. Abort. *" ; \	79	${ECHO_CMD} "* same C++ std. library before trying to build OpenEXR. Abort. *" ; \
80	exit 1; }	80	exit 1; }
81		81
82
83	.if ! ${PORT_OPTIONS:MEXAMPLES}	82	.if ! ${PORT_OPTIONS:MEXAMPLES}
84	EXTRA_PATCHES+=${FILESDIR}/extra-patch-IlmImfExamples__Makefile.in	83	EXTRA_PATCHES+=${FILESDIR}/extra-patch-IlmImfExamples__Makefile.in
85	.endif	84	.endif

Line 0 Link Here

(-)files/patch-IlmImfTest__main.cpp (+11 lines)
	1	--- IlmImfTest/main.cpp.orig 2014-08-09 21:23:59.000000000 -0700
	2	+++ IlmImfTest/main.cpp 2015-01-05 16:43:16.000000000 -0800
	3	@@ -100,7 +100,7 @@
	4	#include <string.h>
	5	#include <time.h>
	6
	7	-#if defined(OPENEXR_IMF_HAVE_LINUX_PROCFS) \|\| defined(OPENEXR_IMF_HAVE_DARWIN)
	8	+#if defined(OPENEXR_IMF_HAVE_LINUX_PROCFS) \|\| defined(OPENEXR_IMF_HAVE_DARWIN) \|\| defined(__FreeBSD__)
	9	#include <unistd.h>
	10	#include <sstream>
	11	#endif




--- IlmImf/ImfSystemSpecific.cpp.orig	2014-08-10 04:23:57.000000000 +0000
+++ IlmImf/ImfSystemSpecific.cpp	2014-12-15 17:11:36.000000000 +0000
@@ -35,6 +35,9 @@
 #include "ImfSystemSpecific.h"
 #include "ImfNamespace.h"
 #include "OpenEXRConfig.h"
+#if defined(IMF_HAVE_SSE2) &&  defined(__GNUC__)
+#include <cpuid.h>
+#endif
 
 OPENEXR_IMF_INTERNAL_NAMESPACE_SOURCE_ENTER
 
@@ -44,11 +47,7 @@
     // Helper functions for gcc + SSE enabled
     void cpuid(int n, int &eax, int &ebx, int &ecx, int &edx)
     {
-        __asm__ __volatile__ (
-            "cpuid"
-            : /* Output  */ "=a"(eax), "=b"(ebx), "=c"(ecx), "=d"(edx) 
-            : /* Input   */ "a"(n)
-            : /* Clobber */);
+	__cpuid(n, eax, ebx, ecx, edx);
     }
 
 #else // IMF_HAVE_SSE2 && __GNUC__

Return to bug 196014

Line 0 Link Here

(-)files/patch-IlmImf__ImfSystemSpecific.cpp (+25 lines)
	1	--- IlmImf/ImfSystemSpecific.cpp.orig 2014-08-10 04:23:57.000000000 +0000
	2	+++ IlmImf/ImfSystemSpecific.cpp 2014-12-15 17:11:36.000000000 +0000
	3	@@ -35,6 +35,9 @@
	4	#include "ImfSystemSpecific.h"
	5	#include "ImfNamespace.h"
	6	#include "OpenEXRConfig.h"
	7	+#if defined(IMF_HAVE_SSE2) && defined(__GNUC__)
	8	+#include <cpuid.h>
	9	+#endif
	10
	11	OPENEXR_IMF_INTERNAL_NAMESPACE_SOURCE_ENTER
	12
	13	@@ -44,11 +47,7 @@
	14	// Helper functions for gcc + SSE enabled
	15	void cpuid(int n, int &eax, int &ebx, int &ecx, int &edx)
	16	{
	17	- __asm__ __volatile__ (
	18	- "cpuid"
	19	- : /* Output */ "=a"(eax), "=b"(ebx), "=c"(ecx), "=d"(edx)
	20	- : /* Input */ "a"(n)
	21	- : /* Clobber */);
	22	+ __cpuid(n, eax, ebx, ecx, edx);
	23	}
	24
	25	#else // IMF_HAVE_SSE2 && __GNUC__