diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile index a17b25a..909438c 100644 --- a/graphics/darktable/Makefile +++ b/graphics/darktable/Makefile @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= darktable -PORTVERSION= 1.4.2 -PORTREVISION= 6 +PORTVERSION= 1.6.0 CATEGORIES= graphics -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= https://github.com/darktable-org/${PORTNAME}/releases/download/release-${PORTVERSION}/ MAINTAINER= dumbbell@FreeBSD.org COMMENT= Virtual lighttable and darkroom for photographers @@ -21,7 +20,8 @@ LIB_DEPENDS= libexiv2.so:${PORTSDIR}/graphics/exiv2 \ ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= uses SSE extensions -USES= cmake:outsource desktop-file-utils ninja pkgconfig tar:xz +USES= compiler:c++11-lib cmake:outsource desktop-file-utils \ + ninja pkgconfig tar:xz USE_GNOME= librsvg2 USE_SQLITE= yes USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} @@ -29,8 +29,8 @@ INSTALLS_ICONS= yes LDFLAGS+= -L${LOCALBASE}/lib -lintl OPTIONS_DEFINE= COLORD DOCS FB_PICASA FLICKR GEO GNOMEKEYRING GPHOTO \ - GRAPHMAGICK LUA NLS OPENEXR OPENJPEG RAWSPEED SLIDESHOW \ - SQUISH WEBP + GRAPHMAGICK LIBSECRET LUA NLS OPENEXR OPENJPEG RAWSPEED \ + SLIDESHOW SQUISH WEBP GEO_DESC= Support geotagging FB_PICASA_DESC= Support export to Facebook and Picasa @@ -39,10 +39,12 @@ RAWSPEED_DESC= Compile with rawspeed backend SLIDESHOW_DESC= Build OpenGL/SDL slideshow viewer OPTIONS_DEFAULT=COLORD FB_PICASA FLICKR GEO GPHOTO LUA NLS OPENEXR \ - OPENJPEG RAWSPEED WEBP + OPENJPEG RAWSPEED SLIDESHOW SQUISH WEBP OPTIONS_SUB= yes CMAKE_ARGS+= -DBINARY_PACKAGE_BUILD=1 +CMAKE_ARGS+= -DBUILD_CMSTEST:BOOL=ON +CMAKE_ARGS+= -DUSE_KWALLET:BOOL=ON # darktable 1.4 can use colord but provides its own libcolord, # statically linked to libdarktable.so. @@ -67,6 +69,9 @@ GPHOTO_CMAKE_OFF= -DUSE_CAMERA_SUPPORT:BOOL=OFF GRAPHMAGICK_LIB_DEPENDS=libGraphicsMagick.so:${PORTSDIR}/graphics/GraphicsMagick GRAPHMAGICK_CMAKE_OFF= -DUSE_GRAPHICSMAGICK:BOOL=OFF +LIBSECRET_LIB_DEPENDS= libsecret-1.so:${PORTSDIR}/security/libsecret +LIBSECRET_CMAKE_OFF= -DUSE_LIBSECRET:BOOL=OFF + LUA_USES= lua LUA_CMAKE_OFF= -DUSE_LUA:BOOL=OFF @@ -81,7 +86,7 @@ OPENJPEG_CMAKE_OFF= -DUSE_OPENJPEG:BOOL=OFF RAWSPEED_CMAKE_OFF= -DDONT_USE_RAWSPEED:BOOL=ON -SLIDESHOW_USE= GL=gl SDL=sdl +SLIDESHOW_USE= GL=gl SDL=sdl SLIDESHOW_CMAKE_OFF= -DBUILD_SLIDESHOW:BOOL=OFF SQUISH_BUILD_DEPENDS= ${LOCALBASE}/lib/libsquish.a:${PORTSDIR}/graphics/squish @@ -90,14 +95,10 @@ SQUISH_CMAKE_OFF= -DUSE_SQUISH:BOOL=OFF WEBP_LIB_DEPENDS= libwebp.so:${PORTSDIR}/graphics/webp WEBP_CMAKE_OFF= -DUSE_WEBP:BOOL=OFF -.include - -.if ${OSVERSION} < 1000000 -USE_GCC= yes -.endif +.include .if defined(WITH_DEBUG) -CMAKE_BUILD_TYPE?= RelWithDebInfo +CMAKE_BUILD_TYPE= RelWithDebInfo STRIP= .endif @@ -111,4 +112,4 @@ post-install: ${RMDIR} ${STAGEDIR}${DOCSDIR} .endif -.include +.include diff --git a/graphics/darktable/distinfo b/graphics/darktable/distinfo index 3325393..888a2b0 100644 --- a/graphics/darktable/distinfo +++ b/graphics/darktable/distinfo @@ -1,2 +1,2 @@ -SHA256 (darktable-1.4.2.tar.xz) = c1311a6e336007b85d21647652ebec3e26840248a968eab04ab5f0a56c2e0709 -SIZE (darktable-1.4.2.tar.xz) = 2836340 +SHA256 (darktable-1.6.0.tar.xz) = 2bf8b05686f84e4b8960378ab785af8bbb187e8f34758f5eb2338ea35263597e +SIZE (darktable-1.6.0.tar.xz) = 3065488 diff --git a/graphics/darktable/files/patch-src-CMakeLists.txt b/graphics/darktable/files/patch-src-CMakeLists.txt deleted file mode 100644 index bcd7473..0000000 --- a/graphics/darktable/files/patch-src-CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ ---- src/CMakeLists.txt -+++ src/CMakeLists.txt -@@ -438,10 +438,10 @@ else() - endif() - - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -g") --set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -ffast-math ${MARCH}") -+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -ffast-math -fno-finite-math-only ${MARCH}") - set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -g") --set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math ${MARCH}") -+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math -fno-finite-math-only ${MARCH}") - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g") - if(CMAKE_COMPILER_IS_GNUCC) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpmath=sse") diff --git a/graphics/darktable/pkg-plist b/graphics/darktable/pkg-plist index b1b7b6f..534b354 100644 --- a/graphics/darktable/pkg-plist +++ b/graphics/darktable/pkg-plist @@ -1,6 +1,7 @@ bin/darktable bin/darktable-cli bin/darktable-cltest +bin/darktable-cmstest %%SLIDESHOW%%bin/darktable-viewer lib/darktable/libdarktable.so lib/darktable/plugins/imageio/format/libcopy.so @@ -39,6 +40,7 @@ lib/darktable/plugins/libcolormapping.so lib/darktable/plugins/libcolorout.so lib/darktable/plugins/libcolortransfer.so lib/darktable/plugins/libcolorzones.so +lib/darktable/plugins/libdefringe.so lib/darktable/plugins/libdemosaic.so lib/darktable/plugins/libdenoiseprofile.so lib/darktable/plugins/libdither.so @@ -54,6 +56,7 @@ lib/darktable/plugins/libhighpass.so lib/darktable/plugins/libhotpixels.so lib/darktable/plugins/libinvert.so lib/darktable/plugins/liblens.so +lib/darktable/plugins/libletsgofloat.so lib/darktable/plugins/liblevels.so lib/darktable/plugins/liblowlight.so lib/darktable/plugins/liblowpass.so @@ -63,6 +66,8 @@ lib/darktable/plugins/liboverexposed.so lib/darktable/plugins/libprofile_gamma.so lib/darktable/plugins/librawdenoise.so lib/darktable/plugins/librelight.so +lib/darktable/plugins/librotatepixels.so +lib/darktable/plugins/libscalepixels.so lib/darktable/plugins/libshadhi.so lib/darktable/plugins/libsharpen.so lib/darktable/plugins/libsoften.so @@ -78,7 +83,6 @@ lib/darktable/plugins/libwatermark.so lib/darktable/plugins/libzonesystem.so lib/darktable/plugins/lighttable/libbackgroundjobs.so %%GPHOTO%%lib/darktable/plugins/lighttable/libcamera.so -%%GPHOTO%%lib/darktable/plugins/lighttable/libcapture.so lib/darktable/plugins/lighttable/libcollect.so lib/darktable/plugins/lighttable/libcolorlabels.so lib/darktable/plugins/lighttable/libcolorpicker.so @@ -108,15 +112,17 @@ lib/darktable/plugins/lighttable/libnavigation.so lib/darktable/plugins/lighttable/libratings.so lib/darktable/plugins/lighttable/librecentcollect.so lib/darktable/plugins/lighttable/libselect.so +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/libview_toolbox.so lib/darktable/plugins/lighttable/libviewswitcher.so -%%GPHOTO%%lib/darktable/views/libcapture.so lib/darktable/views/libdarkroom.so lib/darktable/views/liblighttable.so %%GEO%%lib/darktable/views/libmap.so +lib/darktable/views/libslideshow.so +%%GPHOTO%%lib/darktable/views/libtethering.so man/man1/darktable-cli.1.gz man/man1/darktable.1.gz share/appdata/darktable.appdata.xml @@ -150,60 +156,112 @@ share/applications/darktable.desktop %%LUA%%%%DATADIR%%/lua/darktable/debug.lua %%LUA%%%%DATADIR%%/luarc %%DATADIR%%/pixmaps/dt_logo_128x128.png +%%DATADIR%%/pixmaps/idbutton-1.png +%%DATADIR%%/pixmaps/idbutton-1.svg %%DATADIR%%/pixmaps/idbutton-2.png +%%DATADIR%%/pixmaps/idbutton-2.svg %%DATADIR%%/pixmaps/idbutton.png -%%DATADIR%%/pixmaps/off.png -%%DATADIR%%/pixmaps/plugins/darkroom/anlfyeni.png +%%DATADIR%%/pixmaps/idbutton.svg %%DATADIR%%/pixmaps/plugins/darkroom/atrous.png +%%DATADIR%%/pixmaps/plugins/darkroom/atrous.svg %%DATADIR%%/pixmaps/plugins/darkroom/basecurve.png +%%DATADIR%%/pixmaps/plugins/darkroom/basecurve.svg %%DATADIR%%/pixmaps/plugins/darkroom/bilateral.png +%%DATADIR%%/pixmaps/plugins/darkroom/bilateral.svg %%DATADIR%%/pixmaps/plugins/darkroom/bloom.png +%%DATADIR%%/pixmaps/plugins/darkroom/bloom.svg %%DATADIR%%/pixmaps/plugins/darkroom/borders.png +%%DATADIR%%/pixmaps/plugins/darkroom/borders.svg %%DATADIR%%/pixmaps/plugins/darkroom/cacorrect.png +%%DATADIR%%/pixmaps/plugins/darkroom/cacorrect.svg %%DATADIR%%/pixmaps/plugins/darkroom/channelmixer.png +%%DATADIR%%/pixmaps/plugins/darkroom/channelmixer.svg %%DATADIR%%/pixmaps/plugins/darkroom/clahe.png +%%DATADIR%%/pixmaps/plugins/darkroom/clahe.svg %%DATADIR%%/pixmaps/plugins/darkroom/clipping.png +%%DATADIR%%/pixmaps/plugins/darkroom/clipping.svg %%DATADIR%%/pixmaps/plugins/darkroom/colisa.png +%%DATADIR%%/pixmaps/plugins/darkroom/colisa.svg %%DATADIR%%/pixmaps/plugins/darkroom/colorcorrection.png +%%DATADIR%%/pixmaps/plugins/darkroom/colorcorrection.svg %%DATADIR%%/pixmaps/plugins/darkroom/colorin.png +%%DATADIR%%/pixmaps/plugins/darkroom/colorin.svg %%DATADIR%%/pixmaps/plugins/darkroom/colormapping.png +%%DATADIR%%/pixmaps/plugins/darkroom/colormapping.svg %%DATADIR%%/pixmaps/plugins/darkroom/colorout.png +%%DATADIR%%/pixmaps/plugins/darkroom/colorout.svg %%DATADIR%%/pixmaps/plugins/darkroom/colortransfer.png +%%DATADIR%%/pixmaps/plugins/darkroom/colortransfer.svg %%DATADIR%%/pixmaps/plugins/darkroom/colorzones.png +%%DATADIR%%/pixmaps/plugins/darkroom/colorzones.svg %%DATADIR%%/pixmaps/plugins/darkroom/demosaic.png +%%DATADIR%%/pixmaps/plugins/darkroom/demosaic.svg %%DATADIR%%/pixmaps/plugins/darkroom/dither.png +%%DATADIR%%/pixmaps/plugins/darkroom/dither.svg %%DATADIR%%/pixmaps/plugins/darkroom/exposure.png +%%DATADIR%%/pixmaps/plugins/darkroom/exposure.svg %%DATADIR%%/pixmaps/plugins/darkroom/flip.png +%%DATADIR%%/pixmaps/plugins/darkroom/flip.svg %%DATADIR%%/pixmaps/plugins/darkroom/graduatednd.png +%%DATADIR%%/pixmaps/plugins/darkroom/graduatednd.svg %%DATADIR%%/pixmaps/plugins/darkroom/grain.png +%%DATADIR%%/pixmaps/plugins/darkroom/grain.svg %%DATADIR%%/pixmaps/plugins/darkroom/highlights.png +%%DATADIR%%/pixmaps/plugins/darkroom/highlights.svg %%DATADIR%%/pixmaps/plugins/darkroom/highpass.png +%%DATADIR%%/pixmaps/plugins/darkroom/highpass.svg %%DATADIR%%/pixmaps/plugins/darkroom/hotpixels.png +%%DATADIR%%/pixmaps/plugins/darkroom/hotpixels.svg %%DATADIR%%/pixmaps/plugins/darkroom/invert.png +%%DATADIR%%/pixmaps/plugins/darkroom/invert.svg %%DATADIR%%/pixmaps/plugins/darkroom/lens.png +%%DATADIR%%/pixmaps/plugins/darkroom/lens.svg %%DATADIR%%/pixmaps/plugins/darkroom/levels.png +%%DATADIR%%/pixmaps/plugins/darkroom/levels.svg %%DATADIR%%/pixmaps/plugins/darkroom/lowlight.png +%%DATADIR%%/pixmaps/plugins/darkroom/lowlight.svg %%DATADIR%%/pixmaps/plugins/darkroom/lowpass.png +%%DATADIR%%/pixmaps/plugins/darkroom/lowpass.svg %%DATADIR%%/pixmaps/plugins/darkroom/monochrome.png +%%DATADIR%%/pixmaps/plugins/darkroom/monochrome.svg %%DATADIR%%/pixmaps/plugins/darkroom/nlmeans.png +%%DATADIR%%/pixmaps/plugins/darkroom/nlmeans.svg %%DATADIR%%/pixmaps/plugins/darkroom/overexposed.png +%%DATADIR%%/pixmaps/plugins/darkroom/overexposed.svg %%DATADIR%%/pixmaps/plugins/darkroom/profile_gamma.png +%%DATADIR%%/pixmaps/plugins/darkroom/profile_gamma.svg %%DATADIR%%/pixmaps/plugins/darkroom/rawdenoise.png +%%DATADIR%%/pixmaps/plugins/darkroom/rawdenoise.svg %%DATADIR%%/pixmaps/plugins/darkroom/rawimport.png +%%DATADIR%%/pixmaps/plugins/darkroom/rawimport.svg %%DATADIR%%/pixmaps/plugins/darkroom/relight.png +%%DATADIR%%/pixmaps/plugins/darkroom/relight.svg %%DATADIR%%/pixmaps/plugins/darkroom/shadhi.png +%%DATADIR%%/pixmaps/plugins/darkroom/shadhi.svg %%DATADIR%%/pixmaps/plugins/darkroom/sharpen.png +%%DATADIR%%/pixmaps/plugins/darkroom/sharpen.svg %%DATADIR%%/pixmaps/plugins/darkroom/soften.png +%%DATADIR%%/pixmaps/plugins/darkroom/soften.svg %%DATADIR%%/pixmaps/plugins/darkroom/splittoning.png +%%DATADIR%%/pixmaps/plugins/darkroom/splittoning.svg %%DATADIR%%/pixmaps/plugins/darkroom/spots.png +%%DATADIR%%/pixmaps/plugins/darkroom/spots.svg %%DATADIR%%/pixmaps/plugins/darkroom/temperature.png +%%DATADIR%%/pixmaps/plugins/darkroom/temperature.svg %%DATADIR%%/pixmaps/plugins/darkroom/template.png +%%DATADIR%%/pixmaps/plugins/darkroom/template.svg %%DATADIR%%/pixmaps/plugins/darkroom/tonecurve.png +%%DATADIR%%/pixmaps/plugins/darkroom/tonecurve.svg %%DATADIR%%/pixmaps/plugins/darkroom/tonemap.png +%%DATADIR%%/pixmaps/plugins/darkroom/tonemap.svg %%DATADIR%%/pixmaps/plugins/darkroom/velvia.png +%%DATADIR%%/pixmaps/plugins/darkroom/velvia.svg %%DATADIR%%/pixmaps/plugins/darkroom/vignette.png +%%DATADIR%%/pixmaps/plugins/darkroom/vignette.svg %%DATADIR%%/pixmaps/plugins/darkroom/watermark.png +%%DATADIR%%/pixmaps/plugins/darkroom/watermark.svg %%DATADIR%%/pixmaps/plugins/darkroom/zonesystem.png +%%DATADIR%%/pixmaps/plugins/darkroom/zonesystem.svg %%RAWSPEED%%%%DATADIR%%/rawspeed/cameras.xml %%RAWSPEED%%%%DATADIR%%/rawspeed/showcameras.xsl %%DATADIR%%/style/bullet.gif @@ -234,8 +292,10 @@ share/icons/hicolor/256x256/apps/darktable.png share/icons/hicolor/32x32/apps/darktable.png share/icons/hicolor/48x48/apps/darktable.png share/icons/hicolor/64x64/apps/darktable.png +share/icons/hicolor/scalable/apps/darktable-1.svg share/icons/hicolor/scalable/apps/darktable-2.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