Thu Aug 25 14:42:54 2011 UTC ()
Update to darktable-0.9.2.

pkgsrc changes: enable flickr module.

upstream changes:

0.9.1 to 0.9.2:
not yet available

0.9 to 0.9.1:
 - new rawspeed, dcraw, libraw
 - fixed various segfaults and deadlocks
 - the pipeline is now more real HDR (unbounded color management, no more gamut clipping in between)
 - fixed a nasty bug which could cause complete loss of history for an image
 - darktable-faster now plays nicely with darktablerc (non-gconf)
 - lots of opencl improvements
 - updated translations
 - second part of our GSoC: customizable keyboard shortcuts!


(jakllsch)
diff -r1.1.1.1 -r1.2 pkgsrc/graphics/darktable/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/graphics/darktable/PLIST
diff -r1.2 -r1.3 pkgsrc/graphics/darktable/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/graphics/darktable/patches/patch-cmake_modules_FindGTK2.cmake
diff -r1.1.1.1 -r1.2 pkgsrc/graphics/darktable/patches/patch-data_darktable-faster
diff -r1.1.1.1 -r1.2 pkgsrc/graphics/darktable/patches/patch-src_CMakeLists.txt
diff -r1.1.1.1 -r1.2 pkgsrc/graphics/darktable/patches/patch-src_LibRaw_libraw_libraw__alloc.h
diff -r1.1.1.1 -r1.2 pkgsrc/graphics/darktable/patches/patch-src_imageio_format_png.c
diff -r1.1.1.1 -r1.2 pkgsrc/graphics/darktable/patches/patch-src_rawspeed_RawSpeed_Common.h
diff -r1.1 -r1.2 pkgsrc/graphics/darktable/patches/patch-doc_CMakeLists.txt
cvs diff -r1.1.1.1 -r1.2 pkgsrc/graphics/darktable/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/darktable/Makefile 2011/07/26 21:37:47 1.1.1.1
+++ pkgsrc/graphics/darktable/Makefile 2011/08/25 14:42:53 1.2
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.1.1.1 2011/07/26 21:37:47 jakllsch Exp $ 1# $NetBSD: Makefile,v 1.2 2011/08/25 14:42:53 jakllsch Exp $
2 2
3DISTNAME= darktable-0.9 3DISTNAME= darktable-0.9.2
4CATEGORIES= misc 4CATEGORIES= graphics
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=darktable/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=darktable/}
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://darktable.sourceforge.net/ 8HOMEPAGE= http://darktable.sourceforge.net/
9COMMENT= Photography workflow application 9COMMENT= Photography workflow application
10LICENSE= gnu-gpl-v3 10LICENSE= gnu-gpl-v3
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14USE_CMAKE= yes 14USE_CMAKE= yes
15USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
16USE_PKGLOCALEDIR= yes 16USE_PKGLOCALEDIR= yes
17USE_TOOLS+= gmake msgfmt pkg-config 17USE_TOOLS+= gmake msgfmt pkg-config
@@ -33,38 +33,40 @@ LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX @@ -33,38 +33,40 @@ LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX
33#NOT_FOR_PLATFORM= NetBSD-4*-* NetBSD-5.[0-8]*-* 33#NOT_FOR_PLATFORM= NetBSD-4*-* NetBSD-5.[0-8]*-*
34 34
35.include "../../mk/bsd.fast.prefs.mk" 35.include "../../mk/bsd.fast.prefs.mk"
36.if ${MACHINE_ARCH} == "i386" 36.if ${MACHINE_ARCH} == "i386"
37# SSE alignment issues 37# SSE alignment issues
38GCC_REQD= 4.2 38GCC_REQD= 4.2
39CFLAGS+= -mstackrealign 39CFLAGS+= -mstackrealign
40.endif 40.endif
41 41
42# for some reason msgfmt can't handle these two 42# for some reason msgfmt can't handle these two
43post-extract: 43post-extract:
44 ${RM} ${WRKSRC}/po/cs.po 44 ${RM} ${WRKSRC}/po/cs.po
45 ${RM} ${WRKSRC}/po/es.po 45 ${RM} ${WRKSRC}/po/es.po
 46 ${RM} ${WRKSRC}/po/sv.po
