Index: head/graphics/OpenEXR/Makefile =================================================================== --- head/graphics/OpenEXR/Makefile (revision 421625) +++ head/graphics/OpenEXR/Makefile (revision 421626) @@ -1,93 +1,93 @@ # Created by: nork@FreeBSD.org # $FreeBSD$ PORTNAME= OpenEXR PORTVERSION= 2.2.0 PORTREVISION= 5 CATEGORIES= graphics devel 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 LICENSE= BSD3CLAUSE # exact version required to avoid hard-to-debug issues LIB_DEPENDS= libImath-2_2.so.12:graphics/ilmbase WRKSRC= ${WRKDIR}/${DISTNAME} USES= compiler:features gmake libtool pathfix pkgconfig GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-ilmbasetest --enable-imfexamples USE_LDCONFIG= yes TEST_TARGET= check CPPFLAGS+= -I. -I../IlmImf # must be linked with -l{thr|pthread} explicitly LDFLAGS+= -lpthread PORTDOCS= * PORTEXAMPLES= * DOCSRCDIR1= ${WRKSRC} DOC_FILES1= AUTHORS ChangeLog NEWS README DOCSRCDIR2= ${WRKSRC}/doc DOCSDIR2= ${DOCSDIR}/doc DOC_FILES2= *.pdf OPTIONS_DEFINE= DOCS EXAMPLES LARGE_STACK LARGE_STACK_DESC= Enable sys-dependant large stack optimizations OPTIONS_SUB= yes LARGE_STACK_CONFIGURE_ENABLE= large-stack .include .if ${ARCH} == powerpc USE_GCC= yes .endif MAJORVER= 2_2 VER= 22 PLIST_SUB= MAJORVER=${MAJORVER} PLIST_SUB+= VER=${VER} post-patch: @${REINPLACE_CMD} -e 's|== x|= x|g' ${WRKSRC}/configure @${REINPLACE_CMD} \ -e 's|$$(datadir)/doc/OpenEXR-@OPENEXR_VERSION@/examples|$$(prefix)/share/examples/${PORTNAME}|' \ ${WRKSRC}/IlmImfExamples/Makefile.in @${REINPLACE_CMD} -e 's|$$(datadir)/doc/OpenEXR-@OPENEXR_VERSION@||' \ -e 's|$$(EXTRA_DIST)||' \ ${WRKSRC}/doc/Makefile.am ${WRKSRC}/doc/Makefile.in # too many reports about compilation failures, so sanity check C++ # library _ilm_libcxx=${COMPILER_FEATURES:Mlib*c++} pre-configure: - @${OBJDUMP} -p ${LOCALBASE}/lib/libImath.so \ - | ${EGREP} -q '^[[:space:]]*NEEDED[[:space:]]+${_ilm_libcxx:C/\+/\\+/g}\.' \ + @${READELF} -d ${LOCALBASE}/lib/libImath.so \ + | ${EGREP} -q '\(NEEDED\).*\[${_ilm_libcxx:C/\+/\\+/g}\.' \ || { ${ECHO_CMD} "*** Your ilmbase package uses a different C++ standard library than ***" ; \ ${ECHO_CMD} "*** OpenEXR would. Please recompile and reinstall ilmbase with the ***" ; \ ${ECHO_CMD} "*** same C++ std. library before trying to build OpenEXR. Abort. ***" ; \ exit 1; } post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libIlmImf-${MAJORVER}.so.${VER} \ ${STAGEDIR}${PREFIX}/lib/libIlmImfUtil-${MAJORVER}.so.${VER} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR2} ${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2} .include Index: head/graphics/OpenEXR/files/patch-IlmImfUtil__Makefile.in =================================================================== --- head/graphics/OpenEXR/files/patch-IlmImfUtil__Makefile.in (revision 421625) +++ head/graphics/OpenEXR/files/patch-IlmImfUtil__Makefile.in (revision 421626) @@ -1,16 +1,16 @@ ---- ./IlmImfUtil/Makefile.in.orig 2014-08-15 19:35:57.000000000 +0200 -+++ ./IlmImfUtil/Makefile.in 2014-08-15 19:45:15.000000000 +0200 -@@ -265,10 +265,11 @@ +--- IlmImfUtil/Makefile.in.orig 2014-08-10 04:48:23 UTC ++++ IlmImfUtil/Makefile.in +@@ -265,10 +265,11 @@ libIlmImfUtil_la_LDFLAGS = @ILMBASE_LDFL libIlmImfUtil_la_LIBADD = -L$(top_builddir)/IlmImf @ILMBASE_LIBS@ -lIlmImf libIlmImfUtilincludedir = $(includedir)/OpenEXR EXTRA_DIST = CMakeLists.txt -INCLUDES = @ILMBASE_CXXFLAGS@ \ +INCLUDES = \ -I$(top_builddir) \ -I$(top_srcdir)/IlmImf \ - -I$(top_srcdir)/config + -I$(top_srcdir)/config \ + @ILMBASE_CXXFLAGS@ all: all-am Index: head/graphics/OpenEXR/files/patch-IlmImf_ImfFastHuf.cpp =================================================================== --- head/graphics/OpenEXR/files/patch-IlmImf_ImfFastHuf.cpp (revision 421625) +++ head/graphics/OpenEXR/files/patch-IlmImf_ImfFastHuf.cpp (revision 421626) @@ -1,47 +1,47 @@ ---- IlmImf/ImfFastHuf.cpp.orig 2014-08-10 08:23:56.000000000 +0400 -+++ IlmImf/ImfFastHuf.cpp 2015-04-08 00:10:07.536640000 +0300 -@@ -107,7 +107,7 @@ +--- IlmImf/ImfFastHuf.cpp.orig 2014-08-10 04:23:56 UTC ++++ IlmImf/ImfFastHuf.cpp +@@ -107,7 +107,7 @@ FastHufDecoder::FastHufDecoder for (int i = 0; i <= MAX_CODE_LEN; ++i) { codeCount[i] = 0; - base[i] = 0xffffffffffffffffL; + base[i] = 0xffffffffffffffffULL; offset[i] = 0; } -@@ -352,7 +352,7 @@ +@@ -352,7 +352,7 @@ FastHufDecoder::buildTables (Int64 *base for (int i = 0; i <= MAX_CODE_LEN; ++i) { - if (base[i] != 0xffffffffffffffffL) + if (base[i] != 0xffffffffffffffffULL) { _ljBase[i] = base[i] << (64 - i); } -@@ -362,7 +362,7 @@ +@@ -362,7 +362,7 @@ FastHufDecoder::buildTables (Int64 *base // Unused code length - insert dummy values // - _ljBase[i] = 0xffffffffffffffffL; + _ljBase[i] = 0xffffffffffffffffULL; } } -@@ -417,7 +417,7 @@ +@@ -417,7 +417,7 @@ FastHufDecoder::buildTables (Int64 *base int minIdx = TABLE_LOOKUP_BITS; - while (minIdx > 0 && _ljBase[minIdx] == 0xffffffffffffffffL) + while (minIdx > 0 && _ljBase[minIdx] == 0xffffffffffffffffULL) minIdx--; if (minIdx < 0) -@@ -427,7 +427,7 @@ +@@ -427,7 +427,7 @@ FastHufDecoder::buildTables (Int64 *base // Set the min value such that the table is never tested. // - _tableMin = 0xffffffffffffffffL; + _tableMin = 0xffffffffffffffffULL; } else { Index: head/graphics/OpenEXR/files/patch-IlmImf__ImfSystemSpecific.cpp =================================================================== --- head/graphics/OpenEXR/files/patch-IlmImf__ImfSystemSpecific.cpp (revision 421625) +++ head/graphics/OpenEXR/files/patch-IlmImf__ImfSystemSpecific.cpp (revision 421626) @@ -1,29 +1,29 @@ ---- IlmImf/ImfSystemSpecific.cpp.orig 2014-08-10 08:23:57.000000000 +0400 -+++ IlmImf/ImfSystemSpecific.cpp 2015-04-09 00:08:50.100958000 +0300 -@@ -44,11 +44,23 @@ +--- IlmImf/ImfSystemSpecific.cpp.orig 2014-08-10 04:23:57 UTC ++++ IlmImf/ImfSystemSpecific.cpp +@@ -44,11 +44,23 @@ namespace { // Helper functions for gcc + SSE enabled void cpuid(int n, int &eax, int &ebx, int &ecx, int &edx) { +#if __i386__ __asm__ __volatile__ ( - "cpuid" - : /* Output */ "=a"(eax), "=b"(ebx), "=c"(ecx), "=d"(edx) - : /* Input */ "a"(n) + "xchgl %%ebx,%k1\n" + "cpuid\n" + "xchgl %%ebx,%k1" \ + : /* Output */ "=a"(eax), "=&r"(ebx), "=c"(ecx), "=d"(edx) + : /* Input */ "0"(n) : /* Clobber */); +#else + __asm__ __volatile__ ( + "xchgq %%rbx,%q1\n" + "cpuid\n" + "xchgq %%rbx,%q1" \ + : /* Output */ "=a"(eax), "=&r"(ebx), "=c"(ecx), "=d"(edx) + : /* Input */ "0"(n) + : /* Clobber */); +#endif } #else // IMF_HAVE_SSE2 && __GNUC__ Index: head/graphics/OpenEXR/files/patch-IlmImf__Makefile.in =================================================================== --- head/graphics/OpenEXR/files/patch-IlmImf__Makefile.in (revision 421625) +++ head/graphics/OpenEXR/files/patch-IlmImf__Makefile.in (revision 421626) @@ -1,15 +1,15 @@ ---- ./IlmImf/Makefile.in.orig 2014-08-15 19:35:57.000000000 +0200 -+++ ./IlmImf/Makefile.in 2014-08-15 19:45:43.000000000 +0200 -@@ -458,9 +458,10 @@ +--- IlmImf/Makefile.in.orig 2014-08-10 04:48:23 UTC ++++ IlmImf/Makefile.in +@@ -458,9 +458,10 @@ noinst_HEADERS = ImfCompressor.h \ ImfOptimizedPixelReading.h EXTRA_DIST = $(noinst_HEADERS) b44ExpLogTable.cpp b44ExpLogTable.h dwaLookups.cpp dwaLookups.h CMakeLists.txt -INCLUDES = @ILMBASE_CXXFLAGS@ \ +INCLUDES = \ -I$(top_builddir) \ - -I$(top_srcdir)/config + -I$(top_srcdir)/config \ + @ILMBASE_CXXFLAGS@ CLEANFILES = b44ExpLogTable b44ExpLogTable.h dwaLookups dwaLookups.h b44ExpLogTable_SOURCES = b44ExpLogTable.cpp Index: head/graphics/OpenEXR/files/patch-exrenvmap__main.cpp =================================================================== --- head/graphics/OpenEXR/files/patch-exrenvmap__main.cpp (revision 421625) +++ head/graphics/OpenEXR/files/patch-exrenvmap__main.cpp (revision 421626) @@ -1,10 +1,10 @@ ---- ./exrenvmap/main.cpp.orig 2013-11-25 20:49:55.000000000 +0100 -+++ ./exrenvmap/main.cpp 2014-03-24 18:28:37.906458972 +0100 +--- exrenvmap/main.cpp.orig 2014-08-10 04:24:00 UTC ++++ exrenvmap/main.cpp @@ -47,6 +47,7 @@ #include #include +#include #include #include #include Index: head/graphics/OpenEXR/files/patch-exrmaketiled__main.cpp =================================================================== --- head/graphics/OpenEXR/files/patch-exrmaketiled__main.cpp (revision 421625) +++ head/graphics/OpenEXR/files/patch-exrmaketiled__main.cpp (revision 421626) @@ -1,10 +1,10 @@ ---- ./exrmaketiled/main.cpp.orig 2013-11-25 20:49:56.000000000 +0100 -+++ ./exrmaketiled/main.cpp 2014-03-24 18:28:37.916466529 +0100 +--- exrmaketiled/main.cpp.orig 2014-08-10 04:24:00 UTC ++++ exrmaketiled/main.cpp @@ -43,6 +43,7 @@ #include "makeTiled.h" #include +#include #include #include #include