diff --git a/0001-Allow-compilation-with-colord-and-without-squish.patch b/0001-Allow-compilation-with-colord-and-without-squish.patch deleted file mode 100644 index b665c6e..0000000 --- a/0001-Allow-compilation-with-colord-and-without-squish.patch +++ /dev/null @@ -1,41 +0,0 @@ -From f1604c556506fcfc0ae6c9c8fa21fb8c6a990d18 Mon Sep 17 00:00:00 2001 -From: Tobias Ellinghaus -Date: Sun, 24 Nov 2013 16:17:06 +0100 -Subject: [PATCH] Allow compilation with colord and without squish - -Signed-off-by: Togan Muftuoglu ---- - src/CMakeLists.txt | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index a82c4ad..d7ed303 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -470,8 +470,6 @@ else(USE_GEO) - message(STATUS "Map mode: disabled") - endif(USE_GEO) - --target_link_libraries(lib_darktable ${LIBS}) -- - # libcolord-gtk: - if(USE_COLORD) - find_package(Colord) -@@ -496,11 +494,13 @@ if(USE_SQUISH) - add_dependencies(lib_darktable squish) - add_library(squish_static STATIC IMPORTED) - set_target_properties(squish_static PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/external/squish/libsquish.a) --target_link_libraries(lib_darktable ${LIBS} squish_static) -+target_link_libraries(lib_darktable squish_static) - add_subdirectory(external/squish) - add_definitions("-DHAVE_SQUISH") - endif(USE_SQUISH) - -+target_link_libraries(lib_darktable ${LIBS}) -+ - install(TARGETS lib_darktable DESTINATION ${LIB_INSTALL}/darktable) - # make sure static libs is first - list(INSERT LIBS 0 lib_darktable ${STATIC_LIBS}) --- -1.8.4.3 - diff --git a/darktable-1.4-nopatents.tar.xz b/darktable-1.4-nopatents.tar.xz deleted file mode 100644 index a34e8aa..0000000 --- a/darktable-1.4-nopatents.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f79d4a5d2ed982bb334c95737de78f61a5a6682425bc3c3990edfa0fa3455912 -size 2795552 diff --git a/darktable-1.4.1-nopatents.tar.xz b/darktable-1.4.1-nopatents.tar.xz new file mode 100644 index 0000000..e08876d --- /dev/null +++ b/darktable-1.4.1-nopatents.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:612b88bae2a0a601e5c1ddda0658ae2d320f73da5a27408ff3841a2839643dee +size 2816676 diff --git a/darktable.changes b/darktable.changes index 955805f..0e3ba7e 100644 --- a/darktable.changes +++ b/darktable.changes @@ -1,3 +1,40 @@ +------------------------------------------------------------------- +Sun Feb 9 12:59:09 UTC 2014 - toganm@opensuse.org + +- update to version 1.4.1 + + * export: consistent names for output formats + * export to disk: overwrite file option + * grain plugin now allows smaller coarseness and will display + coarseness values half of what they used to be, this is merely a + cosmetic change, your images are unaffected. + * some masks related fixes + * some lua related fixes + * tiff writer (32bit float, little endian output, configurable + compression) + * tiff reader + * subtly nicer scrollbar behavior + * theme loading cornercase fixups + * shadow & highlight module improvements (should be less prone to + artifacts when used on new images) + * allow importing more than 1 style at a time + * regression was fixed when building darktable against bleeding + edge glibc + * Sony A77V enhanced color matrix + * Nikon D5100 updated white balance presets + * Nikon 1 V2 noise profile (and by extension J3/AW1) + * Nikon 1 J1 noise profile (and by extension V1/J2/S1) + * Pentax K3 noise profile + * experimental support for Panasonic DMC-LF1 (we still need + samples for the nonstandard aspect ratios) + * experimental support for SONY DSC-RX100M2 + * experimental support for SONY NEX-3N + * still no Nikon D5300/D3300 support, we're still looking into + that. + + +- Added pkgconfig(xandr) to build requires + ------------------------------------------------------------------- Wed Jan 1 11:54:39 UTC 2014 - adrian@suse.de diff --git a/darktable.spec b/darktable.spec index 654e842..2b0734f 100644 --- a/darktable.spec +++ b/darktable.spec @@ -17,7 +17,7 @@ Name: darktable -Version: 1.4 +Version: 1.4.1 Release: 0 Url: http://darktable.sourceforge.net # darktable contains patented code that we cannot ship. Therefore we use @@ -61,6 +61,7 @@ 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(libwebp) @@ -121,10 +122,12 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DBINARY_PACKAGE_BUILD=1 \ -DUSE_XMLLINT=OFF \ - -DUSE_SQUISH=OFF -DUSE_COLORD=ON \ + -DUSE_SQUISH=OFF -DUSE_COLORD=ON -DBUILD_CMSTEST=On \ -DINSTALL_IOP_EXPERIMENTAL=On .. %__make %{_smp_mflags} VERBOSE=1 +#%%__make -j 1 VERBOSE=1 + %install cd build %make_install @@ -146,6 +149,7 @@ cp %{S:2} %buildroot%_defaultdocdir/%name/. %{_bindir}/darktable-cltest %{_bindir}/darktable-cli %{_bindir}/darktable-viewer +%{_bindir}/darktable-cmstest %{_libdir}/darktable %{_datadir}/applications/darktable.desktop %{_datadir}/darktable