Page MenuHomeFreeBSD
Files F146118301

D8994.id23447.diff
No OneTemporary
Actions

D8994.id23447.diff
View Options

Index: Makefile
===================================================================
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= darktable
-PORTVERSION= 2.0.7
+PORTVERSION= 2.2.0
CATEGORIES= graphics
MASTER_SITES= https://github.com/darktable-org/${PORTNAME}/releases/download/release-${PORTVERSION:C/\.rc/rc/}/
@@ -50,6 +50,7 @@
CMAKE_ARGS+= -DBINARY_PACKAGE_BUILD=1
CMAKE_ARGS+= -DBUILD_CMSTEST:BOOL=ON
CMAKE_ARGS+= -DUSE_KWALLET:BOOL=ON
+LDFLAGS+= -L${LOCALBASE}/lib
# darktable 1.4+ can use colord but provides its own libcolord,
# statically linked to libdarktable.so.
@@ -61,7 +62,7 @@
FLICKR_CMAKE_OFF= -DUSE_FLICKR:BOOL=OFF
GEO_LIB_DEPENDS= libosmgpsmap-1.0.so:x11-toolkits/osm-gps-map
-GEO_CMAKE_OFF= -DUSE_GEO:BOOL=OFF
+GEO_CMAKE_OFF= -DUSE_MAP:BOOL=OFF
GNOMEKEYRING_LIB_DEPENDS=libgnome-keyring.so:security/libgnome-keyring
GNOMEKEYRING_CMAKE_OFF= -DUSE_GNOME_KEYRING:BOOL=OFF
@@ -89,7 +90,7 @@
libIlmThread-2_2.so:graphics/ilmbase
OPENEXR_CMAKE_OFF= -DUSE_OPENEXR:BOOL=OFF
-OPENJPEG_LIB_DEPENDS= libopenjpeg.so:graphics/openjpeg15
+OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg
OPENJPEG_CMAKE_OFF= -DUSE_OPENJPEG:BOOL=OFF
PRINT_LIB_DEPENDS= libcups.so:print/cups
Index: distinfo
===================================================================
--- distinfo
+++ distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1477429902
-SHA256 (darktable-2.0.7.tar.xz) = a9226157404538183549079e3b8707c910fedbb669bd018106bdf584b88a1dab
-SIZE (darktable-2.0.7.tar.xz) = 2960436
+TIMESTAMP = 1483003973
+SHA256 (darktable-2.2.0.tar.xz) = 3eca193831faae58200bb1cb6ef29e658bce43a81706b54420953a7c33d79377
+SIZE (darktable-2.2.0.tar.xz) = 3061716
Index: files/patch-data_CMakeLists.txt
===================================================================
--- files/patch-data_CMakeLists.txt
+++ files/patch-data_CMakeLists.txt
@@ -1,11 +1,11 @@
---- data/CMakeLists.txt.orig 2016-02-02 11:36:06 UTC
+--- data/CMakeLists.txt.orig 2016-12-23 10:38:36 UTC
+++ data/CMakeLists.txt
-@@ -85,7 +85,7 @@ if(APPLE)
+@@ -130,7 +130,7 @@ if(APPLE)
+ # OS X doesn't have aplay, but afplay should do
set(DEFCONFIG_AUDIOPLAYER "afplay")
endif(APPLE)
- configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/darktableconfig.xml.in ${CMAKE_CURRENT_BINARY_DIR}/darktableconfig.xml )
--execute_process( COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/darktableconfig.dtd ${CMAKE_CURRENT_BINARY_DIR}/darktableconfig.dtd)
-+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/darktableconfig.dtd.in ${CMAKE_CURRENT_BINARY_DIR}/darktableconfig.dtd )
+-configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/darktableconfig.dtd ${CMAKE_CURRENT_BINARY_DIR}/darktableconfig.dtd COPYONLY )
++configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/darktableconfig.dtd.in ${CMAKE_CURRENT_BINARY_DIR}/darktableconfig.dtd COPYONLY )
-
- if(USE_XMLLINT)
+ # get_property(DT_PLUGIN_IOPS GLOBAL PROPERTY DT_PLUGIN_IOPS)
+ get_property(DT_PLUGIN_IOPS_VISIBLE_BY_DEFAULT GLOBAL PROPERTY DT_PLUGIN_IOPS_VISIBLE_BY_DEFAULT)
Index: files/patch-doc_CMakeLists.txt
===================================================================
--- files/patch-doc_CMakeLists.txt
+++ files/patch-doc_CMakeLists.txt
@@ -1,19 +0,0 @@
---- doc/CMakeLists.txt.orig 2016-02-02 11:36:06 UTC
-+++ doc/CMakeLists.txt
-@@ -9,14 +9,14 @@ install(FILES ${DOC_FILES} DESTINATION .
- # create config docs
- if(NOT ${Xsltproc_BIN} STREQUAL "Xsltproc_BIN-NOTFOUND")
- add_custom_command(
-- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../tools/generate_darktablerc_doc.xsl ${CMAKE_CURRENT_SOURCE_DIR}/../data/darktableconfig.dtd ${CMAKE_CURRENT_BINARY_DIR}/../data/darktableconfig.xml
-+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../tools/generate_darktablerc_doc.xsl ${CMAKE_CURRENT_BINARY_DIR}/../data/darktableconfig.dtd ${CMAKE_CURRENT_BINARY_DIR}/../data/darktableconfig.xml
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/darktablerc.html
- COMMAND ${Xsltproc_BIN} ${CMAKE_CURRENT_SOURCE_DIR}/../tools/generate_darktablerc_doc.xsl ${CMAKE_CURRENT_BINARY_DIR}/../data/darktableconfig.xml > ${CMAKE_CURRENT_BINARY_DIR}/darktablerc.html
- )
- else(NOT ${Xsltproc_BIN} STREQUAL "Xsltproc_BIN-NOTFOUND")
- if(NOT ${Saxon_BIN} STREQUAL "Saxon_BIN-NOTFOUND")
- add_custom_command(
-- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../tools/generate_darktablerc_doc.xsl ${CMAKE_CURRENT_SOURCE_DIR}/../data/darktableconfig.dtd ${CMAKE_CURRENT_BINARY_DIR}/../data/darktableconfig.xml
-+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../tools/generate_darktablerc_doc.xsl ${CMAKE_CURRENT_BINARY_DIR}/../data/darktableconfig.dtd ${CMAKE_CURRENT_BINARY_DIR}/../data/darktableconfig.xml
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/darktablerc.html
- COMMAND ${Saxon_BIN} ${CMAKE_CURRENT_BINARY_DIR}/../data/darktableconfig.xml ${CMAKE_CURRENT_SOURCE_DIR}/../tools/generate_darktablerc_doc.xsl > ${CMAKE_CURRENT_BINARY_DIR}/darktablerc.html
- )
Index: files/patch-src_CMakeLists.txt
===================================================================
--- files/patch-src_CMakeLists.txt
+++ files/patch-src_CMakeLists.txt
@@ -1,41 +1,14 @@
---- src/CMakeLists.txt.orig 2016-02-02 11:36:06 UTC
+# OpenJPEG-1.5 installs into /usr/local/include which is early in the
+# path, so make sure that OpenJPEG-2.1's path is prepended.
+
+--- src/CMakeLists.txt.orig 2016-12-23 10:38:36 UTC
+++ src/CMakeLists.txt
-@@ -415,8 +415,9 @@ if(NOT CUSTOM_CFLAGS)
- #-g MUST be set for ALL builds, or there will be no support for them when bugs happen
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MARCH} ${DT_REQ_INSTRUCTIONS} -g")
- set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O2")
-- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -ffast-math -fno-finite-math-only")
-+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3")
- if(CMAKE_COMPILER_IS_GNUCC)
-+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -ffast-math -fno-finite-math-only")
- execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
+@@ -254,7 +254,7 @@ if(USE_OPENJPEG)
+ add_definitions("-DHAVE_OPENJPEG")
+ list(APPEND SOURCES "common/imageio_j2k.c")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpmath=sse")
-@@ -428,8 +429,9 @@ if(NOT CUSTOM_CFLAGS)
-
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MARCH} ${DT_REQ_INSTRUCTIONS} -g")
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2")
-- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math -fno-finite-math-only")
-+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")
- if(CMAKE_COMPILER_IS_GNUCXX)
-+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -ffast-math -fno-finite-math-only")
- execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
-
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpmath=sse")
-@@ -677,14 +679,14 @@ endif(CMAKE_C_COMPILER_ID STREQUAL "GCC"
- #
- if(NOT ${Xsltproc_BIN} STREQUAL "Xsltproc_BIN-NOTFOUND")
- add_custom_command(
-- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../tools/generate_prefs.xsl ${CMAKE_CURRENT_SOURCE_DIR}/../data/darktableconfig.dtd ${CMAKE_CURRENT_BINARY_DIR}/../data/darktableconfig.xml
-+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../tools/generate_prefs.xsl ${CMAKE_CURRENT_BINARY_DIR}/../data/darktableconfig.dtd ${CMAKE_CURRENT_BINARY_DIR}/../data/darktableconfig.xml
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/preferences_gen.h
- COMMAND ${Xsltproc_BIN} --stringparam HAVE_OPENCL ${HAVE_OPENCL} ${CMAKE_CURRENT_SOURCE_DIR}/../tools/generate_prefs.xsl ${CMAKE_CURRENT_BINARY_DIR}/../data/darktableconfig.xml > ${CMAKE_CURRENT_BINARY_DIR}/preferences_gen.h
- )
- else(NOT ${Xsltproc_BIN} STREQUAL "Xsltproc_BIN-NOTFOUND")
- if(NOT ${Saxon_BIN} STREQUAL "Saxon_BIN-NOTFOUND")
- add_custom_command(
-- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../tools/generate_prefs.xsl ${CMAKE_CURRENT_SOURCE_DIR}/../data/darktableconfig.dtd ${CMAKE_CURRENT_BINARY_DIR}/../data/darktableconfig.xml
-+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../tools/generate_prefs.xsl ${CMAKE_CURRENT_BINARY_DIR}/../data/darktableconfig.dtd ${CMAKE_CURRENT_BINARY_DIR}/../data/darktableconfig.xml
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/preferences_gen.h
- COMMAND ${Saxon_BIN} ${CMAKE_CURRENT_BINARY_DIR}/../data/darktableconfig.xml ${CMAKE_CURRENT_SOURCE_DIR}/../tools/generate_prefs.xsl HAVE_OPENCL=${HAVE_OPENCL} > ${CMAKE_CURRENT_BINARY_DIR}/preferences_gen.h
- )
+- include_directories(SYSTEM ${OpenJPEG_INCLUDE_DIRS})
++ include_directories(BEFORE SYSTEM ${OpenJPEG_INCLUDE_DIRS})
+ list(APPEND LIBS ${OpenJPEG_LIBRARIES})
+ endif(OpenJPEG_FOUND)
+ endif(USE_OPENJPEG)
Index: pkg-plist
===================================================================
--- pkg-plist
+++ pkg-plist
@@ -1,9 +1,10 @@
bin/darktable
+bin/darktable-chart
bin/darktable-cli
bin/darktable-cltest
bin/darktable-cmstest
bin/darktable-generate-cache
-%%SLIDESHOW%%bin/darktable-viewer
+bin/darktable-rs-identify
lib/darktable/libdarktable.so
lib/darktable/plugins/imageio/format/libcopy.so
%%OPENEXR%%lib/darktable/plugins/imageio/format/libexr.so
@@ -22,6 +23,7 @@
lib/darktable/plugins/imageio/storage/libgallery.so
lib/darktable/plugins/imageio/storage/liblatex.so
lib/darktable/plugins/imageio/storage/libpicasa.so
+lib/darktable/plugins/libashift.so
lib/darktable/plugins/libatrous.so
lib/darktable/plugins/libbasecurve.so
lib/darktable/plugins/libbilat.so
@@ -34,6 +36,7 @@
lib/darktable/plugins/libclipping.so
lib/darktable/plugins/libcolisa.so
lib/darktable/plugins/libcolorbalance.so
+lib/darktable/plugins/libcolorchecker.so
lib/darktable/plugins/libcolorcontrast.so
lib/darktable/plugins/libcolorcorrection.so
lib/darktable/plugins/libcolorin.so
@@ -61,6 +64,7 @@
lib/darktable/plugins/libinvert.so
lib/darktable/plugins/liblens.so
lib/darktable/plugins/liblevels.so
+lib/darktable/plugins/libliquify.so
lib/darktable/plugins/liblowlight.so
lib/darktable/plugins/liblowpass.so
lib/darktable/plugins/libmonochrome.so
@@ -68,6 +72,7 @@
lib/darktable/plugins/liboverexposed.so
lib/darktable/plugins/libprofile_gamma.so
lib/darktable/plugins/librawdenoise.so
+lib/darktable/plugins/librawoverexposed.so
lib/darktable/plugins/librawprepare.so
lib/darktable/plugins/librelight.so
lib/darktable/plugins/librotatepixels.so
@@ -134,20 +139,14 @@
man/man1/darktable-cltest.1.gz
man/man1/darktable-cmstest.1.gz
man/man1/darktable-generate-cache.1.gz
-man/man1/darktable-viewer.1.gz
man/man1/darktable.1.gz
share/appdata/darktable.appdata.xml
share/applications/darktable.desktop
%%DATADIR%%/darktable.css
%%DATADIR%%/darktablerc
%%DATADIR%%/gdb_commands
-%%DATADIR%%/js/builder.js
-%%DATADIR%%/js/effects.js
-%%DATADIR%%/js/lightbox-web.js
-%%DATADIR%%/js/lightbox.js
-%%DATADIR%%/js/prototype.js
-%%DATADIR%%/js/scriptaculous.js
%%DATADIR%%/kernels/atrous.cl
+%%DATADIR%%/kernels/basecurve.cl
%%DATADIR%%/kernels/basic.cl
%%DATADIR%%/kernels/bilateral.cl
%%DATADIR%%/kernels/blendop.cl
@@ -155,12 +154,15 @@
%%DATADIR%%/kernels/colorreconstruction.cl
%%DATADIR%%/kernels/colorspace.cl
%%DATADIR%%/kernels/common.h
+%%DATADIR%%/kernels/demosaic_markesteijn.cl
%%DATADIR%%/kernels/demosaic_other.cl
%%DATADIR%%/kernels/demosaic_ppg.cl
+%%DATADIR%%/kernels/demosaic_vng.cl
%%DATADIR%%/kernels/denoiseprofile.cl
%%DATADIR%%/kernels/extended.cl
%%DATADIR%%/kernels/gaussian.cl
%%DATADIR%%/kernels/highpass.cl
+%%DATADIR%%/kernels/liquify.cl
%%DATADIR%%/kernels/nlmeans.cl
%%DATADIR%%/kernels/programs.conf
%%DATADIR%%/kernels/sharpen.cl
@@ -192,6 +194,8 @@
%%DATADIR%%/pixmaps/idbutton-3.svg
%%DATADIR%%/pixmaps/idbutton.png
%%DATADIR%%/pixmaps/idbutton.svg
+%%DATADIR%%/pixmaps/plugins/darkroom/ashift.png
+%%DATADIR%%/pixmaps/plugins/darkroom/ashift.svg
%%DATADIR%%/pixmaps/plugins/darkroom/atrous.png
%%DATADIR%%/pixmaps/plugins/darkroom/atrous.svg
%%DATADIR%%/pixmaps/plugins/darkroom/basecurve.png
@@ -250,6 +254,8 @@
%%DATADIR%%/pixmaps/plugins/darkroom/lens.svg
%%DATADIR%%/pixmaps/plugins/darkroom/levels.png
%%DATADIR%%/pixmaps/plugins/darkroom/levels.svg
+%%DATADIR%%/pixmaps/plugins/darkroom/liquify.png
+%%DATADIR%%/pixmaps/plugins/darkroom/liquify.svg
%%DATADIR%%/pixmaps/plugins/darkroom/lowlight.png
%%DATADIR%%/pixmaps/plugins/darkroom/lowlight.svg
%%DATADIR%%/pixmaps/plugins/darkroom/lowpass.png
@@ -296,6 +302,16 @@
%%DATADIR%%/pixmaps/plugins/darkroom/watermark.svg
%%DATADIR%%/pixmaps/plugins/darkroom/zonesystem.png
%%DATADIR%%/pixmaps/plugins/darkroom/zonesystem.svg
+%%DATADIR%%/pswp/LICENSE
+%%DATADIR%%/pswp/default-skin/default-skin.css
+%%DATADIR%%/pswp/default-skin/default-skin.png
+%%DATADIR%%/pswp/default-skin/default-skin.svg
+%%DATADIR%%/pswp/default-skin/preloader.gif
+%%DATADIR%%/pswp/photoswipe-ui-default.js
+%%DATADIR%%/pswp/photoswipe-ui-default.min.js
+%%DATADIR%%/pswp/photoswipe.css
+%%DATADIR%%/pswp/photoswipe.js
+%%DATADIR%%/pswp/photoswipe.min.js
%%DATADIR%%/rawspeed/cameras.xml
%%DATADIR%%/rawspeed/showcameras.xsl
%%DATADIR%%/style/bullet.gif
@@ -335,7 +351,6 @@
%%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/el/LC_MESSAGES/darktable.mo
%%NLS%%share/locale/es/LC_MESSAGES/darktable.mo
%%NLS%%share/locale/fr/LC_MESSAGES/darktable.mo
%%NLS%%share/locale/he/LC_MESSAGES/darktable.mo
@@ -344,11 +359,8 @@
%%NLS%%share/locale/ja/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/pt_PT/LC_MESSAGES/darktable.mo
%%NLS%%share/locale/ru/LC_MESSAGES/darktable.mo
%%NLS%%share/locale/sk/LC_MESSAGES/darktable.mo
%%NLS%%share/locale/sl/LC_MESSAGES/darktable.mo
-%%NLS%%share/locale/sq/LC_MESSAGES/darktable.mo
%%NLS%%share/locale/sv/LC_MESSAGES/darktable.mo
%%NLS%%share/locale/uk/LC_MESSAGES/darktable.mo

File Metadata

Mime Type
text/plain
Expires
Sat, Feb 28, 11:33 PM (3 h, 19 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29086730
Default Alt Text
D8994.id23447.diff (13 KB)

Event Timeline