46 47
47pre-configure: 48pre-configure:
48 ${MKDIR} ${WRKSRC}/pkgsrc_build 49 ${MKDIR} ${WRKSRC}/pkgsrc_build
49 50
50.include "../../databases/sqlite3/buildlink3.mk" 51.include "../../databases/sqlite3/buildlink3.mk"
51.include "../../devel/GConf/buildlink3.mk" 52.include "../../devel/GConf/buildlink3.mk"
52.include "../../devel/SDL/buildlink3.mk" 53.include "../../devel/SDL/buildlink3.mk"
53.include "../../devel/gettext-lib/buildlink3.mk" 54.include "../../devel/gettext-lib/buildlink3.mk"
54.include "../../devel/glib2/buildlink3.mk" 55.include "../../devel/glib2/buildlink3.mk"
55.include "../../devel/libgphoto2/buildlink3.mk" 56.include "../../devel/libgphoto2/buildlink3.mk"
56.include "../../devel/zlib/buildlink3.mk" 57.include "../../devel/zlib/buildlink3.mk"
57.include "../../graphics/exiv2/buildlink3.mk" 58.include "../../graphics/exiv2/buildlink3.mk"
58.include "../../graphics/gegl/buildlink3.mk" 59.include "../../graphics/gegl/buildlink3.mk"
59.include "../../graphics/lensfun/buildlink3.mk" 60.include "../../graphics/lensfun/buildlink3.mk"
60.include "../../graphics/lcms2/buildlink3.mk" 61.include "../../graphics/lcms2/buildlink3.mk"
61.include "../../graphics/openexr/buildlink3.mk" 62.include "../../graphics/openexr/buildlink3.mk"
62.include "../../graphics/png/buildlink3.mk" 63.include "../../graphics/png/buildlink3.mk"
63.include "../../graphics/tiff/buildlink3.mk" 64.include "../../graphics/tiff/buildlink3.mk"
 65.include "../../net/flickcurl/buildlink3.mk"
64.include "../../security/gnome-keyring/buildlink3.mk" 66.include "../../security/gnome-keyring/buildlink3.mk"
65.include "../../sysutils/desktop-file-utils/desktopdb.mk" 67.include "../../sysutils/desktop-file-utils/desktopdb.mk"
66.include "../../textproc/libxml2/buildlink3.mk" 68.include "../../textproc/libxml2/buildlink3.mk"
67.include "../../www/curl/buildlink3.mk" 69.include "../../www/curl/buildlink3.mk"
68.include "../../x11/gtk2/buildlink3.mk" 70.include "../../x11/gtk2/buildlink3.mk"
69.include "../../mk/jpeg.buildlink3.mk" 71.include "../../mk/jpeg.buildlink3.mk"
70.include "../../mk/bsd.pkg.mk" 72.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/graphics/darktable/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/darktable/PLIST 2011/07/26 21:37:47 1.1.1.1
+++ pkgsrc/graphics/darktable/PLIST 2011/08/25 14:42:53 1.2
@@ -1,28 +1,29 @@ @@ -1,28 +1,29 @@
1@comment $NetBSD: PLIST,v 1.1.1.1 2011/07/26 21:37:47 jakllsch Exp $ 1@comment $NetBSD: PLIST,v 1.2 2011/08/25 14:42:53 jakllsch Exp $
2bin/darktable 2bin/darktable
3bin/darktable-cltest 3bin/darktable-cltest
4bin/darktable-faster 4bin/darktable-faster
5bin/darktable-viewer 5bin/darktable-viewer
6lib/darktable/libdarktable.so 6lib/darktable/libdarktable.so
7lib/darktable/plugins/imageio/format/libcopy.so 7lib/darktable/plugins/imageio/format/libcopy.so
8lib/darktable/plugins/imageio/format/libexr.so 8lib/darktable/plugins/imageio/format/libexr.so
9lib/darktable/plugins/imageio/format/libjpeg.so 9lib/darktable/plugins/imageio/format/libjpeg.so
10lib/darktable/plugins/imageio/format/libpfm.so 10lib/darktable/plugins/imageio/format/libpfm.so
11lib/darktable/plugins/imageio/format/libpng.so 11lib/darktable/plugins/imageio/format/libpng.so
12lib/darktable/plugins/imageio/format/libppm.so 12lib/darktable/plugins/imageio/format/libppm.so
13lib/darktable/plugins/imageio/format/libtiff.so 13lib/darktable/plugins/imageio/format/libtiff.so
14lib/darktable/plugins/imageio/storage/libdisk.so 14lib/darktable/plugins/imageio/storage/libdisk.so
15lib/darktable/plugins/imageio/storage/libemail.so 15lib/darktable/plugins/imageio/storage/libemail.so
 16lib/darktable/plugins/imageio/storage/libflickr.so
