update to darktable 1.0.5

This commit is contained in:
sthen 2012-09-14 09:50:18 +00:00
parent 03de2da4f4
commit a667ddea35
9 changed files with 106 additions and 57 deletions

View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.22 2012/09/14 07:36:07 sthen Exp $
# $OpenBSD: Makefile,v 1.23 2012/09/14 09:50:18 sthen Exp $
# requires SSE
ONLY_FOR_ARCHS= i386 amd64
COMMENT= virtual lighttable and darkroom for photographers
DISTNAME= darktable-0.9.3
REVISION= 3
DISTNAME= darktable-1.0.5
SHARED_ONLY= Yes
@ -54,7 +53,8 @@ USE_LIBTOOL= Yes
USE_GROFF= Yes
CONFIGURE_STYLE= cmake
CONFIGURE_ARGS= -DCMAKE_BUILD_TYPE=Release
CONFIGURE_ARGS= -DCMAKE_BUILD_TYPE=Release \
-DMAN_INSTALL_DIR="./man/man1"
CPPFLAGS+= -I${LOCALBASE}/include/libpng
LDFLAGS+= -L${LOCALBASE}/lib

View File

@ -1,5 +1,2 @@
MD5 (darktable-0.9.3.tar.gz) = SSU6OimQpL+OCwoZKV8ZvQ==
RMD160 (darktable-0.9.3.tar.gz) = p8USYqUvrgszF5+02QMOt4REMF0=
SHA1 (darktable-0.9.3.tar.gz) = Nu1sEQK5IAls+Ar/1xrfpmroU4E=
SHA256 (darktable-0.9.3.tar.gz) = HNdSUzVb1wtpjceMJGPBtwhnrJbLbyMzejtt7GJ3iSo=
SIZE (darktable-0.9.3.tar.gz) = 2330605
SHA256 (darktable-1.0.5.tar.gz) = DBhTBEbS8kWf5TOh72/CcRMA7+dGbzbCMWjsIjD7X70=
SIZE (darktable-1.0.5.tar.gz) = 2568221

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-data_CMakeLists_txt,v 1.1 2012/09/14 09:50:18 sthen Exp $
--- data/CMakeLists.txt.orig Tue Aug 21 10:19:21 2012
+++ data/CMakeLists.txt Tue Aug 21 10:19:28 2012
@@ -51,7 +51,7 @@ install(FILES gdb_commands DESTINATION ${SHARE_INSTALL
COMMAND
grep '<key>' ${CMAKE_CURRENT_SOURCE_DIR}/darktable.schemas |
sed -e 's/<key>//g' -e 's/<\\/key>//g' -e 's/\\/schemas\\/apps\\/darktable\\///g' |
- nl -s: |
+ gnl -s: |
sed -e 's/^[ \\t]*//\;s/[ \\t]*$$//' > ${CMAKE_CURRENT_BINARY_DIR}/darktablerc_keys
)
@@ -60,7 +60,7 @@ install(FILES gdb_commands DESTINATION ${SHARE_INSTALL
COMMAND
grep '<default>' ${CMAKE_CURRENT_SOURCE_DIR}/darktable.schemas |
sed -e 's/<default>//g' -e 's/<\\/default>//g' |
- nl -s: |
+ gnl -s: |
sed -e 's/^[ \\t]*//\;s/[ \\t]*$$//' > ${CMAKE_CURRENT_BINARY_DIR}/darktablerc_values
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/darktablerc_keys

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-doc_CMakeLists_txt,v 1.1 2011/12/09 20:11:00 sthen Exp $
--- doc/CMakeLists.txt.orig Sat Apr 16 11:58:32 2011
+++ doc/CMakeLists.txt Sat Apr 16 11:58:41 2011
@@ -20,6 +20,6 @@ add_custom_command(
add_custom_target(manpages ALL DEPENDS darktable.1)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/darktable.1 DESTINATION ./share/man/man1)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/darktable.1 DESTINATION ./man/man1)
add_subdirectory(usermanual)

View File

@ -1,27 +1,21 @@
$OpenBSD: patch-src_common_darktable_c,v 1.1 2011/12/09 20:11:00 sthen Exp $
--- src/common/darktable.c.orig Fri Dec 9 16:24:27 2011
+++ src/common/darktable.c Fri Dec 9 16:28:10 2011
@@ -49,7 +49,7 @@
#include <sys/param.h>
$OpenBSD: patch-src_common_darktable_c,v 1.2 2012/09/14 09:50:18 sthen Exp $
--- src/common/darktable.c.orig Sat Jul 21 04:44:08 2012
+++ src/common/darktable.c Tue Aug 21 10:06:04 2012
@@ -54,7 +54,7 @@
#include <unistd.h>
#include <locale.h>
-#if !defined(__APPLE__) && !defined(__FreeBSD__)
+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
#include <malloc.h>
#endif
#ifdef __APPLE__
@@ -77,12 +77,12 @@ typedef void (dt_signal_handler_t)(int) ;
static dt_signal_handler_t *_dt_sigill_old_handler = NULL;
static dt_signal_handler_t *_dt_sigsegv_old_handler = NULL;
@@ -87,7 +87,7 @@ static dt_signal_handler_t *_dt_sigsegv_old_handler =
-#ifdef __APPLE__
+#if defined (__APPLE__) || defined(__OpenBSD__)
#if (defined(__APPLE__) && defined(APPLE_NEED_DPRINTF)) || \
(defined(__FreeBSD_version) && (__FreeBSD_version < 800071)) || \
- defined(__SUNOS__)
+ defined(__SUNOS__) || defined(__OpenBSD__)
static int dprintf(int fd,const char *fmt, ...)
{
va_list ap;
FILE *f = fdopen(fd,"a");
- va_start(ap, &fmt);
+ va_start(ap, fmt);
int rc = vfprintf(f, fmt, ap);
fclose(f);
va_end(ap);

View File

@ -0,0 +1,25 @@
$OpenBSD: patch-src_common_darktable_h,v 1.3 2012/09/14 09:50:19 sthen Exp $
--- src/common/darktable.h.orig Sat Jul 21 04:44:08 2012
+++ src/common/darktable.h Tue Aug 21 10:06:41 2012
@@ -19,6 +19,10 @@
#define DARKTABLE_H
// just to be sure. the build system should set this for us already:
+#if defined(__NetBSD__) || defined(__OpenBSD__)
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#endif
#ifndef _XOPEN_SOURCE
#define _XOPEN_SOURCE 700 // for localtime_r and dprintf
#endif
@@ -46,10 +50,6 @@
#if defined(__DragonFly__) || defined(__FreeBSD__)
typedef unsigned int u_int;
#include <sys/types.h>
-#include <sys/sysctl.h>
-#endif
-#if defined(__NetBSD__) || defined(__OpenBSD__)
-#include <sys/param.h>
#include <sys/sysctl.h>
#endif

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-src_gui_camera_import_dialog_c,v 1.3 2012/05/15 15:16:02 naddy Exp $
Needed for strptime(3).
--- src/gui/camera_import_dialog.c.orig Tue May 15 08:54:28 2012
+++ src/gui/camera_import_dialog.c Tue May 15 08:55:33 2012
@@ -17,6 +17,7 @@
*/
#define _XOPEN_SOURCE // for strptime
+#define _XOPEN_SOURCE_EXTENDED 1
#include <time.h>
#include "develop/develop.h"

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_imageio_format_png_c,v 1.2 2011/12/09 20:11:00 sthen Exp $
--- src/imageio/format/png.c.orig Mon Nov 7 06:46:13 2011
+++ src/imageio/format/png.c Fri Dec 9 15:54:31 2011
@@ -27,6 +27,7 @@
$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>

View File

@ -1,7 +1,6 @@
@comment $OpenBSD: PLIST,v 1.4 2012/06/15 08:32:16 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.5 2012/09/14 09:50:19 sthen Exp $
@bin bin/darktable
@bin bin/darktable-cltest
@comment bin/darktable-faster
@bin bin/darktable-viewer
lib/darktable/
lib/darktable/libdarktable.so
@ -33,25 +32,32 @@ lib/darktable/plugins/libclipping.so
lib/darktable/plugins/libcolorcontrast.so
lib/darktable/plugins/libcolorcorrection.so
lib/darktable/plugins/libcolorin.so
lib/darktable/plugins/libcolorize.so
lib/darktable/plugins/libcolorout.so
lib/darktable/plugins/libcolortransfer.so
lib/darktable/plugins/libcolorzones.so
lib/darktable/plugins/libdemosaic.so
lib/darktable/plugins/libequalizer.so
lib/darktable/plugins/libexposure.so
lib/darktable/plugins/libflip.so
lib/darktable/plugins/libgamma.so
lib/darktable/plugins/libgraduatednd.so
lib/darktable/plugins/libgrain.so
lib/darktable/plugins/libhighlights.so
lib/darktable/plugins/libhighpass.so
lib/darktable/plugins/libhotpixels.so
lib/darktable/plugins/libinvert.so
lib/darktable/plugins/liblens.so
lib/darktable/plugins/liblevels.so
lib/darktable/plugins/liblowlight.so
lib/darktable/plugins/liblowpass.so
lib/darktable/plugins/libmonochrome.so
lib/darktable/plugins/libnlmeans.so
lib/darktable/plugins/liboverexposed.so
lib/darktable/plugins/libprofile_gamma.so
lib/darktable/plugins/librawdenoise.so
lib/darktable/plugins/librelight.so
lib/darktable/plugins/libshadhi.so
lib/darktable/plugins/libsharpen.so
lib/darktable/plugins/libsoften.so
lib/darktable/plugins/libsplittoning.so
@ -60,31 +66,54 @@ lib/darktable/plugins/libtemperature.so
lib/darktable/plugins/libtonecurve.so
lib/darktable/plugins/libtonemap.so
lib/darktable/plugins/libvelvia.so
lib/darktable/plugins/libvibrance.so
lib/darktable/plugins/libvignette.so
lib/darktable/plugins/libwatermark.so
lib/darktable/plugins/libzonesystem.so
lib/darktable/plugins/lighttable/
lib/darktable/plugins/lighttable/libbackgroundjobs.so
lib/darktable/plugins/lighttable/libcamera.so
lib/darktable/plugins/lighttable/libcapture.so
lib/darktable/plugins/lighttable/libcollect.so
lib/darktable/plugins/lighttable/libcolorlabels.so
lib/darktable/plugins/lighttable/libcolorpicker.so
lib/darktable/plugins/lighttable/libcopy_history.so
lib/darktable/plugins/lighttable/libdarktable_label.so
lib/darktable/plugins/lighttable/libexport.so
lib/darktable/plugins/lighttable/libfilmstrip.so
lib/darktable/plugins/lighttable/libfilter.so
lib/darktable/plugins/lighttable/libglobal_toolbox.so
lib/darktable/plugins/lighttable/libhinter.so
lib/darktable/plugins/lighttable/libhistogram.so
lib/darktable/plugins/lighttable/libhistory.so
lib/darktable/plugins/lighttable/libimage.so
lib/darktable/plugins/lighttable/libimport.so
lib/darktable/plugins/lighttable/libkeywords.so
lib/darktable/plugins/lighttable/liblighttable_mode.so
lib/darktable/plugins/lighttable/libmetadata.so
lib/darktable/plugins/lighttable/libmetadata_view.so
lib/darktable/plugins/lighttable/libmodule_toolbox.so
lib/darktable/plugins/lighttable/libmodulegroups.so
lib/darktable/plugins/lighttable/libmodulelist.so
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/libsnapshots.so
lib/darktable/plugins/lighttable/libstyles.so
lib/darktable/plugins/lighttable/libtagging.so
lib/darktable/plugins/lighttable/libview_toolbox.so
lib/darktable/plugins/lighttable/libviewswitcher.so
lib/darktable/views/
lib/darktable/views/libcapture.so
lib/darktable/views/libdarkroom.so
lib/darktable/views/libfilmstrip.so
lib/darktable/views/liblighttable.so
lib/libdarktable.so
@man man/man1/darktable.1
share/applications/darktable.desktop
share/darktable/
share/darktable/darktable.gtkrc
share/darktable/darktablerc
share/darktable/gdb_commands
share/darktable/kernels/
share/darktable/kernels/atrous.cl
@ -97,6 +126,8 @@ share/darktable/kernels/nlmeans.cl
share/darktable/kernels/programs.conf
share/darktable/kernels/sharpen.cl
share/darktable/pixmaps/
share/darktable/pixmaps/idbutton.png
share/darktable/pixmaps/off.png
share/darktable/pixmaps/plugins/
share/darktable/pixmaps/plugins/darkroom/
share/darktable/pixmaps/plugins/darkroom/anlfyeni.png
@ -116,6 +147,7 @@ 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/exposure.png
share/darktable/pixmaps/plugins/darkroom/flip.png
share/darktable/pixmaps/plugins/darkroom/graduatednd.png
share/darktable/pixmaps/plugins/darkroom/grain.png
share/darktable/pixmaps/plugins/darkroom/highlights.png
@ -123,6 +155,7 @@ share/darktable/pixmaps/plugins/darkroom/highpass.png
share/darktable/pixmaps/plugins/darkroom/hotpixels.png
share/darktable/pixmaps/plugins/darkroom/invert.png
share/darktable/pixmaps/plugins/darkroom/lens.png
share/darktable/pixmaps/plugins/darkroom/levels.png
share/darktable/pixmaps/plugins/darkroom/lowlight.png
share/darktable/pixmaps/plugins/darkroom/lowpass.png
share/darktable/pixmaps/plugins/darkroom/monochrome.png
@ -132,6 +165,7 @@ share/darktable/pixmaps/plugins/darkroom/profile_gamma.png
share/darktable/pixmaps/plugins/darkroom/rawdenoise.png
share/darktable/pixmaps/plugins/darkroom/rawimport.png
share/darktable/pixmaps/plugins/darkroom/relight.png
share/darktable/pixmaps/plugins/darkroom/shadhi.png
share/darktable/pixmaps/plugins/darkroom/sharpen.png
share/darktable/pixmaps/plugins/darkroom/soften.png
share/darktable/pixmaps/plugins/darkroom/splittoning.png
@ -161,6 +195,8 @@ share/doc/darktable/README
share/doc/darktable/TRANSLATORS
share/icons/hicolor/16x16/apps/darktable.png
share/icons/hicolor/22x22/apps/darktable.png
share/icons/hicolor/24x24/apps/darktable.png
share/icons/hicolor/256x256/apps/darktable.png
share/icons/hicolor/32x32/apps/darktable.png
share/icons/hicolor/48x48/apps/darktable.png
share/icons/hicolor/64x64/apps/darktable.png
@ -181,6 +217,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/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
@exec %D/bin/update-desktop-database