Accepting request 198449 from graphics
upgrade that fixes bnc#837745 (forwarded request 198447 from toganm) OBS-URL: https://build.opensuse.org/request/show/198449 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/darktable?expand=0&rev=34
This commit is contained in:
Stephan Kulow
Git OBS Bridge
parent
45f3299e02
commit
71c0ca9155
@ -1,38 +0,0 @@
|
|||||||
From 796937043871aadbd0c0dc61bc90ea674ec1bc18 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Alex Tutubalin <lexa@lexa.ru>
|
|
||||||
Date: Fri, 24 May 2013 23:20:57 +0400
|
|
||||||
Subject: [PATCH] fixed error handling for broken full-color images
|
|
||||||
|
|
||||||
---
|
|
||||||
src/external/LibRaw/src/libraw_cxx.cpp | 8 ++++----
|
|
||||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/external/LibRaw/src/libraw_cxx.cpp b/src/external/LibRaw/src/libraw_cxx.cpp
|
|
||||||
index 218460c..977e40a 100644
|
|
||||||
--- a/src/external/LibRaw/src/libraw_cxx.cpp
|
|
||||||
+++ b/src/external/LibRaw/src/libraw_cxx.cpp
|
|
||||||
@@ -796,8 +796,8 @@ int LibRaw::unpack(void)
|
|
||||||
S.iheight= S.height;
|
|
||||||
IO.shrink = 0;
|
|
||||||
// allocate image as temporary buffer, size
|
|
||||||
- imgdata.rawdata.raw_alloc = calloc(S.iwidth*S.iheight,sizeof(*imgdata.image));
|
|
||||||
- imgdata.image = (ushort (*)[4]) imgdata.rawdata.raw_alloc;
|
|
||||||
+ imgdata.rawdata.raw_alloc = 0;
|
|
||||||
+ imgdata.image = (ushort (*)[4]) calloc(S.iwidth*S.iheight,sizeof(*imgdata.image));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@@ -807,8 +807,8 @@ int LibRaw::unpack(void)
|
|
||||||
// recover saved
|
|
||||||
if( decoder_info.decoder_flags & LIBRAW_DECODER_LEGACY)
|
|
||||||
{
|
|
||||||
- imgdata.image = 0;
|
|
||||||
- imgdata.rawdata.color_image = (ushort (*)[4]) imgdata.rawdata.raw_alloc;
|
|
||||||
+ imgdata.rawdata.raw_alloc = imgdata.rawdata.color_image = imgdata.image;
|
|
||||||
+ imgdata.image = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
// calculate channel maximum
|
|
||||||
--
|
|
||||||
1.8.3
|
|
||||||
|
|
||||||
@ -1,85 +0,0 @@
|
|||||||
From 1b9952c990c3611691306bfd46e0929c7fc14386 Mon Sep 17 00:00:00 2001
|
|
||||||
From: johannes hanika <hanika@kit.edu>
|
|
||||||
Date: Mon, 10 Jun 2013 11:25:09 +0200
|
|
||||||
Subject: [PATCH] thumbnail compression: make libsquish optional.
|
|
||||||
|
|
||||||
some poor sobs in undeveloped countries are concerned by software patents.
|
|
||||||
|
|
||||||
Signed-off-by: Togan Muftuoglu <toganm@users.sourceforge.net>
|
|
||||||
---
|
|
||||||
CMakeLists.txt | 1 +
|
|
||||||
src/CMakeLists.txt | 3 +++
|
|
||||||
src/common/mipmap_cache.c | 6 ++++++
|
|
||||||
3 files changed, 10 insertions(+)
|
|
||||||
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -10,6 +10,7 @@ option(USE_FLICKR "Enable Flickr support
|
|
||||||
option(USE_GLIBJSON "Enable GlibJson support" ON)
|
|
||||||
option(USE_GNOME_KEYRING "Build gnome-keyring password storage backend" ON)
|
|
||||||
option(USE_UNITY "Use libunity to report progress in the launcher" OFF)
|
|
||||||
+option(USE_SQUISH "Use thumbnail compression via libsquish" OFF)
|
|
||||||
option(BUILD_SLIDESHOW "Build the opengl slideshow viewer" ON)
|
|
||||||
option(USE_OPENMP "Use openmp threading support." ON)
|
|
||||||
option(USE_OPENCL "Use OpenCL support." ON)
|
|
||||||
--- a/src/CMakeLists.txt
|
|
||||||
+++ b/src/CMakeLists.txt
|
|
||||||
@@ -491,12 +491,15 @@ if(USE_COLORD)
|
|
||||||
endif(COLORD_FOUND)
|
|
||||||
endif(USE_COLORD)
|
|
||||||
|
|
||||||
+if(USE_SQUISH)
|
|
||||||
# libsquish for compressed thumbnails:
|
|
||||||
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)
|
|
||||||
add_subdirectory(external/squish)
|
|
||||||
+add_definitions("-DHAVE_SQUISH")
|
|
||||||
+endif(USE_SQUISH)
|
|
||||||
|
|
||||||
install(TARGETS lib_darktable DESTINATION ${LIB_INSTALL}/darktable)
|
|
||||||
# make sure static libs is first
|
|
||||||
--- a/src/common/mipmap_cache.c
|
|
||||||
+++ b/src/common/mipmap_cache.c
|
|
||||||
@@ -26,7 +26,9 @@
|
|
||||||
#include "control/conf.h"
|
|
||||||
#include "control/jobs.h"
|
|
||||||
#include "libraw/libraw.h"
|
|
||||||
+#ifdef HAVE_SQUISH
|
|
||||||
#include "squish/csquish.h"
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#include <assert.h>
|
|
||||||
#include <string.h>
|
|
||||||
@@ -1340,12 +1342,14 @@ dt_mipmap_cache_decompress(
|
|
||||||
const dt_mipmap_buffer_t *buf,
|
|
||||||
uint8_t *scratchmem)
|
|
||||||
{
|
|
||||||
+#ifdef HAVE_SQUISH
|
|
||||||
if(darktable.mipmap_cache->compression_type && buf->width > 8 && buf->height > 8)
|
|
||||||
{
|
|
||||||
squish_decompress_image(scratchmem, buf->width, buf->height, buf->buf, squish_dxt1);
|
|
||||||
return scratchmem;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
+#endif
|
|
||||||
{
|
|
||||||
return buf->buf;
|
|
||||||
}
|
|
||||||
@@ -1359,6 +1363,7 @@ dt_mipmap_cache_compress(
|
|
||||||
dt_mipmap_buffer_t *buf,
|
|
||||||
uint8_t *const scratchmem)
|
|
||||||
{
|
|
||||||
+#ifdef HAVE_SQUISH
|
|
||||||
// only do something if compression is on, don't compress skulls:
|
|
||||||
if(darktable.mipmap_cache->compression_type && buf->width > 8 && buf->height > 8)
|
|
||||||
{
|
|
||||||
@@ -1367,6 +1372,7 @@ dt_mipmap_cache_compress(
|
|
||||||
if(darktable.mipmap_cache->compression_type == 1) flags |= squish_colour_range_fit;
|
|
||||||
squish_compress_image(scratchmem, buf->width, buf->height, buf->buf, squish_dxt1);
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:12a708e443f3190ca6f57afd9e071f7c2da62e685ef5eba72e921692d8c6e54b
|
|
||||||
size 2293140
|
|
||||||
3
darktable-1.2.3-nopatents.tar.xz
Normal file
3
darktable-1.2.3-nopatents.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:9ba57335b654f1f765a76d8e72dc8c495b775a3c10f005e0a85ce5dafc7a96d2
|
||||||
|
size 2353480
|
||||||
@ -1,3 +1,63 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Sep 10 19:28:34 UTC 2013 - toganm@opensuse.org
|
||||||
|
|
||||||
|
- Update to version 1.2.3
|
||||||
|
+ Update to RawSpeed r570
|
||||||
|
+ Canon 70D (preliminary)
|
||||||
|
+ Olympus E-P5 (incl. preliminary Adobe Coeff.)
|
||||||
|
+ Samsung NX2000
|
||||||
|
+ Sony RX100m2
|
||||||
|
+ Sony SLT-A58 (updated)
|
||||||
|
|
||||||
|
* White Balance Presets:
|
||||||
|
|
||||||
|
+ Sony NEX-5R
|
||||||
|
+ Sony SLT-A58
|
||||||
|
+ Nikon D3200 (updated)
|
||||||
|
+ Pentax K20D
|
||||||
|
|
||||||
|
* Enhanced Color Matrix:
|
||||||
|
|
||||||
|
+ Pentax K20D
|
||||||
|
|
||||||
|
* Noise Profiles:
|
||||||
|
|
||||||
|
+ Canon EOS 1100D == Canon EOS Rebel T3
|
||||||
|
+ Canon PowerShot S95
|
||||||
|
+ Canon PowerShot G11
|
||||||
|
+ Nikon Coolpix P330
|
||||||
|
+ Sony A580
|
||||||
|
+ Fuji X10
|
||||||
|
+ Pentax K20D
|
||||||
|
|
||||||
|
* Fixes and improvements:
|
||||||
|
|
||||||
|
+ Increased maximum cache size to 8GB
|
||||||
|
+ OS X: fix Facebook uploads
|
||||||
|
+ Adjustments to default lowpass blur settings
|
||||||
|
+ Adjustments to dithering slider ranges
|
||||||
|
+ Metadata viewer: fix display of focal length: indicate unit
|
||||||
|
and hide if invalid.
|
||||||
|
+ Chromatic Aberrations: fix segfault for small buffers
|
||||||
|
+ Color pickers: fix various issues, e.g. #9482
|
||||||
|
+ More guides for Crop & Rotate
|
||||||
|
+ Improve light table usability: when viewing images in
|
||||||
|
fullscreen wrap around at line end when pressing right arrow
|
||||||
|
key
|
||||||
|
+ Soften: massive speed improvements by using SSE and OpenMP
|
||||||
|
+ Deleting images from camera is not supported anymore for
|
||||||
|
safety.
|
||||||
|
+ Exposure module now supports multiple instances
|
||||||
|
+ Support for custom meta data burn in (see commit
|
||||||
|
6ac7ba055440aa27f79f0a67ac112799a0e7785e)
|
||||||
|
+ OpenCL support for nVidia GeForce GT330
|
||||||
|
+ PFM: load timestamp as date & time taken.
|
||||||
|
+ Fix bug prohibiting image rating by mouse
|
||||||
|
+ Update Picasa uploader: references Google+ now
|
||||||
|
+ Some fixes for memory leaks, deadlocks, background jobs
|
||||||
|
+ Fixes of on-screen handles for Crop&Rotate and GND modules
|
||||||
|
+ 0 bytes files will no longer be imported but ignored
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Jun 25 13:53:52 UTC 2013 - toganm@opensuse.org
|
Tue Jun 25 13:53:52 UTC 2013 - toganm@opensuse.org
|
||||||
|
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: darktable
|
Name: darktable
|
||||||
Version: 1.2.2
|
Version: 1.2.3
|
||||||
Release: 0
|
Release: 0
|
||||||
Url: http://darktable.sourceforge.net
|
Url: http://darktable.sourceforge.net
|
||||||
# darktable contains patented code that we cannot ship. Therefore we use
|
# darktable contains patented code that we cannot ship. Therefore we use
|
||||||
@ -93,6 +93,7 @@ This package provides the user manual in pdf format
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
|
||||||
|
|
||||||
chmod -x tools/create_control_svg.sh tools/purge_non_existing_images.sh
|
chmod -x tools/create_control_svg.sh tools/purge_non_existing_images.sh
|
||||||
cp %{S:1} darktable-usermanual.pdf
|
cp %{S:1} darktable-usermanual.pdf
|
||||||
|
|
||||||
@ -135,6 +136,8 @@ find %{buildroot}%{_libdir} -name "*.la" -delete
|
|||||||
%{_libdir}/darktable
|
%{_libdir}/darktable
|
||||||
%{_datadir}/applications/darktable.desktop
|
%{_datadir}/applications/darktable.desktop
|
||||||
%{_datadir}/darktable
|
%{_datadir}/darktable
|
||||||
|
%dir %{_datadir}/appdata
|
||||||
|
%{_datadir}/appdata/darktable.appdata.xml
|
||||||
%{_datadir}/icons/hicolor/*/apps/darktable.*
|
%{_datadir}/icons/hicolor/*/apps/darktable.*
|
||||||
%{_mandir}/man1/darktable.1.*
|
%{_mandir}/man1/darktable.1.*
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user