cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to darktable-1.2

Browse Source
This commit is contained in:
sthen 2013-04-26 23:10:26 +00:00
parent dbfdbfb1bf
commit 36718fffe2
10 changed files with 50 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
graphics/darktable/Makefile
View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.30 2013/03/21 08:45:18 ajacoutot Exp $
BROKEN= unlocks an unlocked mutex (rthread_sync.c 1.34)
# $OpenBSD: Makefile,v 1.31 2013/04/26 23:10:26 sthen Exp $
# requires SSE
ONLY_FOR_ARCHS= i386 amd64
COMMENT= virtual lighttable and darkroom for photographers
DISTNAME= darktable-1.1.3
DISTNAME= darktable-1.2
EXTRACT_SUFX= .tar.xz
SHARED_ONLY= Yes
@ -19,12 +18,13 @@ MAINTAINER= Stuart Henderson <sthen@openbsd.org>
# GPLv3+
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += GraphicsMagick
WANTLIB += GL GLU ICE Iex IlmImf IlmThread Imath SDL SM X11 Xext
WANTLIB += atk-1.0 c cairo curl exiv2 flickcurl freetype gdk-x11-2.0
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gnome-keyring
WANTLIB += gobject-2.0 gphoto2 gthread-2.0 gtk-x11-2.0 jpeg lcms2
WANTLIB += m pango-1.0 pangocairo-1.0 png pthread rsvg-2 sqlite3
WANTLIB += stdc++ tiff xml2 z gphoto2_port soup-2.4 json-glib-1.0
WANTLIB += m openjpeg pango-1.0 pangocairo-1.0 png pthread rsvg-2
WANTLIB += sqlite3 stdc++ tiff xml2 z gphoto2_port soup-2.4 json-glib-1.0
WANTLIB += lensfun # dlopen'd. this is "Extra" in check-lib-depends; that's ok,
@ -41,11 +41,13 @@ RUN_DEPENDS= devel/desktop-file-utils \
LIB_DEPENDS= devel/json-glib \
devel/libsoup \
devel/sdl \
graphics/GraphicsMagick \
graphics/exiv2>=0.22 \
graphics/lcms2 \
graphics/libgphoto2>=2.5.0 \
graphics/lensfun \
graphics/openexr \
graphics/openjpeg \
net/curl \
net/flickcurl \
x11/gnome/libgnome-keyring \
@ -57,9 +59,7 @@ USE_GROFF= Yes
CONFIGURE_STYLE= cmake
CONFIGURE_ARGS= -DCMAKE_BUILD_TYPE=Release \
-DBINARY_PACKAGE_BUILD=Yes \
-DCUSTOM_CFLAGS=Yes \
-DMAN_INSTALL_DIR="./man/man1"
-DBINARY_PACKAGE_BUILD=1
CFLAGS+= -D_DEBUG
CPPFLAGS+= -I${LOCALBASE}/include/libpng

4
graphics/darktable/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (darktable-1.1.3.tar.gz) = dge0qJG6vg1NTiQojGxGPWfrbILKiRLyCRBPuy+SSj0=
SIZE (darktable-1.1.3.tar.gz) = 3432839
SHA256 (darktable-1.2.tar.xz) = 3FJYK1xd+9Iuk28dRB4ZKkqlOsZTP+LFOqpZQzzNVFA=
SIZE (darktable-1.2.tar.xz) = 2399856

12
graphics/darktable/patches/patch-cmake_modules_FindFLICKCURL_cmake
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-cmake_modules_FindFLICKCURL_cmake,v 1.2 2013/03/09 11:18:14 sthen Exp $
--- cmake/modules/FindFLICKCURL.cmake.orig Fri Feb 8 23:00:29 2013
+++ cmake/modules/FindFLICKCURL.cmake Tue Feb 19 11:26:57 2013
@@ -23,7 +23,7 @@ FIND_PATH(FLICKCURL_INCLUDE_DIR flickcurl.h
)
FIND_LIBRARY(FLICKCURL_LIBRARY
- NAMES ${FLICKCURL_NAMES} libflickcurl.so libflickcurl.dylib
+ NAMES ${FLICKCURL_NAMES} flickcurl libflickcurl.so libflickcurl.dylib
PATHS /usr/lib /usr/local/lib /opt/local/lib
HINTS ENV FLICKCURL_LIBRARY
)