16lib/darktable/plugins/imageio/storage/libgallery.so 17lib/darktable/plugins/imageio/storage/libgallery.so
17lib/darktable/plugins/imageio/storage/libpicasa.so 18lib/darktable/plugins/imageio/storage/libpicasa.so
18lib/darktable/plugins/libatrous.so 19lib/darktable/plugins/libatrous.so
19lib/darktable/plugins/libbasecurve.so 20lib/darktable/plugins/libbasecurve.so
20lib/darktable/plugins/libbilateral.so 21lib/darktable/plugins/libbilateral.so
21lib/darktable/plugins/libbloom.so 22lib/darktable/plugins/libbloom.so
22lib/darktable/plugins/libborders.so 23lib/darktable/plugins/libborders.so
23lib/darktable/plugins/libcacorrect.so 24lib/darktable/plugins/libcacorrect.so
24lib/darktable/plugins/libchannelmixer.so 25lib/darktable/plugins/libchannelmixer.so
25lib/darktable/plugins/libclahe.so 26lib/darktable/plugins/libclahe.so
26lib/darktable/plugins/libclipping.so 27lib/darktable/plugins/libclipping.so
27lib/darktable/plugins/libcolorcontrast.so 28lib/darktable/plugins/libcolorcontrast.so
28lib/darktable/plugins/libcolorcorrection.so 29lib/darktable/plugins/libcolorcorrection.so
@@ -62,97 +63,99 @@ lib/darktable/plugins/lighttable/libcapt @@ -62,97 +63,99 @@ lib/darktable/plugins/lighttable/libcapt
62lib/darktable/plugins/lighttable/libcollect.so 63lib/darktable/plugins/lighttable/libcollect.so
63lib/darktable/plugins/lighttable/libcopy_history.so 64lib/darktable/plugins/lighttable/libcopy_history.so
64lib/darktable/plugins/lighttable/libexport.so 65lib/darktable/plugins/lighttable/libexport.so
65lib/darktable/plugins/lighttable/libimage.so 66lib/darktable/plugins/lighttable/libimage.so
66lib/darktable/plugins/lighttable/libmetadata.so 67lib/darktable/plugins/lighttable/libmetadata.so
67lib/darktable/plugins/lighttable/librecentcollect.so 68lib/darktable/plugins/lighttable/librecentcollect.so
68lib/darktable/plugins/lighttable/libselect.so 69lib/darktable/plugins/lighttable/libselect.so
69lib/darktable/plugins/lighttable/libstyles.so 70lib/darktable/plugins/lighttable/libstyles.so
70lib/darktable/plugins/lighttable/libtagging.so 71lib/darktable/plugins/lighttable/libtagging.so
71lib/darktable/views/libcapture.so 72lib/darktable/views/libcapture.so
72lib/darktable/views/libdarkroom.so 73lib/darktable/views/libdarkroom.so
73lib/darktable/views/libfilmstrip.so 74lib/darktable/views/libfilmstrip.so
74lib/darktable/views/liblighttable.so 75lib/darktable/views/liblighttable.so
 76man/man1/darktable.1
75share/applications/darktable.desktop 77share/applications/darktable.desktop
76share/darktable/darktable.gtkrc 78share/darktable/darktable.gtkrc
77share/darktable/kernels/atrous.cl 79share/darktable/kernels/atrous.cl
78share/darktable/kernels/basic.cl 80share/darktable/kernels/basic.cl
79share/darktable/kernels/blendop.cl 81share/darktable/kernels/blendop.cl
80share/darktable/kernels/demosaic_ppg.cl 82share/darktable/kernels/demosaic_ppg.cl
 83share/darktable/kernels/gaussian.cl
81share/darktable/kernels/highpass.cl 84share/darktable/kernels/highpass.cl
82share/darktable/kernels/nlmeans.cl 85share/darktable/kernels/nlmeans.cl
83share/darktable/kernels/programs.conf 86share/darktable/kernels/programs.conf
 87share/darktable/kernels/sharpen.cl
