diff options
author | ryoon <ryoon@pkgsrc.org> | 2019-03-05 11:19:24 +0000 |
---|---|---|
committer | ryoon <ryoon@pkgsrc.org> | 2019-03-05 11:19:24 +0000 |
commit | 9ef1145e8780db17e175ba75033239d2326ac154 (patch) | |
tree | 14434e63d8dc8a7e413ebb91752eeab4284df9f8 /graphics | |
parent | d6d092b8ae1c9f8ce882a8ebfd004e0c97cd6260 (diff) | |
download | pkgsrc-9ef1145e8780db17e175ba75033239d2326ac154.tar.gz |
Update to 2.6.0
Changelog:
we're proud to announce the new feature release of darktable, 2.6.0!
as always, please don't use the autogenerated tarball provided by github, but only our tar.xz. the checksums are:
when updating from the currently stable 2.4.x series, please bear in mind that your edits will be preserved during this process, but it will not be possible to downgrade from 2.6 to 2.4.x any more.
#### Important note: to make sure that darktable can keep on supporting the raw file format for your camera, *please* read [this post](https://discuss.pixls.us/t/raw-samples-wanted/5420?u=lebedevri) on how/what raw samples you can contribute to ensure that we have the *full* raw sample set for your camera under CC0 license!
- Over 1600 commits to darktable+rawspeed since 2.4
- 260+ pull requests handled
- 250+ issues closed
- Updated user manual is coming soon™
## The Big Ones
- new module retouch allowing changes based on image frequency layers
- new module filmic which can replace the base curve and shadows and highlights
- new module to handle duplicates in the darkroom with possibility to add a title, create standard or virgin duplicate, delete duplicate and quickly compare with a duplicate
- new logarithm controls for the tone-curve
- new mode for the unbreak profile module
- add mask preview to adjust size, hardness before placing them
- make it possible to change the cropped area in the perspective correction module
- the mask blur has been complemented with a guided-filter to fine tune it (this works on RGB and Lab color space).
- color balance module has two new modes based on ProPhotoRGB and HSL
- Experimental support for PPC64le architecture (OpenCL support needs to be disabled, `-DUSE_OPENCL=OFF`)
## New Features And Changes
- search from the map view is now fixed
- visual rework of the lighttable (color label, image kind, local copy)
- an option make it possible to display some image information directly on the thumb
- add optional scrollbars on lighttable, or lighttable and darkroom
- allow each masks of the clone module to have the opacity adjusted
- lightroom import module supports the creator, rights, title, description and publisher information.
- enhance TurboPrint support by displaying the dialogue with all possible options (print cancellation will be fixed in TurboPrint 2.47)
- new sort filter based on the image's aspect
- new sort filter based on the image's shutter speed
- new sort filter based on the image's group
- new sort filter based on a personalized sorting order (drag&drop on the lighttable view)
- collection based on the local copy status
- group image number displayed on the collection module
- new zoom level at 50%; 400%, 800% and 1600%
- better support for monochrome RAW
- add contextual help pointing to the darktable's manual
- better copy/paste support for multiple instances
- add support for renaming the module instances
- add frequency based adjustment for the RAW denoise module
- add frequency based adjustment for the denoise profile module
- all widgets should be themable via CSS now
- add support for configuring the modules layout
- different way to select hierarchical tags in the collection module (only the actual parent tag, all children or the parent and children)
- better handling of grouped images by allowing setting stars, color label for the whole group.
- make it possible to apply a preset to a new module instance using the middle click
- new script to migrate collection from Capture One Pro
## Bug fixes
- Fix the color pickers behavior in all modules
- Fix liquify tools switching
- Many more bugs got fixed
## Lua
- No changes
## Changed Dependencies
- CMake 3.4 is now required
- In order to compile darktable you now need at least gcc-5.0+/clang-3.9+
- Minimal clang version was bumped from 3.4+ to 3.9+
- Packagers are advised to pass ```-DRAWSPEED_ENABLE_LTO=ON``` to CMake to enable partial LTO.
## RawSpeed changes
- GoPro '.GPR' raws are now supported via new, fast 'VC-5' parallel decompressor
- Panasonic's new raw compression ('.RW2', GH5s, G9 cameras) is now supported via new fast, parallel 'Panasonic V5' decompressor
- Panasonic's old (also '.RW2') raw decompressor got rewritten, re-parallelized
- Phase One ('.IIQ') decompressor got parallelized
- Nikon NEF 'lossy after split' raw support was recovered
- Phase One ('.IIQ') Quadrant Correction is now supported
- Olympus High-Res (uncompressed) raw support
- Lot's and lot's and lot's of maintenance, sanitization, cleanups, small rewrites/refactoring.
- NOTE: Canon '.CR3' raws are *NOT* supported as of yet.
## Camera support, compared to 2.4.0
### Base Support
- Canon EOS 1500D
- Canon EOS 2000D
- Canon EOS Rebel T7
- Canon EOS 3000D
- Canon EOS 4000D
- Canon EOS Rebel T100
- Canon EOS 5D Mark IV (sRaw1, sRaw2)
- Canon EOS 5DS (sRaw1, sRaw2)
- Canon EOS 5DS R (sRaw1, sRaw2)
- Canon PowerShot G1 X Mark III
- Fujifilm X-A5
- Fujifilm X-H1 (compressed)
- Fujifilm X-T100
- Fujifilm X-T3 (compressed)
- GoPro FUSION (dng)
- GoPro HERO5 Black (dng)
- GoPro HERO6 Black (dng)
- GoPro HERO7 Black (dng)
- Hasselblad CFV-50
- Hasselblad H5D-40
- Hasselblad H5D-50c
- Kodak DCS Pro 14nx
- Kodak DCS520C
- Kodak DCS760C
- Kodak EOS DCS 3
- Nikon COOLPIX P1000 (12bit-uncompressed)
- Nikon D2Xs (12bit-compressed, 12bit-uncompressed)
- Nikon D3500 (12bit-compressed)
- Nikon Z 6 (except uncompressed raws)
- Nikon Z 7 (except 14-bit uncompressed raw)
- Olympus E-PL8
- Olympus E-PL9
- Olympus SH-2
- Panasonic DC-FZ80 (4:3)
- Panasonic DC-G9 (4:3)
- Panasonic DC-GF9 (4:3)
- Panasonic DC-GX800 (4:3)
- Panasonic DC-GX850 (4:3)
- Panasonic DC-GH5S (4:3, 3:2, 16:9, 1:1)
- Panasonic DC-GX9 (4:3)
- Panasonic DC-LX100M2 (4:3, 1:1, 16:9, 3:2)
- Panasonic DC-TZ200 (3:2)
- Panasonic DC-TZ202 (3:2)
- Panasonic DMC-FZ2000 (3:2)
- Panasonic DMC-FZ2500 (3:2)
- Panasonic DMC-FZ35 (3:2, 16:9)
- Panasonic DMC-FZ38 (3:2, 16:9)
- Panasonic DMC-GX7MK2 (4:3)
- Panasonic DMC-ZS100 (3:2)
- Paralenz Dive Camera (chdk)
- Pentax 645Z
- Pentax K-1 Mark II
- Pentax KP
- Phase One P65+
- Sjcam SJ6 LEGEND (chdk-b, chdk-c)
- Sony DSC-HX99
- Sony DSC-RX0
- Sony DSC-RX100M5A
- Sony DSC-RX10M4
- Sony DSC-RX1RM2
- Sony ILCE-7M3
### White Balance Presets
- Canon EOS M100
- Fujifilm X-T3
- Leaf Credo 40
- Nikon D3400
- Nikon D5600
- Nikon D7500
- Nikon D850
- Nikon Z 6
- Olympus E-M10 Mark III
- Olympus E-M1MarkII
- Panasonic DC-G9
- Panasonic DC-GX9
- Panasonic DMC-FZ300
- Sony DSC-RX0
- Sony DSC-RX100M5
- Sony DSC-RX100M5A
- Sony DSC-RX10M3
- Sony DSC-RX10M4
- Sony DSC-RX1RM2
- Sony ILCE-6500
- Sony ILCE-7M3
- Sony ILCE-7RM3
### Noise Profiles
- Canon EOS 200D
- Canon EOS Kiss X9
- Canon EOS Rebel SL2
- Canon EOS 750D
- Canon EOS Kiss X8i
- Canon EOS Rebel T6i
- Canon EOS 760D
- Canon EOS 8000D
- Canon EOS Rebel T6s
- Canon EOS 77D
- Canon EOS 9000D
- Canon EOS 800D
- Canon EOS Kiss X9i
- Canon EOS Rebel T7i
- Canon EOS M100
- Canon EOS M6
- Canon PowerShot G1 X Mark II
- Canon PowerShot G1 X Mark III
- Canon PowerShot G9 X
- Fujifilm X-A5
- Fujifilm X-E3
- Fujifilm X-T3
- Fujifilm X100F
- Nikon 1 AW1
- Nikon 1 J3
- Nikon COOLPIX B700
- Nikon D5600
- Nikon D7500
- Nikon D850
- Olympus E-M10 Mark III
- Olympus TG-5
- Panasonic DC-G9
- Panasonic DC-GX9
- Panasonic DMC-FZ35
- Panasonic DMC-FZ38
- Panasonic DMC-GF6
- Panasonic DMC-LX10
- Panasonic DMC-LX15
- Panasonic DMC-LX9
- Panasonic DMC-TZ70
- Panasonic DMC-TZ71
- Panasonic DMC-ZS50
- Pentax K-01
- Pentax KP
- Samsung NX1
- Sony DSC-RX100M4
- Sony DSC-RX10M3
- Sony ILCE-7M3
## Translations
- Afrikaans
- Albanian
- Chinese
- Czech
- Dutch
- Finnish
- French
- Galician
- German
- Hebrew
- Hungarian
- Italian
- Japanese
- Nepal
- Norwegian Bokmål
- Polish
- Portuguese
- Romanian
- Russian
- Slovenian
- Thai
Diffstat (limited to 'graphics')
16 files changed, 69 insertions, 215 deletions
diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile index afefabefe32..86846b5674d 100644 --- a/graphics/darktable/Makefile +++ b/graphics/darktable/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.95 2018/12/13 19:51:59 adam Exp $ +# $NetBSD: Makefile,v 1.96 2019/03/05 11:19:24 ryoon Exp $ -DISTNAME= darktable-2.2.5 -PKGREVISION= 20 +DISTNAME= darktable-2.6.0 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GITHUB:=darktable-org/} GITHUB_PROJECT= darktable -GITHUB_RELEASE= release-${PKGVERSION_NOREV} +GITHUB_RELEASE= release-${PKGVERSION_NOREV} EXTRACT_SUFX= .tar.xz MAINTAINER= pkgsrc-users@NetBSD.org @@ -18,18 +17,21 @@ USE_LANGUAGES= c c++ USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake intltool msgfmt pkg-config bash +CFLAGS+= -fopenmp + CMAKE_ARGS+= -DLENSFUN_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.glib2}/include/lensfun CMAKE_ARGS+= -DGTHREAD_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.glib2}/include CMAKE_ARGS+= -DGMODULE_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.glib2}/include -CMAKE_ARGS+= -DMAN_INSTALL_DIR:PATH=${PKGMANDIR}/man1 CMAKE_ARGS+= -DUSE_OPENCL=OFF CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release CMAKE_ARGS+= -DBINARY_PACKAGE_BUILD=Yes CMAKE_ARGS+= -Wno-dev +CMAKE_ARGS+= -DWITH_OPENMP=OFF +CMAKE_ARGS+= -DUSE_COLORD=OFF -CONFIGURE_DIRS= pkgsrc_build -CMAKE_ARG_PATH= .. +CONFIGURE_DIRS= ../pkgsrc_build +CMAKE_ARG_PATH= ${WRKSRC} LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/darktable # NetBSD 6 libm is the first with exp2f(3) @@ -57,13 +59,12 @@ CFLAGS+= -Wno-error=deprecated-declarations CHECK_PORTABILITY_SKIP+= packaging/macosx/start pre-configure: - ${MKDIR} ${WRKSRC}/pkgsrc_build + ${MKDIR} ${WRKDIR}/pkgsrc_build BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.7.14.1nb1 .include "../../databases/sqlite3/buildlink3.mk" .include "../../devel/GConf/buildlink3.mk" -.include "../../devel/SDL/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .if ${OPSYS} != "SunOS" @@ -73,21 +74,25 @@ BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.7.14.1nb1 .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/GraphicsMagick/buildlink3.mk" .include "../../graphics/exiv2/buildlink3.mk" -.include "../../graphics/gegl0.2/buildlink3.mk" +.include "../../graphics/gegl/buildlink3.mk" .include "../../graphics/lensfun/buildlink3.mk" .include "../../graphics/lcms2/buildlink3.mk" .include "../../graphics/openexr/buildlink3.mk" +.include "../../graphics/openjpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" +.include "../../lang/lua53/buildlink3.mk" .include "../../net/flickcurl/buildlink3.mk" .include "../../net/libsoup/buildlink3.mk" .include "../../print/cups-base/buildlink3.mk" -#.include "../../security/gnome-keyring/buildlink3.mk" +.include "../../security/libsecret/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../textproc/iso-codes/buildlink3.mk" .include "../../textproc/pugixml/buildlink3.mk" .include "../../textproc/json-glib/buildlink3.mk" .include "../../www/curl/buildlink3.mk" .include "../../x11/gtk3/buildlink3.mk" +.include "../../x11/libICE/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/darktable/PLIST b/graphics/darktable/PLIST index baf0de3861d..83a77b84b14 100644 --- a/graphics/darktable/PLIST +++ b/graphics/darktable/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2017/07/14 10:02:28 hauke Exp $ +@comment $NetBSD: PLIST,v 1.14 2019/03/05 11:19:24 ryoon Exp $ bin/darktable bin/darktable-chart bin/darktable-cli @@ -8,6 +8,7 @@ bin/darktable-rs-identify lib/darktable/libdarktable.so lib/darktable/plugins/imageio/format/libcopy.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 @@ -50,12 +51,14 @@ lib/darktable/plugins/libdenoiseprofile.so lib/darktable/plugins/libdither.so lib/darktable/plugins/libequalizer.so lib/darktable/plugins/libexposure.so +lib/darktable/plugins/libfilmic.so lib/darktable/plugins/libfinalscale.so lib/darktable/plugins/libflip.so lib/darktable/plugins/libgamma.so lib/darktable/plugins/libglobaltonemap.so lib/darktable/plugins/libgraduatednd.so lib/darktable/plugins/libgrain.so +lib/darktable/plugins/libhazeremoval.so lib/darktable/plugins/libhighlights.so lib/darktable/plugins/libhighpass.so lib/darktable/plugins/libhotpixels.so @@ -73,6 +76,7 @@ lib/darktable/plugins/librawdenoise.so lib/darktable/plugins/librawoverexposed.so lib/darktable/plugins/librawprepare.so lib/darktable/plugins/librelight.so +lib/darktable/plugins/libretouch.so lib/darktable/plugins/librotatepixels.so lib/darktable/plugins/libscalepixels.so lib/darktable/plugins/libshadhi.so @@ -95,6 +99,7 @@ lib/darktable/plugins/lighttable/libcolorlabels.so lib/darktable/plugins/lighttable/libcolorpicker.so lib/darktable/plugins/lighttable/libcopy_history.so lib/darktable/plugins/lighttable/libdarktable_label.so +lib/darktable/plugins/lighttable/libduplicate.so lib/darktable/plugins/lighttable/libexport.so lib/darktable/plugins/lighttable/libfilmstrip.so lib/darktable/plugins/lighttable/libfilter.so @@ -130,11 +135,6 @@ lib/darktable/views/liblighttable.so lib/darktable/views/libprint.so lib/darktable/views/libslideshow.so lib/darktable/views/libtethering.so -man/man1/darktable-cli.1 -man/man1/darktable-cltest.1 -man/man1/darktable-cmstest.1 -man/man1/darktable-generate-cache.1 -man/man1/darktable.1 share/appdata/darktable.appdata.xml share/applications/darktable.desktop share/darktable/darktable.css @@ -142,21 +142,6 @@ share/darktable/darktablerc share/darktable/gdb_commands share/darktable/latex/photobook.cls share/darktable/lua/darktable/debug.lua -share/darktable/lua/darktable/external/pygy_require/.gitignore -share/darktable/lua/darktable/external/pygy_require/README.md -share/darktable/lua/darktable/external/pygy_require/require.lua -share/darktable/lua/darktable/external/pygy_require/rockspecs/require-0.1.1-1.rockspec -share/darktable/lua/darktable/external/pygy_require/rockspecs/require-0.1.2-1.rockspec -share/darktable/lua/darktable/external/pygy_require/rockspecs/require-0.1.3-1.rockspec -share/darktable/lua/darktable/external/pygy_require/rockspecs/require-0.1.4-1.rockspec -share/darktable/lua/darktable/external/pygy_require/rockspecs/require-0.1.4-2.rockspec -share/darktable/lua/darktable/external/pygy_require/rockspecs/require-0.1.4-3.rockspec -share/darktable/lua/darktable/external/pygy_require/rockspecs/require-0.1.4-4.rockspec -share/darktable/lua/darktable/external/pygy_require/rockspecs/require-0.1.4-5.rockspec -share/darktable/lua/darktable/external/pygy_require/rockspecs/require-0.1.5-1.rockspec -share/darktable/lua/darktable/external/pygy_require/rockspecs/require-0.1.6-1.rockspec -share/darktable/lua/darktable/external/pygy_require/rockspecs/require-0.1.7-1.rockspec -share/darktable/lua/darktable/external/pygy_require/rockspecs/require-0.1.7-2.rockspec share/darktable/luarc share/darktable/noiseprofiles.json share/darktable/pixmaps/dt_logo_128x128.png @@ -216,6 +201,8 @@ share/darktable/pixmaps/plugins/darkroom/graduatednd.png share/darktable/pixmaps/plugins/darkroom/graduatednd.svg share/darktable/pixmaps/plugins/darkroom/grain.png share/darktable/pixmaps/plugins/darkroom/grain.svg +share/darktable/pixmaps/plugins/darkroom/hazeremoval.png +share/darktable/pixmaps/plugins/darkroom/hazeremoval.svg share/darktable/pixmaps/plugins/darkroom/highlights.png share/darktable/pixmaps/plugins/darkroom/highlights.svg share/darktable/pixmaps/plugins/darkroom/highpass.png @@ -305,11 +292,6 @@ share/darktable/watermarks/darktable.svg share/darktable/watermarks/hasselblad.svg share/darktable/watermarks/promo.svg share/darktable/watermarks/simple-text.svg -share/doc/darktable/AUTHORS -share/doc/darktable/LICENSE -share/doc/darktable/README -share/doc/darktable/TRANSLATORS -share/doc/darktable/darktablerc.html share/icons/hicolor/16x16/apps/darktable.png share/icons/hicolor/22x22/apps/darktable.png share/icons/hicolor/24x24/apps/darktable.png @@ -322,19 +304,13 @@ share/icons/hicolor/scalable/apps/darktable-2.svg share/icons/hicolor/scalable/apps/darktable-3.svg share/icons/hicolor/scalable/apps/darktable.svg share/locale/ca/LC_MESSAGES/darktable.mo -share/locale/cs/LC_MESSAGES/darktable.mo -share/locale/da/LC_MESSAGES/darktable.mo share/locale/de/LC_MESSAGES/darktable.mo -share/locale/es/LC_MESSAGES/darktable.mo +share/locale/fi/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/ja/LC_MESSAGES/darktable.mo +share/locale/nb/LC_MESSAGES/darktable.mo share/locale/nl/LC_MESSAGES/darktable.mo -share/locale/pl/LC_MESSAGES/darktable.mo +share/locale/pt_BR/LC_MESSAGES/darktable.mo share/locale/ru/LC_MESSAGES/darktable.mo -share/locale/sk/LC_MESSAGES/darktable.mo share/locale/sl/LC_MESSAGES/darktable.mo -share/locale/sv/LC_MESSAGES/darktable.mo -share/locale/uk/LC_MESSAGES/darktable.mo diff --git a/graphics/darktable/distinfo b/graphics/darktable/distinfo index 0db3ac4132a..e3bfe353705 100644 --- a/graphics/darktable/distinfo +++ b/graphics/darktable/distinfo @@ -1,20 +1,11 @@ -$NetBSD: distinfo,v 1.30 2018/06/26 10:49:10 jperkin Exp $ +$NetBSD: distinfo,v 1.31 2019/03/05 11:19:24 ryoon Exp $ -SHA1 (darktable-2.2.5.tar.xz) = f60ab3f9118e96c311f286a87102ad0d647cb111 -RMD160 (darktable-2.2.5.tar.xz) = 1a66797ca24dc7ef06fc5bb2fbed98724d50c0f8 -SHA512 (darktable-2.2.5.tar.xz) = fbc79398660b51e580d22dbdfc9a74d213f69335d6058e2844ef397951a1e840264b6d03d1b52b424319fb647a274ac14ff23ee9a9c60071f71497988bdf989b -Size (darktable-2.2.5.tar.xz) = 3092540 bytes +SHA1 (darktable-2.6.0.tar.xz) = 3b4fdf6f1db287ee04cd1d8c5a05f0dfa2647128 +RMD160 (darktable-2.6.0.tar.xz) = 56e4b383b02fbb9aa7d28b9eb17e72909cb1220e +SHA512 (darktable-2.6.0.tar.xz) = 066a8766edf3d961b2995bd681c9be65ae118f650a34da3c87c9096b76586c4a949b4c620993bcba3e7cd29f255c19dad9c2e205ed413c309398b4bc606eb73b +Size (darktable-2.6.0.tar.xz) = 3358508 bytes +SHA1 (patch-CMakeLists.txt) = 2b2c6c0733af56e61e5be598a59644b40e8f26a6 +SHA1 (patch-cmake_compiler-warnings.cmake) = b65fbb5222cca791088137e823402df6b9423121 SHA1 (patch-src_CMakeLists.txt) = 4535599cf1d0f6aae1909bd4dc09281311e23e0c SHA1 (patch-src_common_system__signal__handling.c) = 296f5618c618a9b16af2ca5a1d9ff408c437c220 -SHA1 (patch-src_external_rawspeed_RawSpeed_AriDecoder.cpp) = c1c7f8b03f63295361138ec1d6dbd1d323fa69ba -SHA1 (patch-src_external_rawspeed_RawSpeed_ArwDecoder.cpp) = 435e99db5d512f6568048a8e6382f6def6e7430f -SHA1 (patch-src_external_rawspeed_RawSpeed_ColorFilterArray.cpp) = 3abfbca5078d1ed068199e96e16b8eaea4eb662d -SHA1 (patch-src_external_rawspeed_RawSpeed_ColorFilterArray.h) = 952924510be16009083b2bdbdeeda84770321c79 -SHA1 (patch-src_external_rawspeed_RawSpeed_Cr2Decoder.cpp) = ba539af74fb071b5a826702a085e5c03e4f2b763 -SHA1 (patch-src_external_rawspeed_RawSpeed_CrwDecoder.cpp) = c3a7445a0e978d615171b5ffa363be74ffafe93e -SHA1 (patch-src_external_rawspeed_RawSpeed_NefDecoder.cpp) = 1eb97b59d1110334d67200e4b9e26b411a5bbd8b -SHA1 (patch-src_external_rawspeed_RawSpeed_OrfDecoder.cpp) = a2e9162e6242633690ada9939bff8b459da18fb6 -SHA1 (patch-src_external_rawspeed_RawSpeed_PefDecoder.cpp) = 3f4b15e56c2e6e77ed18f8479f6e4f3cf5effa23 -SHA1 (patch-src_external_rawspeed_RawSpeed_Rw2Decoder.cpp) = 26870733cb6399095f56ca6caa820990a8572c0a -SHA1 (patch-src_external_rawspeed_RawSpeed_ThreefrDecoder.cpp) = 6d81b0e758a1a7b84b8f510ff670dfb948881f78 SHA1 (patch-tools_noise_benchmark.sh) = 1e26ebbbc73e44ec41c092297d681f33fb55155d diff --git a/graphics/darktable/patches/patch-CMakeLists.txt b/graphics/darktable/patches/patch-CMakeLists.txt new file mode 100644 index 00000000000..103fcd223b3 --- /dev/null +++ b/graphics/darktable/patches/patch-CMakeLists.txt @@ -0,0 +1,14 @@ +$NetBSD: patch-CMakeLists.txt,v 1.1 2019/03/05 11:19:24 ryoon Exp $ + +* Do not handle user manual to avoid additional download + +--- CMakeLists.txt.orig 2018-12-24 09:31:27.000000000 +0000 ++++ CMakeLists.txt +@@ -538,7 +538,6 @@ set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME + include(data/supported_extensions.cmake) # this file needs to be included first as it gets amended in src/ + add_subdirectory(src) # src/ needs to be before data/ so that the correct CSS file gets installed + add_subdirectory(data) +-add_subdirectory(doc) + add_subdirectory(tools) + + # This contains fixup_bundle diff --git a/graphics/darktable/patches/patch-cmake_compiler-warnings.cmake b/graphics/darktable/patches/patch-cmake_compiler-warnings.cmake new file mode 100644 index 00000000000..ab44561ef51 --- /dev/null +++ b/graphics/darktable/patches/patch-cmake_compiler-warnings.cmake @@ -0,0 +1,21 @@ +$NetBSD: patch-cmake_compiler-warnings.cmake,v 1.1 2019/03/05 11:19:24 ryoon Exp $ + +* Disable -Wshadow always to fix build + +--- cmake/compiler-warnings.cmake.orig 2018-12-24 09:31:27.000000000 +0000 ++++ cmake/compiler-warnings.cmake +@@ -12,14 +12,6 @@ else() + CHECK_COMPILER_FLAG_AND_ENABLE_IT(-Wformat-security) + endif() + +-# cleanup this once we no longer need to support gcc-4.9 +-if(NOT (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_LESS 5.0)) +- CHECK_C_COMPILER_FLAG_AND_ENABLE_IT(-Wshadow) +-endif() +-if(NOT (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)) +- CHECK_CXX_COMPILER_FLAG_AND_ENABLE_IT(-Wshadow) +-endif() +- + CHECK_COMPILER_FLAG_AND_ENABLE_IT(-Wtype-limits) + + CHECK_COMPILER_FLAG_AND_ENABLE_IT(-Wvla) diff --git a/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_AriDecoder.cpp b/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_AriDecoder.cpp deleted file mode 100644 index db5285757df..00000000000 --- a/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_AriDecoder.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_external_rawspeed_RawSpeed_AriDecoder.cpp,v 1.1 2017/02/18 23:17:02 joerg Exp $ - ---- src/external/rawspeed/RawSpeed/AriDecoder.cpp.orig 2017-02-18 19:40:48.711688335 +0000 -+++ src/external/rawspeed/RawSpeed/AriDecoder.cpp -@@ -104,7 +104,7 @@ void AriDecoder::checkSupportInternal(Ca - } - - void AriDecoder::decodeMetaDataInternal(CameraMetaData *meta) { -- mRaw->cfa.setCFA(iPoint2D(2,2), CFA_GREEN, CFA_RED, CFA_BLUE, CFA_GREEN2); -+ mRaw->cfa.setCFA(2, 2, CFA_GREEN, CFA_RED, CFA_BLUE, CFA_GREEN2); - mRaw->metadata.wbCoeffs[0] = mWB[0]; - mRaw->metadata.wbCoeffs[1] = mWB[1]; - mRaw->metadata.wbCoeffs[2] = mWB[2]; diff --git a/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_ArwDecoder.cpp b/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_ArwDecoder.cpp deleted file mode 100644 index 3ea2647ea09..00000000000 --- a/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_ArwDecoder.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_external_rawspeed_RawSpeed_ArwDecoder.cpp,v 1.1 2017/02/18 23:17:02 joerg Exp $ - ---- src/external/rawspeed/RawSpeed/ArwDecoder.cpp.orig 2017-02-18 19:40:50.868914278 +0000 -+++ src/external/rawspeed/RawSpeed/ArwDecoder.cpp -@@ -257,7 +257,7 @@ void ArwDecoder::decodeMetaDataInternal( - //Default - int iso = 0; - -- mRaw->cfa.setCFA(iPoint2D(2,2), CFA_RED, CFA_GREEN, CFA_GREEN2, CFA_BLUE); -+ mRaw->cfa.setCFA(2, 2, CFA_RED, CFA_GREEN, CFA_GREEN2, CFA_BLUE); - vector<TiffIFD*> data = mRootIFD->getIFDsWithTag(MODEL); - - if (data.empty()) diff --git a/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_ColorFilterArray.cpp b/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_ColorFilterArray.cpp deleted file mode 100644 index b50380a3abc..00000000000 --- a/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_ColorFilterArray.cpp +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-src_external_rawspeed_RawSpeed_ColorFilterArray.cpp,v 1.1 2017/02/18 23:17:02 joerg Exp $ - ---- src/external/rawspeed/RawSpeed/ColorFilterArray.cpp.orig 2017-02-18 19:34:05.552264374 +0000 -+++ src/external/rawspeed/RawSpeed/ColorFilterArray.cpp -@@ -85,13 +85,14 @@ CFAColor ColorFilterArray::getColorAt( u - return cfa[x+y*size.x]; - } - --void ColorFilterArray::setCFA( iPoint2D in_size, ... ) -+void ColorFilterArray::setCFA(int sizeA, int sizeB, ... ) - { -+ iPoint2D in_size(sizeA, sizeB); - if (in_size != size) { - setSize(in_size); - } - va_list arguments; -- va_start(arguments, in_size); -+ va_start(arguments, sizeB); - for (uint32 i = 0; i < size.area(); i++ ) { - cfa[i] = (CFAColor)va_arg(arguments, int); - } diff --git a/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_ColorFilterArray.h b/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_ColorFilterArray.h deleted file mode 100644 index 458e9ebf53a..00000000000 --- a/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_ColorFilterArray.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_external_rawspeed_RawSpeed_ColorFilterArray.h,v 1.1 2017/02/18 23:17:02 joerg Exp $ - -Only POD types can be used with variadic functions. - ---- src/external/rawspeed/RawSpeed/ColorFilterArray.h.orig 2017-02-18 19:39:46.465232404 +0000 -+++ src/external/rawspeed/RawSpeed/ColorFilterArray.h -@@ -52,7 +52,7 @@ public: - virtual ~ColorFilterArray(void); - virtual void setSize(iPoint2D size); - void setColorAt(iPoint2D pos, CFAColor c); -- virtual void setCFA(iPoint2D size, ...); -+ virtual void setCFA(int sizeA, int sizeB, ...); - CFAColor* getCfaWrt() {return cfa;}; - virtual CFAColor getColorAt(uint32 x, uint32 y); - virtual uint32 getDcrawFilter(); diff --git a/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_Cr2Decoder.cpp b/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_Cr2Decoder.cpp deleted file mode 100644 index 73740bfc0c9..00000000000 --- a/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_Cr2Decoder.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_external_rawspeed_RawSpeed_Cr2Decoder.cpp,v 1.1 2017/02/18 23:17:02 joerg Exp $ - ---- src/external/rawspeed/RawSpeed/Cr2Decoder.cpp.orig 2017-02-18 19:40:53.670055201 +0000 -+++ src/external/rawspeed/RawSpeed/Cr2Decoder.cpp -@@ -280,7 +280,7 @@ void Cr2Decoder::checkSupportInternal(Ca - - void Cr2Decoder::decodeMetaDataInternal(CameraMetaData *meta) { - int iso = 0; -- mRaw->cfa.setCFA(iPoint2D(2,2), CFA_RED, CFA_GREEN, CFA_GREEN2, CFA_BLUE); -+ mRaw->cfa.setCFA(2, 2, CFA_RED, CFA_GREEN, CFA_GREEN2, CFA_BLUE); - vector<TiffIFD*> data = mRootIFD->getIFDsWithTag(MODEL); - - if (data.empty()) diff --git a/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_CrwDecoder.cpp b/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_CrwDecoder.cpp deleted file mode 100644 index 78adbe1ace7..00000000000 --- a/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_CrwDecoder.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_external_rawspeed_RawSpeed_CrwDecoder.cpp,v 1.1 2017/02/18 23:17:02 joerg Exp $ - ---- src/external/rawspeed/RawSpeed/CrwDecoder.cpp.orig 2017-02-18 19:40:55.750611715 +0000 -+++ src/external/rawspeed/RawSpeed/CrwDecoder.cpp -@@ -105,7 +105,7 @@ static float canonEv(const long in) { - - void CrwDecoder::decodeMetaDataInternal(CameraMetaData *meta) { - int iso = 0; -- mRaw->cfa.setCFA(iPoint2D(2,2), CFA_RED, CFA_GREEN, CFA_GREEN2, CFA_BLUE); -+ mRaw->cfa.setCFA(2, 2, CFA_RED, CFA_GREEN, CFA_GREEN2, CFA_BLUE); - vector<CiffIFD*> data = mRootIFD->getIFDsWithTag(CIFF_MAKEMODEL); - if (data.empty()) - ThrowRDE("CRW Support check: Model name not found"); diff --git a/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_NefDecoder.cpp b/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_NefDecoder.cpp deleted file mode 100644 index 85ea0c19c46..00000000000 --- a/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_NefDecoder.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_external_rawspeed_RawSpeed_NefDecoder.cpp,v 1.1 2017/02/18 23:17:02 joerg Exp $ - ---- src/external/rawspeed/RawSpeed/NefDecoder.cpp.orig 2017-02-18 19:40:57.837514025 +0000 -+++ src/external/rawspeed/RawSpeed/NefDecoder.cpp -@@ -411,7 +411,7 @@ string NefDecoder::getExtendedMode(strin - - void NefDecoder::decodeMetaDataInternal(CameraMetaData *meta) { - int iso = 0; -- mRaw->cfa.setCFA(iPoint2D(2,2), CFA_RED, CFA_GREEN, CFA_GREEN2, CFA_BLUE); -+ mRaw->cfa.setCFA(2, 2, CFA_RED, CFA_GREEN, CFA_GREEN2, CFA_BLUE); - - vector<TiffIFD*> data = mRootIFD->getIFDsWithTag(MODEL); - diff --git a/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_OrfDecoder.cpp b/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_OrfDecoder.cpp deleted file mode 100644 index 13bed6d63f5..00000000000 --- a/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_OrfDecoder.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_external_rawspeed_RawSpeed_OrfDecoder.cpp,v 1.1 2017/02/18 23:17:02 joerg Exp $ - ---- src/external/rawspeed/RawSpeed/OrfDecoder.cpp.orig 2017-02-18 19:40:59.878456264 +0000 -+++ src/external/rawspeed/RawSpeed/OrfDecoder.cpp -@@ -264,7 +264,7 @@ void OrfDecoder::checkSupportInternal(Ca - - void OrfDecoder::decodeMetaDataInternal(CameraMetaData *meta) { - int iso = 0; -- mRaw->cfa.setCFA(iPoint2D(2,2), CFA_RED, CFA_GREEN, CFA_GREEN, CFA_BLUE); -+ mRaw->cfa.setCFA(2, 2, CFA_RED, CFA_GREEN, CFA_GREEN, CFA_BLUE); - vector<TiffIFD*> data = mRootIFD->getIFDsWithTag(MODEL); - - if (data.empty()) diff --git a/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_PefDecoder.cpp b/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_PefDecoder.cpp deleted file mode 100644 index 325443d53aa..00000000000 --- a/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_PefDecoder.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_external_rawspeed_RawSpeed_PefDecoder.cpp,v 1.1 2017/02/18 23:17:02 joerg Exp $ - ---- src/external/rawspeed/RawSpeed/PefDecoder.cpp.orig 2017-02-18 19:41:02.200086539 +0000 -+++ src/external/rawspeed/RawSpeed/PefDecoder.cpp -@@ -95,7 +95,7 @@ void PefDecoder::checkSupportInternal(Ca - - void PefDecoder::decodeMetaDataInternal(CameraMetaData *meta) { - int iso = 0; -- mRaw->cfa.setCFA(iPoint2D(2,2), CFA_RED, CFA_GREEN, CFA_GREEN2, CFA_BLUE); -+ mRaw->cfa.setCFA(2, 2, CFA_RED, CFA_GREEN, CFA_GREEN2, CFA_BLUE); - vector<TiffIFD*> data = mRootIFD->getIFDsWithTag(MODEL); - - if (data.empty()) diff --git a/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_Rw2Decoder.cpp b/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_Rw2Decoder.cpp deleted file mode 100644 index bd15604b12c..00000000000 --- a/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_Rw2Decoder.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_external_rawspeed_RawSpeed_Rw2Decoder.cpp,v 1.1 2017/02/18 23:17:02 joerg Exp $ - ---- src/external/rawspeed/RawSpeed/Rw2Decoder.cpp.orig 2017-02-18 19:41:04.240843715 +0000 -+++ src/external/rawspeed/RawSpeed/Rw2Decoder.cpp -@@ -211,7 +211,7 @@ void Rw2Decoder::checkSupportInternal(Ca - } - - void Rw2Decoder::decodeMetaDataInternal(CameraMetaData *meta) { -- mRaw->cfa.setCFA(iPoint2D(2,2), CFA_BLUE, CFA_GREEN, CFA_GREEN2, CFA_RED); -+ mRaw->cfa.setCFA(2, 2, CFA_BLUE, CFA_GREEN, CFA_GREEN2, CFA_RED); - vector<TiffIFD*> data = mRootIFD->getIFDsWithTag(MODEL); - - if (data.empty()) diff --git a/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_ThreefrDecoder.cpp b/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_ThreefrDecoder.cpp deleted file mode 100644 index b76a17ffa3f..00000000000 --- a/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_ThreefrDecoder.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_external_rawspeed_RawSpeed_ThreefrDecoder.cpp,v 1.1 2017/02/18 23:17:02 joerg Exp $ - ---- src/external/rawspeed/RawSpeed/ThreefrDecoder.cpp.orig 2017-02-18 19:41:06.261836198 +0000 -+++ src/external/rawspeed/RawSpeed/ThreefrDecoder.cpp -@@ -77,7 +77,7 @@ void ThreefrDecoder::checkSupportInterna - } - - void ThreefrDecoder::decodeMetaDataInternal(CameraMetaData *meta) { -- mRaw->cfa.setCFA(iPoint2D(2,2), CFA_RED, CFA_GREEN, CFA_GREEN, CFA_BLUE); -+ mRaw->cfa.setCFA(2, 2, CFA_RED, CFA_GREEN, CFA_GREEN, CFA_BLUE); - vector<TiffIFD*> data = mRootIFD->getIFDsWithTag(MODEL); - - if (data.empty()) |