Date: Sat, 26 Oct 2013 19:34:09 GMT From: nemysis <nemysis@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/183345: [exp-run] graphics/ilmbase, update to 2.0.1 Message-ID: <201310261934.r9QJY9dm085739@oldred.freebsd.org> Resent-Message-ID: <201310261940.r9QJe0e0032628@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 183345 >Category: ports >Synopsis: [exp-run] graphics/ilmbase, update to 2.0.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Oct 26 19:40:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: nemysis >Release: FreeBSD 9.2-RELEASE-p8 amd64 >Organization: >Environment: FreeBSD nemysis4now 9.2-RELEASE-p8 FreeBSD 9.2-RELEASE-p8 #0: Mon Sep 23 16:26:45 UTC 2013 >Description: graphics/ilmbase - Update to 2.0.1 - Change master sites to SAVANNAH - Change maintainer email to @FreeBSD.org - Remove conflict with non existent Port - USES pathfix pkgconfig - Add executable - Add DOCS Option - Support STAGEDIR and add OPTIONS_SUB - Use pathfix instead of simple patches - Adjust patches - Change WWW Build log https://redports.org/buildarchive/20131009170900-48405/ When are there build failures with 2.0.1 Versions, I have too finished -devel versions. >How-To-Repeat: >Fix: Patch attached with submission follows: Index: Makefile =================================================================== --- Makefile (revision 329633) +++ Makefile (working copy) @@ -2,46 +2,55 @@ # $FreeBSD$ PORTNAME= ilmbase -PORTVERSION= 1.0.3 +PORTVERSION= 2.0.1 CATEGORIES= graphics devel -MASTER_SITES= http://cloud.github.com/downloads/openexr/openexr/ +MASTER_SITES= SAVANNAH/openexr/ +DISTNAME= ilmbase-${PORTVERSION} -MAINTAINER= nemysis@gmx.ch +MAINTAINER= nemysis@FreeBSD.org COMMENT= ILM Base libraries a.k.a. Half, IlmThread, Imath, and Iex LICENSE= BSD -CONFLICTS= OpenEXR-1.[0-4].* - -USES= pkgconfig -USE_LDCONFIG= yes +USES= pathfix pkgconfig GNU_CONFIGURE= yes USE_AUTOTOOLS= libtool +USE_LDCONFIG= yes PORTDOCS= AUTHORS ChangeLog README -OPTIONS_DEFINE= THREAD +BIN= eLut toFloat + +OPTIONS_DEFINE= DOCS THREAD OPTIONS_DEFAULT= THREAD THREAD_DESC= Enable multithreaded file I/O support -NO_STAGE= yes +OPTIONS_SUB= yes + +THREAD_CONFIGURE_ENABLE= threading + .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MTHREAD} -CONFIGURE_ARGS+=--enable-threading CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" -.else -CONFIGURE_ARGS+=--disable-threading .endif +PLIST_SUB= MAJORVER=2_0 + regression-test regression test check: build @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check) +post-patch: + @${REINPLACE_CMD} -e 's|Iex/libIex.la|Iex/libIex.la $(PTHREAD_LIBS)|' \ + ${WRKSRC}/IlmThread/Makefile.am + post-install: -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} -.endif +.for e in ${BIN} + ${INSTALL_PROGRAM} ${WRKSRC}/Half/${e} ${STAGEDIR}${PREFIX}/bin/${e} +.endfor + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} + .include <bsd.port.mk> Index: distinfo =================================================================== --- distinfo (revision 329633) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (ilmbase-1.0.3.tar.gz) = a998e064d6960ba258731fa5c8e7a3870b0eaa7ba9c1a5e5078263e9d9f76502 -SIZE (ilmbase-1.0.3.tar.gz) = 534980 +SHA256 (ilmbase-2.0.1.tar.gz) = 19b03975fea4461f2eff91f5df138b301b3ea9709eccbda98447f372bf09735f +SIZE (ilmbase-2.0.1.tar.gz) = 555828 Index: files/patch-IexMath-IexMathFpu.cpp =================================================================== --- files/patch-IexMath-IexMathFpu.cpp (revision 329633) +++ files/patch-IexMath-IexMathFpu.cpp (working copy) @@ -1,6 +1,6 @@ ---- IexMath/IexMathFpu.cpp.orig 2012-07-26 20:51:55.000000000 +0200 -+++ IexMath/IexMathFpu.cpp 2012-11-01 12:00:36.000000000 +0100 -@@ -27,7 +27,7 @@ +--- IexMath/IexMathFpu.cpp.orig 2013-06-18 21:51:38.000000000 +0200 ++++ IexMath/IexMathFpu.cpp 2013-10-04 19:25:00.000000000 +0200 +@@ -53,7 +53,7 @@ #endif Index: files/patch-Imath-ImathFun.cpp =================================================================== --- files/patch-Imath-ImathFun.cpp (revision 329633) +++ files/patch-Imath-ImathFun.cpp (working copy) @@ -1,5 +1,5 @@ ---- Imath/ImathFun.cpp.orig 2006-12-09 06:59:37.000000000 +0900 -+++ Imath/ImathFun.cpp 2007-10-07 23:23:38.000000000 +0900 +--- Imath/ImathFun.cpp.orig 2013-06-18 21:51:38.000000000 +0200 ++++ Imath/ImathFun.cpp 2013-10-04 20:06:42.000000000 +0200 @@ -33,6 +33,7 @@ /////////////////////////////////////////////////////////////////////////// @@ -7,7 +7,7 @@ +#include <inttypes.h> #include "ImathFun.h" - namespace Imath { + IMATH_INTERNAL_NAMESPACE_SOURCE_ENTER @@ -41,14 +42,14 @@ float succf (float f) Index: files/patch-ImathTest-testBoxAlgo.cpp =================================================================== --- files/patch-ImathTest-testBoxAlgo.cpp (revision 329633) +++ files/patch-ImathTest-testBoxAlgo.cpp (working copy) @@ -1,5 +1,5 @@ ---- ImathTest/testBoxAlgo.cpp.orig 2012-07-18 01:27:26.000000000 +0200 -+++ ImathTest/testBoxAlgo.cpp 2012-10-04 15:45:00.000000000 +0200 +--- ImathTest/testBoxAlgo.cpp.orig 2013-06-18 21:51:38.000000000 +0200 ++++ ImathTest/testBoxAlgo.cpp 2013-10-04 20:10:10.000000000 +0200 @@ -356,7 +356,7 @@ Box3f () }; Index: files/patch-ImathTest-testShear.cpp =================================================================== --- files/patch-ImathTest-testShear.cpp (revision 329633) +++ files/patch-ImathTest-testShear.cpp (working copy) @@ -1,10 +1,10 @@ ---- ImathTest/testShear.cpp.orig 2006-12-09 06:59:38.000000000 +0900 -+++ ImathTest/testShear.cpp 2007-10-07 23:24:27.000000000 +0900 +--- ImathTest/testShear.cpp.orig 2013-06-18 21:51:38.000000000 +0200 ++++ ImathTest/testShear.cpp 2013-10-04 20:16:08.000000000 +0200 @@ -54,7 +54,6 @@ - const float epsilon = Imath::limits< float >::epsilon(); + const float epsilon = IMATH_INTERNAL_NAMESPACE::limits< float >::epsilon(); - float array[6] = { 1.0F, 2.0F, 3.0F, 4.0F, 5.0F, 6.0F }; - Imath::Shear6f testConstructor1; - Imath::Shear6f testConstructor2( testConstructor1 ); + IMATH_INTERNAL_NAMESPACE::Shear6f testConstructor1; + IMATH_INTERNAL_NAMESPACE::Shear6f testConstructor2( testConstructor1 ); Index: files/patch-Makefile.in =================================================================== --- files/patch-Makefile.in (revision 329633) +++ files/patch-Makefile.in (working copy) @@ -1,11 +0,0 @@ ---- Makefile.in.orig 2012-07-31 22:09:25.000000000 +0200 -+++ Makefile.in 2012-10-04 14:25:06.000000000 +0200 -@@ -224,7 +224,7 @@ - README README.CVS README.OSX README.win32 bootstrap \ - config.windows/IlmBaseConfig.h - --pkgconfigdir = $(libdir)/pkgconfig -+pkgconfigdir = $(prefix)/libdata/pkgconfig - pkgconfig_DATA = IlmBase.pc - all: all-recursive - Index: files/patch-configure =================================================================== --- files/patch-configure (revision 329633) +++ files/patch-configure (working copy) @@ -1,9 +1,9 @@ ---- configure.orig 2012-07-31 00:11:22.000000000 +0200 -+++ configure 2012-10-04 14:20:16.000000000 +0200 -@@ -15978,25 +15978,25 @@ - osx_arch=default - fi; +--- configure.orig 2013-10-04 18:58:30.000000000 +0200 ++++ configure 2013-10-04 19:09:40.000000000 +0200 +@@ -17373,25 +17373,25 @@ + fi + - if test "${osx_arch}" != default ; then - osx_arch_flags="-arch ${osx_arch// / -arch }" - CXXFLAGS="$CXXFLAGS $osx_arch_flags" @@ -11,11 +11,11 @@ - if test "$enable_dependency_tracking" != no ; then - osx_arch_array=( ${osx_arch} ) - if test ${#osx_arch_array[@]} -gt 1 ; then -- { { echo "$as_me:$LINENO: error: building multiple OS X architectures requires --disable-dependency-tracking. +- { { $as_echo "$as_me:$LINENO: error: building multiple OS X architectures requires --disable-dependency-tracking. -Please re-run configure with these options: - --enable-osx-arch=\"${osx_arch}\" --disable-dependency-tracking - " >&5 --echo "$as_me: error: building multiple OS X architectures requires --disable-dependency-tracking. +-$as_echo "$as_me: error: building multiple OS X architectures requires --disable-dependency-tracking. -Please re-run configure with these options: - --enable-osx-arch=\"${osx_arch}\" --disable-dependency-tracking - " >&2;} @@ -30,11 +30,11 @@ +# if test "$enable_dependency_tracking" != no ; then +# osx_arch_array=( ${osx_arch} ) +# if test ${#osx_arch_array[@]} -gt 1 ; then -+# { { echo "$as_me:$LINENO: error: building multiple OS X architectures requires --disable-dependency-tracking. ++# { { $as_echo "$as_me:$LINENO: error: building multiple OS X architectures requires --disable-dependency-tracking. +#Please re-run configure with these options: +# --enable-osx-arch=\"${osx_arch}\" --disable-dependency-tracking +# " >&5 -+#echo "$as_me: error: building multiple OS X architectures requires --disable-dependency-tracking. ++#$as_echo "$as_me: error: building multiple OS X architectures requires --disable-dependency-tracking. +#Please re-run configure with these options: +# --enable-osx-arch=\"${osx_arch}\" --disable-dependency-tracking +# " >&2;} @@ -43,5 +43,5 @@ +# fi +# fi - # Check whether --enable-osx-sdk or --disable-osx-sdk was given. + # Check whether --enable-osx-sdk was given. if test "${enable_osx_sdk+set}" = set; then Index: pkg-descr =================================================================== --- pkg-descr (revision 329633) +++ pkg-descr (working copy) @@ -15,4 +15,4 @@ If you have questions about using the IlmBase libraries, you may want to join our developer mailing list. -WWW: http://www.openexr.com/ +WWW: http://www.openexr.com/ Index: pkg-plist =================================================================== --- pkg-plist (revision 329633) +++ pkg-plist (working copy) @@ -1,15 +1,23 @@ +bin/eLut +bin/toFloat include/OpenEXR/Iex.h include/OpenEXR/IexBaseExc.h include/OpenEXR/IexErrnoExc.h +include/OpenEXR/IexExport.h +include/OpenEXR/IexForward.h include/OpenEXR/IexMacros.h include/OpenEXR/IexMathExc.h include/OpenEXR/IexMathFloatExc.h include/OpenEXR/IexMathFpu.h include/OpenEXR/IexMathIeeeExc.h +include/OpenEXR/IexNamespace.h include/OpenEXR/IexThrowErrnoExc.h include/OpenEXR/IlmBaseConfig.h include/OpenEXR/IlmThread.h +include/OpenEXR/IlmThreadExport.h +include/OpenEXR/IlmThreadForward.h include/OpenEXR/IlmThreadMutex.h +include/OpenEXR/IlmThreadNamespace.h include/OpenEXR/IlmThreadPool.h include/OpenEXR/IlmThreadSemaphore.h include/OpenEXR/ImathBox.h @@ -18,6 +26,8 @@ include/OpenEXR/ImathColorAlgo.h include/OpenEXR/ImathEuler.h include/OpenEXR/ImathExc.h +include/OpenEXR/ImathExport.h +include/OpenEXR/ImathForward.h include/OpenEXR/ImathFrame.h include/OpenEXR/ImathFrustum.h include/OpenEXR/ImathFun.h @@ -32,6 +42,7 @@ include/OpenEXR/ImathMath.h include/OpenEXR/ImathMatrix.h include/OpenEXR/ImathMatrixAlgo.h +include/OpenEXR/ImathNamespace.h include/OpenEXR/ImathPlane.h include/OpenEXR/ImathPlatform.h include/OpenEXR/ImathQuat.h @@ -42,27 +53,32 @@ include/OpenEXR/ImathVec.h include/OpenEXR/ImathVecAlgo.h include/OpenEXR/half.h +include/OpenEXR/halfExport.h include/OpenEXR/halfFunction.h include/OpenEXR/halfLimits.h lib/libHalf.a lib/libHalf.la lib/libHalf.so -lib/libHalf.so.7 +lib/libHalf.so.10 +lib/libIex-%%MAJORVER%%.so +lib/libIex-%%MAJORVER%%.so.10 lib/libIex.a lib/libIex.la lib/libIex.so -lib/libIex.so.7 +lib/libIexMath-%%MAJORVER%%.so +lib/libIexMath-%%MAJORVER%%.so.10 lib/libIexMath.a lib/libIexMath.la lib/libIexMath.so -lib/libIexMath.so.7 +lib/libIlmThread-%%MAJORVER%%.so +lib/libIlmThread-%%MAJORVER%%.so.10 lib/libIlmThread.a lib/libIlmThread.la lib/libIlmThread.so -lib/libIlmThread.so.7 +lib/libImath-%%MAJORVER%%.so +lib/libImath-%%MAJORVER%%.so.10 lib/libImath.a lib/libImath.la lib/libImath.so -lib/libImath.so.7 libdata/pkgconfig/IlmBase.pc @dirrmtry include/OpenEXR >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310261934.r9QJY9dm085739>