diff -Naur graphics/darktable.orig/Makefile graphics/darktable/Makefile --- graphics/darktable.orig/Makefile 2012-02-18 11:18:24.000000000 +0100 +++ graphics/darktable/Makefile 2012-04-30 23:25:49.711995466 +0200 @@ -6,8 +6,7 @@ # PORTNAME= darktable -PORTVERSION= 0.9.3 -PORTREVISION= 1 +PORTVERSION= 1.0.3 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R} @@ -24,12 +23,28 @@ USE_CMAKE= yes CMAKE_OUTSOURCE= yes +# Use GCC 4.6 for its OpenMP support. +USE_GCC= 4.6+ USE_GNOME= librsvg2 USE_SQLITE= yes +# "darktable" has an RPATH set to "$ORIGIN/../lib/darktable" (the +# directory containing "libdarktable.so"), but our rtld requires +# DF_ORIGIN to be set in DT_FLAGS to expand $ORIGIN (see r189959 in +# src). This is not the case here, so we add libdarktable.so path to +# ldconfig. USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} INSTALLS_ICONS= yes MAN1= ${PORTNAME}.1 +# libdarktable.so has parts written in C++ (built-in rawspeed and +# libraw) and is linked to GCC 4.6's libstdc++. However CMake removes +# RPATH from this library and libstdc++ from base (GCC 4.2.1) is pulled +# at runtime, preventing darktable from starting. +# +# To workaround this, we link the "darktable" executable to libstdc++. +# This one still has the RPATH and the correct libstdc++ is pulled. +LDFLAGS+= -lstdc++ + OPTIONS= GCONF "Enable GConf backend" off \ GPHOTO "Enable camera support via libgphoto2" on \ FLICKR "Enable Flickr support via flickcurl" off \ @@ -41,9 +56,8 @@ .include -.if ${ARCH} == "powerpc" || ${ARCH} == "sparc64" -BROKEN= does not compile: invokes i386 assembler -.endif +ONLY_FOR_ARCHS= i386 amd64 +ONLY_FOR_ARCHS_REASON= Use SSE extensions .if defined(WITH_GCONF) USE_GNOME+= gconf2 diff -Naur graphics/darktable.orig/distinfo graphics/darktable/distinfo --- graphics/darktable.orig/distinfo 2011-11-08 18:18:15.000000000 +0100 +++ graphics/darktable/distinfo 2012-04-30 18:26:18.862843400 +0200 @@ -1,2 +1,2 @@ -SHA256 (darktable-0.9.3.tar.gz) = 1cd75253355bd70b698dc78c2463c1b70867ac96cb6f23337a3b6dec6277892a -SIZE (darktable-0.9.3.tar.gz) = 2330605 +SHA256 (darktable-1.0.3.tar.gz) = 112d237a9ec99dab814eccf938a6a9aea1d2e7eec2da685633a03632f9ae99f1 +SIZE (darktable-1.0.3.tar.gz) = 2538467 diff -Naur graphics/darktable.orig/pkg-plist graphics/darktable/pkg-plist --- graphics/darktable.orig/pkg-plist 2011-11-08 18:18:15.000000000 +0100 +++ graphics/darktable/pkg-plist 2012-04-30 19:16:16.892843353 +0200 @@ -1,6 +1,5 @@ bin/darktable bin/darktable-cltest -bin/darktable-faster %%DATADIR%%/darktable.gtkrc %%DATADIR%%/gdb_commands %%DATADIR%%/kernels/atrous.cl @@ -12,6 +11,8 @@ %%DATADIR%%/kernels/nlmeans.cl %%DATADIR%%/kernels/programs.conf %%DATADIR%%/kernels/sharpen.cl +%%DATADIR%%/pixmaps/idbutton.png +%%DATADIR%%/pixmaps/off.png %%DATADIR%%/pixmaps/plugins/darkroom/anlfyeni.png %%DATADIR%%/pixmaps/plugins/darkroom/atrous.png %%DATADIR%%/pixmaps/plugins/darkroom/basecurve.png @@ -36,6 +37,7 @@ %%DATADIR%%/pixmaps/plugins/darkroom/hotpixels.png %%DATADIR%%/pixmaps/plugins/darkroom/invert.png %%DATADIR%%/pixmaps/plugins/darkroom/lens.png +%%DATADIR%%/pixmaps/plugins/darkroom/levels.png %%DATADIR%%/pixmaps/plugins/darkroom/lowlight.png %%DATADIR%%/pixmaps/plugins/darkroom/lowpass.png %%DATADIR%%/pixmaps/plugins/darkroom/monochrome.png @@ -45,6 +47,7 @@ %%DATADIR%%/pixmaps/plugins/darkroom/rawdenoise.png %%DATADIR%%/pixmaps/plugins/darkroom/rawimport.png %%DATADIR%%/pixmaps/plugins/darkroom/relight.png +%%DATADIR%%/pixmaps/plugins/darkroom/shadhi.png %%DATADIR%%/pixmaps/plugins/darkroom/sharpen.png %%DATADIR%%/pixmaps/plugins/darkroom/soften.png %%DATADIR%%/pixmaps/plugins/darkroom/splittoning.png @@ -88,25 +91,32 @@ 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 @@ -115,24 +125,48 @@ 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/libbackgroundjobs.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/libdarkroom.so -lib/darktable/views/libfilmstrip.so lib/darktable/views/liblighttable.so share/applications/darktable.desktop 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 @@ -153,6 +187,7 @@ 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 @dirrmtry share/applications @dirrm lib/darktable/views @dirrm lib/darktable/plugins/lighttable