Index: head/graphics/shotwell/files/patch-configure.ac =================================================================== --- head/graphics/shotwell/files/patch-configure.ac (revision 480312) +++ head/graphics/shotwell/files/patch-configure.ac (nonexistent) @@ -1,10 +0,0 @@ ---- configure.ac.orig 2018-07-15 15:12:12 UTC -+++ configure.ac -@@ -114,7 +114,6 @@ PKG_CHECK_MODULES(SHOTWELL, [ - gstreamer-plugins-base-1.0 >= 1.0.0 - gstreamer-pbutils-1.0 >= 1.0.0 - gtk+-3.0 >= 3.18.0 -- gudev-1.0 >= 145 - libexif >= 0.6.16 - libgphoto2 >= 2.5.0 - libraw >= 0.13.2 Property changes on: head/graphics/shotwell/files/patch-configure.ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/shotwell/files/patch-src_camera_CameraTable.vala =================================================================== --- head/graphics/shotwell/files/patch-src_camera_CameraTable.vala (revision 480312) +++ head/graphics/shotwell/files/patch-src_camera_CameraTable.vala (nonexistent) @@ -1,83 +0,0 @@ ---- src/camera/CameraTable.vala.orig 2018-07-15 15:10:47 UTC -+++ src/camera/CameraTable.vala -@@ -26,7 +26,6 @@ public class CameraTable { - - private static CameraTable instance = null; - -- private GUdev.Client client = new GUdev.Client(SUBSYSTEMS); - private OneShotScheduler camera_update_scheduler = null; - private GPhoto.Context null_context = new GPhoto.Context(); - private GPhoto.CameraAbilitiesList abilities_list; -@@ -43,7 +42,6 @@ public class CameraTable { - on_update_cameras); - - // listen for interesting events on the specified subsystems -- client.uevent.connect(on_udev_event); - volume_monitor = VolumeMonitor.get(); - volume_monitor.volume_changed.connect(on_volume_changed); - volume_monitor.volume_added.connect(on_volume_changed); -@@ -118,23 +116,7 @@ public class CameraTable { - "/dev/bus/usb/%s".printf(port.substring(4).replace(",", "/")) : null; - } - -- private string? get_name_for_uuid(string uuid) { -- foreach (Volume volume in volume_monitor.get_volumes()) { -- if (volume.get_identifier(VolumeIdentifier.UUID) == uuid) { -- return volume.get_name(); -- } -- } -- return null; -- } -- -- private string? get_icon_for_uuid(string uuid) { -- foreach (Volume volume in volume_monitor.get_volumes()) { -- if (volume.get_identifier(VolumeIdentifier.UUID) == uuid) { -- return volume.get_icon().to_string(); -- } -- } -- return null; -- } -+ // get_name_for_uuid() and get_icon_for_uuid() are not used (udev removal) - - private void update_camera_table() throws GPhotoError { - // need to do this because virtual ports come and go in the USB world (and probably others) -@@ -221,23 +203,7 @@ public class CameraTable { - } - - // Get display name for camera. -- string path = get_port_path(port); -- if (null != path) { -- GUdev.Device device = client.query_by_device_file(path); -- string serial = device.get_property("ID_SERIAL_SHORT"); -- if (null != serial) { -- // Try to get the name and icon. -- display_name = get_name_for_uuid(serial); -- icon = get_icon_for_uuid(serial); -- } -- if (null == display_name) { -- display_name = device.get_sysfs_attr("product"); -- } -- if (null == display_name) { -- display_name = device.get_property("ID_MODEL"); -- } -- } -- -+ // in absence of udev, we fall back to the GPhoto name - if (port.has_prefix("disk:")) { - try { - var mount = File.new_for_path (port.substring(5)).find_enclosing_mount(); -@@ -287,13 +253,7 @@ public class CameraTable { - } - } - -- private void on_udev_event(string action, GUdev.Device device) { -- debug("udev event: %s on %s", action, device.get_name()); -- -- // Device add/removes often arrive in pairs; this allows for a single -- // update to occur when they come in all at once -- camera_update_scheduler.after_timeout(UPDATE_DELAY_MSEC, true); -- } -+ // on_udev_event() removed - we do not have udev - - public void on_volume_changed(Volume volume) { - camera_update_scheduler.after_timeout(UPDATE_DELAY_MSEC, true); Property changes on: head/graphics/shotwell/files/patch-src_camera_CameraTable.vala ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/shotwell/Makefile =================================================================== --- head/graphics/shotwell/Makefile (revision 480312) +++ head/graphics/shotwell/Makefile (revision 480313) @@ -1,83 +1,62 @@ # Created by: Mario Sergio Fujikawa Ferreira et al. # $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 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 - -# attempt at a DATADIR safe port -.for dir in ${DATADIR:S,^${PREFIX}/,,:S,/, ,g} -SHOTWELL_DATADIR+=.get_child("${dir}") -.endfor - -.include +.include Index: head/graphics/shotwell/distinfo =================================================================== --- head/graphics/shotwell/distinfo (revision 480312) +++ head/graphics/shotwell/distinfo (revision 480313) @@ -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