Date: Fri, 9 Sep 2016 18:50:33 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421626 - in head/graphics/OpenEXR: . files Message-ID: <201609091850.u89IoX1G015816@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Fri Sep 9 18:50:33 2016 New Revision: 421626 URL: https://svnweb.freebsd.org/changeset/ports/421626 Log: Replace objdump by readelf. Fixes build on arm64. While here, refresh patches. PR: 212308 Submitted by: emaste@ Reported by: andrew@ MFH: 2016Q3 Differential Revision: D7842 Modified: head/graphics/OpenEXR/Makefile head/graphics/OpenEXR/files/patch-IlmImfUtil__Makefile.in head/graphics/OpenEXR/files/patch-IlmImf_ImfFastHuf.cpp head/graphics/OpenEXR/files/patch-IlmImf__ImfSystemSpecific.cpp head/graphics/OpenEXR/files/patch-IlmImf__Makefile.in head/graphics/OpenEXR/files/patch-exrenvmap__main.cpp head/graphics/OpenEXR/files/patch-exrmaketiled__main.cpp Modified: head/graphics/OpenEXR/Makefile ============================================================================== --- head/graphics/OpenEXR/Makefile Fri Sep 9 18:48:24 2016 (r421625) +++ head/graphics/OpenEXR/Makefile Fri Sep 9 18:50:33 2016 (r421626) @@ -73,8 +73,8 @@ post-patch: # 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. ***" ; \ Modified: head/graphics/OpenEXR/files/patch-IlmImfUtil__Makefile.in ============================================================================== --- head/graphics/OpenEXR/files/patch-IlmImfUtil__Makefile.in Fri Sep 9 18:48:24 2016 (r421625) +++ head/graphics/OpenEXR/files/patch-IlmImfUtil__Makefile.in Fri Sep 9 18:50:33 2016 (r421626) @@ -1,6 +1,6 @@ ---- ./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 Modified: head/graphics/OpenEXR/files/patch-IlmImf_ImfFastHuf.cpp ============================================================================== --- head/graphics/OpenEXR/files/patch-IlmImf_ImfFastHuf.cpp Fri Sep 9 18:48:24 2016 (r421625) +++ head/graphics/OpenEXR/files/patch-IlmImf_ImfFastHuf.cpp Fri Sep 9 18:50:33 2016 (r421626) @@ -1,6 +1,6 @@ ---- 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; @@ -9,7 +9,7 @@ offset[i] = 0; } -@@ -352,7 +352,7 @@ +@@ -352,7 +352,7 @@ FastHufDecoder::buildTables (Int64 *base for (int i = 0; i <= MAX_CODE_LEN; ++i) { @@ -18,7 +18,7 @@ { _ljBase[i] = base[i] << (64 - i); } -@@ -362,7 +362,7 @@ +@@ -362,7 +362,7 @@ FastHufDecoder::buildTables (Int64 *base // Unused code length - insert dummy values // @@ -27,7 +27,7 @@ } } -@@ -417,7 +417,7 @@ +@@ -417,7 +417,7 @@ FastHufDecoder::buildTables (Int64 *base int minIdx = TABLE_LOOKUP_BITS; @@ -36,7 +36,7 @@ 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. // Modified: head/graphics/OpenEXR/files/patch-IlmImf__ImfSystemSpecific.cpp ============================================================================== --- head/graphics/OpenEXR/files/patch-IlmImf__ImfSystemSpecific.cpp Fri Sep 9 18:48:24 2016 (r421625) +++ head/graphics/OpenEXR/files/patch-IlmImf__ImfSystemSpecific.cpp Fri Sep 9 18:50:33 2016 (r421626) @@ -1,6 +1,6 @@ ---- 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) { Modified: head/graphics/OpenEXR/files/patch-IlmImf__Makefile.in ============================================================================== --- head/graphics/OpenEXR/files/patch-IlmImf__Makefile.in Fri Sep 9 18:48:24 2016 (r421625) +++ head/graphics/OpenEXR/files/patch-IlmImf__Makefile.in Fri Sep 9 18:50:33 2016 (r421626) @@ -1,6 +1,6 @@ ---- ./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 Modified: head/graphics/OpenEXR/files/patch-exrenvmap__main.cpp ============================================================================== --- head/graphics/OpenEXR/files/patch-exrenvmap__main.cpp Fri Sep 9 18:48:24 2016 (r421625) +++ head/graphics/OpenEXR/files/patch-exrenvmap__main.cpp Fri Sep 9 18:50:33 2016 (r421626) @@ -1,5 +1,5 @@ ---- ./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 <ImfHeader.h> Modified: head/graphics/OpenEXR/files/patch-exrmaketiled__main.cpp ============================================================================== --- head/graphics/OpenEXR/files/patch-exrmaketiled__main.cpp Fri Sep 9 18:48:24 2016 (r421625) +++ head/graphics/OpenEXR/files/patch-exrmaketiled__main.cpp Fri Sep 9 18:50:33 2016 (r421626) @@ -1,5 +1,5 @@ ---- ./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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609091850.u89IoX1G015816>