summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Robby Workman <rworkman@slackbuilds.org>2016-01-09 17:47:50 -0600
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2016-01-17 09:40:16 +0700
commit36590f73e0aa3b0cf7b2293cdda6988e036c54b2 (patch)
tree116ad632fcdb6414e39e52e02655557355c5de9f
parent4b259554efad005317fe88dc0f95c7516c00b4d6 (diff)
downloadslackbuilds-36590f73e0aa3b0cf7b2293cdda6988e036c54b2.tar.gz
slackbuilds-36590f73e0aa3b0cf7b2293cdda6988e036c54b2.tar.xz
graphics/darktable: Use Slackware's openjpeg (libopenmj2)
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
-rw-r--r--graphics/darktable/README1
-rw-r--r--graphics/darktable/darktable.SlackBuild4
-rw-r--r--graphics/darktable/darktable.info2
-rw-r--r--graphics/darktable/fix-find-openjpeg.diff21
4 files changed, 26 insertions, 2 deletions
diff --git a/graphics/darktable/README b/graphics/darktable/README
index b2de133644..f51453f187 100644
--- a/graphics/darktable/README
+++ b/graphics/darktable/README
@@ -14,7 +14,6 @@ or higher).
The following are optional dependencies:
GraphicsMagick - for importing a wide range of non-RAW image formats
-openjpeg1 - for exporting images in JPEG 2000 format
libwebp - for exporting images in WebP format
flickcurl - for exporting images to Flickr
json-glib - for exporting images to Facebook
diff --git a/graphics/darktable/darktable.SlackBuild b/graphics/darktable/darktable.SlackBuild
index 4d457313c1..e64af46e91 100644
--- a/graphics/darktable/darktable.SlackBuild
+++ b/graphics/darktable/darktable.SlackBuild
@@ -68,11 +68,15 @@ 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
+
mkdir -p build
cd build
cmake \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DOPENJPEG_INCLUDE_DIR="/usr/include/openmj2-2.1" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIB_SUFFIX=${LIBDIRSUFFIX} \
-DMAN_INSTALL_DIR=/usr/man/man1 \
diff --git a/graphics/darktable/darktable.info b/graphics/darktable/darktable.info
index 0e4ee2b5ba..0d73314cfd 100644
--- a/graphics/darktable/darktable.info
+++ b/graphics/darktable/darktable.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/darktable-org/darktable/releases/download/release-2
MD5SUM="8d2dd10643bfa6f1d046171d54123643"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="lensfun pugixml"
+REQUIRES="json-glib lensfun pugixml"
MAINTAINER="David Spencer"
EMAIL="baildon.research@googlemail.com"
diff --git a/graphics/darktable/fix-find-openjpeg.diff b/graphics/darktable/fix-find-openjpeg.diff
new file mode 100644
index 0000000000..2f28e7c9d0
--- /dev/null
+++ b/graphics/darktable/fix-find-openjpeg.diff
@@ -0,0 +1,21 @@
+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}