Dominique Leuenberger 2015-12-24 11:17:09 +00:00 committed by Git OBS Bridge
parent f4a52ea0f6
commit 35e6f99f00
5 changed files with 394 additions and 102 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:223db92ebb6ffe3322a492b06b244121542d266eaddc480aa7451f7611a69066
size 3130072

3
darktable-2.0.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d4f2f525bbbb1355bc3470e74cc158d79d7e236f3925928f67a88461f1df7cb1
size 2888596

View File

@ -1,3 +1,235 @@
-------------------------------------------------------------------
Tue Dec 22 16:33:36 UTC 2015 - mrueckert@suse.de
- update to 2.0.0
when updating from the currently stable 1.6.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.0 to 1.6.x any
more.
Robert Hutton has done a video covering the new features and
other changes between darktable 1.6 and 2.0:
https://youtu.be/VJbJ0btlui0
gui:
* darktable has been ported to gtk-3.0
* the viewport in darkroom mode is now dynamically sized, you
specify the border width
* side panels now default to a width of 350px in dt 2.0
instead of 300px in dt 1.6
* further hidpi enhancements
* navigating lighttable with arrow keys and space/enter
* brush size/hardness/opacity have key accels
* allow adding tone- and basecurve nodes with ctrl-click
* the facebook login procedure is a little different now
* image information now supports gps altitude
features:
* new print mode
* reworked screen color management (softproof, gamut check etc.)
* delete/trash feature
* pdf export
* export can upscale
* new "mode" parameter in the export panel to fine tune
application of styles upon export
core improvements:
* new thumbnail cache replaces mipmap cache (much improved speed,
stability and seamless support for even up to 4K/5K screens)
* all thumbnails are now properly fully color-managed
* it is now possible to generate thumbnails for all images in the
library using new darktable-generate-cache tool
* we no longer drop history entries above the selected one when
leaving darkroom mode or switching images
* high quality export now downsamples before watermark and
framing to guarantee consistent results
* optimizations to loading jpeg's when using libjpeg-turbo with
its custom features
* asynchronous camera and printer detection, prevents deadlocks
in some cases
* noiseprofiles are in external JSON file now
* aspect ratios for crop&rotate can be added to config file
image operations:
* color reconstruction module
* magic lantern-style deflicker was added to the exposure module
(extremely useful for timelapses)
* text watermarks
* shadows&highlights: add option for white point adjustment
* more proper Kelvin temperature, fine-tuning preset
interpolation in white balance iop
* monochrome raw demosaicing (for cameras with color filter array
physically removed)
* raw black/white point module
packaging:
* removed dependency on libraw
* removed dependency on libsquish (solves patent issues as a side
effect)
* unbundled pugixml, osm-gps-map and colord-gtk
generic:
* 32-bit support is soft-deprecated due to limited virtual
address space
* support for building with gcc earlier than 4.8 is
soft-deprecated
* numerous memory leaks were exterminated
* overall stability enhancements
scripting:
* lua scripts can now add UI elements to the lighttable view
(buttons, sliders etc...)
* a new repository for external lua scripts was started:
https://github.com/darktable-org/lua-scripts
* it is now possible to edit the collection filters via lua
* it is now possible to add new cropping guides via lua
* it is now possible to run background tasks in lua
* a lua event is generated when the mouse under the cursor
changes
Usermanual has been updated, and will be released shortly after.
New camera support, compared to 1.6.9:
Base Support
- Canon PowerShot G5 X
- Olympus SP320
- Panasonic DMC-FZ150 (3:2)
- Panasonic DMC-FZ70 (1:1, 3:2, 16:9)
- Panasonic DMC-FZ72 (1:1, 3:2, 16:9)
- Panasonic DMC-GF7 (1:1, 3:2, 16:9)
- Panasonic DMC-GX8 (4:3)
- Panasonic DMC-LF1 (3:2, 16:9, 1:1)
- Sony DSC-RX10M2
White Balance Presets
- Canon EOS M3
- Canon EOS-1D Mark III
- Canon EOS-1Ds Mark III
- Canon PowerShot G1 X
- Canon PowerShot G1 X Mark II
- Canon PowerShot G15
- Canon PowerShot G16
- Canon PowerShot G3 X
- Canon PowerShot G5 X
- Canon PowerShot S110
- Panasonic DMC-GX8
- Panasonic DMC-LF1
- Pentax *ist DL2
- Sony DSC-RX1
- Sony DSC-RX10M2
- Sony DSC-RX1R
- Sony DSLR-A500
- Sony DSLR-A580
- Sony ILCE-3000
- Sony ILCE-5000
- Sony ILCE-5100
- Sony ILCE-6000
- Sony ILCE-7S
- Sony ILCE-7SM2
- Sony NEX-3N
- Sony NEX-5T
- Sony NEX-F3
- Sony SLT-A33
- Sony SLT-A35
Noise Profiles
- Canon EOS M3
- Fujifilm X-E1
- Fujifilm X30
- Nikon Coolpix P7700
- Olympus E-M10 Mark II
- Olympus E-M5 Mark II
- Olympus E-PL3
- Panasonic DMC-GX8
- Panasonic DMC-LF1
- Pentax K-50
- Sony DSC-RX1
- Sony DSC-RX10M2
- Sony ILCA-77M2
- Sony ILCE-7M2
- Sony ILCE-7RM2
- Sony SLT-A58
-------------------------------------------------------------------
Tue Nov 17 16:49:13 UTC 2015 - mrueckert@suse.de
- s/pkg-config/pkgconfig/ for fedora
-------------------------------------------------------------------
Tue Nov 17 14:34:43 UTC 2015 - mrueckert@suse.de
- add fedora 23 support to conditionals
- enable osm gps map support for fedora >= 22
- extract the cmake options into a define
-------------------------------------------------------------------
Fri Nov 13 14:29:48 UTC 2015 - mrueckert@suse.de
- first steps to build also on fedora
-------------------------------------------------------------------
Tue Nov 3 22:32:01 UTC 2015 - mrueckert@suse.de
- restore some cmake flags to make the package more compatible with
CPUs
-------------------------------------------------------------------
Tue Nov 3 20:36:48 UTC 2015 - mrueckert@suse.de
- make more BR conditional to enable building on more distros
-------------------------------------------------------------------
Sun Nov 1 23:20:51 UTC 2015 - mrueckert@suse.de
- do not strip the rpath, DT actually needs it.
-------------------------------------------------------------------
Sun Nov 1 22:32:36 UTC 2015 - mrueckert@suse.de
- update to 2.0~rc1
when updating from the currently stable 1.6.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.0 to 1.6.x any
more. be careful if you need darktable for production work!
- darktable has been ported to gtk-3.0
- new thumbnail cache replaces mipmap cache (much improved speed,
less crashiness)
- added print mode
- reworked screen color management (softproof, gamut check etc.)
- text watermarks
- color reconstruction module
- raw black/white point module
- delete/trash feature
- addition to shadows&highlights
- more proper Kelvin temperature, fine-tuning preset
interpolation in WB iop
- noiseprofiles are in external JSON file now
- monochrome raw demosaicing (not sure whether it will stay for
release, like Deflicker, but hopefully it will stay)
- aspect ratios for crop&rotate can be added to conf (ae36f03)
- navigating lighttable with arrow keys and space/enter
- pdf export -- some changes might happen there still
- brush size/hardness/opacity have key accels
- the facebook login procedure is a little different now
- export can upscale
- we no longer drop history entries above the selected one when
leaving dr or switching images
- text/font/color in watermarks
- image information now supports gps altitude
- allow adding tone- and basecurve nodes with ctrl-click
- we renamed mipmaps to thumbnails in the preferences
- new "mode" parameter in the export panel
- high quality export now downsamples before watermark and frame
to guarantee consistent results
- lua scripts can now add UI elements to the lighttable view
(buttons, sliders etc...)
- a new repository for external lua scripts was started.
- drop generate generate-tarball.sh as it is no longer needed
- use cmake macros
- start buildrequires list from scratch
-------------------------------------------------------------------
Wed Oct 21 09:43:32 UTC 2015 - mrueckert@suse.de

