update to darktable 1.2.2

This commit is contained in:
sthen 2013-06-26 11:22:25 +00:00
parent fa53c4e6f5
commit 46a8c16598
4 changed files with 6 additions and 33 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.33 2013/06/18 18:45:49 sthen Exp $
# $OpenBSD: Makefile,v 1.34 2013/06/26 11:22:25 sthen Exp $
# requires SSE
ONLY_FOR_ARCHS= i386 amd64
COMMENT= virtual lighttable and darkroom for photographers
DISTNAME= darktable-1.2.1
DISTNAME= darktable-1.2.2
EXTRACT_SUFX= .tar.xz
SHARED_ONLY= Yes

View File

@ -1,2 +1,2 @@
SHA256 (darktable-1.2.1.tar.xz) = sXVild/aePyChgMDOljyM87RkIuKUOyX0uYA1urPjio=
SIZE (darktable-1.2.1.tar.xz) = 2273260
SHA256 (darktable-1.2.2.tar.xz) = EpAujD7xhdIWfOOl+dEe3d52PFo8sOkmf0tHCiUvyFk=
SIZE (darktable-1.2.2.tar.xz) = 2307300

View File

@ -1,28 +0,0 @@
$OpenBSD: patch-src_external_LibRaw_src_libraw_cxx_cpp,v 1.1 2013/06/18 18:45:49 sthen Exp $
https://github.com/darktable-org/darktable/commit/796937043871aadbd0c0dc61bc90ea674ec1bc18
--- src/external/LibRaw/src/libraw_cxx.cpp.orig Tue Jun 18 19:21:00 2013
+++ src/external/LibRaw/src/libraw_cxx.cpp Tue Jun 18 19:22:02 2013
@@ -796,8 +796,8 @@ int LibRaw::unpack(void)
S.iheight= S.height;
IO.shrink = 0;
// allocate image as temporary buffer, size
- imgdata.rawdata.raw_alloc = calloc(S.iwidth*S.iheight,sizeof(*imgdata.image));
- imgdata.image = (ushort (*)[4]) imgdata.rawdata.raw_alloc;
+ imgdata.rawdata.raw_alloc = 0;
+ imgdata.image = (ushort (*)[4]) calloc(S.iwidth*S.iheight,sizeof(*imgdata.image));
}
@@ -807,8 +807,8 @@ int LibRaw::unpack(void)
// recover saved
if( decoder_info.decoder_flags & LIBRAW_DECODER_LEGACY)
{
- imgdata.image = 0;
- imgdata.rawdata.color_image = (ushort (*)[4]) imgdata.rawdata.raw_alloc;
+ imgdata.rawdata.raw_alloc = imgdata.rawdata.color_image = imgdata.image;
+ imgdata.image = 0;
}
// calculate channel maximum

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.8 2013/06/18 18:45:49 sthen Exp $
@comment $OpenBSD: PLIST,v 1.9 2013/06/26 11:22:25 sthen Exp $
@bin bin/darktable
@bin bin/darktable-cli
@bin bin/darktable-cltest
@ -246,6 +246,7 @@ share/locale/da/LC_MESSAGES/darktable.mo
share/locale/de/LC_MESSAGES/darktable.mo
share/locale/es/LC_MESSAGES/darktable.mo
share/locale/fr/LC_MESSAGES/darktable.mo
share/locale/it/LC_MESSAGES/darktable.mo
share/locale/ja/LC_MESSAGES/darktable.mo
share/locale/nl/LC_MESSAGES/darktable.mo
share/locale/pl/LC_MESSAGES/darktable.mo