Date: Sun, 5 Jan 2020 02:17: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: r522079 - in head: devel/kio-extras devel/synfig editors/calligra games/pink-pony graphics/alembic graphics/ampasCTL graphics/blender graphics/cimg graphics/darktable graphics/enblend g... Message-ID: <202001050217.0052HX82080111@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Sun Jan 5 02:17:32 2020 New Revision: 522079 URL: https://svnweb.freebsd.org/changeset/ports/522079 Log: graphics/ilmbase, graphics/openexr: upgrade to upstream v2.4.0 graphics/gstreamer1-plugins-openexr: switch from C++98 to C++11 to match new OpenEXR headers and unbreak compilation. Bump PORTREVISION of all ports depending directly on either, based on assessing INDEX-12 (bump_portrevision.pl -l (shallow) used). Release Notes: https://github.com/AcademySoftwareFoundation/openexr/releases/tag/v2.4.0 The update was deliberately deferred until after 2020Q1, and should not be MFH'd back to it. Added: head/graphics/ilmbase/files/patch-CMakeLists.txt (contents, props changed) head/graphics/openexr/files/patch-config_CMakeLists.txt (contents, props changed) Deleted: head/graphics/ilmbase/files/patch-CVE-2018-18443 head/graphics/ilmbase/files/patch-ImathTest__testBoxAlgo.cpp head/graphics/ilmbase/files/patch-ImathTest__testShear.cpp head/graphics/ilmbase/files/patch-Imath__ImathFun.cpp head/graphics/openexr/files/patch-IlmImfTest_main.cpp head/graphics/openexr/files/patch-IlmImfTest_testOptimizedInterleavePatterns.cpp head/graphics/openexr/files/patch-IlmImfUtilTest_main.cpp head/graphics/openexr/files/patch-IlmImf_ImfFrameBuffer.cpp head/graphics/openexr/files/patch-IlmImf_ImfFrameBuffer.h head/graphics/openexr/files/patch-IlmImf_ImfHeader.cpp head/graphics/openexr/files/patch-IlmImf_ImfRgbaFile.h head/graphics/openexr/files/patch-IlmImf_ImfScanLineInputFile.cpp head/graphics/openexr/files/patch-IlmImf_ImfSystemSpecific.cpp head/graphics/openexr/files/patch-exrenvmap_main.cpp head/graphics/openexr/files/patch-exrenvmap_readInputImage.cpp head/graphics/openexr/files/patch-exrmakepreview_makePreview.cpp head/graphics/openexr/files/patch-exrmaketiled_Image.h head/graphics/openexr/files/patch-exrmaketiled_main.cpp head/graphics/openexr/files/patch-exrmultiview_Image.h Modified: head/devel/kio-extras/Makefile head/devel/synfig/Makefile head/editors/calligra/Makefile head/games/pink-pony/Makefile head/graphics/alembic/Makefile head/graphics/ampasCTL/Makefile head/graphics/blender/Makefile head/graphics/cimg/Makefile head/graphics/darktable/Makefile head/graphics/enblend/Makefile head/graphics/exact-image/Makefile head/graphics/exrtools/Makefile head/graphics/fyre/Makefile head/graphics/gegl/Makefile head/graphics/gimp-gmic-plugin/Makefile head/graphics/gmic/Makefile head/graphics/gstreamer1-plugins-openexr/Makefile head/graphics/hdr_tools/Makefile head/graphics/hugin/Makefile head/graphics/ilmbase/Makefile head/graphics/ilmbase/distinfo head/graphics/ilmbase/pkg-plist head/graphics/kf5-kimageformats/Makefile head/graphics/krita/Makefile head/graphics/luminance-qt5/Makefile head/graphics/nvidia-texture-tools/Makefile head/graphics/openexr/Makefile head/graphics/openexr/distinfo head/graphics/openexr/pkg-plist head/graphics/openimageio/Makefile head/graphics/openshadinglanguage/Makefile head/graphics/pixie/Makefile head/graphics/py-openexr/Makefile head/graphics/simpleviewer/Makefile head/graphics/synfigstudio/Makefile head/graphics/vigra/Makefile head/graphics/vips/Makefile head/graphics/yafaray/Makefile head/math/curv/Makefile head/math/mandelbulber2/Makefile head/misc/openvdb/Makefile head/multimedia/cinelerra-gg/Makefile head/science/gwyddion/Makefile Modified: head/devel/kio-extras/Makefile ============================================================================== --- head/devel/kio-extras/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/devel/kio-extras/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -2,6 +2,7 @@ PORTNAME= kio-extras DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= devel kde kde-applications # kde kde-applications-plasma MAINTAINER= kde@FreeBSD.org Modified: head/devel/synfig/Makefile ============================================================================== --- head/devel/synfig/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/devel/synfig/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -4,7 +4,7 @@ PORTNAME= synfig PORTVERSION= 1.2.2 DISTVERSIONPREFIX=v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel graphics multimedia MAINTAINER= woodsb02@FreeBSD.org Modified: head/editors/calligra/Makefile ============================================================================== --- head/editors/calligra/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/editors/calligra/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -2,7 +2,7 @@ PORTNAME= calligra DISTVERSION= 3.1.0 -PORTREVISION= 29 +PORTREVISION= 30 CATEGORIES= editors kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION} DIST_SUBDIR= KDE/${PORTNAME} Modified: head/games/pink-pony/Makefile ============================================================================== --- head/games/pink-pony/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/games/pink-pony/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -3,7 +3,7 @@ PORTNAME= pink-pony PORTVERSION= 1.4.1 -PORTREVISION= 17 +PORTREVISION= 18 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org Modified: head/graphics/alembic/Makefile ============================================================================== --- head/graphics/alembic/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/graphics/alembic/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -3,7 +3,7 @@ PORTNAME= alembic PORTVERSION= 1.7.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MAINTAINER= danfe@FreeBSD.org Modified: head/graphics/ampasCTL/Makefile ============================================================================== --- head/graphics/ampasCTL/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/graphics/ampasCTL/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -3,7 +3,7 @@ PORTNAME= ampasCTL PORTVERSION= 1.5.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics devel MAINTAINER= ports@FreeBSD.org Modified: head/graphics/blender/Makefile ============================================================================== --- head/graphics/blender/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/graphics/blender/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -3,7 +3,7 @@ PORTNAME= blender DISTVERSION= 2.80 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics multimedia MASTER_SITES= http://download.blender.org/source/ \ http://mirror.cs.umn.edu/blender.org/source/ \ Modified: head/graphics/cimg/Makefile ============================================================================== --- head/graphics/cimg/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/graphics/cimg/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -4,6 +4,7 @@ PORTNAME= cimg DISTVERSIONPREFIX= v. DISTVERSION= 2.8.1 +PORTREVISION= 1 PORTEPOCH= 3 CATEGORIES= graphics devel Modified: head/graphics/darktable/Makefile ============================================================================== --- head/graphics/darktable/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/graphics/darktable/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -3,7 +3,7 @@ PORTNAME= darktable PORTVERSION= 2.6.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= https://github.com/darktable-org/${PORTNAME}/releases/download/release-${PORTVERSION:C/\.rc/rc/}/ Modified: head/graphics/enblend/Makefile ============================================================================== --- head/graphics/enblend/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/graphics/enblend/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -3,7 +3,7 @@ PORTNAME= enblend PORTVERSION= 4.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= SF/enblend/enblend-enfuse/enblend-enfuse-${PORTVERSION} DISTNAME= enblend-enfuse-${PORTVERSION} Modified: head/graphics/exact-image/Makefile ============================================================================== --- head/graphics/exact-image/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/graphics/exact-image/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -3,7 +3,7 @@ PORTNAME= exact-image PORTVERSION= 1.0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics perl5 python MASTER_SITES= https://dl.exactcode.de/oss/exact-image/ Modified: head/graphics/exrtools/Makefile ============================================================================== --- head/graphics/exrtools/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/graphics/exrtools/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -3,7 +3,7 @@ PORTNAME= exrtools PORTVERSION= 0.4 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= graphics MASTER_SITES= http://scanline.ca/exrtools/ \ LOCAL/ehaupt Modified: head/graphics/fyre/Makefile ============================================================================== --- head/graphics/fyre/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/graphics/fyre/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -3,7 +3,7 @@ PORTNAME= fyre PORTVERSION= 1.0.1 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= graphics MASTER_SITES= http://releases.navi.cx/fyre/ Modified: head/graphics/gegl/Makefile ============================================================================== --- head/graphics/gegl/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/graphics/gegl/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -3,6 +3,7 @@ PORTNAME= gegl PORTVERSION= 0.4.18 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= GIMP Modified: head/graphics/gimp-gmic-plugin/Makefile ============================================================================== --- head/graphics/gimp-gmic-plugin/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/graphics/gimp-gmic-plugin/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -2,7 +2,7 @@ PORTNAME= gmic PORTVERSION= 1.6.9 -PORTREVISION= 21 +PORTREVISION= 22 CATEGORIES= graphics MASTER_SITES= http://gmic.eu/files/source/ PKGNAMEPREFIX= gimp- Modified: head/graphics/gmic/Makefile ============================================================================== --- head/graphics/gmic/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/graphics/gmic/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -2,7 +2,7 @@ PORTNAME= gmic DISTVERSION= 2.8.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= https://gmic.eu/files/source/ DISTNAME= ${PORTNAME}_${DISTVERSION} Modified: head/graphics/gstreamer1-plugins-openexr/Makefile ============================================================================== --- head/graphics/gstreamer1-plugins-openexr/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/graphics/gstreamer1-plugins-openexr/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -1,12 +1,15 @@ # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics COMMENT= GStreamer OpenExr codec plugin GST_PLUGIN= openexr DIST= bad + +pre-configure: + ${REINPLACE_CMD} -e 's/c++98/c++11/' ${WRKSRC}/ext/openexr/Makefile.in MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins Modified: head/graphics/hdr_tools/Makefile ============================================================================== --- head/graphics/hdr_tools/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/graphics/hdr_tools/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -3,7 +3,7 @@ PORTNAME= hdr_tools PORTVERSION= 0.0.2010.11.23 # unspecified by the author, so use the date -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= http://ttic.uchicago.edu/~cotter/projects/hdr_tools/archives/ \ http://freebsd.nsu.ru/distfiles/ Modified: head/graphics/hugin/Makefile ============================================================================== --- head/graphics/hugin/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/graphics/hugin/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -3,7 +3,7 @@ PORTNAME= hugin PORTVERSION= 2019.0.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R} Modified: head/graphics/ilmbase/Makefile ============================================================================== --- head/graphics/ilmbase/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/graphics/ilmbase/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -2,10 +2,8 @@ # $FreeBSD$ PORTNAME= ilmbase -PORTVERSION= 2.3.0 -PORTREVISION= 4 +PORTVERSION= 2.4.0 CATEGORIES= graphics devel -MASTER_SITES= https://github.com/openexr/openexr/releases/download/v${PORTVERSION}/ MAINTAINER= mandree@FreeBSD.org COMMENT= ILM Base libraries a.k.a. Half, IlmThread, Imath, and Iex @@ -17,29 +15,30 @@ LICENSE= BSD3CLAUSE # path we will pass down through CONFIGURE_SHELL below. BUILD_DEPENDS= ${BASH_CMD}:shells/bash -USES= compiler:c++14-lang pkgconfig libtool +USES= cmake compiler:c++14-lang pkgconfig libtool USE_LDCONFIG= yes -GNU_CONFIGURE= yes -# The configure script uses bash arrays -CONFIGURE_SHELL=${BASH_CMD} -CONFIGURE_ARGS= --disable-static +USE_GITHUB= yes +GH_TUPLE= AcademySoftwareFoundation:openexr:v2.4.0 +WRKSRC_SUBDIR= IlmBase + # libtool links C++ libraries with -nostdlib, which prevents -pthread from # having an effect (at least with clang). Make sure we also pass -lpthread so # we do link against libthr.so. -CONFIGURE_ENV+= PTHREAD_LIBS="-pthread -lpthread" TEST_TARGET= check -PORTDOCS= AUTHORS ChangeLog README.md +PORTDOCS= README.md OPTIONS_DEFINE= DOCS LARGE_STACK LARGE_STACK_DESC= Enable sys-dependent large stack optimizations LARGE_STACK_CONFIGURE_ENABLE= large-stack +CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX} --target install + BASH_CMD= ${LOCALBASE}/bin/bash OPTIONS_SUB= yes -MAJORVER= 2_3 +MAJORVER= 2_4 VER= 24 PLIST_SUB= MAJORVER=${MAJORVER} @@ -47,22 +46,19 @@ PLIST_SUB+= VER=${VER} HALF_BIN= eLut toFloat -regression-test regression check:: test +regression-test regression check:: + cd ${BUILD_WRKSRC} && ctest -post-configure: - ${REINPLACE_CMD} -e 's/#define HAVE_UCONTEXT_H 1/#undef HAVE_UCONTEXT_H/' ${WRKSRC}/config/IlmBaseConfig.h - post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libHalf.so.${VER} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libHalf-${MAJORVER}.so ${RM} ${STAGEDIR}${PREFIX}/lib/*.la -.for l in libIex libIexMath libImath libIlmThread - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${l}-${MAJORVER}.so.${VER} - @#${LN} -s ${l}-${MAJORVER}.so.${VER} ${STAGEDIR}${PREFIX}/lib/${l}.so || : - ${LN} -s ${l}.so ${STAGEDIR}${PREFIX}/lib/${l}-${MAJORVER}.so +.for l in libHalf libIex libIexMath libImath libIlmThread + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${l}-${MAJORVER}.so + ${LN} -s ${l}-${MAJORVER}.so.${VER} ${STAGEDIR}${PREFIX}/lib/${l}.so || : .endfor .for e in ${HALF_BIN} - ${INSTALL_PROGRAM} ${WRKSRC}/Half/${e} ${STAGEDIR}${PREFIX}/bin/${e} + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/Half/${e} ${STAGEDIR}${PREFIX}/bin/${e} .endfor @${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/graphics/ilmbase/distinfo ============================================================================== --- head/graphics/ilmbase/distinfo Sun Jan 5 02:05:23 2020 (r522078) +++ head/graphics/ilmbase/distinfo Sun Jan 5 02:17:32 2020 (r522079) @@ -1,3 +1,3 @@ -TIMESTAMP = 1536500142 -SHA256 (ilmbase-2.3.0.tar.gz) = 456978d1a978a5f823c7c675f3f36b0ae14dba36638aeaa3c4b0e784f12a3862 -SIZE (ilmbase-2.3.0.tar.gz) = 595490 +TIMESTAMP = 1577542212 +SHA256 (AcademySoftwareFoundation-openexr-2.4.0-v2.4.0_GH0.tar.gz) = 4904c5ea7914a58f60a5e2fbc397be67e7a25c380d7d07c1c31a3eefff1c92f1 +SIZE (AcademySoftwareFoundation-openexr-2.4.0-v2.4.0_GH0.tar.gz) = 26806627 Added: head/graphics/ilmbase/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/ilmbase/files/patch-CMakeLists.txt Sun Jan 5 02:17:32 2020 (r522079) @@ -0,0 +1,24 @@ +From fe2fccde18bc35db11895718d0b77d3f23d427b5 Mon Sep 17 00:00:00 2001 +From: Kimball Thurston <kdt3rd@gmail.com> +Date: Tue, 5 Nov 2019 21:42:45 +1300 +Subject: [PATCH] Fix #595 and others, issue with pkgconfig generation under + cmake + +autoconf seems to automatically insert the ${prefix} variable reference +when emitting the pkg-config file. Make cmake rules conform to that +pattern. +--- config/CMakeLists.txt.orig 2019-09-18 01:02:06 UTC ++++ config/CMakeLists.txt +@@ -71,9 +71,9 @@ if(ILMBASE_INSTALL_PKG_CONFIG) + # use a helper function to avoid variable pollution, but pretty simple + function(ilmbase_pkg_config_help pcinfile) + set(prefix ${CMAKE_INSTALL_PREFIX}) +- set(exec_prefix ${CMAKE_INSTALL_BINDIR}) +- set(libdir ${CMAKE_INSTALL_LIBDIR}) +- set(includedir ${CMAKE_INSTALL_INCLUDEDIR}) ++ set(exec_prefix "\${prefix}") ++ set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") ++ set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") + set(LIB_SUFFIX_DASH ${ILMBASE_LIB_SUFFIX}) + if(TARGET Threads::Threads) + # hrm, can't use properties as they end up as generator expressions Modified: head/graphics/ilmbase/pkg-plist ============================================================================== --- head/graphics/ilmbase/pkg-plist Sun Jan 5 02:05:23 2020 (r522078) +++ head/graphics/ilmbase/pkg-plist Sun Jan 5 02:17:32 2020 (r522079) @@ -57,9 +57,13 @@ include/OpenEXR/half.h include/OpenEXR/halfExport.h include/OpenEXR/halfFunction.h include/OpenEXR/halfLimits.h +lib/cmake/IlmBase/IlmBaseConfig-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/IlmBase/IlmBaseConfig.cmake +lib/cmake/IlmBase/IlmBaseConfigVersion.cmake +lib/libHalf-%%MAJORVER%%.so +lib/libHalf-%%MAJORVER%%.so.%%VER%% +lib/libHalf-%%MAJORVER%%.so.%%VER%%.0.0 lib/libHalf.so -lib/libHalf.so.%%VER%% -lib/libHalf.so.%%VER%%.0.0 lib/libIex-%%MAJORVER%%.so lib/libIex-%%MAJORVER%%.so.%%VER%% lib/libIex-%%MAJORVER%%.so.%%VER%%.0.0 Modified: head/graphics/kf5-kimageformats/Makefile ============================================================================== --- head/graphics/kf5-kimageformats/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/graphics/kf5-kimageformats/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -2,6 +2,7 @@ PORTNAME= kimageformats DISTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde kde-frameworks MAINTAINER= kde@FreeBSD.org Modified: head/graphics/krita/Makefile ============================================================================== --- head/graphics/krita/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/graphics/krita/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -2,7 +2,7 @@ PORTNAME= krita DISTVERSION= 4.2.8.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics kde MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION:R} DIST_SUBDIR= KDE/${PORTNAME} Modified: head/graphics/luminance-qt5/Makefile ============================================================================== --- head/graphics/luminance-qt5/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/graphics/luminance-qt5/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -3,7 +3,7 @@ PORTNAME= luminance-hdr DISTVERSION= 2.5.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= SF/qtpfsgui/luminance/${DISTVERSION} PKGNAMESUFFIX= -qt5 Modified: head/graphics/nvidia-texture-tools/Makefile ============================================================================== --- head/graphics/nvidia-texture-tools/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/graphics/nvidia-texture-tools/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -3,7 +3,7 @@ PORTNAME= nvidia-texture-tools PORTVERSION= 2.0.8.1 # needed to not bump PORTEPOCH; remove on next update -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= graphics MAINTAINER= amdmi3@FreeBSD.org Modified: head/graphics/openexr/Makefile ============================================================================== --- head/graphics/openexr/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/graphics/openexr/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -2,13 +2,10 @@ # $FreeBSD$ PORTNAME= openexr -PORTVERSION= 2.3.0 -PORTREVISION= 3 +PORTVERSION= 2.4.0 CATEGORIES= graphics devel -MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${PORTVERSION}/:dist \ - LOCAL/mandree/:test -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:dist \ - ${PORTNAME}-2.2.0-comp_dwa-test-images.tar.xz:test +MASTER_SITES= LOCAL/mandree/:test +DISTFILES= ${PORTNAME}-2.2.0-comp_dwa-test-images.tar.xz:test MAINTAINER= mandree@FreeBSD.org COMMENT= High dynamic-range (HDR) image file format @@ -16,16 +13,15 @@ COMMENT= High dynamic-range (HDR) image file format LICENSE= BSD3CLAUSE # exact version required to avoid hard-to-debug issues -LIB_DEPENDS= libImath-2_3.so.24:graphics/ilmbase +LIB_DEPENDS= libImath-2_4.so.24:graphics/ilmbase -WRKSRC= ${WRKDIR}/${DISTNAME} - -USES= compiler:c++14-lang gmake libtool pathfix pkgconfig -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-ilmbasetest --enable-imfexamples +USES= cmake compiler:c++14-lang libtool pathfix pkgconfig USE_LDCONFIG= yes TEST_TARGET= check +USE_GITHUB= yes +GH_TUPLE= AcademySoftwareFoundation:openexr:v2.4.0 + CPPFLAGS+= -I. -I../IlmImf # must be linked with -l{thr|pthread} explicitly LDFLAGS+= -lpthread @@ -33,15 +29,18 @@ LDFLAGS+= -lpthread PORTDOCS= * PORTEXAMPLES= * -DOCSRCDIR1= ${WRKSRC} -DOC_FILES1= AUTHORS ChangeLog NEWS README.md +DOCSRCDIR1= ${WRKSRC}/.. +DOC_FILES1= CHANGES.md CONTRIBUTING.md GOVERNANCE.md LICENSE.md SECURITY.md \ + CODE_OF_CONDUCT.md CONTRIBUTORS.md README.md DOCSRCDIR2= ${WRKSRC}/doc -DOC_FILES2= *.pdf +DOC_FILES2= *.odt *.pdf OPTIONS_DEFINE= DOCS EXAMPLES LARGE_STACK LARGE_STACK_DESC= Enable sys-dependent large stack optimizations +WRKSRC_SUBDIR= OpenEXR + OPTIONS_SUB= yes LARGE_STACK_CONFIGURE_ENABLE= large-stack @@ -52,23 +51,14 @@ LARGE_STACK_CONFIGURE_ENABLE= large-stack USE_GCC= yes .endif -MAJORVER= 2_3 +MAJORVER= 2_4 VER= 24 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 +# too many reports about compilation failures, so +# sanity check we are using the same C++ standard library _ilm_libcxx=${COMPILER_FEATURES:Mlib*c++} pre-configure: @${READELF} -d ${LOCALBASE}/lib/libImath.so \ @@ -82,20 +72,28 @@ post-install: ${STRIP_CMD} \ ${STAGEDIR}${PREFIX}/lib/libIlmImf-${MAJORVER}.so.${VER} \ ${STAGEDIR}${PREFIX}/lib/libIlmImfUtil-${MAJORVER}.so.${VER} +.for i in libIlmImf libIlmImfUtil + ${LN} -s ${i}-${MAJORVER}.so.${VER} ${STAGEDIR}${PREFIX}/lib/${i}.so +.endfor post-install-EXAMPLES-on: ${MV} \ - ${STAGEDIR}${PREFIX}/share/doc/${PORTNAME}/examples/ ${STAGEDIR}${EXAMPLESDIR} - @${RMDIR} ${STAGEDIR}${PREFIX}/share/doc/${PORTNAME} 2>/dev/null || : + ${STAGEDIR}${PREFIX}/share/doc/OpenEXR/examples/ ${STAGEDIR}${EXAMPLESDIR} + @${RMDIR} ${STAGEDIR}${PREFIX}/share/doc/OpenEXR 2>/dev/null || : post-install-EXAMPLES-off: - ${RM} -R ${STAGEDIR}${PREFIX}/share/doc/${PORTNAME}/examples/ + ${RM} -R ${STAGEDIR}${PREFIX}/share/doc/OpenEXR/examples/ post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR} + ${MV} ${STAGEDIR}${DOCSDIR}/../OpenEXR/[a-df-zA-Z]* ${STAGEDIR}${DOCSDIR} post-install-DOCS-off: @${RMDIR} ${STAGEDIR}${PREFIX}/share/doc/${PORTNAME} 2>/dev/null || : + +regression-test check: + cd ${BUILD_WRKSRC} && ctest -j ${MAKE_JOBS_NUMBER} + .include <bsd.port.post.mk> Modified: head/graphics/openexr/distinfo ============================================================================== --- head/graphics/openexr/distinfo Sun Jan 5 02:05:23 2020 (r522078) +++ head/graphics/openexr/distinfo Sun Jan 5 02:17:32 2020 (r522079) @@ -1,5 +1,5 @@ -TIMESTAMP = 1536500711 -SHA256 (openexr-2.3.0.tar.gz) = fd6cb3a87f8c1a233be17b94c74799e6241d50fc5efd4df75c7a4b9cf4e25ea6 -SIZE (openexr-2.3.0.tar.gz) = 18412067 +TIMESTAMP = 1577537381 SHA256 (openexr-2.2.0-comp_dwa-test-images.tar.xz) = bbb8ff547e9b68f0dfb1e8804a7ad984978c2b15897988399cc68176e99dd63a SIZE (openexr-2.2.0-comp_dwa-test-images.tar.xz) = 653768 +SHA256 (AcademySoftwareFoundation-openexr-2.4.0-v2.4.0_GH0.tar.gz) = 4904c5ea7914a58f60a5e2fbc397be67e7a25c380d7d07c1c31a3eefff1c92f1 +SIZE (AcademySoftwareFoundation-openexr-2.4.0-v2.4.0_GH0.tar.gz) = 26806627 Added: head/graphics/openexr/files/patch-config_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/openexr/files/patch-config_CMakeLists.txt Sun Jan 5 02:17:32 2020 (r522079) @@ -0,0 +1,15 @@ +--- config/CMakeLists.txt.orig 2019-12-28 20:44:23 UTC ++++ config/CMakeLists.txt +@@ -72,9 +72,9 @@ if(OPENEXR_INSTALL_PKG_CONFIG) + # use a helper function to avoid variable pollution, but pretty simple + function(openexr_pkg_config_help pcinfile) + set(prefix ${CMAKE_INSTALL_PREFIX}) +- set(exec_prefix ${CMAKE_INSTALL_BINDIR}) +- set(libdir ${CMAKE_INSTALL_LIBDIR}) +- set(includedir ${CMAKE_INSTALL_INCLUDEDIR}) ++ set(exec_prefix "\${prefix}") ++ set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") ++ set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") + set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}) + if(TARGET Threads::Threads) + # hrm, can't use properties as they end up as generator expressions Modified: head/graphics/openexr/pkg-plist ============================================================================== --- head/graphics/openexr/pkg-plist Sun Jan 5 02:05:23 2020 (r522078) +++ head/graphics/openexr/pkg-plist Sun Jan 5 02:17:32 2020 (r522079) @@ -1,3 +1,4 @@ +bin/exr2aces bin/exrenvmap bin/exrheader bin/exrmakepreview @@ -21,6 +22,10 @@ include/OpenEXR/ImfCompressionAttribute.h include/OpenEXR/ImfConvert.h include/OpenEXR/ImfDeepCompositing.h include/OpenEXR/ImfDeepFrameBuffer.h +include/OpenEXR/ImfDeepImage.h +include/OpenEXR/ImfDeepImageChannel.h +include/OpenEXR/ImfDeepImageIO.h +include/OpenEXR/ImfDeepImageLevel.h include/OpenEXR/ImfDeepImageState.h include/OpenEXR/ImfDeepImageStateAttribute.h include/OpenEXR/ImfDeepScanLineInputFile.h @@ -35,7 +40,12 @@ include/OpenEXR/ImfDoubleAttribute.h include/OpenEXR/ImfEnvmap.h include/OpenEXR/ImfEnvmapAttribute.h include/OpenEXR/ImfExport.h +include/OpenEXR/ImfFlatImage.h +include/OpenEXR/ImfFlatImageChannel.h +include/OpenEXR/ImfFlatImageIO.h +include/OpenEXR/ImfFlatImageLevel.h include/OpenEXR/ImfFloatAttribute.h +include/OpenEXR/ImfFloatVectorAttribute.h include/OpenEXR/ImfForward.h include/OpenEXR/ImfFrameBuffer.h include/OpenEXR/ImfFramesPerSecond.h @@ -44,6 +54,12 @@ include/OpenEXR/ImfGenericOutputFile.h include/OpenEXR/ImfHeader.h include/OpenEXR/ImfHuf.h include/OpenEXR/ImfIO.h +include/OpenEXR/ImfImage.h +include/OpenEXR/ImfImageChannel.h +include/OpenEXR/ImfImageChannelRenaming.h +include/OpenEXR/ImfImageDataWindow.h +include/OpenEXR/ImfImageIO.h +include/OpenEXR/ImfImageLevel.h include/OpenEXR/ImfInputFile.h include/OpenEXR/ImfInputPart.h include/OpenEXR/ImfInt64.h @@ -73,6 +89,7 @@ include/OpenEXR/ImfRationalAttribute.h include/OpenEXR/ImfRgba.h include/OpenEXR/ImfRgbaFile.h include/OpenEXR/ImfRgbaYca.h +include/OpenEXR/ImfSampleCountChannel.h include/OpenEXR/ImfStandardAttributes.h include/OpenEXR/ImfStdIO.h include/OpenEXR/ImfStringAttribute.h @@ -88,18 +105,21 @@ include/OpenEXR/ImfTiledOutputPart.h include/OpenEXR/ImfTiledRgbaFile.h include/OpenEXR/ImfTimeCode.h include/OpenEXR/ImfTimeCodeAttribute.h +include/OpenEXR/ImfUtilExport.h include/OpenEXR/ImfVecAttribute.h include/OpenEXR/ImfVersion.h include/OpenEXR/ImfWav.h include/OpenEXR/ImfXdr.h include/OpenEXR/OpenEXRConfig.h +lib/cmake/OpenEXR/OpenEXRConfig-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/OpenEXR/OpenEXRConfig.cmake +lib/cmake/OpenEXR/OpenEXRConfigVersion.cmake +lib/libIlmImf-%%MAJORVER%%.so lib/libIlmImf-%%MAJORVER%%.so.%%VER%% lib/libIlmImf-%%MAJORVER%%.so.%%VER%%.0.0 -lib/libIlmImf.a lib/libIlmImf.so +lib/libIlmImfUtil-%%MAJORVER%%.so lib/libIlmImfUtil-%%MAJORVER%%.so.%%VER%% lib/libIlmImfUtil-%%MAJORVER%%.so.%%VER%%.0.0 -lib/libIlmImfUtil.a lib/libIlmImfUtil.so libdata/pkgconfig/OpenEXR.pc -share/aclocal/openexr.m4 Modified: head/graphics/openimageio/Makefile ============================================================================== --- head/graphics/openimageio/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/graphics/openimageio/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -4,7 +4,7 @@ PORTNAME= openimageio DISTVERSIONPREFIX= Release- DISTVERSION= 2.0.10 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES?= graphics multimedia MAINTAINER?= FreeBSD@Shaneware.biz Modified: head/graphics/openshadinglanguage/Makefile ============================================================================== --- head/graphics/openshadinglanguage/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/graphics/openshadinglanguage/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -4,7 +4,7 @@ PORTNAME= openshadinglanguage DISTVERSIONPREFIX= Release- DISTVERSION= 1.10.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics devel MAINTAINER= FreeBSD@Shaneware.biz Modified: head/graphics/pixie/Makefile ============================================================================== --- head/graphics/pixie/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/graphics/pixie/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -3,7 +3,7 @@ PORTNAME= pixie PORTVERSION= 2.2.6 -PORTREVISION= 21 +PORTREVISION= 22 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Pixie%20${PORTVERSION} DISTNAME= Pixie-src-${PORTVERSION} Modified: head/graphics/py-openexr/Makefile ============================================================================== --- head/graphics/py-openexr/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/graphics/py-openexr/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -3,7 +3,7 @@ PORTNAME= openexr PORTVERSION= 1.2.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics python MASTER_SITES= http://excamera.com/files/ \ CHEESESHOP Modified: head/graphics/simpleviewer/Makefile ============================================================================== --- head/graphics/simpleviewer/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/graphics/simpleviewer/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -3,6 +3,7 @@ PORTNAME= simpleviewer PORTVERSION= 3.1.7 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= https://bitbucket.org/andreyu/simple-viewer-gl/get/ DISTNAME= v${PORTVERSION} # version tag, has no embedded ${PORTNAME} Modified: head/graphics/synfigstudio/Makefile ============================================================================== --- head/graphics/synfigstudio/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/graphics/synfigstudio/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -4,6 +4,7 @@ PORTNAME= synfigstudio PORTVERSION= 1.2.2 DISTVERSIONPREFIX=v +PORTREVISION= 1 CATEGORIES= graphics multimedia MAINTAINER= woodsb02@FreeBSD.org Modified: head/graphics/vigra/Makefile ============================================================================== --- head/graphics/vigra/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/graphics/vigra/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -4,7 +4,7 @@ PORTNAME= vigra DISTVERSIONPREFIX=v DISTVERSION= 1.11.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MAINTAINER= ports@FreeBSD.org Modified: head/graphics/vips/Makefile ============================================================================== --- head/graphics/vips/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/graphics/vips/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -3,7 +3,7 @@ PORTNAME= vips PORTVERSION= 8.8.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= https://github.com/libvips/libvips/releases/download/v${PORTVERSION}/ Modified: head/graphics/yafaray/Makefile ============================================================================== --- head/graphics/yafaray/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/graphics/yafaray/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -5,7 +5,7 @@ PORTNAME= yafaray DISTVERSIONPREFIX= v DISTVERSION= 3.3.0-15 DISTVERSIONSUFFIX= -g67f6586 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MAINTAINER= yuri@FreeBSD.org Modified: head/math/curv/Makefile ============================================================================== --- head/math/curv/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/math/curv/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -3,7 +3,7 @@ PORTNAME= curv DISTVERSION= 0.4-417 DISTVERSIONSUFFIX= -gf6f8d011 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math lang graphics MAINTAINER= yuri@FreeBSD.org Modified: head/math/mandelbulber2/Makefile ============================================================================== --- head/math/mandelbulber2/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/math/mandelbulber2/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -2,6 +2,7 @@ PORTNAME= mandelbulber2 DISTVERSION= 2.20 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org Modified: head/misc/openvdb/Makefile ============================================================================== --- head/misc/openvdb/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/misc/openvdb/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -3,7 +3,7 @@ PORTNAME= openvdb DISTVERSIONPREFIX= v DISTVERSION= 6.1.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= misc MAINTAINER= yuri@FreeBSD.org Modified: head/multimedia/cinelerra-gg/Makefile ============================================================================== --- head/multimedia/cinelerra-gg/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/multimedia/cinelerra-gg/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -3,7 +3,7 @@ PORTNAME= cinelerra-gg DISTVERSION= 5.1-20180714 DISTVERSIONSUFFIX= -${REV:C/(.......).*/\1/} -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= multimedia MASTER_SITES= https://git.cinelerra-gg.org/git?p=goodguy/cinelerra.git;a=snapshot;h=${REV};sf=tgz;dummy=/ Modified: head/science/gwyddion/Makefile ============================================================================== --- head/science/gwyddion/Makefile Sun Jan 5 02:05:23 2020 (r522078) +++ head/science/gwyddion/Makefile Sun Jan 5 02:17:32 2020 (r522079) @@ -3,7 +3,7 @@ PORTNAME= gwyddion PORTVERSION= 2.51 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= science graphics MASTER_SITES= SF
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001050217.0052HX82080111>