From owner-svn-ports-head@freebsd.org Wed May 13 12:05:36 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BB8772F4A53; Wed, 13 May 2020 12:05:36 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49MYKD4XRQz3yhp; Wed, 13 May 2020 12:05:36 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 96DB12127E; Wed, 13 May 2020 12:05:36 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04DC5aRj078685; Wed, 13 May 2020 12:05:36 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04DC5Zv0078681; Wed, 13 May 2020 12:05:35 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <202005131205.04DC5Zv0078681@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Wed, 13 May 2020 12:05:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r535105 - in head/graphics/darktable: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: in head/graphics/darktable: . files X-SVN-Commit-Revision: 535105 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 May 2020 12:05:36 -0000 Author: mandree Date: Wed May 13 12:05:35 2020 New Revision: 535105 URL: https://svnweb.freebsd.org/changeset/ports/535105 Log: graphics/darktable: update to 3.0.2 This is an upgrade for darktable from 3.0.0 to 3.0.2, with Ludger's changes from the original PR submission: - export to Flickr, Facebook and Google Photo removed as [they are] no longer supported in 3.0.2 And these changes by mandree@: - rediff patches - reshuffle Makefile per portclippy recommendation - remove COLORD option, it's not technically required to build, but a a raw image processing application without color management makes little sense. This option was default-on anyways. Changes 3.0.0 -> 3.0.1: https://www.darktable.org/2020/03/darktable-301-released/ https://github.com/darktable-org/darktable/releases/tag/release-3.0.1 Changes 3.0.1 -> 3.0.2: https://www.darktable.org/2020/04/darktable-302-released/ https://github.com/darktable-org/darktable/releases/tag/release-3.0.2 PR: 246065 Submitted by: Ludger Bolmerg Approved by: Jean-Sébastien Pédron (maintainer) Modified: head/graphics/darktable/Makefile head/graphics/darktable/distinfo head/graphics/darktable/files/patch-src_CMakeLists.txt head/graphics/darktable/files/patch-src_external_rawspeed_cmake_Modules_CheckZLIB.cmake head/graphics/darktable/pkg-plist Modified: head/graphics/darktable/Makefile ============================================================================== --- head/graphics/darktable/Makefile Wed May 13 11:48:24 2020 (r535104) +++ head/graphics/darktable/Makefile Wed May 13 12:05:35 2020 (r535105) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= darktable -PORTVERSION= 3.0.0 -PORTREVISION= 4 +PORTVERSION= 3.0.2 CATEGORIES= graphics MASTER_SITES= https://github.com/darktable-org/${PORTNAME}/releases/download/release-${PORTVERSION:C/\.rc/rc/}/ @@ -18,7 +17,9 @@ ONLY_FOR_ARCHS_REASON= uses SSE instructions and 64-bi BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \ xsltproc:textproc/libxslt \ po4a-translate:textproc/po4a -LIB_DEPENDS= libcurl.so:ftp/curl \ +LIB_DEPENDS= libcolord.so:graphics/colord \ + libcolord-gtk.so:graphics/colord-gtk \ + libcurl.so:ftp/curl \ libexiv2.so:graphics/exiv2 \ libjson-glib-1.0.so:devel/json-glib \ liblcms2.so:graphics/lcms2 \ @@ -32,34 +33,27 @@ USES= cmake compiler:c++11-lib desktop-file-utils \ gl gnome jpeg pkgconfig sqlite tar:xz xorg 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 +USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} +USE_XORG= ice sm x11 xext xrandr -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 + CFLAGS+= -fopenmp +LDFLAGS+= -L${LOCALBASE}/lib -COLORD_LIB_DEPENDS= libcolord.so:graphics/colord \ - libcolord-gtk.so:graphics/colord-gtk -COLORD_CMAKE_OFF= -DUSE_COLORD:BOOL=OFF +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\.rc/~rc/} -FLICKR_LIB_DEPENDS= libflickcurl.so:www/flickcurl -FLICKR_CMAKE_OFF= -DUSE_FLICKR:BOOL=OFF +OPTIONS_DEFINE= DOCS GEO GPHOTO GRAPHMAGICK \ + LIBSECRET LUA NLS OPENEXR OPENJPEG PRINT WEBP +OPTIONS_DEFAULT=GEO GPHOTO LUA OPENEXR OPENJPEG \ + PRINT WEBP +OPTIONS_SUB= yes + +GEO_DESC= Support geotagging +LIBSECRET_DESC= Support libsecret as password backend GEO_LIB_DEPENDS= libosmgpsmap-1.0.so:x11-toolkits/osm-gps-map GEO_CMAKE_OFF= -DUSE_MAP:BOOL=OFF Modified: head/graphics/darktable/distinfo ============================================================================== --- head/graphics/darktable/distinfo Wed May 13 11:48:24 2020 (r535104) +++ head/graphics/darktable/distinfo Wed May 13 12:05:35 2020 (r535105) @@ -1,3 +1,3 @@ -TIMESTAMP = 1577531331 -SHA256 (darktable-3.0.0.tar.xz) = 7195a5ff7ee95ab7c5a57e4e84f8c90cc4728b2c917359203c21293ab754c0db -SIZE (darktable-3.0.0.tar.xz) = 3827412 +TIMESTAMP = 1588248963 +SHA256 (darktable-3.0.2.tar.xz) = 6abaf661fe9414e92bdb33b58b98ef024ccf6132b7876abaf0751ec2109f36fb +SIZE (darktable-3.0.2.tar.xz) = 3931240 Modified: head/graphics/darktable/files/patch-src_CMakeLists.txt ============================================================================== --- head/graphics/darktable/files/patch-src_CMakeLists.txt Wed May 13 11:48:24 2020 (r535104) +++ head/graphics/darktable/files/patch-src_CMakeLists.txt Wed May 13 12:05:35 2020 (r535105) @@ -1,6 +1,6 @@ ---- src/CMakeLists.txt.orig +--- src/CMakeLists.txt.orig 2020-04-15 07:10:53 UTC +++ src/CMakeLists.txt -@@ -336,7 +336,7 @@ if(USE_OPENJPEG) +@@ -360,7 +360,7 @@ if(USE_OPENJPEG) add_definitions("-DHAVE_OPENJPEG") list(APPEND SOURCES "common/imageio_j2k.c") Modified: head/graphics/darktable/files/patch-src_external_rawspeed_cmake_Modules_CheckZLIB.cmake ============================================================================== --- head/graphics/darktable/files/patch-src_external_rawspeed_cmake_Modules_CheckZLIB.cmake Wed May 13 11:48:24 2020 (r535104) +++ head/graphics/darktable/files/patch-src_external_rawspeed_cmake_Modules_CheckZLIB.cmake Wed May 13 12:05:35 2020 (r535105) @@ -1,6 +1,6 @@ ---- src/external/rawspeed/cmake/Modules/CheckZLIB.cmake.orig 2018-01-18 18:05:10 UTC +--- src/external/rawspeed/cmake/Modules/CheckZLIB.cmake.orig 2020-04-03 21:02:54 UTC +++ src/external/rawspeed/cmake/Modules/CheckZLIB.cmake -@@ -38,7 +38,7 @@ endif() +@@ -40,7 +40,7 @@ endif() CHECK_PROTOTYPE_DEFINITION(zError "const char* zError(int zErrorCode)" "NULL" Modified: head/graphics/darktable/pkg-plist ============================================================================== --- head/graphics/darktable/pkg-plist Wed May 13 11:48:24 2020 (r535104) +++ head/graphics/darktable/pkg-plist Wed May 13 12:05:35 2020 (r535105) @@ -18,9 +18,6 @@ lib/darktable/plugins/imageio/format/libtiff.so %%WEBP%%lib/darktable/plugins/imageio/format/libwebp.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/libpiwigo.so