9
graphics/darktable/patches/patch-doc_CMakeLists_txt Normal file
View File

@ -0,0 +1,9 @@
$OpenBSD: patch-doc_CMakeLists_txt,v 1.3 2013/04/26 23:10:26 sthen Exp $
--- doc/CMakeLists.txt.orig Wed Feb 27 23:46:21 2013
+++ doc/CMakeLists.txt Wed Feb 27 23:45:54 2013
@@ -29,4 +29,4 @@ endif(NOT MAN_INSTALL_DIR)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/darktable.1 DESTINATION ${MAN_INSTALL_DIR})
-add_subdirectory(usermanual)
+# add_subdirectory(usermanual)

16
graphics/darktable/patches/patch-src_LibRaw_libraw_libraw_types_h
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-src_LibRaw_libraw_libraw_types_h,v 1.2 2011/12/09 20:11:00 sthen Exp $
ushort is already defined in <sys/types.h> and gcc3 warns about this and
aborts with -Werror.
--- src/external/LibRaw/libraw/libraw_types.h.orig Mon Nov 7 06:46:13 2011
+++ src/external/LibRaw/libraw/libraw_types.h Fri Dec 9 15:54:31 2011
@@ -78,7 +78,7 @@ typedef unsigned long long UINT64;
#endif
typedef unsigned char uchar;
-typedef unsigned short ushort;
+/*typedef unsigned short ushort;*/
#ifdef WIN32
#ifdef LIBRAW_NODLL

12
graphics/darktable/patches/patch-src_common_darktable_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_common_darktable_c,v 1.4 2013/03/09 11:18:14 sthen Exp $
--- src/common/darktable.c.orig Fri Feb 8 23:00:29 2013
+++ src/common/darktable.c Tue Feb 19 11:30:11 2013
@@ -56,7 +56,7 @@
#include <unistd.h>
#include <locale.h>
-#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__DragonFly__)
+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__OpenBSD__)
#include <malloc.h>
#endif
#ifdef __APPLE__

21
graphics/darktable/patches/patch-src_common_dtpthread_h Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-src_common_dtpthread_h,v 1.1 2013/04/26 23:10:26 sthen Exp $
XXX disable the default PTHREAD_MUTEX_STRICT_NP behaviour (sorry!)
--- src/common/dtpthread.h.orig Wed Apr 3 21:13:14 2013
+++ src/common/dtpthread.h Fri Apr 26 18:50:17 2013
@@ -75,6 +75,14 @@ dt_pthread_mutex_init_with_caller(dt_pthread_mutex_t *
{
memset(mutex, 0x0, sizeof(dt_pthread_mutex_t));
snprintf(mutex->name, 256, "%s:%d (%s)", file, line, function);
+ if (attr == NULL) {
+ pthread_mutexattr_t a;
+ pthread_mutexattr_init(&a);
+ pthread_mutexattr_settype(&a, PTHREAD_MUTEX_NORMAL);
+ const int ret = pthread_mutex_init(&(mutex->mutex), &a);
+ pthread_mutexattr_destroy(&a);
+ return ret;
+ }
const int ret = pthread_mutex_init(&(mutex->mutex), attr);
return ret;
}

10
graphics/darktable/patches/patch-src_dtview_CMakeLists_txt
View File

@ -1,10 +0,0 @@
$OpenBSD: patch-src_dtview_CMakeLists_txt,v 1.1 2011/12/09 20:11:00 sthen Exp $
--- src/dtview/CMakeLists.txt.orig Fri Dec 9 16:54:33 2011
+++ src/dtview/CMakeLists.txt Fri Dec 9 16:54:48 2011
@@ -1,5 +1,6 @@
include_directories(${SDL_INCLUDE_DIR})
+include_directories(${OPENGL_INCLUDE_DIR})
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/..)
add_executable(darktable-viewer main.c)

