[Midnightbsd-cvs] mports [23505] trunk/graphics/OpenEXR: update openexr

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri May 11 12:02:20 EDT 2018 

Revision: 23505
          http://svnweb.midnightbsd.org/mports/?rev=23505
Author:   laffer1
Date:     2018-05-11 12:02:19 -0400 (Fri, 11 May 2018)
Log Message:
-----------
update openexr

Modified Paths:
--------------
    trunk/graphics/OpenEXR/Makefile
    trunk/graphics/OpenEXR/distinfo
    trunk/graphics/OpenEXR/files/patch-IlmImfUtil__Makefile.in
    trunk/graphics/OpenEXR/files/patch-IlmImf_ImfFastHuf.cpp
    trunk/graphics/OpenEXR/files/patch-IlmImf__ImfSystemSpecific.cpp
    trunk/graphics/OpenEXR/files/patch-IlmImf__Makefile.in
    trunk/graphics/OpenEXR/files/patch-exrenvmap__main.cpp
    trunk/graphics/OpenEXR/files/patch-exrmaketiled__main.cpp
    trunk/graphics/OpenEXR/pkg-plist

Removed Paths:
-------------
    trunk/graphics/OpenEXR/files/extra-patch-IlmImfExamples__Makefile.in

Modified: trunk/graphics/OpenEXR/Makefile
===================================================================
--- trunk/graphics/OpenEXR/Makefile	2018-05-11 15:59:26 UTC (rev 23504)
+++ trunk/graphics/OpenEXR/Makefile	2018-05-11 16:02:19 UTC (rev 23505)
@@ -1,8 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	OpenEXR
-PORTVERSION=	2.2.0
-PORTREVISION=	3
+PORTVERSION=	2.2.1
 CATEGORIES=	graphics devel
 MASTER_SITES=	SAVANNAH/openexr/:dist \
 		FREEBSD_LOCAL/mandree/:test
@@ -16,16 +15,17 @@
 LICENSE=	bsd3
 
 # exact version required to avoid hard-to-debug issues
-LIB_DEPENDS=	libImath-2_2.so.12:${PORTSDIR}/graphics/ilmbase
+LIB_DEPENDS=	libImath-2_2.so.23:graphics/ilmbase
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
 USES=		compiler:features gmake libtool pathfix pkgconfig
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--disable-ilmbasetest --enable-imfexamples
+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
 
@@ -48,8 +48,12 @@
 
 .include <bsd.port.pre.mk>
 
+.if ${ARCH} == powerpc
+USE_GCC=	yes
+.endif
+
 MAJORVER=	2_2
-VER=		22
+VER=		23
 
 PLIST_SUB=	MAJORVER=${MAJORVER}
 PLIST_SUB+=	VER=${VER}
@@ -67,24 +71,18 @@
 # 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; }
 
-.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} ${_MAKE_JOBS} check)
-
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libIlmImf-${MAJORVER}.so.${VER}
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libIlmImfUtil-${MAJORVER}.so.${VER}
+	${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}

Modified: trunk/graphics/OpenEXR/distinfo
===================================================================
--- trunk/graphics/OpenEXR/distinfo	2018-05-11 15:59:26 UTC (rev 23504)
+++ trunk/graphics/OpenEXR/distinfo	2018-05-11 16:02:19 UTC (rev 23505)
@@ -1,4 +1,5 @@
-SHA256 (openexr-2.2.0.tar.gz) = 36a012f6c43213f840ce29a8b182700f6cf6b214bea0d5735594136b44914231
-SIZE (openexr-2.2.0.tar.gz) = 14489661
+TIMESTAMP = 1512081871
+SHA256 (openexr-2.2.1.tar.gz) = 8f9a5af6131583404261931d9a5c83de0a425cb4b8b25ddab2b169fbf113aecd
+SIZE (openexr-2.2.1.tar.gz) = 18176639
 SHA256 (openexr-2.2.0-comp_dwa-test-images.tar.xz) = bbb8ff547e9b68f0dfb1e8804a7ad984978c2b15897988399cc68176e99dd63a
 SIZE (openexr-2.2.0-comp_dwa-test-images.tar.xz) = 653768

Deleted: trunk/graphics/OpenEXR/files/extra-patch-IlmImfExamples__Makefile.in
===================================================================
--- trunk/graphics/OpenEXR/files/extra-patch-IlmImfExamples__Makefile.in	2018-05-11 15:59:26 UTC (rev 23504)
+++ trunk/graphics/OpenEXR/files/extra-patch-IlmImfExamples__Makefile.in	2018-05-11 16:02:19 UTC (rev 23505)
@@ -1,33 +0,0 @@
---- ./IlmImfExamples/Makefile.in.orig	2014-03-24 18:28:37.886449236 +0100
-+++ ./IlmImfExamples/Makefile.in	2014-03-24 18:33:52.637113427 +0100
-@@ -356,18 +356,18 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--install-examplesDATA: $(examples_DATA)
--	@$(NORMAL_INSTALL)
--	test -z "$(examplesdir)" || $(MKDIR_P) "$(DESTDIR)$(examplesdir)"
--	@list='$(examples_DATA)'; test -n "$(examplesdir)" || list=; \
--	for p in $$list; do \
--	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  echo "$$d$$p"; \
--	done | $(am__base_list) | \
--	while read files; do \
--	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(examplesdir)'"; \
--	  $(INSTALL_DATA) $$files "$(DESTDIR)$(examplesdir)" || exit $$?; \
--	done
-+#install-examplesDATA: $(examples_DATA)
-+#	@$(NORMAL_INSTALL)
-+#	test -z "$(examplesdir)" || $(MKDIR_P) "$(DESTDIR)$(examplesdir)"
-+#	@list='$(examples_DATA)'; test -n "$(examplesdir)" || list=; \
-+#	for p in $$list; do \
-+#	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+#	  echo "$$d$$p"; \
-+#	done | $(am__base_list) | \
-+#	while read files; do \
-+#	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(examplesdir)'"; \
-+#	  $(INSTALL_DATA) $$files "$(DESTDIR)$(examplesdir)" || exit $$?; \
-+#	done
- 
- uninstall-examplesDATA:
- 	@$(NORMAL_UNINSTALL)

