Index: head/graphics/darktable/Makefile =================================================================== --- head/graphics/darktable/Makefile (revision 433114) +++ head/graphics/darktable/Makefile (revision 433115) @@ -1,131 +1,131 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= darktable -PORTVERSION= 2.2.2 +PORTVERSION= 2.2.3 CATEGORIES= graphics MASTER_SITES= https://github.com/darktable-org/${PORTNAME}/releases/download/release-${PORTVERSION:C/\.rc/rc/}/ MAINTAINER= dumbbell@FreeBSD.org COMMENT= Virtual lighttable and darkroom for photographers LICENSE= GPLv3 BUILD_DEPENDS= xsltproc:textproc/libxslt \ po4a-translate:textproc/po4a LIB_DEPENDS= libcurl.so:ftp/curl \ libexiv2.so:graphics/exiv2 \ libjson-glib-1.0.so:devel/json-glib \ liblcms2.so:graphics/lcms2 \ liblensfun.so:graphics/lensfun \ libpng16.so:graphics/png \ libpugixml.so:textproc/pugixml \ libsoup-2.4.so:devel/libsoup \ libtiff.so:graphics/tiff ONLY_FOR_ARCHS= amd64 arm64 ONLY_FOR_ARCHS_REASON= uses SSE instructions and 64-bit address space USES= cmake:outsource compiler:c++11-lib desktop-file-utils \ jpeg ninja pkgconfig sqlite tar:xz USE_GL= glu USE_GNOME= cairo gtk30 intltool librsvg2 libxml2 USE_XORG= ice sm x11 xext xrandr USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} INSTALLS_ICONS= yes OPTIONS_DEFINE= COLORD DOCS FLICKR GEO GPHOTO GRAPHMAGICK \ LIBSECRET LUA NLS OPENEXR OPENJPEG PRINT WEBP GEO_DESC= Support geotagging LIBSECRET_DESC= Support libsecret as password backend OPTIONS_DEFAULT=COLORD FLICKR GEO GPHOTO LUA OPENEXR OPENJPEG \ PRINT WEBP OPTIONS_SUB= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\.rc/~rc/} CMAKE_ARGS+= -DBINARY_PACKAGE_BUILD=1 CMAKE_ARGS+= -DBUILD_CMSTEST:BOOL=ON CMAKE_ARGS+= -DUSE_KWALLET:BOOL=ON LDFLAGS+= -L${LOCALBASE}/lib COLORD_LIB_DEPENDS= libcolord.so:graphics/colord \ libcolord-gtk.so:graphics/colord-gtk COLORD_CMAKE_OFF= -DUSE_COLORD:BOOL=OFF FLICKR_LIB_DEPENDS= libflickcurl.so:www/flickcurl FLICKR_CMAKE_OFF= -DUSE_FLICKR:BOOL=OFF GEO_LIB_DEPENDS= libosmgpsmap-1.0.so:x11-toolkits/osm-gps-map GEO_CMAKE_OFF= -DUSE_MAP:BOOL=OFF GPHOTO_LIB_DEPENDS= libgphoto2.so:graphics/libgphoto2 GPHOTO_CMAKE_OFF= -DUSE_CAMERA_SUPPORT:BOOL=OFF GRAPHMAGICK_LIB_DEPENDS=libGraphicsMagick.so:graphics/GraphicsMagick GRAPHMAGICK_CMAKE_OFF= -DUSE_GRAPHICSMAGICK:BOOL=OFF LIBSECRET_LIB_DEPENDS= libsecret-1.so:security/libsecret LIBSECRET_CMAKE_OFF= -DUSE_LIBSECRET:BOOL=OFF LUA_USES= lua:52 LUA_CMAKE_OFF= -DUSE_LUA:BOOL=OFF # FIXME: Even with NLS turned off, darktable(1) is still linked to # libintl.so. NLS_USES= gettext NLS_USES_OFF= gettext-runtime NLS_CMAKE_OFF= -DUSE_NLS:BOOL=OFF NLS_LDFLAGS= -L${LOCALBASE}/lib -lintl OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR \ libIlmThread-2_2.so:graphics/ilmbase OPENEXR_CMAKE_OFF= -DUSE_OPENEXR:BOOL=OFF OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg OPENJPEG_CMAKE_OFF= -DUSE_OPENJPEG:BOOL=OFF PRINT_LIB_DEPENDS= libcups.so:print/cups PRINT_CMAKE_OFF= -DBUILD_PRINT:BOOL=OFF WEBP_LIB_DEPENDS= libwebp.so:graphics/webp WEBP_CMAKE_OFF= -DUSE_WEBP:BOOL=OFF .include .if ${ARCH} == amd64 && ${CHOSEN_COMPILER_TYPE} == clang # Enable OpenMP support with Clang 3.9. LLVM_VER= 39 BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER} CPP= clang-cpp${LLVM_VER} CC= clang${LLVM_VER} CXX= clang++${LLVM_VER} # FIXME: At least in 3.7.0 and 3.7.1, Clang doesn't find libomp.so # itself. Furthermore, there may be a regression in 3.7.1 because we now # need to explicitly link to libm.so as well. This remains true with # Clang 3.9.1. OPENMP_FLAGS= -L${LOCALBASE}/llvm${LLVM_VER}/lib -lm -lomp LDFLAGS+= ${OPENMP_FLAGS} # Depend on devel/openmp instead of the full LLVM at runtime. Required # for a consistent libomp experience. LIB_DEPENDS+= libomp.so.0:devel/openmp # Last but not least, there is a second change or regression in CMake # 3.4.x: CMAKE_EXE_LINKER_FLAGS is not passed to TRY_COMPILE by default # anymore. The CMP0056 policy must be explicitly set to NEW to ensure # linker flags are passed. # See: https://cmake.org/cmake/help/v3.4/policy/CMP0056.html CMAKE_ARGS+= -DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW .endif .if defined(WITH_DEBUG) CMAKE_BUILD_TYPE= RelWithDebInfo STRIP= .endif .include Index: head/graphics/darktable/distinfo =================================================================== --- head/graphics/darktable/distinfo (revision 433114) +++ head/graphics/darktable/distinfo (revision 433115) @@ -1,3 +1,3 @@ -TIMESTAMP = 1485537770 -SHA256 (darktable-2.2.2.tar.xz) = 766d7d734e7bd5a33f6a6932a43b15cc88435c64ad9a0b20410ba5b4706941c2 -SIZE (darktable-2.2.2.tar.xz) = 3079424 +TIMESTAMP = 1485877660 +SHA256 (darktable-2.2.3.tar.xz) = 1b33859585bf283577680c61e3c0ea4e48214371453b9c17a86664d2fbda48a0 +SIZE (darktable-2.2.3.tar.xz) = 3079524 Index: head/graphics/darktable/files/patch-src_develop_imageop__math.c =================================================================== --- head/graphics/darktable/files/patch-src_develop_imageop__math.c (revision 433114) +++ head/graphics/darktable/files/patch-src_develop_imageop__math.c (nonexistent) @@ -1,18 +0,0 @@ ---- src/develop/imageop_math.c.orig 2017-01-27 11:03:43 UTC -+++ src/develop/imageop_math.c -@@ -195,13 +195,13 @@ void dt_iop_clip_and_zoom_mosaic_half_si - - const float fy = (y + roi_out->y) * px_footprint; - const int miny = CLAMPS((int)floorf(fy - px_footprint), 0, roi_in->height-3); -- const int maxy = MIN(roi_in->height-1, (int)ceilf(fy + px_footprint)); -+ const int maxy = MIN(roi_in->height-2, (int)ceilf(fy + px_footprint)); - - float fx = roi_out->x * px_footprint; - for(int x = 0; x < roi_out->width; x++, fx += px_footprint, outc++) - { - const int minx = CLAMPS((int)floorf(fx - px_footprint), 0, roi_in->width-3); -- const int maxx = MIN(roi_in->width-1, (int)ceilf(fx + px_footprint)); -+ const int maxx = MIN(roi_in->width-2, (int)ceilf(fx + px_footprint)); - - const int c = FC(y, x, filters); - int num = 0; Property changes on: head/graphics/darktable/files/patch-src_develop_imageop__math.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property