From owner-svn-ports-head@FreeBSD.ORG Mon Jan 19 01:46:17 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 96974D97; Mon, 19 Jan 2015 01:46:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8266FC9F; Mon, 19 Jan 2015 01:46:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0J1kHNc089810; Mon, 19 Jan 2015 01:46:17 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0J1kFrP089803; Mon, 19 Jan 2015 01:46:15 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201501190146.t0J1kFrP089803@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Mon, 19 Jan 2015 01:46:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r377376 - in head/graphics/OpenEXR: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jan 2015 01:46:17 -0000 Author: mandree Date: Mon Jan 19 01:46:15 2015 New Revision: 377376 URL: https://svnweb.freebsd.org/changeset/ports/377376 QAT: https://qat.redports.org/buildarchive/r377376/ Log: Fix compilation if SSE2 is enabled on i386. While here, fix regression tests and see that things are fine. (Some regression-test issues remain for largestack, the default build passes make regression now on i386 and amd64). (No revision bump because these are build fixes, and the regression test stuff does not become part of the installed material.) Assisted by: truckman@ PR: 196014 Submitted by: truckman@ Added: head/graphics/OpenEXR/files/patch-IlmImfTest__main.cpp (contents, props changed) head/graphics/OpenEXR/files/patch-IlmImfTest_testOptimizedInterleavePatterns.cpp (contents, props changed) head/graphics/OpenEXR/files/patch-IlmImfUtilTest_main.cpp (contents, props changed) head/graphics/OpenEXR/files/patch-IlmImf__ImfSystemSpecific.cpp (contents, props changed) Modified: head/graphics/OpenEXR/Makefile head/graphics/OpenEXR/distinfo Modified: head/graphics/OpenEXR/Makefile ============================================================================== --- head/graphics/OpenEXR/Makefile Mon Jan 19 00:57:30 2015 (r377375) +++ head/graphics/OpenEXR/Makefile Mon Jan 19 01:46:15 2015 (r377376) @@ -5,8 +5,11 @@ PORTNAME= OpenEXR PORTVERSION= 2.2.0 PORTREVISION= 4 CATEGORIES= graphics devel -MASTER_SITES= SAVANNAH/openexr/ +MASTER_SITES= SAVANNAH/openexr/:dist \ + LOCAL/mandree/:test DISTNAME= openexr-${DISTVERSION} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:dist \ + openexr-2.2.0-comp_dwa-test-images.tar.xz:test MAINTAINER= mandree@FreeBSD.org COMMENT= High dynamic-range (HDR) image file format @@ -79,13 +82,12 @@ pre-configure: ${ECHO_CMD} "*** same C++ std. library before trying to build OpenEXR. Abort. ***" ; \ exit 1; } - .if ! ${PORT_OPTIONS:MEXAMPLES} EXTRA_PATCHES+=${FILESDIR}/extra-patch-IlmImfExamples__Makefile.in .endif regression-test regression test check: build - @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check) + @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${_MAKE_JOBS} check) post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libIlmImf-${MAJORVER}.so.${VER} Modified: head/graphics/OpenEXR/distinfo ============================================================================== --- head/graphics/OpenEXR/distinfo Mon Jan 19 00:57:30 2015 (r377375) +++ head/graphics/OpenEXR/distinfo Mon Jan 19 01:46:15 2015 (r377376) @@ -1,2 +1,4 @@ SHA256 (openexr-2.2.0.tar.gz) = 36a012f6c43213f840ce29a8b182700f6cf6b214bea0d5735594136b44914231 SIZE (openexr-2.2.0.tar.gz) = 14489661 +SHA256 (openexr-2.2.0-comp_dwa-test-images.tar.xz) = bbb8ff547e9b68f0dfb1e8804a7ad984978c2b15897988399cc68176e99dd63a +SIZE (openexr-2.2.0-comp_dwa-test-images.tar.xz) = 653768 Added: head/graphics/OpenEXR/files/patch-IlmImfTest__main.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/OpenEXR/files/patch-IlmImfTest__main.cpp Mon Jan 19 01:46:15 2015 (r377376) @@ -0,0 +1,11 @@ +--- IlmImfTest/main.cpp.orig 2014-08-10 04:23:59 UTC ++++ IlmImfTest/main.cpp +@@ -100,7 +100,7 @@ + #include + #include + +-#if defined(OPENEXR_IMF_HAVE_LINUX_PROCFS) || defined(OPENEXR_IMF_HAVE_DARWIN) ++#if defined(OPENEXR_IMF_HAVE_LINUX_PROCFS) || defined(OPENEXR_IMF_HAVE_DARWIN) || defined(__FreeBSD__) + #include + #include + #endif Added: head/graphics/OpenEXR/files/patch-IlmImfTest_testOptimizedInterleavePatterns.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/OpenEXR/files/patch-IlmImfTest_testOptimizedInterleavePatterns.cpp Mon Jan 19 01:46:15 2015 (r377376) @@ -0,0 +1,22 @@ +--- IlmImfTest/testOptimizedInterleavePatterns.cpp.orig 2014-08-10 02:03:49 UTC ++++ IlmImfTest/testOptimizedInterleavePatterns.cpp +@@ -226,7 +226,8 @@ bool compare(const FrameBuffer& asRead, + writtenHalf=half(i.slice().fillValue); + } + +- if (writtenHalf.bits()!=readHalf.bits()) ++ if (writtenHalf.bits()!=readHalf.bits() && ++ !(writtenHalf.isNan() && readHalf.isNan())) + { + if (nonfatal) + { +@@ -235,7 +236,8 @@ bool compare(const FrameBuffer& asRead, + else + { + cout << "\n\nerror reading back channel " << i.name() << " pixel " << x << ',' << y << " got " << readHalf << " expected " << writtenHalf << endl; +- assert(writtenHalf.bits()==readHalf.bits()); ++ assert(writtenHalf.bits()==readHalf.bits() || ++ (writtenHalf.isNan() && readHalf.isNan())); + exit(1); + } + } Added: head/graphics/OpenEXR/files/patch-IlmImfUtilTest_main.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/OpenEXR/files/patch-IlmImfUtilTest_main.cpp Mon Jan 19 01:46:15 2015 (r377376) @@ -0,0 +1,11 @@ +--- IlmImfUtilTest/main.cpp.orig 2014-08-10 04:24:00 UTC ++++ IlmImfUtilTest/main.cpp +@@ -46,7 +46,7 @@ + #include + #include + +-#if defined(OPENEXR_IMF_HAVE_LINUX_PROCFS) || defined(OPENEXR_IMF_HAVE_DARWIN) ++#if defined(OPENEXR_IMF_HAVE_LINUX_PROCFS) || defined(OPENEXR_IMF_HAVE_DARWIN) || defined(__FreeBSD__) + #include + #endif + Added: head/graphics/OpenEXR/files/patch-IlmImf__ImfSystemSpecific.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/OpenEXR/files/patch-IlmImf__ImfSystemSpecific.cpp Mon Jan 19 01:46:15 2015 (r377376) @@ -0,0 +1,25 @@ +--- IlmImf/ImfSystemSpecific.cpp.orig 2014-08-10 04:23:57 UTC ++++ IlmImf/ImfSystemSpecific.cpp +@@ -35,6 +35,9 @@ + #include "ImfSystemSpecific.h" + #include "ImfNamespace.h" + #include "OpenEXRConfig.h" ++#if defined(IMF_HAVE_SSE2) && defined(__GNUC__) ++#include ++#endif + + OPENEXR_IMF_INTERNAL_NAMESPACE_SOURCE_ENTER + +@@ -44,11 +47,7 @@ namespace { + // 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__