Hello community,

here is the log from the commit of package darktable for openSUSE:Factory 
checked in at 2013-06-21 10:33:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/darktable (Old)
 and      /work/SRC/openSUSE:Factory/.darktable.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "darktable"

Changes:
--------
--- /work/SRC/openSUSE:Factory/darktable/darktable.changes      2013-06-11 
09:26:27.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.darktable.new/darktable.changes 2013-06-21 
10:51:44.000000000 +0200
@@ -1,0 +2,12 @@
+Thu Jun 20 12:52:15 UTC 2013 - tog...@opensuse.org
+
+-  Remove patented code from the source via
+   generate--tarball.sh bnc#824484
+   * added backported patch from git master
+     0001-thumbnail-compression-make-libsquish-optional 
+   * Remove pkgconfig(colord) from Build Requires
+
+   Because compression code is disabled previous cache will not
+   work. Removing  ~/.cache/darktable/mipmaps is necessary
+  
+-------------------------------------------------------------------

Old:
----
  darktable-1.2.1.tar.xz

New:
----
  0001-thumbnail-compression-make-libsquish-optional.patch
  darktable-1.2.1-nopatents.tar.xz
  generate-tarball.sh

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ darktable.spec ++++++
--- /var/tmp/diff_new_pack.O1Fpaf/_old  2013-06-21 10:51:45.000000000 +0200
+++ /var/tmp/diff_new_pack.O1Fpaf/_new  2013-06-21 10:51:45.000000000 +0200
@@ -20,10 +20,18 @@
 Version:        1.2.1
 Release:        0
 Url:            http://darktable.sourceforge.net
-Source0:        
https://downloads.sourceforge.net/project/darktable/darktable/1.2/%name-%version.tar.xz
+# 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://downloads.sourceforge.net/project/darktable/darktable/1.2/%%name-%%version.tar.xz
+# ./generate-tarball.sh 
+Source0:        %name-%version-nopatents.tar.xz
 Source1:        
http://sourceforge.net/projects/darktable/files/darktable/1.2/darktable-usermanual.pdf
 #PATCH-FIX-UPSTREAM backported from git master bnc#823114
 Patch0:         0001-fixed-error-handling-for-broken-full-color-images.patch
+#PATCH-FIX-OPENSUSE makes the use of squish library backported from git 
+Patch1:         0001-thumbnail-compression-make-libsquish-optional.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  cmake
 BuildRequires:  dbus-1-glib-devel
@@ -39,7 +47,6 @@
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(GraphicsMagick)
 BuildRequires:  pkgconfig(OpenEXR)
-BuildRequires:  pkgconfig(colord)
 BuildRequires:  pkgconfig(dri)
 BuildRequires:  pkgconfig(exiv2)
 BuildRequires:  pkgconfig(flickcurl)
@@ -90,6 +97,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 chmod -x tools/create_control_svg.sh tools/purge_non_existing_images.sh
 cp %{S:1} darktable-usermanual.pdf
@@ -106,6 +114,7 @@
         -DCMAKE_BUILD_TYPE=Release \
         -DBINARY_PACKAGE_BUILD=1  \
         -DUSE_XMLLINT=OFF \
+        -DUSE_SQUISH=OFF -DUSE_COLORD=OFF \
         -DINSTALL_IOP_EXPERIMENTAL=On  ..
 %__make %{_smp_mflags} VERBOSE=1
 

++++++ 0001-thumbnail-compression-make-libsquish-optional.patch ++++++
>From 1b9952c990c3611691306bfd46e0929c7fc14386 Mon Sep 17 00:00:00 2001
From: johannes hanika <han...@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 <tog...@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
 }
 
 
++++++ generate-tarball.sh ++++++
#!/bin/sh

VERSION=$1

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
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to