Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 21 Sep 2018 21:34:47 +0000 (UTC)
From:      Christoph Moench-Tegeder <cmt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r480313 - in head/graphics/shotwell: . files
Message-ID:  <201809212134.w8LLYlGV011140@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cmt
Date: Fri Sep 21 21:34:47 2018
New Revision: 480313
URL: https://svnweb.freebsd.org/changeset/ports/480313

Log:
  graphics/shotwell: update to 0.30.0
  
  - optional face detection algorithms
  - major internal overhaul: now build with meson/ninja, etc.

Deleted:
  head/graphics/shotwell/files/
Modified:
  head/graphics/shotwell/Makefile
  head/graphics/shotwell/distinfo

Modified: head/graphics/shotwell/Makefile
==============================================================================
--- head/graphics/shotwell/Makefile	Fri Sep 21 21:31:56 2018	(r480312)
+++ head/graphics/shotwell/Makefile	Fri Sep 21 21:34:47 2018	(r480313)
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	shotwell
-PORTVERSION=	0.28.4
-PORTREVISION=	1
+PORTVERSION=	0.30.0
 CATEGORIES=	graphics gnome
-MASTER_SITES=	GNOME/sources/shotwell/${PORTVERSION:R}
+MASTER_SITES=	GNOME
 
 MAINTAINER=	cmt@FreeBSD.org
 COMMENT=	Open source photo manager for GNOME
@@ -14,70 +13,50 @@ LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	vala>=0.20.1:lang/vala \
-		bash:shells/bash \
 		itstool:textproc/itstool
-LIB_DEPENDS=	libappstream-glib.so:devel/appstream-glib \
-		libdbus-glib-1.so:devel/dbus-glib \
-		libexiv2.so:graphics/exiv2 \
-		libgcr-ui-3.so:security/gcr \
+LIB_DEPENDS=	libgio-2.0.so:devel/glib20 \
+		libjson-glib-1.0.so:devel/json-glib \
 		libgdata.so:devel/libgdata \
 		libgee-0.8.so:devel/libgee \
-		libgstapp-1.0.so:multimedia/gstreamer1-plugins \
-		libgstreamer-1.0.so:multimedia/gstreamer1 \
-		liblcms2.so:graphics/lcms2 \
-		libjson-glib-1.0.so:devel/json-glib \
-		libp11-kit.so:security/p11-kit \
 		libsoup-2.4.so:devel/libsoup \
+		libexiv2.so:graphics/exiv2 \
+		libgdk_pixbuf-2.0.so:graphics/gdk-pixbuf2 \
 		libgexiv2.so:graphics/gexiv2 \
 		libexif.so:graphics/libexif \
 		libgphoto2.so:graphics/libgphoto2 \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
-		libunique-1.0.so:x11-toolkits/unique \
 		libraw.so:graphics/libraw \
-		librest-0.7.so:devel/librest \
+		libgstreamer-1.0.so:multimedia/gstreamer1 \
+		libgstapp-1.0.so:multimedia/gstreamer1-plugins \
+		libgcr-ui-3.so:security/gcr \
+		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
 		libxml2.so:textproc/libxml2
 
-USES=		autoreconf gettext desktop-file-utils gmake libtool pkgconfig \
+USES=		gettext desktop-file-utils gnome meson ninja pkgconfig \
 		sqlite tar:xz
 USE_GNOME=	cairo dconf gtk30 gnomedocutils
 USE_GSTREAMER1=	yes
 USE_LDCONFIG=	yes
 USE_XORG=	x11
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	--define=NO_CAMERA
-CONFIGURE_ARGS+=	--enable-publishers=all --enable-extra-plugins
-INSTALL_TARGET=	install-strip
+
+MESON_ARGS=	-Dudev=false -Dextra-plugins=true -Dinstall-apport-hook=false \
+		-Dpublishers=facebook,flickr,gallery3,picasa,piwigo,rajce,tumblr,yandex,youtube
 INSTALLS_ICONS=	yes
 PORTSCOUT=	limitw:1,even
 MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS_DEFINE=	OPENMP NLS
+OPTIONS_DEFINE=	FACED OPENMP
+OPTIONS_SUB=	yes
+
+FACED_DESC=	Face Detection
 OPENMP_DESC=	libraw uses OpenMP (implies GCC)
 
-NLS_CONFIGURE_ENABLE=	nls
-NLS_USES=		gettext
-NLS_LIBS=		-L${LOCALBASE}/lib -lintl
-
+FACED_CONFIGURE_ON=	-Dface-detection=true
+FACED_CONFIGURE_OFF=	-Dface-detection=false
+FACED_LIB_DEPENDS=	libopencv_core.so:graphics/opencv-core \
+			libopencv_photo.so:graphics/opencv
 OPENMP_USES=		compiler:openmp
 OPENMP_USES_OFF=	compiler:c++11-lib
 
 GLIB_SCHEMAS=	org.yorba.shotwell.gschema.xml org.yorba.shotwell-extras.gschema.xml
 
-post-configure:
-	@${REINPLACE_CMD} -E \
-		-e 's|share/shotwell|${DATADIR_REL}|g' \
-			${WRKSRC}/${MAKEFILE}
-
-# attempt at a DATADIR safe port
-	@${REINPLACE_CMD} -E \
-		-e 's|\.get_child\("share")\.get_child\("shotwell")|${SHOTWELL_DATADIR}|' \
-		${WRKSRC}/src/AppDirs.vala
-
-.include <bsd.port.pre.mk>
-
-# attempt at a DATADIR safe port
-.for dir in ${DATADIR:S,^${PREFIX}/,,:S,/, ,g}
-SHOTWELL_DATADIR+=.get_child("${dir}")
-.endfor
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/graphics/shotwell/distinfo
==============================================================================
--- head/graphics/shotwell/distinfo	Fri Sep 21 21:31:56 2018	(r480312)
+++ head/graphics/shotwell/distinfo	Fri Sep 21 21:34:47 2018	(r480313)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1531658607
-SHA256 (shotwell-0.28.4.tar.xz) = a976f5ab972e8448a1509fa0dc132e4b40d94d3d7c8c33dc0cc1e25fa7b0670e
-SIZE (shotwell-0.28.4.tar.xz) = 5529712
+TIMESTAMP = 1537533952
+SHA256 (shotwell-0.30.0.tar.xz) = d496de89587a7aa13fd08323b919bafefac71d48a160c2cff2f28b7dbd6b9ed5
+SIZE (shotwell-0.30.0.tar.xz) = 6341136



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809212134.w8LLYlGV011140>