gentoo resync : 06.04.2022

5 files changed, 158 insertions, 7 deletions

diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index 581c12c481c7..02c28d7fa628 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,4 +1,7 @@
 AUX 0.30.14-vala-0.52.8-compat.patch 650 BLAKE2B eda8739a4f8f6fad9ad026c97542d2ec3683f3fdf86ce34be9235a49a5569ad0a67b1ab454eba6c5d13bf9a3fb2a1cefb52d8d0a6103d4d84e2d0efbafd55e0f SHA512 0736a02880c5db69a85cc3eedc444aa6d95f96e3e31695b078a416384f9751d8c8cc550d42ba6dfc1a59f98b0b30b6f87ea5136988d404ee08fe9e6b0c752ec9
+AUX 0.30.15-opencv4-compatibility.patch 2253 BLAKE2B 5120413e34f1638e777a3c737a5cf3664049c907e7a641354d7b222611f5d84ff51632b4903dd1587c3407773816bf259c2b682936b301ad3184a250e9bb9127 SHA512 5346bd1360a423c38e833cd9d52798aea4fef0f49519316023fa6c94a424cfc7db2e5468303e03e8bdaad756ed05fe40f3cdf9168d3042f3ca0ac669fd02bde6
 DIST shotwell-0.30.14.tar.xz 6524680 BLAKE2B 321406d3731a4baa333c3820ee46e8dc12ca9a340c7f1ac3824ee894fa2826b7efa3ee7a27f551d62043e5f22199042befb5063cc67cefd27830e19db7d7f661 SHA512 bd899ac099ec4760f6119804812ef9314c9261c18273309abfb1dccc675b9e4a561c0abea1c46ea0dbbab9f5c00301d840b52714f97ec06548c180a77871db7c
