gentoo auto-resync : 17:08:2022 - 20:33:10

3 files changed, 0 insertions, 156 deletions

diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index 883883236a9d..4188f4ca0b37 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,7 +1,4 @@
-AUX 0.30.15-opencv4-compatibility.patch 2253 BLAKE2B 5120413e34f1638e777a3c737a5cf3664049c907e7a641354d7b222611f5d84ff51632b4903dd1587c3407773816bf259c2b682936b301ad3184a250e9bb9127 SHA512 5346bd1360a423c38e833cd9d52798aea4fef0f49519316023fa6c94a424cfc7db2e5468303e03e8bdaad756ed05fe40f3cdf9168d3042f3ca0ac669fd02bde6
 AUX 0.30.16-optional-wayland.patch 2111 BLAKE2B 9d928c8b449792b198314c9f169dc2ddfddb97efbf43bf888a6e00fc47e9f60635f8d482a6b227335e0e7ef028e663b8b959a18658ba300ceb925704e977b8cb SHA512 4b6e00823a4cd271ba72b382b35694737d6944cbb123465da4243a16cb5cf6bbf3a8d3ecc707ded6e74df47ac76c5ebe1f789aebfc7c4a7b0ecd8e926d32c120
-DIST shotwell-0.30.15.tar.xz 6533632 BLAKE2B a973c22f06b2c05561db72974fa8f8a72006e4795ca282bd7c94e99f1b59c411917a30dd00b896cf606b80596c1510fe50e81c1a1c8fa6b98bcd75f8b25c5769 SHA512 aded4c8ec015546cb64189cc1a85b6bc233861367ec514cce041607a1deec9d69687f26e448865783c686813c1caec78df17c29d38c4296c4a255ff20c7cde0e
 DIST shotwell-0.30.16.tar.xz 6532812 BLAKE2B caa2ff2f4536d8f04900d7ba7c583b7ec0d0244d6253bc17971e2b4e04aa3790b17e932b3367e1be40d4a0bb566bab31396aa5dfdb6dbb5c9803272cd7f94e97 SHA512 4ed725a34b1663b9cb63dcd13c98795fb2ea9a5d79ee4541276bc9dc2f607ce6466cc9c983bab55e7418e69eef3d1598846aeb6750f00927663756bd11d9a084
-EBUILD shotwell-0.30.15.ebuild 1910 BLAKE2B 414fb09249cb5354982841ed268d8ccb58b7ecdc460132489c71aea275bc42c31a5e645d1f7081c4cc9240576920941ff93b10b47c1337bab37da5875ec5bbc5 SHA512 3666499bfaf923981fc5965e06f23a871006c11ea8d93b630bcf3d75a86f2640a3a75c485800c37af36cb12a9107176675adea83f65db84e2ebfd6903194ac0b
 EBUILD shotwell-0.30.16.ebuild 1947 BLAKE2B 2989733092e2ebdc07978fc2c0e4cf7a6228afd6e7e552e5e2e2552e9b2e0162543cbd168573f220ae488693a86f811d92a7b778872ed1f9e5c9d52f0911dfe7 SHA512 cd39afa12c9cd0329fbe4074a1a6f2380dbd7bd68bfc8695a18b7c43aaf72170582bedc8c6a1482e22fca2165c673ffebaf6d3caead0889f79dc67b4b36338eb
 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
deleted file mode 100644
index 1b7275188535..000000000000
--- a/media-gfx/shotwell/files/0.30.15-opencv4-compatibility.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-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/shotwell-0.30.15.ebuild b/media-gfx/shotwell/shotwell-0.30.15.ebuild
deleted file mode 100644
index ddc681e611ef..000000000000
--- a/media-gfx/shotwell/shotwell-0.30.15.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-VALA_MIN_API_VERSION="0.54"
-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
-}