Date: Mon, 6 Jan 2020 16:52:00 +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: r522259 - head/graphics/darktable Message-ID: <202001061652.006Gq0bV001486@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Mon Jan 6 16:52:00 2020 New Revision: 522259 URL: https://svnweb.freebsd.org/changeset/ports/522259 Log: graphics/darktable: update to new release 3.0.0 Announcement: <https://www.darktable.org/2019/12/darktable-300-released/>; <https://www.darktable.org/2019/12/darktable-30/>; Additional changes: - ONLY_FOR_ARCHS* variables moved up to please portlint - some CMAKE_ARGS hacks with CMAKE_*_COMPILER_LAUNCHER to get ccache back in - switch from hardcoding LLVM_VER=60 to ${LLVM_DEFAULT} - strip out -D_XOPEN_SOURCE=... (upstream CMakeLists.txt) because it is harmful in hiding, for instance, u_char typedefs, which causes compilation failure down the road for cups_print. PR: 242943 Approved by: dumbbell@ (maintainer) Modified: head/graphics/darktable/Makefile head/graphics/darktable/distinfo head/graphics/darktable/pkg-plist Modified: head/graphics/darktable/Makefile ============================================================================== --- head/graphics/darktable/Makefile Mon Jan 6 16:34:40 2020 (r522258) +++ head/graphics/darktable/Makefile Mon Jan 6 16:52:00 2020 (r522259) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= darktable -PORTVERSION= 2.6.2 -PORTREVISION= 4 +PORTVERSION= 3.0.0 CATEGORIES= graphics MASTER_SITES= https://github.com/darktable-org/${PORTNAME}/releases/download/release-${PORTVERSION:C/\.rc/rc/}/ @@ -12,6 +11,9 @@ COMMENT= Virtual lighttable and darkroom for photograp LICENSE= GPLv3 +ONLY_FOR_ARCHS= amd64 +ONLY_FOR_ARCHS_REASON= uses SSE instructions and 64-bit address space + BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \ xsltproc:textproc/libxslt \ po4a-translate:textproc/po4a @@ -25,9 +27,6 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libsoup-2.4.so:devel/libsoup \ libtiff.so:graphics/tiff -ONLY_FOR_ARCHS= amd64 -ONLY_FOR_ARCHS_REASON= uses SSE instructions and 64-bit address space - USES= cmake compiler:c++11-lib desktop-file-utils \ gl gnome jpeg pkgconfig sqlite tar:xz xorg USE_GL= glu @@ -98,9 +97,15 @@ WEBP_CMAKE_OFF= -DUSE_WEBP:BOOL=OFF .include <bsd.port.pre.mk> +# work around CMAKE/CCACHE flaw (cmake stomps over ccache) +.if "${WITH_CCACHE_BUILD}" == "yes" && !defined(NO_CCACHE) +CMAKE_ARGS+= -DCMAKE_C_COMPILER_LAUNCHER=${CCACHE_BIN} \ + -DCMAKE_CXX_COMPILER_LAUNCHER=${CCACHE_BIN} +.endif + +# Base clang may not support OpenMP, use ports clang: .if ${ARCH} == amd64 && ${CHOSEN_COMPILER_TYPE} == clang -# Enable OpenMP support with Clang 6.0. -LLVM_VER= 60 +LLVM_VER= ${LLVM_DEFAULT} BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER} CPP= clang-cpp${LLVM_VER} @@ -114,5 +119,12 @@ LIB_DEPENDS+= libomp.so:devel/llvm${LLVM_VER} CMAKE_BUILD_TYPE= RelWithDebInfo STRIP= .endif + +# darktable defines the __XOPEN_SOURCE preprocessor macro, which +# restricts symbol visibility on FreeBSD and causes compilation failures +# on, for instance, the cups_print module, because u_char remains +# undefined. Remove _XOPEN_SOURCE maro definitions. +post-patch: + ${REINPLACE_CMD} '/add_definitions."-D_XOPEN_SOURCE=.*"/d' ${WRKSRC}/CMakeLists.txt .include <bsd.port.post.mk> Modified: head/graphics/darktable/distinfo ============================================================================== --- head/graphics/darktable/distinfo Mon Jan 6 16:34:40 2020 (r522258) +++ head/graphics/darktable/distinfo Mon Jan 6 16:52:00 2020 (r522259) @@ -1,3 +1,3 @@ -TIMESTAMP = 1553932563 -SHA256 (darktable-2.6.2.tar.xz) = 9cb9efbb09a40375ff05cef89343235a621c58339539e44985470a029a7ffb45 -SIZE (darktable-2.6.2.tar.xz) = 3512572 +TIMESTAMP = 1577531331 +SHA256 (darktable-3.0.0.tar.xz) = 7195a5ff7ee95ab7c5a57e4e84f8c90cc4728b2c917359203c21293ab754c0db +SIZE (darktable-3.0.0.tar.xz) = 3827412 Modified: head/graphics/darktable/pkg-plist ============================================================================== --- head/graphics/darktable/pkg-plist Mon Jan 6 16:34:40 2020 (r522258) +++ head/graphics/darktable/pkg-plist Mon Jan 6 16:52:00 2020 (r522259) @@ -19,14 +19,15 @@ lib/darktable/plugins/imageio/format/libtiff.so lib/darktable/plugins/imageio/storage/libdisk.so lib/darktable/plugins/imageio/storage/libemail.so lib/darktable/plugins/imageio/storage/libfacebook.so +lib/darktable/plugins/imageio/storage/libgooglephoto.so %%FLICKR%%lib/darktable/plugins/imageio/storage/libflickr.so lib/darktable/plugins/imageio/storage/libgallery.so lib/darktable/plugins/imageio/storage/liblatex.so -lib/darktable/plugins/imageio/storage/libpicasa.so lib/darktable/plugins/imageio/storage/libpiwigo.so lib/darktable/plugins/libashift.so lib/darktable/plugins/libatrous.so lib/darktable/plugins/libbasecurve.so +lib/darktable/plugins/libbasicadj.so lib/darktable/plugins/libbilat.so lib/darktable/plugins/libbilateral.so lib/darktable/plugins/libbloom.so @@ -54,6 +55,7 @@ lib/darktable/plugins/libdither.so lib/darktable/plugins/libequalizer.so lib/darktable/plugins/libexposure.so lib/darktable/plugins/libfilmic.so +lib/darktable/plugins/libfilmicrgb.so lib/darktable/plugins/libfinalscale.so lib/darktable/plugins/libflip.so lib/darktable/plugins/libgamma.so @@ -70,6 +72,8 @@ lib/darktable/plugins/liblevels.so lib/darktable/plugins/libliquify.so lib/darktable/plugins/liblowlight.so lib/darktable/plugins/liblowpass.so +lib/darktable/plugins/liblut3d.so +lib/darktable/plugins/libmask_manager.so lib/darktable/plugins/libmonochrome.so lib/darktable/plugins/libnlmeans.so lib/darktable/plugins/liboverexposed.so @@ -79,6 +83,8 @@ lib/darktable/plugins/librawoverexposed.so lib/darktable/plugins/librawprepare.so lib/darktable/plugins/librelight.so lib/darktable/plugins/libretouch.so +lib/darktable/plugins/librgbcurve.so +lib/darktable/plugins/librgblevels.so lib/darktable/plugins/librotatepixels.so lib/darktable/plugins/libscalepixels.so lib/darktable/plugins/libshadhi.so @@ -88,6 +94,7 @@ lib/darktable/plugins/libsplittoning.so lib/darktable/plugins/libspots.so lib/darktable/plugins/libtemperature.so lib/darktable/plugins/libtonecurve.so +lib/darktable/plugins/libtoneequal.so lib/darktable/plugins/libtonemap.so lib/darktable/plugins/libvelvia.so lib/darktable/plugins/libvibrance.so @@ -111,6 +118,7 @@ lib/darktable/plugins/lighttable/libhinter.so lib/darktable/plugins/lighttable/libhistogram.so lib/darktable/plugins/lighttable/libhistory.so lib/darktable/plugins/lighttable/libimage.so +lib/darktable/plugins/lighttable/libimage_infos.so lib/darktable/plugins/lighttable/libimport.so lib/darktable/plugins/lighttable/liblighttable_mode.so %%GPHOTO%%lib/darktable/plugins/lighttable/liblive_view.so @@ -131,6 +139,7 @@ lib/darktable/plugins/lighttable/libsession.so lib/darktable/plugins/lighttable/libsnapshots.so lib/darktable/plugins/lighttable/libstyles.so lib/darktable/plugins/lighttable/libtagging.so +lib/darktable/plugins/lighttable/libtimeline.so lib/darktable/plugins/lighttable/libview_toolbox.so lib/darktable/plugins/lighttable/libviewswitcher.so lib/darktable/views/libdarkroom.so @@ -162,17 +171,20 @@ man/man1/darktable.1.gz %%NLS%%man/fr/man1/darktable.1.gz share/appdata/darktable.appdata.xml share/applications/darktable.desktop -%%DATADIR%%/darktable.css +%%DATADIR%%/darktable.bash %%DATADIR%%/darktablerc %%DATADIR%%/gdb_commands %%DATADIR%%/kernels/atrous.cl %%DATADIR%%/kernels/basecurve.cl %%DATADIR%%/kernels/basic.cl +%%DATADIR%%/kernels/basicadj.cl %%DATADIR%%/kernels/bilateral.cl %%DATADIR%%/kernels/blendop.cl %%DATADIR%%/kernels/bloom.cl +%%DATADIR%%/kernels/color_conversion.cl %%DATADIR%%/kernels/colorreconstruction.cl %%DATADIR%%/kernels/colorspace.cl +%%DATADIR%%/kernels/colorspaces.cl %%DATADIR%%/kernels/common.h %%DATADIR%%/kernels/demosaic_markesteijn.cl %%DATADIR%%/kernels/demosaic_other.cl @@ -183,12 +195,18 @@ share/applications/darktable.desktop %%DATADIR%%/kernels/extended.cl %%DATADIR%%/kernels/filmic.cl %%DATADIR%%/kernels/gaussian.cl +%%DATADIR%%/kernels/guided_filter.cl +%%DATADIR%%/kernels/hazeremoval.cl %%DATADIR%%/kernels/highpass.cl %%DATADIR%%/kernels/liquify.cl %%DATADIR%%/kernels/locallaplacian.cl +%%DATADIR%%/kernels/lut3d.cl %%DATADIR%%/kernels/nlmeans.cl %%DATADIR%%/kernels/programs.conf %%DATADIR%%/kernels/retouch.cl +%%DATADIR%%/kernels/rgb_norms.h +%%DATADIR%%/kernels/rgbcurve.cl +%%DATADIR%%/kernels/rgblevels.cl %%DATADIR%%/kernels/sharpen.cl %%DATADIR%%/kernels/soften.cl %%DATADIR%%/latex/photobook.cls @@ -240,6 +258,7 @@ share/applications/darktable.desktop %%DATADIR%%/pixmaps/plugins/darkroom/colortransfer.svg %%DATADIR%%/pixmaps/plugins/darkroom/colorzones.png %%DATADIR%%/pixmaps/plugins/darkroom/colorzones.svg +%%DATADIR%%/pixmaps/plugins/darkroom/default.svg %%DATADIR%%/pixmaps/plugins/darkroom/demosaic.png %%DATADIR%%/pixmaps/plugins/darkroom/demosaic.svg %%DATADIR%%/pixmaps/plugins/darkroom/dither.png @@ -339,6 +358,14 @@ share/applications/darktable.desktop %%DATADIR%%/style/prevlabel.gif %%DATADIR%%/style/style.css %%DATADIR%%/style/thumb-1.jpg +%%DATADIR%%/themes/darktable-elegant-dark.css +%%DATADIR%%/themes/darktable-elegant-darker.css +%%DATADIR%%/themes/darktable-elegant-grey.css +%%DATADIR%%/themes/darktable-icons-dark.css +%%DATADIR%%/themes/darktable-icons-darker.css +%%DATADIR%%/themes/darktable-icons-grey.css +%%DATADIR%%/themes/darktable-icons.css +%%DATADIR%%/themes/darktable.css %%DATADIR%%/watermarks/darktable.svg %%DATADIR%%/watermarks/hasselblad.svg %%DATADIR%%/watermarks/promo.svg @@ -361,15 +388,20 @@ share/icons/hicolor/scalable/apps/darktable-3.svg share/icons/hicolor/scalable/apps/darktable.svg %%NLS%%share/locale/ca/LC_MESSAGES/darktable.mo %%NLS%%share/locale/cs/LC_MESSAGES/darktable.mo +%%NLS%%share/locale/da/LC_MESSAGES/darktable.mo %%NLS%%share/locale/de/LC_MESSAGES/darktable.mo %%NLS%%share/locale/es/LC_MESSAGES/darktable.mo -%%NLS%%share/locale/fi/LC_MESSAGES/darktable.mo %%NLS%%share/locale/fr/LC_MESSAGES/darktable.mo +%%NLS%%share/locale/he/LC_MESSAGES/darktable.mo %%NLS%%share/locale/hu/LC_MESSAGES/darktable.mo +%%NLS%%share/locale/it/LC_MESSAGES/darktable.mo %%NLS%%share/locale/ja/LC_MESSAGES/darktable.mo %%NLS%%share/locale/nb/LC_MESSAGES/darktable.mo %%NLS%%share/locale/nl/LC_MESSAGES/darktable.mo %%NLS%%share/locale/pl/LC_MESSAGES/darktable.mo -%%NLS%%share/locale/pt_BR/LC_MESSAGES/darktable.mo %%NLS%%share/locale/ru/LC_MESSAGES/darktable.mo %%NLS%%share/locale/sl/LC_MESSAGES/darktable.mo +%%DATADIR%%/tools/common.sh +%%DATADIR%%/tools/purge_from_cache.sh +%%DATADIR%%/tools/purge_non_existing_images.sh +%%DATADIR%%/tools/purge_unused_tags.sh
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001061652.006Gq0bV001486>