11
graphics/darktable/patches/patch-src_imageio_format_png_c
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-src_imageio_format_png_c,v 1.3 2012/09/14 09:50:19 sthen Exp $
--- src/imageio/format/png.c.orig Sat Jul 21 04:44:08 2012
+++ src/imageio/format/png.c Tue Aug 21 09:37:39 2012
@@ -28,6 +28,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <png.h>
+#include <zlib.h>
#include <inttypes.h>
#include <zlib.h>

11
graphics/darktable/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.6 2013/03/09 11:18:14 sthen Exp $
@comment $OpenBSD: PLIST,v 1.7 2013/04/26 23:10:26 sthen Exp $
@bin bin/darktable
@bin bin/darktable-cli
@bin bin/darktable-cltest
@ -10,6 +10,7 @@ lib/darktable/plugins/imageio/
lib/darktable/plugins/imageio/format/
lib/darktable/plugins/imageio/format/libcopy.so
lib/darktable/plugins/imageio/format/libexr.so
lib/darktable/plugins/imageio/format/libj2k.so
lib/darktable/plugins/imageio/format/libjpeg.so
lib/darktable/plugins/imageio/format/libpfm.so
lib/darktable/plugins/imageio/format/libpng.so
@ -41,6 +42,8 @@ lib/darktable/plugins/libcolorout.so
lib/darktable/plugins/libcolortransfer.so
lib/darktable/plugins/libcolorzones.so
lib/darktable/plugins/libdemosaic.so
lib/darktable/plugins/libdenoiseprofile.so
lib/darktable/plugins/libdither.so
lib/darktable/plugins/libequalizer.so
lib/darktable/plugins/libexposure.so
lib/darktable/plugins/libflip.so
@ -108,7 +111,6 @@ lib/darktable/plugins/lighttable/libnavigation.so
lib/darktable/plugins/lighttable/libratings.so
lib/darktable/plugins/lighttable/librecentcollect.so
lib/darktable/plugins/lighttable/libselect.so
lib/darktable/plugins/lighttable/libsimilarity.so
lib/darktable/plugins/lighttable/libsnapshots.so
lib/darktable/plugins/lighttable/libstyles.so
lib/darktable/plugins/lighttable/libtagging.so
@ -138,7 +140,10 @@ share/darktable/kernels/atrous.cl
share/darktable/kernels/basic.cl
share/darktable/kernels/bilateral.cl
share/darktable/kernels/blendop.cl
share/darktable/kernels/colorspace.cl
share/darktable/kernels/common.h
share/darktable/kernels/demosaic_ppg.cl
share/darktable/kernels/denoiseprofile.cl
share/darktable/kernels/extended.cl
share/darktable/kernels/gaussian.cl
share/darktable/kernels/highpass.cl
@ -170,6 +175,7 @@ share/darktable/pixmaps/plugins/darkroom/colorout.png
share/darktable/pixmaps/plugins/darkroom/colortransfer.png
share/darktable/pixmaps/plugins/darkroom/colorzones.png
share/darktable/pixmaps/plugins/darkroom/demosaic.png
share/darktable/pixmaps/plugins/darkroom/dither.png
share/darktable/pixmaps/plugins/darkroom/exposure.png
share/darktable/pixmaps/plugins/darkroom/flip.png
share/darktable/pixmaps/plugins/darkroom/graduatednd.png
@ -256,6 +262,7 @@ share/locale/ru/LC_MESSAGES/darktable.mo
share/locale/sq/LC_MESSAGES/darktable.mo
share/locale/sv/LC_MESSAGES/darktable.mo
share/locale/th/LC_MESSAGES/darktable.mo
share/locale/uk/LC_MESSAGES/darktable.mo
share/locale/zh_CN/LC_MESSAGES/darktable.mo
@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor