diff --git a/darktable-2.2.5.tar.xz b/darktable-2.2.5.tar.xz deleted file mode 100644 index 0126948..0000000 --- a/darktable-2.2.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e303a42b33f78eb1f48d3b36d1df46f30873df4c5a7b49605314f61c49fbf281 -size 3092540 diff --git a/darktable-2.4.0.tar.xz b/darktable-2.4.0.tar.xz new file mode 100644 index 0000000..887e70d --- /dev/null +++ b/darktable-2.4.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d37388aee79d5ada71062bbac3cda612a61d1a781f6320b784b27308f3a1878 +size 3387972 diff --git a/darktable-old-glib.patch b/darktable-old-glib.patch index 62a3db9..e1abc41 100644 --- a/darktable-old-glib.patch +++ b/darktable-old-glib.patch @@ -1,10 +1,10 @@ -Index: darktable-2.2.5/src/common/exif.cc +Index: darktable-2.4.0rc2~git33.5175e5ed8/src/common/exif.cc =================================================================== ---- darktable-2.2.5.orig/src/common/exif.cc -+++ darktable-2.2.5/src/common/exif.cc -@@ -82,6 +82,13 @@ const char *dt_xmp_keys[] - - static const guint dt_xmp_keys_n = G_N_ELEMENTS(dt_xmp_keys); // the number of XmpBag XmpSeq keys that dt uses +--- darktable-2.4.0rc2~git33.5175e5ed8.orig/src/common/exif.cc ++++ darktable-2.4.0rc2~git33.5175e5ed8/src/common/exif.cc +@@ -175,6 +175,13 @@ static bool dt_exif_read_xmp_tag(Exiv2:: + } + #define FIND_XMP_TAG(key) dt_exif_read_xmp_tag(xmpData, &pos, key) +#if ! GLIB_CHECK_VERSION(2,40,0) +static gboolean _str_is_ascii(const char *str) @@ -14,9 +14,9 @@ Index: darktable-2.2.5/src/common/exif.cc +} +#endif - /* a few helper functions inspired by - https://projects.kde.org/projects/kde/kdegraphics/libs/libkexiv2/repository/revisions/master/entry/libkexiv2/kexiv2gps.cpp -@@ -1356,7 +1363,11 @@ int dt_exif_read_blob(uint8_t **buf, con + // FIXME: according to http://www.exiv2.org/doc/classExiv2_1_1Metadatum.html#63c2b87249ba96679c29e01218169124 + // there is no need to pass xmpData +@@ -1294,7 +1301,11 @@ int dt_exif_read_blob(uint8_t **buf, con if(res != NULL) { char *desc = (char *)res->data; diff --git a/darktable.changes b/darktable.changes index c7c22b9..77931a2 100644 --- a/darktable.changes +++ b/darktable.changes @@ -1,3 +1,679 @@ +------------------------------------------------------------------- +Sun Dec 24 11:34:51 UTC 2017 - mrueckert@suse.de + +- drop llvm5.patch +- modified darktable-old-glib.patch to apply cleanly again + +------------------------------------------------------------------- +Sun Dec 24 11:14:52 UTC 2017 - mrueckert@suse.de + +- update to 2.4.0 + - The maintainership of the RawSpeed library was transferred to + the darktable project. The work on code cleanup, hardening, + modernization, simplification and testing is ongoing. + - Almost 3 thousand commits to darktable+rawspeed since 2.2.0 + - 273 pull requests handled + - 340+ issues closed + - Updated user manual is coming soon™ + + - The Big Ones + - A new module for haze removal + - The local contrast module can now be pushed much further, it + also got a new [local + laplacian](https://www.darktable.org/2017/11/local-laplacian-pyramids/) + mode + - Add undo support for masks and more intelligent grouping of + undo steps + - Blending now allows to display individual channels using + false colors + - darktable now supports loading Fujifilm compressed RAFs + - darktable now supports loading floating point HDR DNGs as + written by HDRMERGE + - We also added channel specific blend modes for Lab and RGB + color spaces + - The base curve module allows for more control of the + [exposure + fusion](https://www.darktable.org/2016/08/compressing-dynamic-range-with-exposure-fusion/) + feature using the newly added bias slider + - The tonecurve module now supports auto colour adjustment in + RGB + - Add absolute color input as an option to the color look up + table module + - A new X-Trans demosaicing algorithm, Frequency Domain Chroma, + was implemented. + - You can now choose from pre-defined scheduling profiles for + OpenCL + - Speaking of OpenCL, darktable now allows to force-use OpenCL + for a specific pixelpipe + - XMP sidecar files are no longer written to disk when the + content didn't actually change. That mostly helps with + network storage and backup systems that use files' time + stamps + + - New Features And Changes + - Show a dialog window that tells when locking the + database/library failed + - Don't shade the whole region on the map when searching for a + location. Instead just draw a border around it. + - Also in map mode: Clear the search list and map indicators + when resetting the search module. + - With OsmGPSMap newer than version 1.1.0 (i.e., anything + released after that OsmGPSMap version) the map will show + copyright info. + - Running jobs with a progressbar (mostly import and export) + will show that progress bar ontop the window entry in your + task bar – if the system supports it. It should work on + GNOME, KDE and Windows at least. + - Add bash like string replacement for variables (export, + watermark, session settings) + - Add a preferences option to ask before removing empty dirs + - The "colorbalance" module got a lot faster, thanks to SSE + optimized code + - Make gradient sliders a little more colorful + - Make PNG compression level used for exporting configurable + - On OSX, load single images from command line or via drag&drop + in darkroom mode + - Add an option to omit the intermediate tag hierarchy in + exported files and only add the last level + - In the watermark module, sort the list of SVG files and omit + the file extension + - Support XYZ as a proofing profile + - Local contrast now got a new slider to set the midtone range + - darktable got two new helper scripts (those are not installed + by default, grab them from [the sources](https://github.com/darktable-org/darktable/tree/master/tools)) + - One to purge thumbnails that no longer have an associated + image in the database, + - and a second script that uses inotify to watch a folder + for new files to open them in a running darktable + instance. + - In the curve editors of base curve and tone curve you can now + delete nodes with a right click and see coordinates of nodes + while editing. Note that you can use keyboard modifiers + `ctrl` and `shift` to change the precision of your changes + - Creating a new instance of a module can now be done with a + quick click of the middle mouse button on the multi-instance + icon + - New darktable installations on computers with more than 8 Gb + of memory will now by default use half of that per module + - Several background colors and the brush color are now + configurable in the CSS + - Some new cameras can bump the ISO level to insane highs. We + try to follow as good as we can by no longer limiting it to + 51200 in the GUI + - Base curve and the highlights module now support multiple + instances and use blending and masks + - Having the `1` key toggle between 1 and 0 stars wasn't very + popular with many people. You can disable that extra feature + and have it behave like the other rating shortcuts now + - You can decide if you want to be asked before resetting the + history stacks of images from the lighttable + - The grain module was slightly changed to have a more + pleasing, photographic-paper like appearance + - Using the color look up table module you can now convert your + images to monochrome, honoring the Helmholtz-Kohlrausch + effect + - Support basic import of Lightroom 7 settings + - Change the styling of insensitive bauhaus widgets + - Don't hide the mode combobox in the exposure module, just + disable it + - Read primaries and whitepoint from .hdr files and default to + those as the input color profile + - Some more small improvements were made + - Bugfixes + - Fix the problem with rating images by accident when moving + the mouse while typing an image size in the export module + - Fix several oddities in folder and tag mode of the collect + module + - Print mode's color profile settings no longer interact with + the export module + - Update the style lists when importing a style + - Fix some bugs with multiple module instances used in a style + - On OSX only the main window should be fullscreen, not the + popups + - Some speedups with VERY big libraries or having A LOT OF tags + - Significantly speed up tagging many images + - Fix searching locations using OpenStreetMap + - Fix partial copies of large files in "import from camera" + - Fix a crash in the import dialog when using Lua to add + widgets there + - Fix some false-positive warnings about another running + darktable instance and it having locked the databases + - No longer switch to the favourite modules group when + duplicating one of its modules + - Fix loading of XYZ files + - Fix Lab export when the profile was set from the lighttable + - Create temporary snapshot files with mode 0600 to stop other + people looking at them + - Fix several bugs with Wayland. However, there are still + issues, so darktable will prefer XWayland + - Google deprecated the Picasa Web API so it's no longer + possible to create G+ albums + - Fix the default for sliders with target not being "red" in + the channel mixer + - Fix the removal of directories + - Make the escape key cancel history dialogs + - Block keyboard accels when editing camera controls + - Properly delete XMP sidecars + - Make sure that the rating set in darktable is used for the + exported file, not something set inside the raw file + - Don't re-write all XMP files when detaching a tag + - Sync XMPs when a tag is removed from the database + - Sync XMPs after a tag is attached/detached via the Lua API + - Bail out of darktable-cli when the XMP file is not readable + - Show ratings on zoomable lighttable without a delay + - Rely on CUPS color management when printing without + configuring any color profile in darktable + - Fix spurious segfault in local contrast + - Make calls to exiv2's readMetadata thread safe to not crash + randomly + - Properly read Lightroom XMPs on systems with `,` as the + decimal separator + - Fix setting the PNG bit depth from the gui + - Many more bugs got fixed + - Lua + - darktable now uses Lua 5.3. The bundled copy got updated + accordingly + - Add dt.print_log. It's like print_error but without the ERROR + prefix + - Reorder callback parameters for intermediate export image: + add the actual image to the parameters of the event + - Call lua post-import-image event synchronously + - Add darktable.configuration.running_os to detect the OS + darktable is running on + - New widget type: section_label, adds a label which looks like + a section change + - Changed Dependencies + - CMake 3.1 is now required + - In order to compile darktable you now need at least + gcc-5.0+/clang-3.4+ + - ZLIB is now required for the DNG Deflate compressed raw + support + - darktable now uses Lua 5.3 + - Camera support, compared to 2.2.0 + + Warning: support for Nikon NEF 'lossy after split' raws was + unintentionally broken due to the lack of such samples. Please + see [this post](https://discuss.pixls.us/t/nikon-a-specific-raw-sample-wanted/5483?u=lebedevri) + for more details. If you have affected raws, please contribute + samples! + + - Base Support + - Canon EOS 200D + - Canon EOS Kiss X9 + - Canon EOS Rebel SL2 + - Canon EOS 6D Mark II (sRaw1, sRaw2) + - Canon EOS 77D + - Canon EOS 9000D + - Canon EOS 800D + - Canon EOS Kiss X9i + - Canon EOS Rebel T7i + - Canon EOS M100 + - Canon EOS M5 + - Canon EOS M6 + - Canon PowerShot G9 X Mark II + - Canon PowerShot SX40 HS (dng) + - Fujifilm GFX 50S (compressed) + - Fujifilm X-A3 + - Fujifilm X-E2S + - Fujifilm X-E3 (compressed) + - Fujifilm X-Pro2 (compressed) + - Fujifilm X-T2 (compressed) + - Fujifilm X-T20 (compressed) + - Fujifilm X100F (compressed) + - GITUP GIT2P (chdk-a, chdk-b) + - Kodak EasyShare Z980 + - LG D855 (dng) + - LG H815 (dng) + - LG Nexus 5X (dng) + - LG US996 (dng) + - LG VS995 (dng) + - Leica D-LUX (Typ 109) (4:3, 3:2, 16:9, 1:1) + - Leica X2 (dng) + - Nikon COOLPIX B700 (12bit-uncompressed) + - Nikon D500 (14bit-uncompressed, 12bit-uncompressed) + - Nikon D5600 (12bit-compressed, 12bit-uncompressed, + 14bit-compressed, 14bit-uncompressed) + - Nikon D7500 (12bit-compressed, 14bit-compressed) + - Nikon D850 (12bit-compressed, 12bit-uncompressed, + 14bit-compressed, 14bit-uncompressed) + - Nikon LS-5000 (dng) + - Nokia Lumia 1020 (dng) + - Olympus E-M10 Mark III + - Olympus E-M1MarkII + - Olympus TG-5 + - Panasonic DC-FZ82 (4:3) + - Panasonic DMC-FZ80 (4:3) + - Panasonic DMC-FZ85 (4:3) + - Panasonic DC-GH5 (4:3) + - Panasonic DC-FZ91 (4:3) + - Panasonic DC-FZ92 (4:3) + - Panasonic DC-FZ93 (4:3) + - Panasonic DC-TZ90 (4:3) + - Panasonic DC-ZS70 (4:3) + - Panasonic DMC-FZ330 (4:3) + - Panasonic DMC-GF6 (16:9, 3:2, 1:1) + - Panasonic DMC-TZ61 (4:3, 3:2, 1:1, 16:9) + - Panasonic DMC-ZS40 (4:3, 3:2, 1:1, 16:9) + - Panasonic DMC-TZ80 (4:3) + - Panasonic DMC-TZ81 (4:3) + - Panasonic DMC-TZ85 (4:3) + - Panasonic DMC-ZS60 (4:3) + - Pentax K-5 (dng) + - Pentax K-r (dng) + - Pentax K10D (dng) + - Phase One IQ140 + - Samsung G920F + - Samsung G935F + - Samsung GX10 + - Sony ILCE-6500 + - Sony ILCE-7RM3 + - Sony ILCE-9 + - White Balance Presets + - Canon EOS 6D Mark II + - Fujifilm X-T20 + - Fujifilm X100F + - Nikon 1 AW1 + - Nikon Coolpix A + - Panasonic DMC-GX80 + - Panasonic DMC-GX85 + - Panasonic DMC-TZ100 + - Panasonic DMC-TZ101 + - Panasonic DMC-TZ110 + - Panasonic DMC-ZS110 + - Pentax K-3 II + - Noise Profiles + - Canon EOS 1300D + - Canon EOS Kiss X80 + - Canon EOS Rebel T6 + - Canon EOS 5D Mark IV + - Canon EOS 6D Mark II + - Canon EOS M5 + - Canon PowerShot G16 + - Canon PowerShot G3 X + - Canon PowerShot G7 X Mark II + - Canon PowerShot G9 X Mark II + - Fujifilm X-M1 + - Fujifilm X-Pro1 + - Fujifilm X-Pro2 + - Fujifilm X-T20 + - Leica X2 + - Nikon Coolpix A + - Nikon D2X + - Nikon D3000 + - Nikon D3400 + - Nikon D4 + - Nikon D500 + - Olympus E-M1MarkII + - Olympus E-P5 + - Panasonic DMC-FZ200 + - Panasonic DMC-FZ300 + - Panasonic DMC-G7 + - Panasonic DMC-G70 + - Panasonic DMC-G8 + - Panasonic DMC-G80 + - Panasonic DMC-G81 + - Panasonic DMC-G85 + - Panasonic DMC-GX80 + - Panasonic DMC-GX85 + - Panasonic DMC-LX100 + - Panasonic DMC-TZ100 + - Panasonic DMC-TZ101 + - Panasonic DMC-TZ110 + - Panasonic DMC-ZS110 + - Pentax K-70 + - Sony DSC-RX100M5 + - Sony ILCA-68 + - Sony ILCE-5000 + - Sony ILCE-6500 + - Sony ILCE-7RM3 + - Translations + - Catalan + - Czech + - Danish + - Dutch + - French + - German + - Greek + - Hebrew + - Hungarian + - Italian + - Japanese + - Polish + - Russian + - Slovak + - Slovenian + - Spanish + - Swedish + - Ukrainian + +------------------------------------------------------------------- +Mon Dec 18 17:45:19 UTC 2017 - mrueckert@suse.de + +- added llvm5.patch: list of llvm version is hardcoded and llvm 5, + while it works for building, wasn't searched for. +- package the darktable basecurve tool in a new subpackage +- make sure pdf documentation never ends up in the main package +- drop non suse support +- drop ix86 support. 64bit only from now on. + +------------------------------------------------------------------- +Mon Dec 18 16:46:00 UTC 2017 - mrueckert@suse.de + +- update to 2.4.0.rc2 + - The maintainership of the RawSpeed library was transferred to + the darktable project. The work on code cleanup, hardening, + modernization, simplification and testing is ongoing. + - Well over 2 thousand commits to darktable+rawspeed since 2.2.0 + - 244 pull requests handled + - 320+ issues closed + - Updated user manual is coming soon™ + + - The Big Ones + - A new module for haze removal + - The local contrast module can now be pushed much further, it + also got a new local laplacian mode + - Add undo support for masks and more intelligent grouping of + undo steps + - Blending now allows to display individual channels using + false colors + - darktable now supports loading Fujifilm compressed RAFs + - darktable now supports loading floating point HDR DNGs as + written by HDRMERGE + - We also added channel specific blend modes for Lab and RGB + color spaces + - The base curve module allows for more control of the exposure + fusion feature using the newly added bias slider + - The tonecurve module now supports auto colour adjustment in + RGB + - Add absolute color input as an option to the color look up + table module + - A new X-Trans demosaicing algorithm, Frequency Domain Chroma, + was implemented. + - You can now choose from pre-defined scheduling profiles for + OpenCL + - Speaking of OpenCL, darktable now allows to force-use OpenCL + for a specific pixelpipe + - Xmp sidecar files are no longer written to disk when the + content didn't actually change. That mostly helps with + network storage and backup systems that use files' time + stamps + - New Features And Changes + - Show a dialog window that tells when locking the + database/library failed + - Don't shade the whole region on the map when searching for a + location. Instead just draw a border around it. + - Also in map mode: Clear the search list and map indicators + when resetting the search module. + - With OsmGPSMap newer than version 1.1.0 (i.e., anything + released after that OsmGPSMap version) the map will show + copyright info. + - Running jobs with a progressbar (mostly import and export) + will show that progress bar ontop the window entry in your + task bar – if the system supports it. It should work on + GNOME, KDE and Windows at least. + - Add bash like string replacement for variables (export, + watermark, session settings). + - Add a preferences option to ask before removing empty dirs + - The "colorbalance" module got a lot faster, thanks to SSE + optimized code + - Make gradient sliders a little more colorful + - Make PNG compression level used for exporting configurable + - On OSX, load single images from command line or via drag&drop + in darkroom mode + - Add an option to omit the intermediate tag hierarchy in + exported files and only add the last level + - In the watermark module, sort the list of SVG files and omit + the file extension + - Support XYZ as a proofing profile + - Local contrast now got a new slider to set the midtone range + - darktable got two new helper scripts (those are not installed + by default, grab them from the sources): One to purge + thumbnails that no longer have an associated image in the + database, and a second script that uses inotify to watch a + folder for new files to open them in a running darktable + instance. + - In the curve editors of base curve and tone curve you can now + delete nodes with a right click and see coordinates of nodes + while editing. Note that you can use keyboard modifiers ctrl + and shift to change the precision of your changes + - Creating a new instance of a module can now be done with a + quick click of the middle mouse button on the multi-instance + icon + - New darktable installations on computers with more than 8 Gb + of memory will now by default use half of that per module + - Several background colors and the brush color are now + configurable in the CSS + - Some new cameras can bump the ISO level to insane highs. We + try to follow as good as we can by no longer limiting it to + 51200 in the GUI + - Base curve and the highlights module now support multiple + instances and use blending and masks + - Having the `1` key toggle between 1 and 0 stars wasn't very + popular with many people. You can disable that extra feature + and have it behave like the other rating shortcuts now + - You can decide if you want to be asked before resetting the + history stacks of images from the lighttable + - The grain module was slightly changed to have a more + pleasing, photographic-paper like appearance + - Using the color look up table module you can now convert your + images to monochrome, honoring the Helmholtz-Kohlrausch + effect + - Some more small improvements were made + - Support basic import of Lightroom 7 settings + - Change the styling of insensitive bauhaus widgets + - Don't hide the mode combobox in the exposure module, just + disable it + - Bugfixes + - Fix the problem with rating images by accident when moving + the mouse while typing an image size in the export module + - Fix several oddities in folder and tag mode of the collect + module. + - Print mode's color profile settings no longer interact with + the export module + - Update the style lists when importing a style + - Fix some bugs with multiple module instances used in a style + - On OSX only the main window should be fullscreen, not the + popups + - Some speedups with VERY big libraries or having A LOT OF tags + - Significantly speed up tagging many images + - Fix searching locations using OpenStreetMap + - Fix partial copies of large files in "import from camera" + - Fix a crash in the import dialog when using Lua to add + widgets there + - Fix some false-positive warnings about another running + darktable instance and it having locked the databases + - No longer switch to the favourite modules group when + duplicating one of its modules + - Fix loading of XYZ files + - Fix Lab export when the profile was set from the lighttable + - Create tmp snapshot files with mode 0600 to stop other people + looking at them + - Fix several bugs with Wayland. However, there are still + issues, so darktable will prefer XWayland + - Google deprecated the Picasa Web API so it's no longer + possible to create G+ albums + - Fix the default for sliders with target not being "red" in + the channel mixer + - Fix the removing of directories + - Make the escape key cancel history dialogs + - Block keyboard accels when editing camera controls + - Properly delete XMP sidecars + - Make sure that the rating set in darktable is used for the + exported file, not something set inside the raw file + - Don't re-write all XMP files when detaching a tag + - Sync XMPs when a tag is removed from the database + - Sync XMPs after a tag is attached/detached via the Lua API + - Bail out of darktable-cli when the XMP file is not readable + - Show ratings on zoomable lighttable without a delay + - Rely on CUPS color management when printing without + configuring any color profile in darktable + - Many more bugs got fixed + - Fix spurious segfault in local contrast + - Make calls to exiv2's readMetadata thread safe to not crash + randomly + - Lua + - darktable now uses Lua 5.3. The bundled copy got updated + accordingly + - Add dt.print_log. It's like print_error but without the ERROR + prefix + - Reorder callback parameters for intermediate export image: + add the actual image to the parameters of the event + - Call lua post-import-image event synchronously + - Add darktable.configuration.running_os to detect the OS + darktable is running on + - New widget type: section_label, adds a label which looks like + a section change + - Changed Dependencies + - CMake 3.1 is now required. + - In order to compile darktable you now need at least + gcc-4.9+/clang-3.4+, and gcc-5.0+ is *highly* recommended. + - ZLIB is now required for the DNG Deflate compressed raw + support. + - darktable now uses Lua 5.3 + - Camera support, compared to 2.2.0 + Warning: support for Nikon NEF 'lossy after split' raws was + unintentionally broken due to the lack of such samples. Please + see https://discuss.pixls.us/t/nikon-a-specific-raw-sample-wanted/5483 + for more details. If you have affected raws, please contribute samples! + + - Base Support + - Canon EOS 200D + - Canon EOS Kiss X9 + - Canon EOS Rebel SL2 + - Canon EOS 6D Mark II (sRaw1, sRaw2) + - Canon EOS 77D + - Canon EOS 9000D + - Canon EOS 800D + - Canon EOS Kiss X9i + - Canon EOS Rebel T7i + - Canon EOS M100 + - Canon EOS M5 + - Canon EOS M6 + - Canon PowerShot G9 X Mark II + - Canon PowerShot SX40 HS (dng) + - Fujifilm GFX 50S (compressed) + - Fujifilm X-A3 + - Fujifilm X-E2S + - Fujifilm X-E3 (compressed) + - Fujifilm X-Pro2 (compressed) + - Fujifilm X-T2 (compressed) + - Fujifilm X-T20 (compressed) + - Fujifilm X100F (compressed) + - GITUP GIT2P (chdk-a, chdk-b) + - Kodak EasyShare Z980 + - LG D855 (dng) + - LG H815 (dng) + - LG Nexus 5X (dng) + - LG US996 (dng) + - LG VS995 (dng) + - Leica D-LUX (Typ 109) (4:3, 3:2, 16:9, 1:1) + - Leica X2 (dng) + - Nikon COOLPIX B700 (12bit-uncompressed) + - Nikon D500 (14bit-uncompressed, 12bit-uncompressed) + - Nikon D5600 (12bit-compressed, 12bit-uncompressed, + 14bit-compressed, 14bit-uncompressed) + - Nikon D7500 (12bit-compressed, 14bit-compressed) + - Nikon D850 (12bit-compressed, 12bit-uncompressed, + 14bit-compressed, 14bit-uncompressed) + - Nikon LS-5000 (dng) + - Nokia Lumia 1020 (dng) + - Olympus E-M10 Mark III + - Olympus E-M1MarkII + - Olympus TG-5 + - Panasonic DC-FZ82 (4:3) + - Panasonic DMC-FZ80 (4:3) + - Panasonic DMC-FZ85 (4:3) + - Panasonic DC-GH5 (4:3) + - Panasonic DC-FZ91 (4:3) + - Panasonic DC-FZ92 (4:3) + - Panasonic DC-FZ93 (4:3) + - Panasonic DC-TZ90 (4:3) + - Panasonic DC-ZS70 (4:3) + - Panasonic DMC-FZ330 (4:3) + - Panasonic DMC-GF6 (16:9, 3:2, 1:1) + - Panasonic DMC-TZ61 (4:3, 3:2, 1:1, 16:9) + - Panasonic DMC-ZS40 (4:3, 3:2, 1:1, 16:9) + - Panasonic DMC-TZ80 (4:3) + - Panasonic DMC-TZ81 (4:3) + - Panasonic DMC-TZ85 (4:3) + - Panasonic DMC-ZS60 (4:3) + - Pentax K-5 (dng) + - Pentax K-r (dng) + - Pentax K10D (dng) + - Phase One IQ140 + - Samsung G920F + - Samsung G935F + - Samsung GX10 + - Sony ILCE-6500 + - Sony ILCE-7RM3 + - Sony ILCE-9 + - White Balance Presets + - Canon EOS 6D Mark II + - Fujifilm X-T20 + - Fujifilm X100F + - Nikon 1 AW1 + - Nikon Coolpix A + - Panasonic DMC-GX80 + - Panasonic DMC-GX85 + - Panasonic DMC-TZ100 + - Panasonic DMC-TZ101 + - Panasonic DMC-TZ110 + - Panasonic DMC-ZS110 + - Pentax K-3 II + - Noise Profiles + - Canon EOS 1300D + - Canon EOS Kiss X80 + - Canon EOS Rebel T6 + - Canon EOS 5D Mark IV + - Canon EOS 6D Mark II + - Canon EOS M5 + - Canon PowerShot G16 + - Canon PowerShot G3 X + - Canon PowerShot G7 X Mark II + - Canon PowerShot G9 X Mark II + - Fujifilm X-M1 + - Fujifilm X-Pro1 + - Fujifilm X-T20 + - Leica X2 + - Nikon Coolpix A + - Nikon D2X + - Nikon D3000 + - Nikon D3400 + - Nikon D4 + - Nikon D500 + - Olympus E-M1MarkII + - Olympus E-P5 + - Panasonic DMC-FZ200 + - Panasonic DMC-FZ300 + - Panasonic DMC-G7 + - Panasonic DMC-G70 + - Panasonic DMC-G8 + - Panasonic DMC-G80 + - Panasonic DMC-G81 + - Panasonic DMC-G85 + - Panasonic DMC-GX80 + - Panasonic DMC-GX85 + - Panasonic DMC-LX100 + - Panasonic DMC-TZ100 + - Panasonic DMC-TZ101 + - Panasonic DMC-TZ110 + - Panasonic DMC-ZS110 + - Pentax K-70 + - Sony DSC-RX100M5 + - Sony ILCA-68 + - Sony ILCE-5000 + - Sony ILCE-6500 + - Updated Translations + - Catalan + - Dutch + - French + - German + - Hebrew + - Hungarian + - Polish + - Russian + - Spanish + ------------------------------------------------------------------- Tue Oct 10 16:04:31 UTC 2017 - mrueckert@suse.de diff --git a/darktable.spec b/darktable.spec index 0d18732..85a83f6 100644 --- a/darktable.spec +++ b/darktable.spec @@ -16,41 +16,41 @@ # -%bcond_with clang +%bcond_with clang -%if ( 0%{?suse_version} > 1310 && 0%{?is_opensuse} ) || 0%{?fedora_version} >= 22 || 0%{?fc22}%{?fc23}%{?fc24}%{?fc25} +%if ( 0%{?suse_version} > 1310 && 0%{?is_opensuse} ) %bcond_without osmgpsmap -%else -%bcond_with osmgpsmap -%endif - -%if (0%{?suse_version} >= 1310 && 0%{?is_opensuse} ) || 0%{?rhel_version} > 6 || 0%{?centos_version} > 6 || 0%{?fedora_version} >= 20 || 0%{?el7}%{?fc20}%{?fc21}%{?fc22}%{?fc23}%{?fc24}%{?fc25} %bcond_without flickcurl %bcond_without translated_manpages %else +%bcond_with osmgpsmap %bcond_with flickcurl %bcond_with translated_manpages %endif -%if 0%{?suse_version} +%if 0%{?suse_version} >= 1330 %bcond_without system_lua %else %bcond_with system_lua %endif -%if 0%{?is_opensuse} == 1 || 0%{?rhel_version} > 6 || 0%{?centos_version} > 6 || 0%{?fedora_version} >= 20 || 0%{?el7}%{?fc20}%{?fc21}%{?fc22}%{?fc23}%{?fc24}%{?fc25} +%if 0%{?suse_version} > 1320 %bcond_without system_opencl %else %bcond_with system_opencl %endif %define cmake_options -DCMAKE_SKIP_RPATH:BOOL=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBINARY_PACKAGE_BUILD=1 -DCMAKE_INSTALL_DATAROOTDIR="share" -DCMAKE_INSTALL_LIBDIR="%{_lib}" +%if 0%{?suse_version} == 1315 +%define force_gcc_version 6 +%endif Name: darktable -Version: 2.2.5 +Version: 2.4.0 Release: 0 +%define pkg_version 2.4.0 Url: http://www.darktable.org/ -Source0: %{name}-%{version}.tar.xz +Source0: %{name}-%{pkg_version}.tar.xz Source1: https://github.com/darktable-org/darktable/releases/download/release-2.0.0/darktable-usermanual.pdf Source2: https://github.com/darktable-org/darktable/releases/download/release-2.0.0/darktable-usermanual-fr.pdf Source3: https://github.com/darktable-org/darktable/releases/download/release-2.0.0/darktable-usermanual-es.pdf @@ -59,14 +59,17 @@ Source99: README.openSUSE Patch: darktable-old-glib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: %ix86 x86_64 aarch64 +ExclusiveArch: x86_64 aarch64 # build time tools +BuildRequires: clang BuildRequires: cmake >= 3 BuildRequires: fdupes -%if %{with clang} -BuildRequires: llvm-clang -%else -BuildRequires: gcc-c++ +BuildRequires: llvm-devel +%if ! %{with clang} +BuildRequires: gcc%{?force_gcc_version}-c++ >= 5 +%if 0%{?force_gcc_version} +#!BuildIgnore: libgcc_s1 +%endif %endif BuildRequires: intltool BuildRequires: libxslt @@ -86,22 +89,13 @@ BuildRequires: libtiff-devel BuildRequires: libxml2-devel # %if %{with system_lua} -%if 0%{?suse_version} -%if 0%{?suse_version} > 1210 && 0%{?suse_version} < 1321 -BuildRequires: lua-devel -%else -BuildRequires: lua52-devel -%endif -%endif +BuildRequires: lua-devel >= 5.3 %endif BuildRequires: pugixml-devel # BuildRequires: pkgconfig %if 0%{?suse_version} != 1315 || ( 0%{?suse_version} == 1315 && 0%{?is_opensuse} ) BuildRequires: pkgconfig(GraphicsMagick) -%if 0%{?suse_version} && 0%{?suse_version} < 1315 -BuildRequires: libGraphicsMagick3 -%endif BuildRequires: pkgconfig(libopenjp2) %endif BuildRequires: pkgconfig(OpenEXR) @@ -143,9 +137,26 @@ darktable is a virtual lighttable and darkroom for photographers: it manages your digital negatives in a database and lets you view them through a zoomable lighttable. it also enables you to develop raw images and enhance them. +%package tools-basecurve +Summary: The basecurve tool from tools/basecurve/ +Group: Productivity/Graphics/Viewers +Requires: /usr/bin/convert +Requires: dcraw +Requires: exiftool + +%description tools-basecurve +darktable is a virtual lighttable and darkroom for photographers: it manages +your digital negatives in a database and lets you view them through a zoomable +lighttable. it also enables you to develop raw images and enhance them. + +This package provides the basecurve tool from tools/basecurve/. +Another option to solve the same problem might be the darktable-chart module +from the darktable package. + %package doc Summary: A virtual Lighttable and Darkroom Group: Productivity/Graphics/Viewers +BuildArch: noarch %description doc darktable is a virtual lighttable and darkroom for photographers: it manages @@ -161,9 +172,6 @@ chmod -x tools/create_control_svg.sh tools/purge_non_existing_images.sh tools/ba cp %{S:1} %{S:2} %{S:3} %{S:4} . cp %{S:99} . -%ifarch ppc64le -echo "" > src/is_supported_platform.h -%endif %if %{with system_opencl} # Remove bundled OpenCL headers. @@ -177,46 +185,47 @@ rm -rf src/external/lua/ %endif %build -./tools/create_version_c.sh src/version_gen.c "%{version}-%{release}" +export BUILDDIR="$PWD" +%if 0%{?force_gcc_version} +export CC="gcc-%{?force_gcc_version}" +export CXX="g++-%{?force_gcc_version}" +%endif %if %{with clang} export CC="/usr/bin/clang" export CXX="/usr/bin/clang++" %endif -%if 0%{?suse_version} -%cmake %{cmake_options} || cat CMakeFiles/CMakeError.log -%else -mkdir %{_target_platform} -pushd %{_target_platform} -%cmake %{cmake_options} \ +export _OPENCL_INCLUDE_DIR=$(clang -print-search-dirs | awk -F= '/^libra/ {print $2}' | awk -F: '{print $1 "/include"}') +%cmake \ + -DCLANG_OPENCL_INCLUDE_DIR=${_OPENCL_INCLUDE_DIR} \ %if ! %{with system_lua} -DDONT_USE_INTERNAL_LUA=Off \ %endif - .. -%endif + %{cmake_options} \ + || cat CMakeFiles/CMakeError.log make %{_smp_mflags} VERBOSE=1 +cd $BUILDDIR + +pushd tools/basecurve +%cmake +make %{_smp_mflags} VERBOSE=1 +cd $BUILDDIR %install -%if 0%{?suse_version} %cmake_install -%else -pushd %{_target_platform} -make install DESTDIR="%{buildroot}" +pushd tools/basecurve +%cmake_install popd -%endif -%if 0%{?suse_version} %suse_update_desktop_file darktable -%endif find %{buildroot}%{_libdir} -name "*.la" -delete %find_lang darktable mkdir -p %{buildroot}%{_defaultdocdir}/%{name}/tools/ -%if 0%{?suse_version} -mv %{buildroot}%{_datadir}/doc/darktable/* %{buildroot}%{_defaultdocdir}/%{name}/ -rm -rf %{buildroot}%{_datadir}/doc/darktable -%endif +mkdir -p %{buildroot}%{_defaultdocdir}/%{name}/tools/basecurve/ -cp -av %{S:99} doc/ChangeLog doc/NEWS \ +mv %{buildroot}%{_datadir}/doc/darktable/* %{buildroot}%{_defaultdocdir}/%{name}/ + +cp -av %{S:2} doc/ChangeLog doc/NEWS \ doc/thumbnail_color_management.txt \ doc/TODO doc/TRANSLATORS \ %{buildroot}%{_defaultdocdir}/%{name} @@ -224,36 +233,27 @@ cp -av %{S:99} doc/ChangeLog doc/NEWS \ cp -av tools/purge* \ %{buildroot}%{_defaultdocdir}/%{name}/tools/ -%fdupes -s %{buildroot}%{_datadir} +cp -av tools/basecurve/plot* tools/basecurve/README.md \ + %{buildroot}%{_defaultdocdir}/%{name}/tools/basecurve/ -%if 0%{?suse_version} +%fdupes %{buildroot} + +# on newer distros it is handled via file trigger +%if 0%{?suse_version} && 0%{?suse_version} < 1500 %post -%mime_database_post %desktop_database_post %icon_theme_cache_post %postun %desktop_database_postun %icon_theme_cache_postun -%mime_database_postun -%else -%post -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun -update-desktop-database &> /dev/null || : -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %files -f darktable.lang %defattr(-,root,root) %doc %{_defaultdocdir}/%{name} +%exclude %{_defaultdocdir}/%{name}/*.pdf +%exclude %{_defaultdocdir}/%{name}/tools/basecurve/ %{_bindir}/darktable %{_bindir}/darktable-cltest %{_bindir}/darktable-cli @@ -272,8 +272,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_mandir}/*/man1/darktable*.1* %endif +%files tools-basecurve +%defattr(-,root,root) +%{_bindir}/dt-curve-tool +%{_bindir}/dt-curve-tool-helper +%doc %{_defaultdocdir}/%{name}/tools/basecurve/ + %files doc %defattr(-,root,root) -%doc darktable-*.pdf +%{_defaultdocdir}/%{name}/*.pdf %changelog