Date: Tue, 4 Dec 2012 09:46:31 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r308226 - head/graphics/darktable Message-ID: <201212040946.qB49kVqO037643@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Tue Dec 4 09:46:31 2012 New Revision: 308226 URL: http://svnweb.freebsd.org/changeset/ports/308226 Log: - Update to version 1.1 - Introduce two new options, GEO and GLIBJSON (off by default) - Remove GCONF option (no longer provided upstream) - Remove some no longer relevant local patching - Sort things around Makefile a bit while here PR: ports/174058 (version update) Submitted by: dumbbell Feature safe: yes Modified: head/graphics/darktable/Makefile head/graphics/darktable/distinfo head/graphics/darktable/pkg-plist Modified: head/graphics/darktable/Makefile ============================================================================== --- head/graphics/darktable/Makefile Tue Dec 4 09:46:24 2012 (r308225) +++ head/graphics/darktable/Makefile Tue Dec 4 09:46:31 2012 (r308226) @@ -2,15 +2,16 @@ # $FreeBSD$ PORTNAME= darktable -PORTVERSION= 1.0.5 +PORTVERSION= 1.1 CATEGORIES= graphics -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} MAINTAINER= danfe@FreeBSD.org COMMENT= Virtual lighttable and darkroom for photographers LICENSE= GPLv3 +BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt LIB_DEPENDS= exiv2:${PORTSDIR}/graphics/exiv2 \ IlmImf:${PORTSDIR}/graphics/OpenEXR \ lensfun:${PORTSDIR}/graphics/lensfun \ @@ -29,10 +30,13 @@ USE_SQLITE= yes USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} INSTALLS_ICONS= yes MAN1= ${PORTNAME}.1 +LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE= GCONF GPHOTO FLICKR RAWSPEED SLIDESHOW KWALLET GNOMEKEYRING \ - NLS GCC46 +OPTIONS_DEFINE= GPHOTO GEO FLICKR GLIBJSON KWALLET GNOMEKEYRING RAWSPEED \ + SLIDESHOW NLS GCC46 +GEO_DESC= Build geotagging parts +GLIBJSON_DESC= GlibJson library support RAWSPEED_DESC= Compile with rawspeed backend SLIDESHOW_DESC= Build OpenGL/SDL slideshow viewer GCC46_DESC= Build with GCC 4.6+ (better OpenMP support) @@ -41,24 +45,22 @@ OPTIONS_DEFAULT= GPHOTO RAWSPEED GCC46 .include <bsd.port.pre.mk> -.if ${PORT_OPTIONS:MGCONF} -USE_GNOME+= gconf2 -CMAKE_ARGS+= -DDONT_INSTALL_GCONF_SCHEMAS:BOOL=ON # bogus name, no typo -GCONF_SCHEMAS= ${PORTNAME}.schemas -.else -CMAKE_ARGS+= -DUSE_GCONF_BACKEND:BOOL=OFF -PLIST_FILES+= share/darktable/darktablerc -.endif - .if ${PORT_OPTIONS:MGPHOTO} LIB_DEPENDS+= gphoto2:${PORTSDIR}/graphics/libgphoto2 PLIST_FILES+= lib/darktable/plugins/lighttable/libcamera.so \ lib/darktable/plugins/lighttable/libcapture.so \ + lib/darktable/plugins/lighttable/liblive_view.so \ lib/darktable/views/libcapture.so .else CMAKE_ARGS+= -DUSE_CAMERA_SUPPORT:BOOL=OFF .endif +.if ${PORT_OPTIONS:MGEO} +LIB_DEPENDS+= soup-2.4:${PORTSDIR}/devel/libsoup +.else +CMAKE_ARGS+= -DUSE_GEO:BOOL=OFF +.endif + .if ${PORT_OPTIONS:MFLICKR} LIB_DEPENDS+= flickcurl:${PORTSDIR}/www/flickcurl PLIST_FILES+= lib/darktable/plugins/imageio/storage/libflickr.so @@ -66,16 +68,10 @@ PLIST_FILES+= lib/darktable/plugins/imag CMAKE_ARGS+= -DUSE_FLICKR:BOOL=OFF .endif -.if ! ${PORT_OPTIONS:MRAWSPEED} -CMAKE_ARGS+= -DDONT_USE_RAWSPEED:BOOL=ON -.endif - -.if ${PORT_OPTIONS:MSLIDESHOW} -USE_GL= gl -USE_SDL= sdl -PLIST_FILES+= bin/darktable-viewer +.if ${PORT_OPTIONS:MGLIBJSON} +LIB_DEPENDS+= json-glib-1.0:${PORTSDIR}/devel/json-glib .else -CMAKE_ARGS+= -DBUILD_SLIDESHOW:BOOL=OFF +CMAKE_ARGS+= -DUSE_GLIBJSON:BOOL=OFF .endif .if ${PORT_OPTIONS:MKWALLET} @@ -90,6 +86,18 @@ LIB_DEPENDS+= gnome-keyring:${PORTSDIR}/ CMAKE_ARGS+= -DUSE_GNOME_KEYRING:BOOL=OFF .endif +.if ! ${PORT_OPTIONS:MRAWSPEED} +CMAKE_ARGS+= -DDONT_USE_RAWSPEED:BOOL=ON +.endif + +.if ${PORT_OPTIONS:MSLIDESHOW} +USE_GL= gl +USE_SDL= sdl +PLIST_FILES+= bin/darktable-viewer +.else +CMAKE_ARGS+= -DBUILD_SLIDESHOW:BOOL=OFF +.endif + .if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes .else @@ -109,10 +117,9 @@ LDFLAGS+= -lstdc++ .endif post-patch: -# Do not define _XOPEN_SOURCE, it breaks the build on FreeBSD (and is bogus -# here anyways); instead, use this space to define required _WITH_DPRINTF - @${REINPLACE_CMD} -e 's,_XOPEN_SOURCE 700,_WITH_DPRINTF,' \ - ${WRKSRC}/src/common/darktable.h + @${RM} ${WRKSRC}/data/js/.DS_Store + @${REINPLACE_CMD} -e 's,const gint,gint,' \ + ${WRKSRC}/src/external/osm-gps-map/src/osm-gps-map-image.* # Do not install useless (to end-user) documentation; adjust manpages path @${REINPLACE_CMD} -e '/DOC_FILES/d ; s,share/man/man1,man/man1,' \ ${WRKSRC}/doc/CMakeLists.txt @@ -120,12 +127,12 @@ post-patch: # are used for release builds as well @${REINPLACE_CMD} -e '/-O3/s,^,#, ; /-msse2/s, -g,,' \ ${WRKSRC}/src/CMakeLists.txt -# Fix GConf schemas installation prefix - @${REINPLACE_CMD} -e 's,/etc/gconf/schemas,.&,' \ - ${WRKSRC}/data/CMakeLists.txt -# Do not use bash(1) when good ol' sh(1) can suffice - @${REINPLACE_CMD} -e 's,usr/bin/env bash,bin/sh,' \ - ${WRKSRC}/tools/create_preferences.sh.in +# Add some missing newlines at the EOF to unbreak the build + @${ECHO_CMD} >> ${WRKSRC}/src/common/srgb_tone_curve_values.h + @${ECHO_CMD} >> ${WRKSRC}/src/common/gpx.c + @${ECHO_CMD} >> ${WRKSRC}/src/gui/drag_and_drop.h + @${ECHO_CMD} >> ${WRKSRC}/src/gui/gtkentry.c + @${ECHO_CMD} >> ${WRKSRC}/src/views/map.c post-install: .if ! ${PORT_OPTIONS:MRAWSPEED} Modified: head/graphics/darktable/distinfo ============================================================================== --- head/graphics/darktable/distinfo Tue Dec 4 09:46:24 2012 (r308225) +++ head/graphics/darktable/distinfo Tue Dec 4 09:46:31 2012 (r308226) @@ -1,2 +1,2 @@ -SHA256 (darktable-1.0.5.tar.gz) = 0c18530446d2f2459fe533a1ef6fc2711300efe7466f36c23168ec2230fb5fbd -SIZE (darktable-1.0.5.tar.gz) = 2568221 +SHA256 (darktable-1.1.tar.gz) = 8f2401422ab3e0bb038b3fedf411aaf69994d679674757ee7886b6146b9fdd4f +SIZE (darktable-1.1.tar.gz) = 3423644 Modified: head/graphics/darktable/pkg-plist ============================================================================== --- head/graphics/darktable/pkg-plist Tue Dec 4 09:46:24 2012 (r308225) +++ head/graphics/darktable/pkg-plist Tue Dec 4 09:46:31 2012 (r308226) @@ -1,16 +1,29 @@ bin/darktable +bin/darktable-cli bin/darktable-cltest %%DATADIR%%/darktable.gtkrc +%%DATADIR%%/darktablerc %%DATADIR%%/gdb_commands +%%DATADIR%%/js/builder.js +%%DATADIR%%/js/effects.js +%%DATADIR%%/js/lightbox-web.js +%%DATADIR%%/js/lightbox.js +%%DATADIR%%/js/prototype.js +%%DATADIR%%/js/scriptaculous.js %%DATADIR%%/kernels/atrous.cl %%DATADIR%%/kernels/basic.cl +%%DATADIR%%/kernels/bilateral.cl %%DATADIR%%/kernels/blendop.cl %%DATADIR%%/kernels/demosaic_ppg.cl +%%DATADIR%%/kernels/extended.cl %%DATADIR%%/kernels/gaussian.cl %%DATADIR%%/kernels/highpass.cl %%DATADIR%%/kernels/nlmeans.cl %%DATADIR%%/kernels/programs.conf %%DATADIR%%/kernels/sharpen.cl +%%DATADIR%%/kernels/soften.cl +%%DATADIR%%/latex/photobook.cls +%%DATADIR%%/pixmaps/dt_logo_128x128.png %%DATADIR%%/pixmaps/idbutton.png %%DATADIR%%/pixmaps/off.png %%DATADIR%%/pixmaps/plugins/darkroom/anlfyeni.png @@ -63,8 +76,19 @@ bin/darktable-cltest %%DATADIR%%/pixmaps/plugins/darkroom/zonesystem.png %%DATADIR%%/rawspeed/cameras.xml %%DATADIR%%/rawspeed/showcameras.xsl +%%DATADIR%%/style/bullet.gif +%%DATADIR%%/style/close.gif +%%DATADIR%%/style/closelabel.gif +%%DATADIR%%/style/donate-button.gif +%%DATADIR%%/style/download-icon.gif %%DATADIR%%/style/favicon.ico +%%DATADIR%%/style/image-1.jpg +%%DATADIR%%/style/lightbox.css +%%DATADIR%%/style/loading.gif +%%DATADIR%%/style/nextlabel.gif +%%DATADIR%%/style/prevlabel.gif %%DATADIR%%/style/style.css +%%DATADIR%%/style/thumb-1.jpg %%DATADIR%%/watermarks/darktable.svg %%DATADIR%%/watermarks/hasselblad.svg %%DATADIR%%/watermarks/promo.svg @@ -78,10 +102,13 @@ lib/darktable/plugins/imageio/format/lib lib/darktable/plugins/imageio/format/libtiff.so lib/darktable/plugins/imageio/storage/libdisk.so lib/darktable/plugins/imageio/storage/libemail.so +lib/darktable/plugins/imageio/storage/libfacebook.so lib/darktable/plugins/imageio/storage/libgallery.so +lib/darktable/plugins/imageio/storage/liblatex.so lib/darktable/plugins/imageio/storage/libpicasa.so lib/darktable/plugins/libatrous.so lib/darktable/plugins/libbasecurve.so +lib/darktable/plugins/libbilat.so lib/darktable/plugins/libbilateral.so lib/darktable/plugins/libbloom.so lib/darktable/plugins/libborders.so @@ -101,6 +128,7 @@ lib/darktable/plugins/libequalizer.so lib/darktable/plugins/libexposure.so lib/darktable/plugins/libflip.so lib/darktable/plugins/libgamma.so +lib/darktable/plugins/libglobaltonemap.so lib/darktable/plugins/libgraduatednd.so lib/darktable/plugins/libgrain.so lib/darktable/plugins/libhighlights.so @@ -139,6 +167,7 @@ lib/darktable/plugins/lighttable/libdark lib/darktable/plugins/lighttable/libexport.so lib/darktable/plugins/lighttable/libfilmstrip.so lib/darktable/plugins/lighttable/libfilter.so +lib/darktable/plugins/lighttable/libgeotagging.so lib/darktable/plugins/lighttable/libglobal_toolbox.so lib/darktable/plugins/lighttable/libhinter.so lib/darktable/plugins/lighttable/libhistogram.so @@ -147,6 +176,8 @@ lib/darktable/plugins/lighttable/libimag lib/darktable/plugins/lighttable/libimport.so lib/darktable/plugins/lighttable/libkeywords.so lib/darktable/plugins/lighttable/liblighttable_mode.so +lib/darktable/plugins/lighttable/liblocation.so +lib/darktable/plugins/lighttable/libmap_settings.so lib/darktable/plugins/lighttable/libmetadata.so lib/darktable/plugins/lighttable/libmetadata_view.so lib/darktable/plugins/lighttable/libmodule_toolbox.so @@ -156,6 +187,7 @@ lib/darktable/plugins/lighttable/libnavi 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 @@ -163,6 +195,7 @@ lib/darktable/plugins/lighttable/libview lib/darktable/plugins/lighttable/libviewswitcher.so lib/darktable/views/libdarkroom.so lib/darktable/views/liblighttable.so +lib/darktable/views/libmap.so share/applications/darktable.desktop share/icons/hicolor/16x16/apps/darktable.png share/icons/hicolor/22x22/apps/darktable.png @@ -183,6 +216,8 @@ 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 +share/locale/pt_BR/LC_MESSAGES/darktable.mo +share/locale/pt_PT/LC_MESSAGES/darktable.mo share/locale/ro/LC_MESSAGES/darktable.mo share/locale/ru/LC_MESSAGES/darktable.mo share/locale/sq/LC_MESSAGES/darktable.mo @@ -203,5 +238,7 @@ share/locale/zh_CN/LC_MESSAGES/darktable @dirrm %%DATADIR%%/pixmaps/plugins/darkroom @dirrm %%DATADIR%%/pixmaps/plugins @dirrm %%DATADIR%%/pixmaps +@dirrm %%DATADIR%%/latex @dirrm %%DATADIR%%/kernels +@dirrm %%DATADIR%%/js @dirrm %%DATADIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212040946.qB49kVqO037643>