Date: Tue, 18 Dec 2012 00:05:48 GMT From: Jean-Sébastien Pédron <dumbbell@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/174531: [PATCH] Update graphics/darktable to 1.1.1 Message-ID: <201212180005.qBI05m2Z061160@red.freebsd.org> Resent-Message-ID: <201212180010.qBI0A0dQ070573@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 174531
>Category: ports
>Synopsis: [PATCH] Update graphics/darktable to 1.1.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Dec 18 00:10:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Jean-Sébastien Pédron
>Release: FreeBSD 10.0-CURRENT amd64
>Organization:
The FreeBSD Project
>Environment:
FreeBSD magellan.dumbbell.fr 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r244029M: Sat Dec 8 12:23:15 CET 2012 root@magellan.dumbbell.fr:/usr/obj/home/dumbbell/Projects/freebsd/src/SVN/head/sys/MAGELLAN amd64
>Description:
The patch is attached to this PR.
This patch includes several changes not related to the version update:
o I took the liberty to rename the "GLIBJSON" option to "FACEBOOK" and
change the associated description. The json-glib dependency is only used
by the Facebook export plugin.
o Fix plist related to GEO and FACEBOOK options.
o No need to remove data/js/.DS_Store, it's fixed upstream.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: graphics/darktable/Makefile
===================================================================
--- graphics/darktable/Makefile (revision 309134)
+++ graphics/darktable/Makefile (working copy)
@@ -2,9 +2,9 @@
# $FreeBSD$
PORTNAME= darktable
-PORTVERSION= 1.1
+PORTVERSION= 1.1.1
CATEGORIES= graphics
-MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}
MAINTAINER= danfe@FreeBSD.org
COMMENT= Virtual lighttable and darkroom for photographers
@@ -32,11 +32,11 @@
MAN1= ${PORTNAME}.1
LDFLAGS+= -L${LOCALBASE}/lib
-OPTIONS_DEFINE= GPHOTO GEO FLICKR GLIBJSON KWALLET GNOMEKEYRING RAWSPEED \
+OPTIONS_DEFINE= GPHOTO GEO FLICKR FACEBOOK KWALLET GNOMEKEYRING RAWSPEED \
SLIDESHOW NLS GCC46
GEO_DESC= Build geotagging parts
-GLIBJSON_DESC= GlibJson library support
+FACEBOOK_DESC= Support images export to Facebook
RAWSPEED_DESC= Compile with rawspeed backend
SLIDESHOW_DESC= Build OpenGL/SDL slideshow viewer
GCC46_DESC= Build with GCC 4.6+ (better OpenMP support)
@@ -57,6 +57,9 @@
.if ${PORT_OPTIONS:MGEO}
LIB_DEPENDS+= soup-2.4:${PORTSDIR}/devel/libsoup
+PLIST_FILES+= lib/darktable/plugins/lighttable/liblocation.so \
+ lib/darktable/plugins/lighttable/libmap_settings.so \
+ lib/darktable/views/libmap.so
.else
CMAKE_ARGS+= -DUSE_GEO:BOOL=OFF
.endif
@@ -68,8 +71,9 @@
CMAKE_ARGS+= -DUSE_FLICKR:BOOL=OFF
.endif
-.if ${PORT_OPTIONS:MGLIBJSON}
+.if ${PORT_OPTIONS:MFACEBOOK}
LIB_DEPENDS+= json-glib-1.0:${PORTSDIR}/devel/json-glib
+PLIST_FILES+= lib/darktable/plugins/imageio/storage/libfacebook.so
.else
CMAKE_ARGS+= -DUSE_GLIBJSON:BOOL=OFF
.endif
@@ -117,7 +121,6 @@
.endif
post-patch:
- @${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
Index: graphics/darktable/distinfo
===================================================================
--- graphics/darktable/distinfo (revision 309134)
+++ graphics/darktable/distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (darktable-1.1.tar.gz) = 8f2401422ab3e0bb038b3fedf411aaf69994d679674757ee7886b6146b9fdd4f
-SIZE (darktable-1.1.tar.gz) = 3423644
+SHA256 (darktable-1.1.1.tar.gz) = ba299ba4903718f5696de7cace80c0374dec4c7a41df90a560c47a419a3d354c
+SIZE (darktable-1.1.1.tar.gz) = 3422916
Index: graphics/darktable/pkg-plist
===================================================================
--- graphics/darktable/pkg-plist (revision 309134)
+++ graphics/darktable/pkg-plist (working copy)
@@ -102,7 +102,6 @@
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
@@ -176,8 +175,6 @@
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
@@ -195,7 +192,6 @@
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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212180005.qBI05m2Z061160>