Modified: trunk/graphics/OpenEXR/files/patch-IlmImfUtil__Makefile.in
===================================================================
--- trunk/graphics/OpenEXR/files/patch-IlmImfUtil__Makefile.in	2018-05-11 15:59:26 UTC (rev 23504)
+++ trunk/graphics/OpenEXR/files/patch-IlmImfUtil__Makefile.in	2018-05-11 16:02:19 UTC (rev 23505)
@@ -1,6 +1,12 @@
---- ./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	2017-12-01 01:20:37 UTC
++++ IlmImfUtil/Makefile.in
+@@ -375,15 +375,16 @@ libIlmImfUtil_la_SOURCES = \
+ 	ImfImageDataWindow.h ImfImageDataWindow.cpp \
+ 	ImfImageChannelRenaming.h
+ 
+-libIlmImfUtil_la_LDFLAGS = @ILMBASE_LDFLAGS@ -version-info \
++libIlmImfUtil_la_LDFLAGS = -L$(top_builddir)/IlmImf @ILMBASE_LDFLAGS@ -version-info \
+ 	@LIBTOOL_VERSION@ -no-undefined $(am__append_1)
  libIlmImfUtil_la_LIBADD = -L$(top_builddir)/IlmImf @ILMBASE_LIBS@ -lIlmImf
  libIlmImfUtilincludedir = $(includedir)/OpenEXR
  EXTRA_DIST = CMakeLists.txt

Modified: trunk/graphics/OpenEXR/files/patch-IlmImf_ImfFastHuf.cpp
===================================================================
--- trunk/graphics/OpenEXR/files/patch-IlmImf_ImfFastHuf.cpp	2018-05-11 15:59:26 UTC (rev 23504)
+++ trunk/graphics/OpenEXR/files/patch-IlmImf_ImfFastHuf.cpp	2018-05-11 16:02:19 UTC (rev 23505)
@@ -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	2017-11-17 23:00:24 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: trunk/graphics/OpenEXR/files/patch-IlmImf__ImfSystemSpecific.cpp
===================================================================
--- trunk/graphics/OpenEXR/files/patch-IlmImf__ImfSystemSpecific.cpp	2018-05-11 15:59:26 UTC (rev 23504)
+++ trunk/graphics/OpenEXR/files/patch-IlmImf__ImfSystemSpecific.cpp	2018-05-11 16:02:19 UTC (rev 23505)
@@ -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	2017-11-17 23:00:24 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: trunk/graphics/OpenEXR/files/patch-IlmImf__Makefile.in
===================================================================
--- trunk/graphics/OpenEXR/files/patch-IlmImf__Makefile.in	2018-05-11 15:59:26 UTC (rev 23504)
+++ trunk/graphics/OpenEXR/files/patch-IlmImf__Makefile.in	2018-05-11 16:02:19 UTC (rev 23505)
@@ -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: trunk/graphics/OpenEXR/files/patch-exrenvmap__main.cpp
===================================================================
--- trunk/graphics/OpenEXR/files/patch-exrenvmap__main.cpp	2018-05-11 15:59:26 UTC (rev 23504)
+++ trunk/graphics/OpenEXR/files/patch-exrenvmap__main.cpp	2018-05-11 16:02:19 UTC (rev 23505)
@@ -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: trunk/graphics/OpenEXR/files/patch-exrmaketiled__main.cpp
===================================================================
--- trunk/graphics/OpenEXR/files/patch-exrmaketiled__main.cpp	2018-05-11 15:59:26 UTC (rev 23504)
+++ trunk/graphics/OpenEXR/files/patch-exrmaketiled__main.cpp	2018-05-11 16:02:19 UTC (rev 23505)
@@ -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"
  

Modified: trunk/graphics/OpenEXR/pkg-plist
===================================================================
--- trunk/graphics/OpenEXR/pkg-plist	2018-05-11 15:59:26 UTC (rev 23504)
+++ trunk/graphics/OpenEXR/pkg-plist	2018-05-11 16:02:19 UTC (rev 23505)
@@ -96,8 +96,8 @@
 lib/libIlmImf-%%MAJORVER%%.so.%%VER%%.0.0
 lib/libIlmImf.a
 lib/libIlmImf.so
-lib/libIlmImfUtil-%%MAJORVER%%.so.22
-lib/libIlmImfUtil-%%MAJORVER%%.so.22.0.0
+lib/libIlmImfUtil-%%MAJORVER%%.so.%%VER%%
+lib/libIlmImfUtil-%%MAJORVER%%.so.%%VER%%.0.0
 lib/libIlmImfUtil.a
 lib/libIlmImfUtil.so
 libdata/pkgconfig/OpenEXR.pc

More information about the Midnightbsd-cvs mailing list