84share/darktable/pixmaps/plugins/darkroom/anlfyeni.png 88share/darktable/pixmaps/plugins/darkroom/anlfyeni.png
85share/darktable/pixmaps/plugins/darkroom/atrous.png 89share/darktable/pixmaps/plugins/darkroom/atrous.png
86share/darktable/pixmaps/plugins/darkroom/basecurve.png 90share/darktable/pixmaps/plugins/darkroom/basecurve.png
87share/darktable/pixmaps/plugins/darkroom/bloom.png 91share/darktable/pixmaps/plugins/darkroom/bloom.png
88share/darktable/pixmaps/plugins/darkroom/borders.png 92share/darktable/pixmaps/plugins/darkroom/borders.png
89share/darktable/pixmaps/plugins/darkroom/cacorrect.png 93share/darktable/pixmaps/plugins/darkroom/cacorrect.png
90share/darktable/pixmaps/plugins/darkroom/channelmixer.png 94share/darktable/pixmaps/plugins/darkroom/channelmixer.png
91share/darktable/pixmaps/plugins/darkroom/clahe.png 95share/darktable/pixmaps/plugins/darkroom/clahe.png
92share/darktable/pixmaps/plugins/darkroom/clipping.png 96share/darktable/pixmaps/plugins/darkroom/clipping.png
93share/darktable/pixmaps/plugins/darkroom/colorcorrection.png 97share/darktable/pixmaps/plugins/darkroom/colorcorrection.png
94share/darktable/pixmaps/plugins/darkroom/colorin.png 98share/darktable/pixmaps/plugins/darkroom/colorin.png
95share/darktable/pixmaps/plugins/darkroom/colorout.png 99share/darktable/pixmaps/plugins/darkroom/colorout.png
96share/darktable/pixmaps/plugins/darkroom/colortransfer.png 100share/darktable/pixmaps/plugins/darkroom/colortransfer.png
97share/darktable/pixmaps/plugins/darkroom/colorzones.png 101share/darktable/pixmaps/plugins/darkroom/colorzones.png
98share/darktable/pixmaps/plugins/darkroom/demosaic.png 102share/darktable/pixmaps/plugins/darkroom/demosaic.png
99share/darktable/pixmaps/plugins/darkroom/exposure.png 103share/darktable/pixmaps/plugins/darkroom/exposure.png
100share/darktable/pixmaps/plugins/darkroom/graduatednd.png 104share/darktable/pixmaps/plugins/darkroom/graduatednd.png
101share/darktable/pixmaps/plugins/darkroom/grain.png 105share/darktable/pixmaps/plugins/darkroom/grain.png
102share/darktable/pixmaps/plugins/darkroom/highlights.png 106share/darktable/pixmaps/plugins/darkroom/highlights.png
103share/darktable/pixmaps/plugins/darkroom/highpass.png 107share/darktable/pixmaps/plugins/darkroom/highpass.png
104share/darktable/pixmaps/plugins/darkroom/hotpixels.png 108share/darktable/pixmaps/plugins/darkroom/hotpixels.png
105share/darktable/pixmaps/plugins/darkroom/lens.png 109share/darktable/pixmaps/plugins/darkroom/lens.png
106share/darktable/pixmaps/plugins/darkroom/localc.png 
107share/darktable/pixmaps/plugins/darkroom/lowlight.png 110share/darktable/pixmaps/plugins/darkroom/lowlight.png
 111share/darktable/pixmaps/plugins/darkroom/lowpass.png
108share/darktable/pixmaps/plugins/darkroom/monochrome.png 112share/darktable/pixmaps/plugins/darkroom/monochrome.png
109share/darktable/pixmaps/plugins/darkroom/nlmeans.png 113share/darktable/pixmaps/plugins/darkroom/nlmeans.png
110share/darktable/pixmaps/plugins/darkroom/overexposed.png 114share/darktable/pixmaps/plugins/darkroom/overexposed.png
111share/darktable/pixmaps/plugins/darkroom/profile_gamma.png 115share/darktable/pixmaps/plugins/darkroom/profile_gamma.png
112share/darktable/pixmaps/plugins/darkroom/rawdenoise.png 116share/darktable/pixmaps/plugins/darkroom/rawdenoise.png
113share/darktable/pixmaps/plugins/darkroom/rawimport.png 117share/darktable/pixmaps/plugins/darkroom/rawimport.png
114share/darktable/pixmaps/plugins/darkroom/relight.png 118share/darktable/pixmaps/plugins/darkroom/relight.png
115share/darktable/pixmaps/plugins/darkroom/sharpen.png 119share/darktable/pixmaps/plugins/darkroom/sharpen.png
116share/darktable/pixmaps/plugins/darkroom/soften.png 120share/darktable/pixmaps/plugins/darkroom/soften.png
117share/darktable/pixmaps/plugins/darkroom/splittoning.png 121share/darktable/pixmaps/plugins/darkroom/splittoning.png
118share/darktable/pixmaps/plugins/darkroom/spots.png 122share/darktable/pixmaps/plugins/darkroom/spots.png
119share/darktable/pixmaps/plugins/darkroom/stuckpixels.png 123share/darktable/pixmaps/plugins/darkroom/stuckpixels.png
120share/darktable/pixmaps/plugins/darkroom/temperature.png 124share/darktable/pixmaps/plugins/darkroom/temperature.png
121share/darktable/pixmaps/plugins/darkroom/template.png 125share/darktable/pixmaps/plugins/darkroom/template.png
122share/darktable/pixmaps/plugins/darkroom/tonecurve.png 126share/darktable/pixmaps/plugins/darkroom/tonecurve.png
123share/darktable/pixmaps/plugins/darkroom/tonemap.png 127share/darktable/pixmaps/plugins/darkroom/tonemap.png
124share/darktable/pixmaps/plugins/darkroom/velvia.png 128share/darktable/pixmaps/plugins/darkroom/velvia.png
125share/darktable/pixmaps/plugins/darkroom/vignette.png 129share/darktable/pixmaps/plugins/darkroom/vignette.png
126share/darktable/pixmaps/plugins/darkroom/watermark.png 130share/darktable/pixmaps/plugins/darkroom/watermark.png
127share/darktable/pixmaps/plugins/darkroom/zonesystem.png 131share/darktable/pixmaps/plugins/darkroom/zonesystem.png
128share/darktable/rawspeed/cameras.xml 132share/darktable/rawspeed/cameras.xml
129share/darktable/rawspeed/showcameras.xsl 133share/darktable/rawspeed/showcameras.xsl
130share/darktable/style/favicon.ico 134share/darktable/style/favicon.ico
131share/darktable/style/style.css 135share/darktable/style/style.css
132share/darktable/watermarks/darktable.svg 136share/darktable/watermarks/darktable.svg
 137share/darktable/watermarks/hasselblad.svg
