Attachment 226308 Details for Bug 257061 – diffs for upgrade from 3.4.1 to 3.6.0

[patch] diffs for upgrade from 3.4.1 to 3.6.0

graphics_darktable360.diff (text/plain), 14.08 KB, created by Ludger Bolmerg on 2021-07-08 17:27:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ludger Bolmerg

Created: 2021-07-08 17:27:12 UTC

Size: 14.08 KB

patch

obsolete

>Index: graphics/darktable/Makefile
>===================================================================
>--- graphics/darktable/Makefile.orig	2021-07-04 17:34:24.876013000 +0200
>+++ graphics/darktable/Makefile	2021-07-08 20:12:42.159628000 +0200
>@@ -1,8 +1,7 @@
> # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
> 
> PORTNAME=	darktable
>-PORTVERSION=	3.4.1
>-PORTREVISION=	6
>+PORTVERSION=	3.6.0
> CATEGORIES=	graphics
> MASTER_SITES=	https://github.com/darktable-org/${PORTNAME}/releases/download/release-${PORTVERSION:C/\.rc/rc/}/
> 
>@@ -29,7 +28,11 @@
> 		libpng.so:graphics/png \
> 		libpugixml.so:textproc/pugixml \
> 		libsoup-2.4.so:devel/libsoup \
>-		libtiff.so:graphics/tiff
>+		libtiff.so:graphics/tiff \
>+		libharfbuzz.so:print/harfbuzz \
>+		libicui18n.so:devel/icu \
>+		libicuuc.so:devel/icu \
>+		libicudata.so:devel/icu
> 
> USES=		cmake compiler:c++14-lang desktop-file-utils gl gnome jpeg \
> 		pkgconfig shebangfix sqlite tar:xz xorg
>Index: graphics/darktable/distinfo
>===================================================================
>--- graphics/darktable/distinfo.orig	2021-07-04 17:37:45.256071000 +0200
>+++ graphics/darktable/distinfo	2021-07-08 20:46:04.687120000 +0200
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1614183132
>-SHA256 (darktable-3.4.1.tar.xz) = 7fc3f851da9bcd7c5053ecd09f21aa3eb6103be98a6c58f52010b6f22174941e
>-SIZE (darktable-3.4.1.tar.xz) = 4456192
>+TIMESTAMP = 1625769964
>+SHA256 (darktable-3.6.0.tar.xz) = 86bcd0184af38b93c3688dffd3d5c19cc65f268ecf9358d649fa11fe26c70a39
>+SIZE (darktable-3.6.0.tar.xz) = 4691608
>Index: graphics/darktable/pkg-plist
>===================================================================
>--- graphics/darktable/pkg-plist.orig	2021-07-04 17:23:39.821045000 +0200
>+++ graphics/darktable/pkg-plist	2021-07-08 18:39:56.484160000 +0200
>@@ -1,23 +1,22 @@
> bin/darktable
> bin/darktable-chart
> bin/darktable-cli
>-%%NO_OPENCL%%bin/darktable-cltest
>+bin/darktable-cltest
> bin/darktable-cmstest
> bin/darktable-generate-cache
> bin/darktable-rs-identify
> lib/darktable/libdarktable.so
> lib/darktable/plugins/imageio/format/libcopy.so
>-%%LIBAVIF%%lib/darktable/plugins/imageio/format/libavif.so
>-%%OPENEXR%%lib/darktable/plugins/imageio/format/libexr.so
>-%%OPENJPEG%%lib/darktable/plugins/imageio/format/libj2k.so
>+lib/darktable/plugins/imageio/format/libexr.so
>+lib/darktable/plugins/imageio/format/libj2k.so
> lib/darktable/plugins/imageio/format/libjpeg.so
> lib/darktable/plugins/imageio/format/libpdf.so
> lib/darktable/plugins/imageio/format/libpfm.so
> lib/darktable/plugins/imageio/format/libpng.so
> lib/darktable/plugins/imageio/format/libppm.so
> lib/darktable/plugins/imageio/format/libtiff.so
>-%%WEBP%%lib/darktable/plugins/imageio/format/libwebp.so
>-%%LUA%%lib/darktable/plugins/imageio/format/libxcf.so
>+lib/darktable/plugins/imageio/format/libwebp.so
>+lib/darktable/plugins/imageio/format/libxcf.so
> lib/darktable/plugins/imageio/storage/libdisk.so
> lib/darktable/plugins/imageio/storage/libemail.so
> lib/darktable/plugins/imageio/storage/libgallery.so
>@@ -32,12 +31,15 @@
> lib/darktable/plugins/libbloom.so
> lib/darktable/plugins/libborders.so
> lib/darktable/plugins/libcacorrect.so
>+lib/darktable/plugins/libcacorrectrgb.so
>+lib/darktable/plugins/libcensorize.so
> lib/darktable/plugins/libchannelmixer.so
> lib/darktable/plugins/libchannelmixerrgb.so
> lib/darktable/plugins/libclahe.so
> lib/darktable/plugins/libclipping.so
> lib/darktable/plugins/libcolisa.so
> lib/darktable/plugins/libcolorbalance.so
>+lib/darktable/plugins/libcolorbalancergb.so
> lib/darktable/plugins/libcolorchecker.so
> lib/darktable/plugins/libcolorcontrast.so
> lib/darktable/plugins/libcolorcorrection.so
>@@ -48,6 +50,7 @@
> lib/darktable/plugins/libcolorreconstruct.so
> lib/darktable/plugins/libcolortransfer.so
> lib/darktable/plugins/libcolorzones.so
>+lib/darktable/plugins/libcrop.so
> lib/darktable/plugins/libdefringe.so
> lib/darktable/plugins/libdemosaic.so
> lib/darktable/plugins/libdenoiseprofile.so
>@@ -75,7 +78,7 @@
> lib/darktable/plugins/liblut3d.so
> lib/darktable/plugins/libmask_manager.so
> lib/darktable/plugins/libmonochrome.so
>-%%LUA%%lib/darktable/plugins/libnegadoctor.so
>+lib/darktable/plugins/libnegadoctor.so
> lib/darktable/plugins/libnlmeans.so
> lib/darktable/plugins/liboverexposed.so
> lib/darktable/plugins/libprofile_gamma.so
>@@ -103,7 +106,7 @@
> lib/darktable/plugins/libwatermark.so
> lib/darktable/plugins/libzonesystem.so
> lib/darktable/plugins/lighttable/libbackgroundjobs.so
>-%%GPHOTO%%lib/darktable/plugins/lighttable/libcamera.so
>+lib/darktable/plugins/lighttable/libcamera.so
> lib/darktable/plugins/lighttable/libcollect.so
> lib/darktable/plugins/lighttable/libcolorlabels.so
> lib/darktable/plugins/lighttable/libcolorpicker.so
>@@ -113,7 +116,7 @@
> lib/darktable/plugins/lighttable/libexport.so
> lib/darktable/plugins/lighttable/libfilmstrip.so
> lib/darktable/plugins/lighttable/libfilter.so
>-%%GEO%%lib/darktable/plugins/lighttable/libgeotagging.so
>+lib/darktable/plugins/lighttable/libgeotagging.so
> lib/darktable/plugins/lighttable/libglobal_toolbox.so
> lib/darktable/plugins/lighttable/libhinter.so
> lib/darktable/plugins/lighttable/libhistogram.so
>@@ -121,19 +124,19 @@
> lib/darktable/plugins/lighttable/libimage.so
> lib/darktable/plugins/lighttable/libimage_infos.so
> lib/darktable/plugins/lighttable/libimport.so
>-%%LUA%%lib/darktable/plugins/lighttable/libioporder.so
>+lib/darktable/plugins/lighttable/libioporder.so
> lib/darktable/plugins/lighttable/liblighttable_mode.so
>-%%GPHOTO%%lib/darktable/plugins/lighttable/liblive_view.so
>-%%GEO%%lib/darktable/plugins/lighttable/liblocation.so
>-%%GEO%%lib/darktable/plugins/lighttable/libmap_locations.so
>-%%GEO%%lib/darktable/plugins/lighttable/libmap_settings.so
>+lib/darktable/plugins/lighttable/liblive_view.so
>+lib/darktable/plugins/lighttable/liblocation.so
>+lib/darktable/plugins/lighttable/libmap_locations.so
>+lib/darktable/plugins/lighttable/libmap_settings.so
> lib/darktable/plugins/lighttable/libmasks.so
> lib/darktable/plugins/lighttable/libmetadata.so
> lib/darktable/plugins/lighttable/libmetadata_view.so
> lib/darktable/plugins/lighttable/libmodule_toolbox.so
> lib/darktable/plugins/lighttable/libmodulegroups.so
> lib/darktable/plugins/lighttable/libnavigation.so
>-%%PRINT%%lib/darktable/plugins/lighttable/libprint_settings.so
>+lib/darktable/plugins/lighttable/libprint_settings.so
> lib/darktable/plugins/lighttable/libratings.so
> lib/darktable/plugins/lighttable/librecentcollect.so
> lib/darktable/plugins/lighttable/libselect.so
>@@ -147,75 +150,76 @@
> lib/darktable/views/libdarkroom.so
> lib/darktable/views/libknight.so
> lib/darktable/views/liblighttable.so
>-%%GEO%%lib/darktable/views/libmap.so
>-%%PRINT%%lib/darktable/views/libprint.so
>+lib/darktable/views/libmap.so
>+lib/darktable/views/libprint.so
> lib/darktable/views/libslideshow.so
>-%%GPHOTO%%lib/darktable/views/libtethering.so
>+lib/darktable/views/libtethering.so
>+man/de/man1/darktable-cli.1.gz
>+man/de/man1/darktable-cltest.1.gz
>+man/de/man1/darktable-cmstest.1.gz
>+man/de/man1/darktable-generate-cache.1.gz
>+man/de/man1/darktable.1.gz
>+man/es/man1/darktable-cli.1.gz
>+man/es/man1/darktable-cltest.1.gz
>+man/es/man1/darktable-cmstest.1.gz
>+man/es/man1/darktable-generate-cache.1.gz
>+man/es/man1/darktable.1.gz
>+man/fr/man1/darktable-cli.1.gz
>+man/fr/man1/darktable-cltest.1.gz
>+man/fr/man1/darktable-cmstest.1.gz
>+man/fr/man1/darktable-generate-cache.1.gz
>+man/fr/man1/darktable.1.gz
> man/man1/darktable-cli.1.gz
> man/man1/darktable-cltest.1.gz
> man/man1/darktable-cmstest.1.gz
> man/man1/darktable-generate-cache.1.gz
> man/man1/darktable.1.gz
>-%%NLS%%man/de/man1/darktable-cli.1.gz
>-%%NLS%%man/de/man1/darktable-cltest.1.gz
>-%%NLS%%man/de/man1/darktable-cmstest.1.gz
>-%%NLS%%man/de/man1/darktable-generate-cache.1.gz
>-%%NLS%%man/de/man1/darktable.1.gz
>-%%NLS%%man/es/man1/darktable-cli.1.gz
>-%%NLS%%man/es/man1/darktable-cltest.1.gz
>-%%NLS%%man/es/man1/darktable-cmstest.1.gz
>-%%NLS%%man/es/man1/darktable-generate-cache.1.gz
>-%%NLS%%man/es/man1/darktable.1.gz
>-%%NLS%%man/fr/man1/darktable-cli.1.gz
>-%%NLS%%man/fr/man1/darktable-cltest.1.gz
>-%%NLS%%man/fr/man1/darktable-cmstest.1.gz
>-%%NLS%%man/fr/man1/darktable-generate-cache.1.gz
>-%%NLS%%man/fr/man1/darktable.1.gz
>-share/appdata/darktable.appdata.xml
> share/applications/darktable.desktop
> %%DATADIR%%/darktable.bash
> %%DATADIR%%/darktablerc
> %%DATADIR%%/gdb_commands
>-%%NO_OPENCL%%%%DATADIR%%/kernels/atrous.cl
>-%%NO_OPENCL%%%%DATADIR%%/kernels/basecurve.cl
>-%%NO_OPENCL%%%%DATADIR%%/kernels/basic.cl
>-%%NO_OPENCL%%%%DATADIR%%/kernels/basicadj.cl
>-%%NO_OPENCL%%%%DATADIR%%/kernels/bilateral.cl
>-%%NO_OPENCL%%%%DATADIR%%/kernels/blendop.cl
>-%%NO_OPENCL%%%%DATADIR%%/kernels/bloom.cl
>-%%NO_OPENCL%%%%DATADIR%%/kernels/color_conversion.cl
>-%%NO_OPENCL%%%%DATADIR%%/kernels/colorreconstruction.cl
>-%%NO_OPENCL%%%%DATADIR%%/kernels/colorspace.cl
>-%%NO_OPENCL%%%%DATADIR%%/kernels/colorspaces.cl
>-%%NO_OPENCL%%%%DATADIR%%/kernels/common.h
>-%%NO_OPENCL%%%%DATADIR%%/kernels/demosaic_markesteijn.cl
>-%%NO_OPENCL%%%%DATADIR%%/kernels/demosaic_other.cl
>-%%NO_OPENCL%%%%DATADIR%%/kernels/demosaic_ppg.cl
>-%%NO_OPENCL%%%%DATADIR%%/kernels/demosaic_vng.cl
>-%%NO_OPENCL%%%%DATADIR%%/kernels/denoiseprofile.cl
>-%%NO_OPENCL%%%%DATADIR%%/kernels/dwt.cl
>-%%NO_OPENCL%%%%DATADIR%%/kernels/extended.cl
>-%%NO_OPENCL%%%%DATADIR%%/kernels/filmic.cl
>-%%NO_OPENCL%%%%DATADIR%%/kernels/gaussian.cl
>-%%NO_OPENCL%%%%DATADIR%%/kernels/guided_filter.cl
>-%%NO_OPENCL%%%%DATADIR%%/kernels/hazeremoval.cl
>-%%NO_OPENCL%%%%DATADIR%%/kernels/highpass.cl
>-%%NO_OPENCL%%%%DATADIR%%/kernels/liquify.cl
>-%%NO_OPENCL%%%%DATADIR%%/kernels/locallaplacian.cl
>-%%NO_OPENCL%%%%DATADIR%%/kernels/lut3d.cl
>-%%NO_OPENCL%%%%DATADIR%%/kernels/negadoctor.cl
>-%%NO_OPENCL%%%%DATADIR%%/kernels/nlmeans.cl
>-%%NO_OPENCL%%%%DATADIR%%/kernels/noise_generator.h
>-%%NO_OPENCL%%%%DATADIR%%/kernels/programs.conf
>-%%NO_OPENCL%%%%DATADIR%%/kernels/retouch.cl
>-%%NO_OPENCL%%%%DATADIR%%/kernels/rgb_norms.h
>-%%NO_OPENCL%%%%DATADIR%%/kernels/rgbcurve.cl
>-%%NO_OPENCL%%%%DATADIR%%/kernels/rgblevels.cl
>-%%NO_OPENCL%%%%DATADIR%%/kernels/sharpen.cl
>-%%NO_OPENCL%%%%DATADIR%%/kernels/soften.cl
>+%%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/channelmixer.cl
>+%%DATADIR%%/kernels/color_conversion.h
>+%%DATADIR%%/kernels/colorreconstruction.cl
>+%%DATADIR%%/kernels/colorspace.h
>+%%DATADIR%%/kernels/colorspaces.cl
>+%%DATADIR%%/kernels/common.h
>+%%DATADIR%%/kernels/demosaic_markesteijn.cl
>+%%DATADIR%%/kernels/demosaic_other.cl
>+%%DATADIR%%/kernels/demosaic_ppg.cl
>+%%DATADIR%%/kernels/demosaic_rcd.cl
>+%%DATADIR%%/kernels/demosaic_vng.cl
>+%%DATADIR%%/kernels/denoiseprofile.cl
>+%%DATADIR%%/kernels/dwt.cl
>+%%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/negadoctor.cl
>+%%DATADIR%%/kernels/nlmeans.cl
>+%%DATADIR%%/kernels/noise_generator.h
>+%%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
>-%%LUA%%%%DATADIR%%/lua/darktable/debug.lua
>-%%LUA%%%%DATADIR%%/luarc
>+%%DATADIR%%/lua/darktable/debug.lua
>+%%DATADIR%%/luarc
> %%DATADIR%%/noiseprofiles.json
> %%DATADIR%%/pixmaps/dt_logo_128x128.png
> %%DATADIR%%/pixmaps/dt_text.svg
>@@ -372,7 +376,6 @@
> %%DATADIR%%/themes/darktable-icons.css
> %%DATADIR%%/themes/darktable.css
> %%DATADIR%%/tools/common.sh
>-%%TOOLS%%%%DATADIR%%/tools/extract_wb_from_images.sh
> %%DATADIR%%/tools/purge_from_cache.sh
> %%DATADIR%%/tools/purge_non_existing_images.sh
> %%DATADIR%%/tools/purge_unused_tags.sh
>@@ -396,17 +399,17 @@
> share/icons/hicolor/scalable/apps/darktable-2.svg
> share/icons/hicolor/scalable/apps/darktable-3.svg
> share/icons/hicolor/scalable/apps/darktable.svg
>-%%NLS%%share/locale/af/LC_MESSAGES/darktable.mo
>-%%NLS%%share/locale/cs/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/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/sk/LC_MESSAGES/darktable.mo
>-%%NLS%%share/locale/sl/LC_MESSAGES/darktable.mo
>+share/locale/af/LC_MESSAGES/darktable.mo
>+share/locale/de/LC_MESSAGES/darktable.mo
>+share/locale/eo/LC_MESSAGES/darktable.mo
>+share/locale/es/LC_MESSAGES/darktable.mo
>+share/locale/fr/LC_MESSAGES/darktable.mo
>+share/locale/he/LC_MESSAGES/darktable.mo
>+share/locale/hu/LC_MESSAGES/darktable.mo
>+share/locale/it/LC_MESSAGES/darktable.mo
>+share/locale/nl/LC_MESSAGES/darktable.mo
>+share/locale/pt_BR/LC_MESSAGES/darktable.mo
>+share/locale/ru/LC_MESSAGES/darktable.mo
>+share/locale/sl/LC_MESSAGES/darktable.mo
>+share/locale/uk/LC_MESSAGES/darktable.mo
>+share/metainfo/darktable.appdata.xml
>Index: graphics/darktable/files/patch-src_CMakeLists.txt
>===================================================================
>--- files/patch-src_CMakeLists.txt.orig	2021-07-04 17:39:11.663252000 +0200
>+++ files/patch-src_CMakeLists.txt	2021-07-04 17:40:45.140734000 +0200
>@@ -1,20 +1,6 @@
>---- src/CMakeLists.txt.orig	2021-04-29 21:04:27 UTC
>+--- src/CMakeLists.txt.orig	2021-07-03 18:19:08.719989000 +0000
> +++ src/CMakeLists.txt
>-@@ -321,7 +321,12 @@ if(USE_CAMERA_SUPPORT)
>- endif(USE_CAMERA_SUPPORT)
>- 
>- if(USE_OPENEXR)
>--  find_package(OpenEXR)
>-+  find_package(OpenEXR 3.0 CONFIG)
>-+  if(TARGET OpenEXR::OpenEXR)
>-+    set(OpenEXR_LIBRARIES OpenEXR::OpenEXR)
>-+  else()
>-+    find_package(OpenEXR)
>-+  endif()
>-   if(OpenEXR_FOUND)
>-     include_directories(SYSTEM ${OpenEXR_INCLUDE_DIRS})
>-     list(APPEND LIBS ${OpenEXR_LIBRARIES})
>-@@ -388,7 +393,7 @@ if(USE_OPENJPEG)
>+@@ -420,7 +420,7 @@
>      add_definitions("-DHAVE_OPENJPEG")
>      list(APPEND SOURCES "common/imageio_j2k.c")
>

Actions: View | Diff

Attachments on bug 257061: 226308