Skip to content

Commit

Permalink
darktable: upgraded to 2.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
conraid committed Feb 4, 2016
1 parent 8991c25 commit b8f2114
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 10 deletions.
5 changes: 2 additions & 3 deletions darktable/darktable.SlackBuild
Expand Up @@ -30,7 +30,7 @@ set -eu
CWD=$(pwd)

PRGNAM=darktable
VERSION=2.0.0
VERSION=${VERSION:-2.0.1}
BUILD=${BUILD:-1}
TAG=${TAG:-cf}
TMP=${TMP:-/tmp/pkg}
Expand Down Expand Up @@ -69,8 +69,7 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
cd $PRGNAM-$VERSION

chown -R root:root .
find . -executable -exec chmod 755 {} \+
find . ! -executable -exec chmod 644 {} \+
chmod -R u+w,go+r-w,a+X-s .

# Fix doc path
sed -e "s#share/doc/darktable#doc/darktable-$VERSION#" \
Expand Down
10 changes: 5 additions & 5 deletions darktable/darktable.info
@@ -1,11 +1,11 @@
PRGNAM="darktable"
VERSION="2.0.0"
VERSION="2.0.1"
HOMEPAGE="http://www.darktable.org/"
DOWNLOAD="https://github.com/darktable-org/darktable/releases/download/release-2.0.0/darktable-2.0.0.tar.xz"
FILENAME="darktable-2.0.0.tar.xz"
DOWNLOAD="https://github.com/darktable-org/darktable/releases/download/release-2.0.1/darktable-2.0.1.tar.xz"
FILENAME="darktable-2.0.1.tar.xz"
REQUIRES="lensfun flickcurl json-glib graphicsmagick lua52 pugixml libwebp openjpeg1"
MD5SUM="8d2dd10643bfa6f1d046171d54123643"
SHASUM="de104b3cabad34fc25af4d615a574e6f182912c0"
MD5SUM="5e9697758ba98c2a8ac0085f242d1613"
SHASUM="eca9fbfea13db02834d9d509da31e55da33e78e8"
SHA256SUM="d4f2f525bbbb1355bc3470e74cc158d79d7e236f3925928f67a88461f1df7cb1"
MAINTAINER="Corrado Franco"
EMAIL="conraid (at) linux (dot) it"
11 changes: 9 additions & 2 deletions digikam/digikam.SlackBuild
Expand Up @@ -26,9 +26,9 @@ set -eu

CWD=$(pwd)

PRGNAM=${PRGNAM:-digikam}
PRGNAM=digikam
VERSION=${VERSION:-4.14.0}
BUILD=${BUILD:-1}
BUILD=${BUILD:-2}
TAG=${TAG:-cf}
TMP=${TMP:-/tmp/pkg}
PKG=$TMP/package-$PRGNAM
Expand Down Expand Up @@ -75,6 +75,12 @@ find . \
# Disable videoslideshow. Error with imagemagick
sed 's/\(.*(videoslideshow)\)/#\1/' -i extra/kipi-plugins/CMakeLists.txt

# patch for lensfun 0.3.2
patch -p1 -i $CWD/lensfun-0.3.2.patch

# workaround for flex-2.6.0
sed -e '/fno-tree-pre/d' -i core/CMakeLists.txt

mkdir build
cd build
cmake \
Expand All @@ -92,6 +98,7 @@ cmake \
-DCMAKE_VERBOSE_MAKEFILE:BOOL="TRUE" \
-DBUILD_tests=OFF \
-DDIGIKAMSC_COMPILE_DOC=OFF \
-DCMAKE_C_COMPILER=clang \
..

make
Expand Down
26 changes: 26 additions & 0 deletions digikam/lensfun-0.3.2.patch
@@ -0,0 +1,26 @@
From: Gilles Caulier <caulier.gilles@gmail.com>
Date: Mon, 14 Dec 2015 21:41:55 +0000
Subject: fix compilation with Lensfun 0.3.2
X-Git-Url: http://quickgit.kde.org/?p=digikam.git&a=commitdiff&h=0f159981176faa6da701f112bfe557b79804d468
---
fix compilation with Lensfun 0.3.2
It still compatible with older lensfun releases.
BUGS: 356672
FIXED-IN: 5.0.0
---


--- a/core/libs/dimg/filters/lens/lensfuniface.h
+++ b/core/libs/dimg/filters/lens/lensfuniface.h
@@ -24,10 +24,7 @@

// Lib LensFun includes

-extern "C"
-{
#include <lensfun.h>
-}

// Local includes


0 comments on commit b8f2114

Please sign in to comment.