133share/darktable/watermarks/promo.svg 138share/darktable/watermarks/promo.svg
134share/doc/darktable/AUTHORS 139share/doc/darktable/AUTHORS
135share/doc/darktable/LICENSE 140share/doc/darktable/LICENSE
136share/doc/darktable/README 141share/doc/darktable/README
137share/doc/darktable/TRANSLATORS 142share/doc/darktable/TRANSLATORS
138share/icons/hicolor/16x16/apps/darktable.png 143share/icons/hicolor/16x16/apps/darktable.png
139share/icons/hicolor/22x22/apps/darktable.png 144share/icons/hicolor/22x22/apps/darktable.png
140share/icons/hicolor/32x32/apps/darktable.png 145share/icons/hicolor/32x32/apps/darktable.png
141share/icons/hicolor/48x48/apps/darktable.png 146share/icons/hicolor/48x48/apps/darktable.png
142share/icons/hicolor/64x64/apps/darktable.png 147share/icons/hicolor/64x64/apps/darktable.png
143share/icons/hicolor/scalable/apps/darktable.svg 148share/icons/hicolor/scalable/apps/darktable.svg
144share/locale/ca/LC_MESSAGES/darktable.mo 149share/locale/ca/LC_MESSAGES/darktable.mo
145share/locale/de/LC_MESSAGES/darktable.mo 150share/locale/de/LC_MESSAGES/darktable.mo
146share/locale/fi/LC_MESSAGES/darktable.mo 151share/locale/fi/LC_MESSAGES/darktable.mo
147share/locale/fr/LC_MESSAGES/darktable.mo 152share/locale/fr/LC_MESSAGES/darktable.mo
148share/locale/gl/LC_MESSAGES/darktable.mo 153share/locale/gl/LC_MESSAGES/darktable.mo
149share/locale/it/LC_MESSAGES/darktable.mo 154share/locale/it/LC_MESSAGES/darktable.mo
150share/locale/ja/LC_MESSAGES/darktable.mo 155share/locale/ja/LC_MESSAGES/darktable.mo
151share/locale/nl/LC_MESSAGES/darktable.mo 156share/locale/nl/LC_MESSAGES/darktable.mo
152share/locale/pl/LC_MESSAGES/darktable.mo 157share/locale/pl/LC_MESSAGES/darktable.mo
153share/locale/ro/LC_MESSAGES/darktable.mo 158share/locale/ro/LC_MESSAGES/darktable.mo
154share/locale/ru/LC_MESSAGES/darktable.mo 159share/locale/ru/LC_MESSAGES/darktable.mo
155share/locale/sq/LC_MESSAGES/darktable.mo 160share/locale/sq/LC_MESSAGES/darktable.mo
156share/locale/sv/LC_MESSAGES/darktable.mo 
157share/locale/th/LC_MESSAGES/darktable.mo 161share/locale/th/LC_MESSAGES/darktable.mo
158man/man1/darktable.1 
cvs diff -r1.2 -r1.3 pkgsrc/graphics/darktable/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/darktable/distinfo 2011/07/26 21:48:00 1.2
+++ pkgsrc/graphics/darktable/distinfo 2011/08/25 14:42:53 1.3
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.2 2011/07/26 21:48:00 jakllsch Exp $ 1$NetBSD: distinfo,v 1.3 2011/08/25 14:42:53 jakllsch Exp $
2 2
3SHA1 (darktable-0.9.tar.gz) = 86a9830bf71bf63abbcc7e426c62f582e5866c2b 3SHA1 (darktable-0.9.2.tar.gz) = 5527854edd10cca074bd956772b81d646a796293
4RMD160 (darktable-0.9.tar.gz) = c79c8707196a113f9d71a6f52ed68d753d8ff537 4RMD160 (darktable-0.9.2.tar.gz) = 95b5f28afd787070d5e8c236f7e3bb2d27522cae
5Size (darktable-0.9.tar.gz) = 2187367 bytes 5Size (darktable-0.9.2.tar.gz) = 2269319 bytes
6SHA1 (patch-cmake_modules_FindGTK2.cmake) = 1311e915f6af6a481c89b25945eef02180bd4942 6SHA1 (patch-cmake_modules_FindGTK2.cmake) = 30dae502bad02a7b993f201a727eba7efa43ed4e
7SHA1 (patch-data_darktable-faster) = e11ccd8f563bdd8d0216b5fe7baa3f35e089bf4e 7SHA1 (patch-data_darktable-faster) = 2eed0fcf4cf571aaf2a19f5dee6b19a2668cf1e1
8SHA1 (patch-doc_CMakeLists.txt) = fac910566a859d86896809b952d81b50df6c3557 8SHA1 (patch-doc_CMakeLists.txt) = 7b7af1dda752725d5b42ba4395de1cd5390c64fd
9SHA1 (patch-src_CMakeLists.txt) = 22a9612ab668007bf7f3fcb4301661c57665cf02 9SHA1 (patch-src_CMakeLists.txt) = 31e90c7c7b622ccc4299f4caa576d5625835555a
10SHA1 (patch-src_LibRaw_libraw_libraw__alloc.h) = f4d3cd8c1b24c0a900b2397aba73093a347d4201 10SHA1 (patch-src_LibRaw_libraw_libraw__alloc.h) = 1217d6bf0b14b538d39e9bfe9fa70e2f7bffbfc5
11SHA1 (patch-src_imageio_format_png.c) = 9167d627c71a59b7e29fdb4451d2dd080473c8dc 11SHA1 (patch-src_imageio_format_png.c) = 59c44f57132f59bb09930498fcdc2357734da6ba
12SHA1 (patch-src_rawspeed_RawSpeed_Common.h) = 34c1b1ea45a2716fa7308ada9facf93245b55e72 12SHA1 (patch-src_rawspeed_RawSpeed_Common.h) = c7dfc4e65ea46e7318d3d5ebdab6dcb5491c1c48
cvs diff -r1.1.1.1 -r1.2 pkgsrc/graphics/darktable/patches/Attic/patch-cmake_modules_FindGTK2.cmake (expand / switch to unified diff)

