Miroirs/slackbuilds_ponce
1
0
Fork 0
mirror of https://github.com/Ponce/slackbuilds synced 2024-11-21 19:42:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

graphics/darktable: Updated for version 2.0.1.

Browse source 
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
This commit is contained in:
David Spencer 2016-02-25 22:43:48 +00:00 committed by Willy Sudiarto Raharjo
parent b29af5ecff
commit 02f03c4bff
4 changed files with 33 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
graphics/darktable/8b1bb5fbb108be341f8313da47be48470c0501ec.patch Normal file
View file

@ -0,0 +1,25 @@
From 9149e5b11bb25fbbdb5c1d7ad58c9a06dbf9f26f Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Thu, 4 Feb 2016 12:24:43 +0100
Subject: [PATCH] src/develop/masks/path.c: fix int -> float (compile error w/
GCC6)
---
src/develop/masks/path.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/develop/masks/path.c b/src/develop/masks/path.c
index 62c0095..f08dd4c 100644
--- a/src/develop/masks/path.c
+++ b/src/develop/masks/path.c
@@ -2555,8 +2555,8 @@ static int dt_path_get_mask_roi(dt_iop_module_t *module, dt_dev_pixelpipe_iop_t
// now check if feather is at least partially within roi
for(int i = nb_corner * 3; i < border_count; i++)
{
- int xx = border[i * 2];
- int yy = border[i * 2 + 1];
+ float xx = border[i * 2];
+ float yy = border[i * 2 + 1];
if(isnan(xx))
{
if(isnan(yy)) break; // that means we have to skip the end of the border path

8
graphics/darktable/darktable.SlackBuild
View file

@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=darktable
VERSION=${VERSION:-2.0.0}
VERSION=${VERSION:-2.0.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@ -68,14 +68,16 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# Fix openjpeg detection - also set OPENJPEG_INCLUDE_DIR
patch -p1 < $CWD/fix-find-openjpeg.diff
# Fix build with gcc-5.3.0
# http://redmine.darktable.org/issues/10931
patch -p1 < $CWD/8b1bb5fbb108be341f8313da47be48470c0501ec.patch
mkdir -p build
cd build
cmake \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-DOPENJPEG_LIBRARY="/usr/lib$LIBDIRSUFFIX/libopenmj2.so" \
-DOPENJPEG_INCLUDE_DIR="/usr/include/openmj2-2.1" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIB_SUFFIX=${LIBDIRSUFFIX} \

6
graphics/darktable/darktable.info
View file

@ -1,8 +1,8 @@
PRGNAM="darktable"
VERSION="2.0.0"
VERSION="2.0.1"
HOMEPAGE="http://darktable.sourceforge.net/"
DOWNLOAD="https://github.com/darktable-org/darktable/releases/download/release-2.0.0/darktable-2.0.0.tar.xz"
MD5SUM="8d2dd10643bfa6f1d046171d54123643"
DOWNLOAD="https://github.com/darktable-org/darktable/releases/download/release-2.0.1/darktable-2.0.1.tar.xz"
MD5SUM="5e9697758ba98c2a8ac0085f242d1613"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="json-glib lensfun pugixml"

21
graphics/darktable/fix-find-openjpeg.diff
View file

@ -1,21 +0,0 @@
diff -Nur darktable-2.0.0.orig/cmake/modules/FindOpenJPEG.cmake darktable-2.0.0/cmake/modules/FindOpenJPEG.cmake
--- darktable-2.0.0.orig/cmake/modules/FindOpenJPEG.cmake 2015-12-22 07:56:37.000000000 -0600
+++ darktable-2.0.0/cmake/modules/FindOpenJPEG.cmake 2016-01-09 17:19:38.605300279 -0600
@@ -29,7 +29,7 @@
include(LibFindMacros)
-libfind_pkg_check_modules(PC_OPENJPEG libopenjpeg1)
+libfind_pkg_check_modules(PC_OPENJPEG libopenmj2)
SET(_openjpeg_SEARCH_DIRS
${OPENJPEG_ROOT_DIR}
@@ -52,7 +52,7 @@
FIND_LIBRARY(OPENJPEG_LIBRARY
NAMES
- openjpeg
+ openmj2
HINTS
${PC_OPENJPEG_LIBDIR}
${PC_OPENJPEG_LIBRARY_DIRS}