Date: Mon, 14 Oct 2013 13:40:49 +0000 (UTC) From: Rusmir Dusko <nemysis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330320 - in head/graphics/ampasCTL: . files Message-ID: <201310141340.r9EDenXF022863@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nemysis Date: Mon Oct 14 13:40:48 2013 New Revision: 330320 URL: http://svnweb.freebsd.org/changeset/ports/330320 Log: - Update to 1.5 - Merge ampasCTL-1.4.1 and openexr_ctl-1.0.1 into ampasCTL-1.5 - Add conflict with graphics/openexr_ctl - Add dependencies for OpenEXR, tiff and ampasACES-container - USES cmake pkgconfig - Support STAGEDIR - Change pkg-descr Approved by: wg/pawel (mentors) Added: head/graphics/ampasCTL/files/ head/graphics/ampasCTL/files/patch-lib__dpx__dpx_util.cc (contents, props changed) Modified: head/graphics/ampasCTL/Makefile head/graphics/ampasCTL/distinfo head/graphics/ampasCTL/pkg-descr head/graphics/ampasCTL/pkg-plist Modified: head/graphics/ampasCTL/Makefile ============================================================================== --- head/graphics/ampasCTL/Makefile Mon Oct 14 13:33:03 2013 (r330319) +++ head/graphics/ampasCTL/Makefile Mon Oct 14 13:40:48 2013 (r330320) @@ -2,36 +2,34 @@ # $FreeBSD$ PORTNAME= ampasCTL -PORTVERSION= 1.4.1 -PORTREVISION= 1 +PORTVERSION= 1.5 CATEGORIES= graphics devel -DISTNAME= ctl-${DISTVERSION} MAINTAINER= nemysis@FreeBSD.org COMMENT= Color Transformation Language interpreter LICENSE= BSD -LIB_DEPENDS= libImath.so:${PORTSDIR}/graphics/ilmbase +CONFLICTS= openexr_ctl-1.[0-4].* -WRKSRC= ${WRKDIR}/ampas-CTL-${GH_COMMIT}/CTL +LIB_DEPENDS= libImath.so:${PORTSDIR}/graphics/ilmbase \ + libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \ + libtiff.so:${PORTSDIR}/graphics/tiff \ + libAcesContainer.so:${PORTSDIR}/graphics/ampasACES-container USE_GITHUB= yes GH_ACCOUNT= ampas GH_PROJECT= CTL GH_TAGNAME= ${GH_COMMIT} -GH_COMMIT= ca179ca +GH_COMMIT= 9cb69b8 -USES= pathfix pkgconfig -PATHFIX_MAKEFILEIN= Makefile.am -GNU_CONFIGURE= yes -USE_AUTOTOOLS= aclocal libtool +USES= cmake pkgconfig USE_LDCONFIG= yes PORTDOCS= * DOCSRCDIR1= ${WRKSRC} -DOC_FILES1= AUTHORS ChangeLog NEWS README +DOC_FILES1= AUTHORS CHANGELOG README.md DOCSRCDIR2= ${WRKSRC}/doc DOCSDIR2= ${DOCSDIR}/doc @@ -39,29 +37,25 @@ DOC_FILES2= CtlManual.pdf CtlManual.doc OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> -pre-configure: - @(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./bootstrap) - post-patch: - @${REINPLACE_CMD} -e 's|CtlManual.pdf CtlManual.doc||' \ - ${WRKSRC}/doc/Makefile.am - -test check: build - @(cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check) + @${REINPLACE_CMD} -e 's|#include <alloca.h>||' \ + ${WRKSRC}/lib/dpx/dpx_util.cc ${WRKSRC}/lib/IlmCtl/CtlExc.cpp \ + ${WRKSRC}/lib/IlmCtl/CtlTypeStorage.cpp ${WRKSRC}/ctlrender/tiff_file.cc + + @${REINPLACE_CMD} -e 's|lib/CMake|lib/cmake|' \ + -e 's|add_subdirectory(doc)||' \ + -e 's|lib/pkgconfig|libdata/pkgconfig|' \ + ${WRKSRC}/CMakeLists.txt -.if defined(PACKAGE_BUILDING) -pre-install: test -.endif + @${REINPLACE_CMD} -e 's|lib/pkgconfig|libdata/pkgconfig|' \ + ${WRKSRC}/OpenEXR_CTL/CMakeLists.txt post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${DOCSDIR} - @${MKDIR} ${DOCSDIR2} - ${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${DOCSDIR2} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR2} + ${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2} .include <bsd.port.mk> Modified: head/graphics/ampasCTL/distinfo ============================================================================== --- head/graphics/ampasCTL/distinfo Mon Oct 14 13:33:03 2013 (r330319) +++ head/graphics/ampasCTL/distinfo Mon Oct 14 13:40:48 2013 (r330320) @@ -1,2 +1,2 @@ -SHA256 (ctl-1.4.1.tar.gz) = 89757647d8a3b53d1cf8e356c4d01c1112f7b57f518b052829339e0a4cd5ac39 -SIZE (ctl-1.4.1.tar.gz) = 1127090 +SHA256 (ampasCTL-1.5.tar.gz) = f0509384bfb37273f433409e7412d2766748fa5a952359b072e8f7f76f218dab +SIZE (ampasCTL-1.5.tar.gz) = 1939635 Added: head/graphics/ampasCTL/files/patch-lib__dpx__dpx_util.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/ampasCTL/files/patch-lib__dpx__dpx_util.cc Mon Oct 14 13:40:48 2013 (r330320) @@ -0,0 +1,10 @@ +--- ./lib/dpx/dpx_util.cc.orig 2013-10-12 18:55:34.000000000 +0200 ++++ ./lib/dpx/dpx_util.cc 2013-10-12 18:55:55.000000000 +0200 +@@ -57,6 +57,7 @@ + #include <stdio.h> + + #include <string.h> ++#include <stdlib.h> + + namespace ctl { + Modified: head/graphics/ampasCTL/pkg-descr ============================================================================== --- head/graphics/ampasCTL/pkg-descr Mon Oct 14 13:33:03 2013 (r330319) +++ head/graphics/ampasCTL/pkg-descr Mon Oct 14 13:40:48 2013 (r330320) @@ -1,22 +1,17 @@ -ABOUT THE CTL LIBRARIES ------------------------ - -The CTL interpreter source code release contains the following -C++ libraries: - -IlmCtl The CTL interpreter front end and the interpreter's - public programming interface. - -IlmCtlSimd The interpreter's SIMD back end. - -IlmCtlMath Math routines that are used by IlmCtlSimd: conversions - between standard color spaces, 1D and 3D lookup tables, - 3D scattered data interpolation. - -IlmCtlTest Confidence tests for IlmCtl, IlmCtlSimd - -IlmCtlMathTest Confidence tests for IlmCtlMath - -IlmCtlTest Confidence tests for IlmImfCtl +# The Color Transformation Language # + +The Color Transformation Language, or CTL, is a programming language for digital +color management. + +Digital color management requires translating digital images between different +representations or color spaces. For example, the pixels in an image may encode +the colors that should be seen when the image is displayed on a video monitor. +Printing this image on paper, or recording it on motion picture film requires +transforming the pixels to an appropriate representation: Video, inks on paper +and film all have different color gamuts and dynamic ranges. Color mixing is +additive for video, but subtractive for inks and film. Video and film typically +use three color channels, while four or more inks are used for printing on +paper. A color management system must transform each pixel in the original image +to corresponding amounts of ink or film density values. WWW: https://github.com/ampas/CTL/ Modified: head/graphics/ampasCTL/pkg-plist ============================================================================== --- head/graphics/ampasCTL/pkg-plist Mon Oct 14 13:33:03 2013 (r330319) +++ head/graphics/ampasCTL/pkg-plist Mon Oct 14 13:40:48 2013 (r330320) @@ -1,3 +1,6 @@ +bin/ctlrender +bin/exr_ctl_exr +bin/exrdpx include/CTL/CtlAddr.h include/CTL/CtlAlign.h include/CTL/CtlColorSpace.h @@ -14,22 +17,32 @@ include/CTL/CtlRcPtr.h include/CTL/CtlReadWriteAccess.h include/CTL/CtlSimdInterpreter.h include/CTL/CtlSparseMatrix.h +include/CTL/CtlStdType.h include/CTL/CtlSymbolTable.h include/CTL/CtlSyntaxTree.h include/CTL/CtlTokens.h include/CTL/CtlType.h +include/CTL/CtlTypeStorage.h include/CTL/CtlVersion.h -lib/libIlmCtl.a -lib/libIlmCtl.la +include/OpenEXR/ImfCtlApplyTransforms.h +lib/CTL/change_saturation.ctl +lib/CTL/transform_DPX_EXR.ctl +lib/CTL/transform_EXR_DPX.ctl +lib/CTL/utilities.ctl +lib/cmake/CTL/CTLConfig.cmake +lib/cmake/CTL/CTLConfigVersion.cmake +lib/cmake/CTL/CTLLibraryDepends.cmake lib/libIlmCtl.so -lib/libIlmCtl.so.2 -lib/libIlmCtlMath.a -lib/libIlmCtlMath.la +lib/libIlmCtl.so.1.5.0 lib/libIlmCtlMath.so -lib/libIlmCtlMath.so.2 -lib/libIlmCtlSimd.a -lib/libIlmCtlSimd.la +lib/libIlmCtlMath.so.1.5.0 lib/libIlmCtlSimd.so -lib/libIlmCtlSimd.so.2 +lib/libIlmCtlSimd.so.1.5.0 +lib/libIlmImfCtl.so libdata/pkgconfig/CTL.pc +libdata/pkgconfig/OpenEXR_CTL.pc +@dirrm lib/cmake/CTL +@dirrmtry lib/cmake +@dirrm lib/CTL +@dirrmtry include/OpenEXR @dirrm include/CTL
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310141340.r9EDenXF022863>