--- pkgsrc/graphics/darktable/patches/Attic/patch-cmake_modules_FindGTK2.cmake 2011/07/26 21:37:47 1.1.1.1
+++ pkgsrc/graphics/darktable/patches/Attic/patch-cmake_modules_FindGTK2.cmake 2011/08/25 14:42:53 1.2
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-cmake_modules_FindGTK2.cmake,v 1.1.1.1 2011/07/26 21:37:47 jakllsch Exp $ 1$NetBSD: patch-cmake_modules_FindGTK2.cmake,v 1.2 2011/08/25 14:42:53 jakllsch Exp $
2 2
3Look for GTK where we might find it. Should honor ${PREFIX} someday. 3Look for GTK where we might find it. Should honor ${PREFIX} someday.
4 4
5--- cmake/modules/FindGTK2.cmake.orig 2011-07-02 03:15:32.000000000 +0000 5--- cmake/modules/FindGTK2.cmake.orig 2011-08-24 09:20:29.000000000 +0000
6+++ cmake/modules/FindGTK2.cmake 6+++ cmake/modules/FindGTK2.cmake
7@@ -182,6 +182,9 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hd 7@@ -184,6 +184,9 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hd
8 /usr/openwin/lib 8 /usr/openwin/lib
9 /sw/include 9 /sw/include
10 /sw/lib 10 /sw/lib
11+ /usr/pkg/include/glib 11+ /usr/pkg/include/glib
12+ /usr/pkg/include 12+ /usr/pkg/include
13+ /usr/pkg/lib 13+ /usr/pkg/lib
14 $ENV{GTKMM_BASEPATH}/include 14 $ENV{GTKMM_BASEPATH}/include
15 $ENV{GTKMM_BASEPATH}/lib 15 $ENV{GTKMM_BASEPATH}/lib
16 [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/include 16 [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/include
cvs diff -r1.1.1.1 -r1.2 pkgsrc/graphics/darktable/patches/Attic/patch-data_darktable-faster (expand / switch to unified diff)

--- pkgsrc/graphics/darktable/patches/Attic/patch-data_darktable-faster 2011/07/26 21:37:47 1.1.1.1
+++ pkgsrc/graphics/darktable/patches/Attic/patch-data_darktable-faster 2011/08/25 14:42:53 1.2
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: patch-data_darktable-faster,v 1.1.1.1 2011/07/26 21:37:47 jakllsch Exp $ 1$NetBSD: patch-data_darktable-faster,v 1.2 2011/08/25 14:42:53 jakllsch Exp $
2 2
3Don't depend on bash. This might not work. 3Don't depend on bash. This might not work.
4 4
5--- data/darktable-faster.orig 2011-07-02 03:15:32.000000000 +0000 5--- data/darktable-faster.orig 2011-08-24 09:20:29.000000000 +0000
6+++ data/darktable-faster 6+++ data/darktable-faster
7@@ -1,4 +1,4 @@ 7@@ -1,4 +1,4 @@
8-#!/bin/bash 8-#!/bin/bash
9+#!/bin/sh 9+#!/bin/sh
10  10
11 # get dbfile from gconf 11 PATH=`dirname $_`:$PATH
12 dbfile=$(gconftool-2 --get /apps/darktable/database) 12
cvs diff -r1.1.1.1 -r1.2 pkgsrc/graphics/darktable/patches/patch-src_CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/graphics/darktable/patches/patch-src_CMakeLists.txt 2011/07/26 21:37:47 1.1.1.1
+++ pkgsrc/graphics/darktable/patches/patch-src_CMakeLists.txt 2011/08/25 14:42:53 1.2
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1$NetBSD: patch-src_CMakeLists.txt,v 1.1.1.1 2011/07/26 21:37:47 jakllsch Exp $ 1$NetBSD: patch-src_CMakeLists.txt,v 1.2 2011/08/25 14:42:53 jakllsch Exp $
2 2
3Various thing to possibly improve portability. 3Various thing to possibly improve portability.
4 4
5--- src/CMakeLists.txt.orig 2011-07-02 03:15:32.000000000 +0000 5--- src/CMakeLists.txt.orig 2011-08-24 09:20:29.000000000 +0000
6+++ src/CMakeLists.txt 6+++ src/CMakeLists.txt
7@@ -219,7 +219,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  7@@ -240,7 +240,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}
8  8
9 if(NOT APPLE) 9 if(NOT APPLE)
10 # apple build fails on deprecated warnings.. 10 # apple build fails on deprecated warnings..
11- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") 11- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
12+ #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") 12+ #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
13 endif(NOT APPLE) 13 endif(NOT APPLE)
14  14
15 if(NOT WIN32) 15 if(NOT WIN32)
16@@ -227,17 +227,17 @@ if(NOT WIN32) 16@@ -248,17 +248,17 @@ if(NOT WIN32)
17 endif(NOT WIN32) 17 endif(NOT WIN32)
18  18
19 if(NOT BINARY_PACKAGE_BUILD) 19 if(NOT BINARY_PACKAGE_BUILD)
20- set(MARCH "-march=native")  20- set(MARCH "-march=native")
21+# set(MARCH "-march=native")  21+# set(MARCH "-march=native")
22 else() 22 else()
23- set(MARCH "-mtune=generic") 23- set(MARCH "-mtune=generic")
24+# set(MARCH "-mtune=generic") 24+# set(MARCH "-mtune=generic")
25 endif() 25 endif()
26  26
27-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -mfpmath=sse ${MARCH} -g") 27-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -mfpmath=sse ${MARCH} -g")
28-set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -ffast-math -fexpensive-optimizations") 28-set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -ffast-math -fexpensive-optimizations")
29-set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g -D_DEBUG") 29-set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g -D_DEBUG")
cvs diff -r1.1.1.1 -r1.2 pkgsrc/graphics/darktable/patches/Attic/patch-src_LibRaw_libraw_libraw__alloc.h (expand / switch to unified diff)

