diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile index ac8eea654f29..abc27083112e 100644 --- a/graphics/shotwell/Makefile +++ b/graphics/shotwell/Makefile @@ -1,62 +1,61 @@ # Created by: Mario Sergio Fujikawa Ferreira et al. PORTNAME= shotwell -PORTVERSION= 0.30.15 -PORTREVISION= 1 +PORTVERSION= 0.30.16 CATEGORIES= graphics gnome 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 \ itstool:textproc/itstool 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 \ 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 \ libraw.so:graphics/libraw \ libgcr-ui-3.so:security/gcr \ libwebkit2gtk-4.0.so:www/webkit2-gtk3 \ libxml2.so:textproc/libxml2 USES= compiler:c++11-lib cpe desktop-file-utils gettext gnome gstreamer meson \ ninja pkgconfig python:3.4+,build shebangfix sqlite tar:xz xorg CPE_VENDOR= gnome USE_GNOME= cairo dconf gtk30 USE_LDCONFIG= yes USE_XORG= x11 SHEBANG_FILES= build-aux/meson/postinstall.py python_OLD_CMD= "/usr/bin/env python3" python_CMD= ${SETENV} ${PYTHON_VERSION} MESON_ARGS= -Dudev=false -Dextra-plugins=true -Dinstall-apport-hook=false \ -Dpublishers=facebook,flickr,gallery3,picasa,piwigo,rajce,tumblr,yandex,youtube PORTSCOUT= limitw:1,even MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= FACED OPTIONS_SUB= yes FACED_DESC= Face Detection FACED_CONFIGURE_ON= -Dface-detection=true FACED_CONFIGURE_OFF= -Dface-detection=false FACED_LIB_DEPENDS= libopencv_core.so:graphics/opencv \ libopencv_photo.so:graphics/opencv PLIST_SUB= DISTVERSION=${DISTVERSION} GLIB_SCHEMAS= org.yorba.shotwell.gschema.xml org.yorba.shotwell-extras.gschema.xml .include diff --git a/graphics/shotwell/distinfo b/graphics/shotwell/distinfo index d5b2a32b6d95..cf9d36b74150 100644 --- a/graphics/shotwell/distinfo +++ b/graphics/shotwell/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1649176255 -SHA256 (shotwell-0.30.15.tar.xz) = 3a52ad60b102da0df5f74db031c45d4ccf263513c954616ee1664bf4f4e9bdc9 -SIZE (shotwell-0.30.15.tar.xz) = 6533632 +TIMESTAMP = 1653051765 +SHA256 (shotwell-0.30.16.tar.xz) = c9882cfbdad303cb8161b149acbb4c617fbe7ca9f6ab6e22d174e2447e7518fa +SIZE (shotwell-0.30.16.tar.xz) = 6532812 diff --git a/graphics/shotwell/files/patch-facedetect_meson.build b/graphics/shotwell/files/patch-facedetect_meson.build deleted file mode 100644 index 851dc14bb6ac..000000000000 --- a/graphics/shotwell/files/patch-facedetect_meson.build +++ /dev/null @@ -1,10 +0,0 @@ ---- facedetect/meson.build.orig 2020-11-05 20:48:33 UTC -+++ facedetect/meson.build -@@ -1,6 +1,6 @@ - subproject = ('facedetect') - add_languages('cpp') --facedetect_dep = dependency('opencv', version : ['>= 2.3.0'], required : true) -+facedetect_dep = dependency('opencv4', version : ['>= 4.0.0'], required : true) - executable('shotwell-facedetect', - 'shotwell-facedetect.cpp', - dependencies : facedetect_dep, diff --git a/graphics/shotwell/files/patch-facedetect_shotwell-facedetect.cpp b/graphics/shotwell/files/patch-facedetect_shotwell-facedetect.cpp deleted file mode 100644 index 0d3aaec14f36..000000000000 --- a/graphics/shotwell/files/patch-facedetect_shotwell-facedetect.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- facedetect/shotwell-facedetect.cpp.orig 2021-02-21 15:22:50 UTC -+++ facedetect/shotwell-facedetect.cpp -@@ -34,7 +34,7 @@ void help() { - void detectFaces(Mat &img, CascadeClassifier &cascade, double scale) { - - Mat gray; -- cvtColor(img, gray, CV_BGR2GRAY); -+ cvtColor(img, gray, COLOR_BGR2GRAY); - - Mat smallImg(cvRound(img.rows / scale), cvRound(img.cols / scale), CV_8UC1); - Size smallImgSize = smallImg.size(); -@@ -43,7 +43,7 @@ void detectFaces(Mat &img, CascadeClassifier &cascade, - equalizeHist(smallImg, smallImg); - - vector faces; -- cascade.detectMultiScale(smallImg, faces, 1.1, 2, CV_HAAR_SCALE_IMAGE, Size(30, 30)); -+ cascade.detectMultiScale(smallImg, faces, 1.1, 2, CASCADE_SCALE_IMAGE, Size(30, 30)); - - int i = 0; - for (vector::const_iterator r = faces.begin(); r != faces.end(); r++, i++) {