Hello community, here is the log from the commit of package darktable for openSUSE:Factory checked in at 2018-04-27 16:10:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/darktable (Old) and /work/SRC/openSUSE:Factory/.darktable.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "darktable" Fri Apr 27 16:10:03 2018 rev:72 rq:601887 version:2.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/darktable/darktable.changes 2018-01-10 23:29:51.498973859 +0100 +++ /work/SRC/openSUSE:Factory/.darktable.new/darktable.changes 2018-04-27 16:10:08.340493661 +0200 @@ -1,0 +2,211 @@ +Fri Apr 27 11:51:22 UTC 2018 - mrueckert@suse.de + +- pull from the stable branch 887d55c.patch: + fix typo in the noise profile tools + +------------------------------------------------------------------- +Tue Apr 24 16:00:26 UTC 2018 - mrueckert@suse.de + +- also track the debian packaging files as sources in the spec file + +------------------------------------------------------------------- +Tue Apr 24 00:50:28 UTC 2018 - mrueckert@suse.de + +- also build and package the noise profiling tools: + new subpackage darktable-tools-noise + +------------------------------------------------------------------- +Tue Apr 24 00:41:18 UTC 2018 - mrueckert@suse.de + +- update to 2.4.3 + - New Features + - Support for tags and ratings in the watermark module + - Read Xmp.exif.DateTimeOriginal from XMP sidecars + - Build and install noise tools + - Add a script for converting .dtyle to an .xmp + - Bugfixes + - Don't create unneeded folders during export in some cases + - When collecting by tags, don't select subtags + - Fix language selection on OSX + - Fix a crash while tethering + - Camera support, compared to 2.4.2 + - Base Support + - Fujifilm X-H1 (compressed) + - Kodak EOS DCS 3 + - Olympus E-PL9 + - Panasonic DC-GX9 (4:3) + - Sony DSC-RX1RM2 + - Sony ILCE-7M3 + - White Balance Presets + - Sony ILCE-7M3 + - Noise Profiles + - Canon PowerShot G1 X Mark III + - Nikon D7500 + - Sony ILCE-7M3 + +------------------------------------------------------------------- +Thu Mar 22 01:06:51 UTC 2018 - mrueckert@suse.de + +- force gcc 7 on suse_version 1315 to get the new GCC flags working + in :Update + +------------------------------------------------------------------- +Wed Mar 21 21:33:26 UTC 2018 - mrueckert@suse.de + +- update to 2.4.2 + - New Features + - Add presets to location search in map mode + - Add timestamps to the output of `-d` command line switches + - Add a compression level slider to the TIFF export module + - Add native binary NetPNM loading, without using + GraphicsMagick + - Add a battery indicator for people running darktable on a + laptop. This is not very portable code and disabled by + default + - Allow to use /? to show the help message on Windows + - Bugfixes + - Turn off smooth scrolling for X11/Quartz. That might help + with oversensitive scrolling + - Fix reading and writing of TIFFs with non-ASCII filenames on + Windows + - Ellipsize background job labels when too long + - Hard code D50 white point when exporting to OpenEXR + - Add tootips to the haze removal module + - Fix a crash when changing lenses while tethering + - Fix incorrect Atom CPU detection on Windows + - Revised performance configuration + - Don't overlay the colorbalance sliders on the left for a + cleaner look + - Honor local copy in copy export format + - Make trashing of files on Windows silent + - Fix string termination override on memmove + - Fix a use after free and some memleaks + - Fix a crash in PDF export + - Fix the min color picker + - Don't hardcode '/' in OpenCL paths on Windows + - Camera support, compared to 2.4.1 + - Base Support + - Canon PowerShot G1 X Mark III + - Panasonic DMC-FZ2000 (3:2) + - Panasonic DMC-FZ2500 (3:2) + - Panasonic DMC-ZS100 (3:2) + - Sony DSC-RX0 + - Sony DSC-RX10M4 + - Noise Profiles + - Canon EOS 200D + - Canon EOS Kiss X9 + - Canon EOS Rebel SL2 + - Canon EOS 760D + - Canon EOS 8000D + - Canon EOS Rebel T6s + - Canon PowerShot G1 X Mark II + - Canon PowerShot G9 X + - Fujifilm X100F + - Nikon D850 + - Panasonic DC-G9 + - Panasonic DMC-GF6 + - Panasonic DMC-LX10 + - Panasonic DMC-LX15 + - Panasonic DMC-LX9 + - Panasonic DMC-TZ70 + - Panasonic DMC-TZ71 + - Panasonic DMC-ZS50 + - Translations + - Dutch + - French + - German + - Hungarian + - Italian + +------------------------------------------------------------------- +Mon Jan 22 16:45:21 UTC 2018 - mrueckert@suse.de + +- update to 2.4.1 + - New Features + - Allow to select the GUI language in the preferences + - Add a filter rule to the collect module to find locally + copied images + - Add favourite toggle to darkroom modules' right click popup + - Allow blending/masking in the hot pixels module + - Add keyboard shortcuts to zoom and pan an image in darkroom. + Panning uses the arrow keys, zooming defaults to `ctrl-` and + `ctrl+`. Use `alt` and `ctrl` to change the step size of + panning. + - Some minor speedups in the grain module + - Handling stdout on Windows: do not redirect stdout for simple + command line arguments (`--help` and `--version`) + - On Windows, show the location of the log file in the help + message + - Enable searching in the more modules list – click into the + list to give focus to it, then start typing. The default GTK + shortcut `ctrl-f` doesn't work as it's used for filmstrip + already + - Add a debug print when compiling OpenCL kernels + - Bugfixes + - Use the configured overwrite color profile when exporting + from Lua – this broke GIMP integration + - Support presets with `<` in their name + - Fix export to non-existing path with `\` as the path + separator on Windows + - Don't insist on the db being locked when it doesn't even + exist + - Don't touch the mix slider when resetting the curve in color + zones + - Fix a bug in the exposure module that would only allow + corrections of up to 10 stops + - Fix custom shortcuts with `shift` modifier + - Properly ellipsize text in the recently used collections list + - Fix exported galeries with filenames containing a `'` + - Fix finding mipmaps cache folder in `purge_from_cache.sh` + script + - Fix a crash in the recently used collections list due to a + broken config file + - Set the sqlite threading mode to Serialized + - Fix old export presets using OpenEXR + - Fix building with clang on Windows + - Changed Dependencies + - iso-codes version 3.66 or newer is suggested for a nicer list + of translations in the preferences. + - Camera support, compared to 2.4.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=lebedev...) + for more details. If you have affected raws, please contribute + samples! + - Base Support + - Panasonic DC-G9 (4:3) + - Paralenz Dive Camera (chdk) + - Pentax KP + - Sjcam SJ6 LEGEND (chdk-b, chdk-c) + - White Balance Presets + - Leaf Credo 40 + - Nikon D3400 + - Olympus E-M1MarkII + - Panasonic DC-G9 + - Sony ILCE-7RM3 + - Noise Profiles + - Canon EOS 750D + - Canon EOS Kiss X8i + - Canon EOS Rebel T6i + - Canon EOS 77D + - Canon EOS 9000D + - Canon EOS M100 + - Canon EOS M6 + - Sony DSC-RX100M4 + - YI TECHNOLOGY M1 + - Translations + - Czech ++++ 14 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/darktable/darktable.changes ++++ and /work/SRC/openSUSE:Factory/.darktable.new/darktable.changes Old: ---- darktable-2.4.0.tar.xz New: ---- 887d55c.patch darktable-2.4.3.tar.xz darktable.dsc debian.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ darktable.spec ++++++ --- /var/tmp/diff_new_pack.xMG33L/_old 2018-04-27 16:10:09.516450534 +0200 +++ /var/tmp/diff_new_pack.xMG33L/_new 2018-04-27 16:10:09.516450534 +0200 @@ -1,7 +1,7 @@ # # spec file for package darktable # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,9 +16,14 @@ # +%if 0%{?fedora_version} +%bcond_with basecurve_tool +%else +%bcond_without basecurve_tool +%endif %bcond_with clang -%if ( 0%{?suse_version} > 1310 && 0%{?is_opensuse} ) +%if 0%{?is_opensuse} || 0%{?fedora_version} >= 26 %bcond_without osmgpsmap %bcond_without flickcurl %bcond_without translated_manpages @@ -28,35 +33,45 @@ %bcond_with translated_manpages %endif -%if 0%{?suse_version} >= 1330 +%if 0%{?suse_version} >= 1330 || 0%{?fedora_version} >= 26 %bcond_without system_lua %else %bcond_with system_lua %endif -%if 0%{?suse_version} > 1320 +%if 0%{?suse_version} > 1320 || 0%{?fedora_version} >= 26 %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}" +%global _libexec_subdir "lib" +%if 0%{?fedora_version} +%global _libexec_subdir "libexec" +%endif + +%define cmake_options -DCMAKE_SKIP_RPATH:BOOL=OFF -DCMAKE_BUILD_TYPE=Release -DBINARY_PACKAGE_BUILD=1 -DCMAKE_INSTALL_DATAROOTDIR="share" -DCMAKE_INSTALL_LIBDIR="%{_lib}" -DCMAKE_INSTALL_LIBEXECDIR="%{_libexec_subdir}" -DBUILD_NOISE_TOOLS=ON + %if 0%{?suse_version} == 1315 -%define force_gcc_version 6 +%define force_gcc_version 7 %endif Name: darktable -Version: 2.4.0 +Version: 2.4.3 Release: 0 -%define pkg_version 2.4.0 +%define pkg_name darktable +%define pkg_version 2.4.3 Url: http://www.darktable.org/ Source0: %{name}-%{pkg_version}.tar.xz Source1: https://github.com/darktable-org/darktable/releases/download/release-2.0.0/d... Source2: https://github.com/darktable-org/darktable/releases/download/release-2.0.0/d... Source3: https://github.com/darktable-org/darktable/releases/download/release-2.0.0/d... Source4: https://github.com/darktable-org/darktable/releases/download/release-2.0.0/d... +Source97: darktable.dsc +Source98: debian.tar.xz Source99: README.openSUSE Patch: darktable-old-glib.patch +Patch1: 887d55c.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: x86_64 aarch64 @@ -65,6 +80,9 @@ BuildRequires: cmake >= 3 BuildRequires: fdupes BuildRequires: llvm-devel +%if 0%{?fedora_version} +BuildRequires: llvm-static +%endif %if ! %{with clang} BuildRequires: gcc%{?force_gcc_version}-c++ >= 5 %if 0%{?force_gcc_version} @@ -110,6 +128,7 @@ BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(iso-codes) BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(lensfun) @@ -127,9 +146,12 @@ %if %{with system_opencl} BuildRequires: opencl-headers %endif +# for the sake of simplicity we do not enforce the version here +# the package is small enough that installing it doesnt hurt +Requires: iso-codes # Summary: A virtual Lighttable and Darkroom -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Productivity/Graphics/Viewers %description @@ -137,6 +159,7 @@ 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. +%if %{with basecurve_tool} %package tools-basecurve Summary: The basecurve tool from tools/basecurve/ Group: Productivity/Graphics/Viewers @@ -152,6 +175,20 @@ 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. +%endif + +%package tools-noise +Summary: The noise profiling tools to support new cameras +Group: Productivity/Graphics/Viewers +Requires: /usr/bin/convert +Requires: gnuplot + +%description tools-noise +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 noise profiling tools to add support for new cameras. %package doc Summary: A virtual Lighttable and Darkroom @@ -168,7 +205,8 @@ %prep %setup -q -n %{name}-%{version} %patch -p1 -chmod -x tools/create_control_svg.sh tools/purge_non_existing_images.sh tools/basecurve/* tools/noise/* +%patch1 -p1 +chmod -x tools/basecurve/* tools/noise/* cp %{S:1} %{S:2} %{S:3} %{S:4} . cp %{S:99} . @@ -195,51 +233,99 @@ export CXX="/usr/bin/clang++" %endif export _OPENCL_INCLUDE_DIR=$(clang -print-search-dirs | awk -F= '/^libra/ {print $2}' | awk -F: '{print $1 "/include"}') +%if 0%{?suse_version} +#suse branch %cmake \ -DCLANG_OPENCL_INCLUDE_DIR=${_OPENCL_INCLUDE_DIR} \ %if ! %{with system_lua} -DDONT_USE_INTERNAL_LUA=Off \ %endif + %ifarch aarch64 + -DTESTBUILD_OPENCL_PROGRAMS=OFF \ + %endif %{cmake_options} \ || cat CMakeFiles/CMakeError.log make %{_smp_mflags} VERBOSE=1 cd $BUILDDIR -pushd tools/basecurve +cd tools/basecurve %cmake make %{_smp_mflags} VERBOSE=1 +#/ suse branch +%else +#fedora branch +mkdir %{_target_platform} +pushd %{_target_platform} +%cmake \ + %if ! %{with system_lua} + -DDONT_USE_INTERNAL_LUA=Off \ + %endif + %ifarch aarch64 + -DTESTBUILD_OPENCL_PROGRAMS=OFF \ + %endif + %{cmake_options} .. +make %{_smp_mflags} VERBOSE=1 +cd $BUILDDIR + +%if %{with basecurve_tool} +cd tools/basecurve +mkdir %{_target_platform} +pushd %{_target_platform} +%cmake .. +make %{_smp_mflags} VERBOSE=1 +%endif +%endif cd $BUILDDIR %install +%if 0%{?suse_version} +# suse branch %cmake_install +%if %{with basecurve_tool} pushd tools/basecurve %cmake_install popd +%endif %suse_update_desktop_file darktable + +mkdir -p %{buildroot}%{_defaultdocdir}/%{pkg_name}/ +mv %{buildroot}%{_datadir}/doc/darktable/* %{buildroot}%{_defaultdocdir}/%{pkg_name}/ +#/ suse branch +%else +# fedora branch +make install DESTDIR="%{buildroot}" -C %{_target_platform} +%if %{with basecurve_tool} +make install DESTDIR="%{buildroot}" -C tools/basecurve/%{_target_platform} +%endif +#/ fedora branch +%endif find %{buildroot}%{_libdir} -name "*.la" -delete %find_lang darktable -mkdir -p %{buildroot}%{_defaultdocdir}/%{name}/tools/ - -mkdir -p %{buildroot}%{_defaultdocdir}/%{name}/tools/basecurve/ - -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} + doc/TODO doc/TRANSLATORS.md \ + %{buildroot}%{_defaultdocdir}/%{pkg_name} + +mkdir -p %{buildroot}%{_defaultdocdir}/%{pkg_name}/tools/ %{buildroot}%{_datadir}/%{pkg_name}/tools/ -cp -av tools/purge* \ - %{buildroot}%{_defaultdocdir}/%{name}/tools/ +cp -av tools/purge* tools/common.sh \ + %{buildroot}%{_datadir}/%{pkg_name}/tools/ -cp -av tools/basecurve/plot* tools/basecurve/README.md \ - %{buildroot}%{_defaultdocdir}/%{name}/tools/basecurve/ +%if %{with basecurve_tool} +mkdir -p %{buildroot}%{_datadir}/%{pkg_name}/tools/basecurve/ +cp -av tools/basecurve/plot* \ + %{buildroot}%{_datadir}/%{pkg_name}/tools/basecurve/ + +install -D -m 0644 tools/basecurve/README.md \ + %{buildroot}%{_defaultdocdir}/%{pkg_name}/README.tools.basecurve.md +%endif %fdupes %{buildroot} +%if 0%{?suse_version} # on newer distros it is handled via file trigger -%if 0%{?suse_version} && 0%{?suse_version} < 1500 +%if 0%{?suse_version} < 1500 %post %desktop_database_post %icon_theme_cache_post @@ -248,12 +334,28 @@ %desktop_database_postun %icon_theme_cache_postun %endif +%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/ +%doc %{_defaultdocdir}/%{pkg_name} +%exclude %{_defaultdocdir}/%{pkg_name}/*.pdf +%if %{with basecurve_tool} +%exclude %{_defaultdocdir}/%{pkg_name}/README.tools.basecurve.md +%endif %{_bindir}/darktable %{_bindir}/darktable-cltest %{_bindir}/darktable-cli @@ -264,6 +366,7 @@ %{_libdir}/darktable %{_datadir}/applications/darktable.desktop %{_datadir}/darktable +%exclude %{_datadir}/%{pkg_name}/tools/basecurve/ %dir %{_datadir}/appdata %{_datadir}/appdata/darktable.appdata.xml %{_datadir}/icons/hicolor/*/apps/darktable* @@ -272,14 +375,26 @@ %{_mandir}/*/man1/darktable*.1* %endif +%if %{with basecurve_tool} %files tools-basecurve %defattr(-,root,root) %{_bindir}/dt-curve-tool %{_bindir}/dt-curve-tool-helper -%doc %{_defaultdocdir}/%{name}/tools/basecurve/ +%{_datadir}/%{pkg_name}/tools/basecurve/ +%doc %{_defaultdocdir}/%{pkg_name}/README.tools.basecurve.md +%endif + +%files tools-noise +%defattr(-,root,root) +%dir %{_libexecdir}/darktable +%dir %{_libexecdir}/darktable/tools +%{_libexecdir}/darktable/tools/darktable-gen-noiseprofile +%{_libexecdir}/darktable/tools/darktable-noiseprofile +%{_libexecdir}/darktable/tools/profiling-shot.xmp +%{_libexecdir}/darktable/tools/subr.sh %files doc %defattr(-,root,root) -%{_defaultdocdir}/%{name}/*.pdf +%{_defaultdocdir}/%{pkg_name}/*.pdf %changelog ++++++ 887d55c.patch ++++++ commit 887d55c86c66ba4dcd90fe7574c18125dde916c6 Author: Andreas Schneider <asn@cryptomilk.org> Date: Fri Apr 27 07:55:51 2018 +0200 tools: Fix typo in darktable-gen-noiseprofile Signed-off-by: Andreas Schneider <asn@cryptomilk.org> (cherry picked from commit 42c43728b70817ec9d4b59a6f8f1b03e2b5473af) diff --git a/tools/noise/darktable-gen-noiseprofile b/tools/noise/darktable-gen-noiseprofile index 0e999a583..ea95f5659 100755 --- a/tools/noise/darktable-gen-noiseprofile +++ b/tools/noise/darktable-gen-noiseprofile @@ -134,7 +134,7 @@ profile_image() { xmp="$scriptdir/profiling-shot.xmp" noiseprofile="$scriptdir/darktable-noiseprofile" - if [ ! -x "$scriptdir/dt-noiseprofile" ]; then + if [ ! -x "$scriptdir/darktable-noiseprofile" ]; then echo "ERROR: Could not find darktable-noiseprofile tool in $scriptdir" exit 1 fi ++++++ darktable-2.4.0.tar.xz -> darktable-2.4.3.tar.xz ++++++ ++++ 76491 lines of diff (skipped) ++++++ darktable.dsc ++++++ Format: 3.0 (quilt) Source: darktable Binary: darktable Architecture: any-amd64 any-arm64 Version: 2.4.3-1.1 Homepage: http://www.darktable.org/ Standards-Version: 3.9.8 Build-Depends: cmake, debhelper (>= 9), intltool, iso-codes, libcairo2-dev, libcolord-dev, libcolord-gtk-dev, libcups2-dev, libcurl4-gnutls-dev | libcurl-dev, libexiv2-dev, libflickcurl-dev, libglib2.0-dev, libgphoto2-dev, libgraphicsmagick1-dev, libgtk-3-dev, libjpeg-dev, libjson-glib-dev, liblcms2-dev, liblensfun-dev, liblua5.3-dev, libopenexr-dev, libopenjp2-7-dev, libosmgpsmap-1.0-dev, libpng-dev, libpugixml-dev, librsvg2-dev, libsecret-1-dev, libsoup2.4-dev, libsqlite3-dev, libtiff5-dev, libtiff-dev, libwebp-dev, xsltproc Package-List: darktable deb graphics optional arch=any-amd64,any-arm64