--- pkgsrc/graphics/darktable/patches/Attic/patch-src_LibRaw_libraw_libraw__alloc.h 2011/07/26 21:37:47 1.1.1.1
+++ pkgsrc/graphics/darktable/patches/Attic/patch-src_LibRaw_libraw_libraw__alloc.h 2011/08/25 14:42:53 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-src_LibRaw_libraw_libraw__alloc.h,v 1.1.1.1 2011/07/26 21:37:47 jakllsch Exp $ 1$NetBSD: patch-src_LibRaw_libraw_libraw__alloc.h,v 1.2 2011/08/25 14:42:53 jakllsch Exp $
2 2
3Work around redefined symbol. 3Work around redefined symbol.
4 4
5--- src/LibRaw/libraw/libraw_alloc.h.orig 2011-07-02 03:15:32.000000000 +0000 5--- src/external/LibRaw/libraw/libraw_alloc.h.orig 2011-08-24 09:20:29.000000000 +0000
6+++ src/LibRaw/libraw/libraw_alloc.h 6+++ src/external/LibRaw/libraw/libraw_alloc.h
7@@ -27,6 +27,7 @@ it under the terms of the one of three l 7@@ -27,6 +27,7 @@ it under the terms of the one of three l
8  8
9 #ifdef __cplusplus 9 #ifdef __cplusplus
10  10
11+#undef MSIZE 11+#undef MSIZE
12 #define MSIZE 32 12 #define MSIZE 32
13  13
14 class DllDef libraw_memmgr 14 class DllDef libraw_memmgr
cvs diff -r1.1.1.1 -r1.2 pkgsrc/graphics/darktable/patches/Attic/patch-src_imageio_format_png.c (expand / switch to unified diff)