View File

@ -15,85 +15,114 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%if 0%{?suse_version} >= 1320 || 0%{?fedora_version} >= 22 || 0%{?fc22}%{?fc23}
%bcond_without osmgpsmap
%else
%bcond_with osmgpsmap
%endif
%if (0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315) || 0%{?rhel_version} > 6 || 0%{?centos_version} > 6 || 0%{?fedora_version} >= 20 || 0%{?el7}%{?fc20}%{?fc21}%{?fc22}%{?fc23}
%bcond_without flickcurl
%bcond_without translated_manpages
%else
%bcond_with flickcurl
%bcond_with translated_manpages
%endif
%if 0%{?suse_version}
%bcond_without system_lua
%else
%bcond_with system_lua
%endif
%if 0%{?suse_version} > 1320 || 0%{?rhel_version} > 6 || 0%{?centos_version} > 6 || 0%{?fedora_version} >= 20 || 0%{?el7}%{?fc20}%{?fc21}%{?fc22}%{?fc23}
%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 -DPROJECT_VERSION:STRING="%{name}-%{version}-%{release}"
Name: darktable
Version: 1.6.9
Version: 2.0.0
Release: 0
Url: http://darktable.sourceforge.net
# darktable contains patented code that we cannot ship. Therefore we use
# this script to remove the patented code before shipping it.
# Download the upstream tarball and invoke this script while in the
# tarball's directory:
# Originial Source: https://github.com/darktable-org/darktable/releases/download/release-%{version}/darktable-%{version}tar.xz
# ./generate-tarball.sh
Source0: %name-%version-nopatents.tar.xz
Url: http://www.darktable.org/
Source0: https://github.com/darktable-org/darktable/releases/download/release-%{version}/%{name}-%{version}.tar.xz
Source1: https://github.com/darktable-org/darktable/releases/download/release-1.6.0/darktable-usermanual.pdf
Source2: README.openSUSE
Source3: generate-tarball.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64
# build time tools
BuildRequires: cmake
BuildRequires: dbus-1-glib-devel
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: intltool
BuildRequires: lensfun-devel
BuildRequires: libcolord-devel
BuildRequires: libxslt
%if %{with translated_manpages}
BuildRequires: po4a
%endif
%if 0%{?suse_version}
BuildRequires: update-desktop-files
%endif
BuildRequires: desktop-file-utils
BuildRequires: hicolor-icon-theme
BuildRequires: xz
# libraries deps
BuildRequires: cups-devel
BuildRequires: libjpeg-devel
BuildRequires: libtiff-devel
BuildRequires: libxslt
BuildRequires: pkg-config
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(GraphicsMagick)
BuildRequires: pkgconfig(OpenEXR)
BuildRequires: pkgconfig(dri)
BuildRequires: pkgconfig(exiv2)
BuildRequires: pkgconfig(flickcurl)
BuildRequires: pkgconfig(gnome-keyring-1)
BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(lcms2)
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(libglade-2.0)
BuildRequires: pkgconfig(libgphoto2)
BuildRequires: pkgconfig(libopenjpeg)
BuildRequires: pkgconfig(librsvg-2.0)
BuildRequires: pkgconfig(libsoup-2.4)
BuildRequires: pkgconfig(sdl)
BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(xrandr)
ExclusiveArch: %ix86 x86_64
%if 0%{?suse_version} > 1220
BuildRequires: pkgconfig(libsecret-1)
BuildRequires: pkgconfig(libwebp)
%endif
%if 0%{?suse_version} < 1315
BuildRequires: libGraphicsMagick3
%endif
%if 0%{?suse_version} && (0%{?suse_version} > 1210 && 0%{?suse_version} < 1321)
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
%if 0%{?suse_version} > 1210
BuildRequires: pkgconfig(libopenjpeg)
%endif
%if 0%{?suse_version} == 1210
BuildRequires: xz
%endif
# needed for darktable black UI
%if 0%{?suse_version} == 1210
Requires: gtk2-engines
BuildRequires: pugixml-devel
#
BuildRequires: pkgconfig
%if 0%{?suse_version} != 1315
BuildRequires: pkgconfig(GraphicsMagick)
%if 0%{?suse_version} && 0%{?suse_version} < 1315
BuildRequires: libGraphicsMagick3
%endif
%if 0%{?suse_version} > 1210
Requires: gtk2-engine-clearlooks
BuildRequires: pkgconfig(libopenjpeg1)
%endif
BuildRequires: pkgconfig(OpenEXR)
BuildRequires: pkgconfig(atk)
BuildRequires: pkgconfig(colord)
BuildRequires: pkgconfig(colord-gtk)
BuildRequires: pkgconfig(exiv2)
%if %{with flickcurl}
BuildRequires: pkgconfig(flickcurl)
%endif
BuildRequires: pkgconfig(gdk-pixbuf-2.0)
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gnome-keyring-1)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(lensfun)
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(libgphoto2)
BuildRequires: pkgconfig(librsvg-2.0)
BuildRequires: pkgconfig(libsecret-1)
BuildRequires: pkgconfig(libwebp)
%if %{with osmgpsmap}
BuildRequires: pkgconfig(osmgpsmap-1.0)
%endif
BuildRequires: pkgconfig(pango)
BuildRequires: pkgconfig(sdl)
BuildRequires: pkgconfig(sqlite3)
%if %{with system_opencl}
BuildRequires: opencl-headers
%endif
#
Summary: A virtual Lighttable and Darkroom
License: GPL-3.0+
Group: Productivity/Graphics/Viewers
@ -115,50 +144,94 @@ lighttable. it also enables you to develop raw images and enhance them.
This package provides the user manual in pdf format
%prep
%setup -q
%setup -q -n %{name}-%{version}
chmod -x tools/create_control_svg.sh tools/purge_non_existing_images.sh tools/basecurve/* tools/noise/*
cp %{S:1} darktable-usermanual.pdf
cp %{S:2} .
%if %{with system_opencl}
# Remove bundled OpenCL headers.
rm -rf src/external/CL
sed -i -e 's, \"external/CL/\*\.h\" , ,' src/CMakeLists.txt
%endif
%if %{with system_lua}
# Remove bundled lua
rm -rf src/external/lua/
%endif
%build
[ ! -d "build" ] && mkdir build
cd build
export CFLAGS="%{optflags} -fno-strict-aliasing "
export CXXFLAGS="$CFLAGS"
cmake \
-DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_INSTALL=%{_lib} \
-DCMAKE_BUILD_TYPE=Release \
-DBINARY_PACKAGE_BUILD=1 \
-DUSE_XMLLINT=OFF \
-DUSE_SQUISH=OFF -DUSE_COLORD=ON -DBUILD_CMSTEST=On \
..
%__make %{_smp_mflags} VERBOSE=1
#%%__make -j 1 VERBOSE=1
echo "#define PACKAGE_VERSION \"%{version}\"" | tee src/version_gen.h
%if 0%{?suse_version}
%cmake %{cmake_options}
%else
mkdir %{_target_platform}
pushd %{_target_platform}
%cmake %{cmake_options} ..
%endif
make %{_smp_mflags} VERBOSE=1
%install
cd build
%make_install
cd ..
%if 0%{?suse_version}
%cmake_install
%else
pushd %{_target_platform}
make install DESTDIR="%{buildroot}"
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}
%__mv %{buildroot}%{_datadir}/doc/darktable %{buildroot}%{_defaultdocdir}
cp %{S:2} %buildroot%_defaultdocdir/%name/.
mkdir -p %{buildroot}%{_defaultdocdir}/%{name}/tools/
%if 0%{?suse_version}
mv %{buildroot}%{_datadir}/doc/darktable/* %{buildroot}%{_defaultdocdir}/%{name}/
%endif
cp -av %{S:2} doc/ChangeLog doc/NEWS \
doc/thumbnail_color_management.txt \
doc/TODO doc/TRANSLATORS \
%{buildroot}%{_defaultdocdir}/%{name}
cp -av tools/purge* \
%{buildroot}%{_defaultdocdir}/%{name}/tools/
%fdupes %{buildroot}
%if 0%{?suse_version}
%post
%desktop_database_post
%icon_theme_cache_post
%postun
%desktop_database_postun
%icon_theme_cache_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 doc/AUTHORS doc/TODO doc/LICENSE tools/purge_non_existing_images.sh tools/create_control_svg.sh tools/noise tools/basecurve README.openSUSE
%doc %{_defaultdocdir}/%{name}
%{_bindir}/darktable
%{_bindir}/darktable-cltest
%{_bindir}/darktable-cli
%{_bindir}/darktable-generate-cache
%{_bindir}/darktable-viewer
%{_bindir}/darktable-cmstest
%{_libdir}/darktable
@ -167,7 +240,10 @@ cp %{S:2} %buildroot%_defaultdocdir/%name/.
%dir %{_datadir}/appdata
%{_datadir}/appdata/darktable.appdata.xml
%{_datadir}/icons/hicolor/*/apps/darktable*
%{_mandir}/man1/darktable*.1.*
%{_mandir}/man1/darktable*.1*
%if %{with translated_manpages}
%{_mandir}/*/man1/darktable*.1*
%endif
%files doc
%defattr(-,root,root)

View File

@ -1,16 +0,0 @@
#!/bin/sh
VERSION=$1
if [ "x$VERSION" == "x" ] ; then
echo "Please call $0 with a version number as parameter. Exiting."
exit 1
fi
tar -xJvf darktable-$VERSION.tar.xz
rm -rf darktable-$VERSION/src/external/squish
tar -cJvf darktable-$VERSION-nopatents.tar.xz darktable-$VERSION
rm -rf darktable-$VERSION/
rm darktable-$VERSION.tar.xz