-EBUILD shotwell-0.30.14.ebuild 1923 BLAKE2B 83b7923b289af84094f97e6b6ea7796b68f61c330fb3f74bc8ea19814dfe7f4ae043a26f012ac4b142c7c1d9d0f50be04d4853c7db703ceec28dcd6e91bd5f81 SHA512 2d06a80f5ac0cf2c590771fcc24e936f9ba531701b7facdd685fcddabf54eec5242b853bc0e5777ab1bd6b3f8092912eff20f9d47f6d7106a1c62e2bd880a593
-MISC metadata.xml 796 BLAKE2B e0c9ab623e0fdaa1df57951920708e41359ae3d2d8335ebb4012c5428a965d426698adb4a8e0815116a07b03e55e3d44aa11e5dcffe4d82bac8e733eaf302995 SHA512 c21d7613c7f200cdd15bf45d201a83c38fa5fc52f40c833d638afc48cef17a8e9db016b29ec3ff95e625cfc750e8bff7603a4fe2ea26fbad1504b581da43c165
+DIST shotwell-0.30.15.tar.xz 6533632 BLAKE2B a973c22f06b2c05561db72974fa8f8a72006e4795ca282bd7c94e99f1b59c411917a30dd00b896cf606b80596c1510fe50e81c1a1c8fa6b98bcd75f8b25c5769 SHA512 aded4c8ec015546cb64189cc1a85b6bc233861367ec514cce041607a1deec9d69687f26e448865783c686813c1caec78df17c29d38c4296c4a255ff20c7cde0e
+EBUILD shotwell-0.30.14.ebuild 1923 BLAKE2B b2ed36882aa19d902673d4f9b5565643e5a2c026e4973a439076fa047cc1bf7e6f5c9a2e573ee117cba45d7d6c520f4f1539290d76a3117c7c2df2ec30a13657 SHA512 27b1afaf0218ae38ab259ca619ec8a0a0e97ce5c2dde709402bf0e519beeacf663933ba7323976c3300e0b2da9058585a76ac8ef8d15b7d13b25a123c679dca9
+EBUILD shotwell-0.30.15.ebuild 1885 BLAKE2B 0ffd5e1db82c7abcce8a78f823625e5982dd56b8cfd77ab65d2a2c0aada103e9e1a47675f13023b7d02e974990f07ed905bd6f8b93b6bb6675573991ec8cb55e SHA512 199f1fc5966ef2496743e55289f25866f779bfd224cc7c1189d1a35b2241b0fc80de4bcd2dcd6127265262031e2ffbebaf8a60818a8421c17db8b6ec668bcd04
+MISC metadata.xml 685 BLAKE2B 60a7448a9542a8663c25966bfa7dae2bbd50fb727795300e6483ea39147521b2d6ebd3c4dd894c553cbd94df18f4e39e1d88359d9da346a02cb7a02709d19f11 SHA512 da9730037e4d473898cfa537446b9ea3dae77bb915c54df139738a4e19b824ff273c36c2e3a43f421d91e2de09789843ccc84bd4cb4bcda258eee37fd9dec425
diff --git a/media-gfx/shotwell/files/0.30.15-opencv4-compatibility.patch b/media-gfx/shotwell/files/0.30.15-opencv4-compatibility.patch
new file mode 100644
index 000000000000..1b7275188535
--- /dev/null
+++ b/media-gfx/shotwell/files/0.30.15-opencv4-compatibility.patch
@@ -0,0 +1,64 @@
+https://gitlab.gnome.org/GNOME/shotwell/-/merge_requests/54
+
+From a8fc1328bcc4296045fece633330814fbfb40bcc Mon Sep 17 00:00:00 2001
+From: Jens Georg <mail@jensge.org>
+Date: Sun, 15 Mar 2020 11:19:18 +0100
+Subject: [PATCH] Fix compatibility with OpenCV 4
+
+Second try, much simpler version
+
+(cherry picked from commit f54094594016359bbafd0be44a53ea28c8968593)
+---
+ facedetect/meson.build             | 5 ++++-
+ facedetect/shotwell-facedetect.cpp | 6 +++---
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/facedetect/meson.build b/facedetect/meson.build
+index 6724abcb..bd5f3c3b 100644
+--- a/facedetect/meson.build
++++ b/facedetect/meson.build
+@@ -1,6 +1,9 @@
+ subproject = ('facedetect')
+ add_languages('cpp')
+-facedetect_dep = dependency('opencv', version : ['>= 2.3.0'], required : true)
++facedetect_dep = dependency('opencv4', version : ['>= 4.0.0'], required : false)
++if not facedetect_dep.found()
++    facedetect_dep = dependency('opencv', version : ['>= 3.4.0'], required : true)
++endif
+ executable('shotwell-facedetect',
+            'shotwell-facedetect.cpp',
+            dependencies : facedetect_dep,
+diff --git a/facedetect/shotwell-facedetect.cpp b/facedetect/shotwell-facedetect.cpp
+index 1b093797..1c105806 100644
+--- a/facedetect/shotwell-facedetect.cpp
++++ b/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, cv::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, double scale) {
+ 	equalizeHist(smallImg, smallImg);
+ 
+ 	vector<Rect> faces;
+-	cascade.detectMultiScale(smallImg, faces, 1.1, 2, CV_HAAR_SCALE_IMAGE, Size(30, 30));
++	cascade.detectMultiScale(smallImg, faces, 1.1, 2, cv::CASCADE_SCALE_IMAGE, Size(30, 30));
+ 
+ 	int i = 0;
+ 	for (vector<Rect>::const_iterator r = faces.begin(); r != faces.end(); r++, i++) {
+@@ -117,7 +117,7 @@ int main(int argc, const char** argv) {
+ 
+ 	}
+ 
+-	Mat image = imread(inputName, 1);
++	Mat image = cv::imread(inputName, 1);
+ 
+ 	if (image.empty()) {
+ 
+-- 
+2.35.1
+
diff --git a/media-gfx/shotwell/metadata.xml b/media-gfx/shotwell/metadata.xml
index 1b0bde1addc5..f92dabd9e049 100644
--- a/media-gfx/shotwell/metadata.xml
+++ b/media-gfx/shotwell/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>nicolasbock@gentoo.org</email>
-		<name>Nicolas Bock</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Project</name>
diff --git a/media-gfx/shotwell/shotwell-0.30.14.ebuild b/media-gfx/shotwell/shotwell-0.30.14.ebuild
index bdf8289fffc9..68dd3cb9e8a4 100644
--- a/media-gfx/shotwell/shotwell-0.30.14.ebuild
+++ b/media-gfx/shotwell/shotwell-0.30.14.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-VALA_MIN_API_VERSION="0.40"
+VALA_MAX_API_VERSION="0.54"
 
 inherit gnome.org gnome2-utils meson vala xdg
 
diff --git a/media-gfx/shotwell/shotwell-0.30.15.ebuild b/media-gfx/shotwell/shotwell-0.30.15.ebuild
new file mode 100644
index 000000000000..fae21f9f1568
--- /dev/null
+++ b/media-gfx/shotwell/shotwell-0.30.15.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Open source photo manager for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
+IUSE="opencv udev"
+
+DEPEND="
+	>=x11-libs/gtk+-3.22.0:3
+	>=dev-libs/glib-2.40.0:2
+	>=dev-libs/libgee-0.8.5:0.8
+	>=net-libs/webkit-gtk-2.26:4
+	>=dev-libs/json-glib-0.7.6
+	>=dev-libs/libxml2-2.6.32:2
+	x11-libs/gdk-pixbuf:2
+	>=dev-db/sqlite-3.5.9:3
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=media-libs/libgphoto2-2.5:=
+	udev? ( >=dev-libs/libgudev-145:= )
+	>=media-libs/gexiv2-0.10.4
+	>=media-libs/libraw-0.13.2:=
+	>=media-libs/libexif-0.6.16:=
+	dev-libs/libgdata
+	>=app-crypt/gcr-3:=[gtk]
+	x11-libs/cairo
+	opencv? ( >=media-libs/opencv-2.3.0:= )
+"
+RDEPEND="${DEPEND}
+	media-plugins/gst-plugins-gdkpixbuf:1.0
+	media-plugins/gst-plugins-meta:1.0
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(vala_depend)
+	dev-libs/appstream-glib
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	net-libs/libsoup:2.4[vala]
+	media-libs/gexiv2[vala]
+	app-crypt/gcr[vala]
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-opencv4-compatibility.patch
+)
+
+src_prepare() {
+	default
+	vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dunity-support=false
+		# -Dpublishers # In 0.30.2 all get compiled in anyways, even if restricted list, affects only runtime support
+		-Dextra-plugins=true
+		#trace
+		#measure
+		-Ddupe-detection=true
+		$(meson_use udev)
+		-Dinstall-apport-hook=false
+		$(meson_use opencv face-detection)
+		-Dfatal_warnings=false
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}