--- pkgsrc/graphics/darktable/patches/Attic/patch-src_imageio_format_png.c 2011/07/26 21:37:47 1.1.1.1
+++ pkgsrc/graphics/darktable/patches/Attic/patch-src_imageio_format_png.c 2011/08/25 14:42:53 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-src_imageio_format_png.c,v 1.1.1.1 2011/07/26 21:37:47 jakllsch Exp $ 1$NetBSD: patch-src_imageio_format_png.c,v 1.2 2011/08/25 14:42:53 jakllsch Exp $
2 2
3Needs a constant from zlib. 3Needs a constant from zlib.
4 4
5--- src/imageio/format/png.c.orig 2011-07-02 03:15:32.000000000 +0000 5--- src/imageio/format/png.c.orig 2011-08-24 09:20:29.000000000 +0000
6+++ src/imageio/format/png.c 6+++ src/imageio/format/png.c
7@@ -27,6 +27,7 @@ 7@@ -27,6 +27,7 @@
8 #include <stdlib.h> 8 #include <stdlib.h>
9 #include <stdio.h> 9 #include <stdio.h>
10 #include <png.h> 10 #include <png.h>
11+#include <zlib.h> 11+#include <zlib.h>
12 #include <inttypes.h> 12 #include <inttypes.h>
13  13
14 DT_MODULE(1) 14 DT_MODULE(1)
cvs diff -r1.1.1.1 -r1.2 pkgsrc/graphics/darktable/patches/Attic/patch-src_rawspeed_RawSpeed_Common.h (expand / switch to unified diff)

--- pkgsrc/graphics/darktable/patches/Attic/patch-src_rawspeed_RawSpeed_Common.h 2011/07/26 21:37:47 1.1.1.1
+++ pkgsrc/graphics/darktable/patches/Attic/patch-src_rawspeed_RawSpeed_Common.h 2011/08/25 14:42:53 1.2
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-src_rawspeed_RawSpeed_Common.h,v 1.1.1.1 2011/07/26 21:37:47 jakllsch Exp $ 1$NetBSD: patch-src_rawspeed_RawSpeed_Common.h,v 1.2 2011/08/25 14:42:53 jakllsch Exp $
2 2
3Move typedef to correct place. 3Move typedef to correct place.
4 4
5--- src/rawspeed/RawSpeed/Common.h.orig 2011-07-02 03:15:32.000000000 +0000 5--- src/external/rawspeed/RawSpeed/Common.h.orig 2011-08-24 09:20:29.000000000 +0000
6+++ src/rawspeed/RawSpeed/Common.h 6+++ src/external/rawspeed/RawSpeed/Common.h
7@@ -42,8 +42,8 @@ void* _aligned_malloc(size_t bytes, size 7@@ -42,8 +42,8 @@ void* _aligned_malloc(size_t bytes, size
8 #define _aligned_free(a) do { free(a); } while (0) 8 #define _aligned_free(a) do { free(a); } while (0)
9 #ifndef MIN 9 #ifndef MIN
10 #define MIN(a, b) lmin(a,b) 10 #define MIN(a, b) lmin(a,b)
11-typedef unsigned long long uint64; 11-typedef unsigned long long uint64;
12 #endif 12 #endif
13+typedef unsigned long long uint64; 13+typedef unsigned long long uint64;
14 #ifndef MAX 14 #ifndef MAX
15 #define MAX(a, b) lmax(a,b) 15 #define MAX(a, b) lmax(a,b)
16 #endif 16 #endif
cvs diff -r1.1 -r1.2 pkgsrc/graphics/darktable/patches/Attic/patch-doc_CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/graphics/darktable/patches/Attic/patch-doc_CMakeLists.txt 2011/07/26 21:48:00 1.1
+++ pkgsrc/graphics/darktable/patches/Attic/patch-doc_CMakeLists.txt 2011/08/25 14:42:53 1.2
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: patch-doc_CMakeLists.txt,v 1.1 2011/07/26 21:48:00 jakllsch Exp $ 1$NetBSD: patch-doc_CMakeLists.txt,v 1.2 2011/08/25 14:42:53 jakllsch Exp $
2 2
3--- doc/CMakeLists.txt.orig 2011-07-02 03:15:32.000000000 +0000 3--- doc/CMakeLists.txt.orig 2011-08-24 09:20:29.000000000 +0000
4+++ doc/CMakeLists.txt 4+++ doc/CMakeLists.txt
5@@ -20,6 +20,6 @@ add_custom_command( 5@@ -20,6 +20,6 @@ add_custom_command(
6 add_custom_target(manpages ALL DEPENDS darktable.1) 6 add_custom_target(manpages ALL DEPENDS darktable.1)
7  7
8  8
9-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/darktable.1 DESTINATION ./share/man/man1) 9-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/darktable.1 DESTINATION ./share/man/man1)
10+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/darktable.1 DESTINATION ./man/man1) 10+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/darktable.1 DESTINATION ./man/man1)
11  11
12 add_subdirectory(usermanual) 12 add_subdirectory(usermanual)