graphics/darktable: Use Slackware's openjpeg (libopenmj2)

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
This commit is contained in:
Robby Workman 2016-01-09 17:47:50 -06:00 committed by Willy Sudiarto Raharjo
parent 4b259554ef
commit 36590f73e0
4 changed files with 26 additions and 2 deletions

View File

@ -14,7 +14,6 @@ or higher).
The following are optional dependencies: The following are optional dependencies:
GraphicsMagick - for importing a wide range of non-RAW image formats 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 libwebp - for exporting images in WebP format
flickcurl - for exporting images to Flickr flickcurl - for exporting images to Flickr
json-glib - for exporting images to Facebook json-glib - for exporting images to Facebook

View File

@ -68,11 +68,15 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -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 mkdir -p build
cd build cd build
cmake \ cmake \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-DOPENJPEG_INCLUDE_DIR="/usr/include/openmj2-2.1" \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
-DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-DMAN_INSTALL_DIR=/usr/man/man1 \ -DMAN_INSTALL_DIR=/usr/man/man1 \

View File

@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/darktable-org/darktable/releases/download/release-2
MD5SUM="8d2dd10643bfa6f1d046171d54123643" MD5SUM="8d2dd10643bfa6f1d046171d54123643"
DOWNLOAD_x86_64="" DOWNLOAD_x86_64=""
MD5SUM_x86_64="" MD5SUM_x86_64=""
REQUIRES="lensfun pugixml" REQUIRES="json-glib lensfun pugixml"
MAINTAINER="David Spencer" MAINTAINER="David Spencer"
EMAIL="baildon.research@googlemail.com" EMAIL="baildon.research@googlemail.com"

View File

@ -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}