From b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 19 Mar 2019 11:37:34 +0000 Subject: gentoo resync : 19.03.2019 --- media-gfx/shotwell/Manifest | 12 ++--- media-gfx/shotwell/metadata.xml | 11 +++-- media-gfx/shotwell/shotwell-0.28.3.ebuild | 5 +- media-gfx/shotwell/shotwell-0.28.4.ebuild | 62 +++++++++++++++++++++++ media-gfx/shotwell/shotwell-0.29.2.ebuild | 39 --------------- media-gfx/shotwell/shotwell-0.29.3.ebuild | 39 --------------- media-gfx/shotwell/shotwell-0.30.2.ebuild | 81 +++++++++++++++++++++++++++++++ 7 files changed, 158 insertions(+), 91 deletions(-) create mode 100644 media-gfx/shotwell/shotwell-0.28.4.ebuild delete mode 100644 media-gfx/shotwell/shotwell-0.29.2.ebuild delete mode 100644 media-gfx/shotwell/shotwell-0.29.3.ebuild create mode 100644 media-gfx/shotwell/shotwell-0.30.2.ebuild (limited to 'media-gfx/shotwell') diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest index d90bd1b56b8e..4f6d063a2a81 100644 --- a/media-gfx/shotwell/Manifest +++ b/media-gfx/shotwell/Manifest @@ -1,7 +1,7 @@ DIST shotwell-0.28.3.tar.xz 5531900 BLAKE2B b585989434e3da9b2d5f43aabf41451e33b7b2f537a21305ff9decd9992d42e5422971d1f89836936630f641efdac1242dc21574d86f61a4c71562b657e0300d SHA512 9a0c15bfe856dabaa85038fe875cc178be6a3e104397b36555005615212ac92579234fc6277f1a4a7bddba517e9ea0db5ed06e0fc30614453e3db1153b47dc16 -DIST shotwell-0.29.2.tar.xz 2321576 BLAKE2B 2dd3c959ca8aba6ecb7c3c15ca491291a2c6ead860fac9c1fb1b97ad22140ce9e67617dd268b2d4d362bb8a0c2606d97b5cc71c12e19fcb59fec0185f27c3f0f SHA512 98c57d511a384ced717e2fb410af16326080e2291fce77ea953a377430459c7a81de73118925b2d42bf96b8b717efc93a898d0d859fbab1364c0c192dbb60311 -DIST shotwell-0.29.3.tar.xz 2416332 BLAKE2B 8f95e3e1b71eb20b10571b5689e9817112935c4d31c8b7800157f7771df04adb4559acc9885ec43032a7619ffefb8899fd90a7740798de4a150c4c78033e890c SHA512 f600db86adf5caece4ed4c8a3ca4309540f9eeb1caded8e3f062fd56fa54f2030568c8168fc662fcf80c9905e9b735d52a2578bc2401faf28876a6f5aed01121 -EBUILD shotwell-0.28.3.ebuild 1485 BLAKE2B 248f0309213445e4ba17c9d8e401fdc3a063c8e2f2df7c2f028d89d772ca668aac0e70986d80053cc879061dec21df87b3da941d08cf153ca802a914b01b3b31 SHA512 8273d6ece7dca82443499d7881f4f790baf2c80c2fe252d83e0eadee288afc9810b833486b9743670e1768141eb3e077798fee744b1a1a60a07227db9bd39d00 -EBUILD shotwell-0.29.2.ebuild 738 BLAKE2B 33f7584f897f980cc14a6823150cf9a2228bebd78d62b953ef3d757b11a37d348287a4f7776cd25c0c6db8450f5b5e6254c22a185afbe5baf01cbf1a915dcc7b SHA512 847163fa58acdb6eb326082e4c21d712c9e908d549330e7913205f3ea37b18049b46b6ac0cc1daa549e36d5487b1f65429ee0c544aa8ac3b1e8c834521d5dccb -EBUILD shotwell-0.29.3.ebuild 738 BLAKE2B 33f7584f897f980cc14a6823150cf9a2228bebd78d62b953ef3d757b11a37d348287a4f7776cd25c0c6db8450f5b5e6254c22a185afbe5baf01cbf1a915dcc7b SHA512 847163fa58acdb6eb326082e4c21d712c9e908d549330e7913205f3ea37b18049b46b6ac0cc1daa549e36d5487b1f65429ee0c544aa8ac3b1e8c834521d5dccb -MISC metadata.xml 789 BLAKE2B ea120210a69912ba02fc9e2d52b4d415254504427a38f572f23d5dca0df8d679b62218428fe588ff429ab74727d017f5a9bc709b400b357c0508e7624ae2d1a2 SHA512 ad52dde0111094d2ccccc8a9d2eebe2d03bab4735903acba5d74dc7cbdf1923a8cc51a299b44189c4c33a206eac34c8e186a954747f9bd3520a64c7080c83330 +DIST shotwell-0.28.4.tar.xz 5529712 BLAKE2B a8ee8243cf1a800fd1c1a91ade81decf9187aa6ce3b5040977dd45ae64245883691674ca2aa8d09df164e84dcc7f3e632dfc206b2f0eaecd18a171f0c170846d SHA512 b80014ec2c5ddfa35c0eea59daaf41fb8e8fac76482f18581de4c91b766f55d1b05e1925088152705ce3eb4ca228e5401ba80ebd2a6232d65b61cdb2c843267b +DIST shotwell-0.30.2.tar.xz 6461648 BLAKE2B d54f34c05dcb092149129977bf59f0434ec4082929e3c87d9b4e774f85b47d73ecce1e80a6a29965194e9791eecb018405b43f082fb8b334c8d012f06a00b817 SHA512 ee74b9d3fbc5b2a5ca87cbc351fa99f6afaec4ce717166f55d79f41f1b039c272ed9028eb3919874f086f934197806738a54f428e790bca50dd8c9af61c21c36 +EBUILD shotwell-0.28.3.ebuild 1432 BLAKE2B 2bd4e420c1dfe788e5df463bf4caff3aa419c808db085f8213a1f66d4050a093c7ecb37337ecee770f91e4b0f7f895e08f54a480b2b51a2de8ded06bd60b04bb SHA512 53212e5aa3d691c8a8fb5ee50a3e3b1bcc17c78f340b9f2d6d8c2e6811fc6587309004c196a63a00d789652fc2329231b24f8d69263d041ce6ac6affcd513c39 +EBUILD shotwell-0.28.4.ebuild 1434 BLAKE2B d88d9a0be4f4e01c152755155afe28ea862101b2f10e7bc053cc8d6c67ddf77f7aaf2143eb3cbd22ac85d1fa82f88d8167054be81f40bf2ba3a82bc4f6d80aab SHA512 f0050d5cb6c3757aaee2d1b39d252d4c6f6f317a8824314aba12479dfa3f379df51d637924fce617e3ae391d6b98324eb96674c3d492ae2979390cb641dd1a04 +EBUILD shotwell-0.30.2.ebuild 1784 BLAKE2B 3041ee251f26919a4cea223771eabc24f44846b4746d697cae976b06218274ce57a3c6debe0336bdcbca09185ec01a155454b8e2820b45f53aa051ebd7712f2b SHA512 38379de15d76e00f42530903beabf18067bed88d2eb7c065ed05458fc6333ac62fee2c6b19b52d666745fdd3872d49aa7693cd0c186a72aed85a6273041b4667 +MISC metadata.xml 915 BLAKE2B 7f83fe936f9a575c6dd12b014007cd97c5a8ada9aa5e55ddeaddefa4eb05d724a068c81d2f6f41c5b1bae01ed2c4326eb5eba5d4bdccf48619edeb43a8eaabfd SHA512 1b226f7fabfd7f5ee4d82b28ce2998273225319b055c01509cc5e493fdc037941c0edd0099df5dada00228fb225bf5e35d0035d3cd244890ad0cbd929b84d214 diff --git a/media-gfx/shotwell/metadata.xml b/media-gfx/shotwell/metadata.xml index 905269f2b26d..3e46be14231f 100644 --- a/media-gfx/shotwell/metadata.xml +++ b/media-gfx/shotwell/metadata.xml @@ -13,10 +13,13 @@ gnome@gentoo.org Gentoo GNOME Project + + Enable face detection via media-libs/opencv + - Shotwell is a digital photo organizer designed for the GNOME desktop - environment. It allows you to import photos from disk or camera, organize - them in various ways, view them in full-window or fullscreen mode, and - export them to share with others. + Shotwell is a digital photo manager designed for the GNOME desktop + environment. It allows you to import photos from disk or camera, + organize them by keywords and events, view them in full-window or fullscreen + mode, and share them with others via social networking and more. diff --git a/media-gfx/shotwell/shotwell-0.28.3.ebuild b/media-gfx/shotwell/shotwell-0.28.3.ebuild index 1d1f9124eb96..b7049d635548 100644 --- a/media-gfx/shotwell/shotwell-0.28.3.ebuild +++ b/media-gfx/shotwell/shotwell-0.28.3.ebuild @@ -1,13 +1,12 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 GNOME2_LA_PUNT="yes" VALA_MIN_API_VERSION="0.28" -inherit gnome2 multilib toolchain-funcs vala versionator +inherit gnome2 multilib toolchain-funcs vala -MY_PV=$(get_version_component_range 1-2) DESCRIPTION="Open source photo manager for GNOME" HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell" diff --git a/media-gfx/shotwell/shotwell-0.28.4.ebuild b/media-gfx/shotwell/shotwell-0.28.4.ebuild new file mode 100644 index 000000000000..e6ea4f5ab99e --- /dev/null +++ b/media-gfx/shotwell/shotwell-0.28.4.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" +VALA_MIN_API_VERSION="0.28" + +inherit gnome2 multilib toolchain-funcs vala + +DESCRIPTION="Open source photo manager for GNOME" +HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="" + +RDEPEND=" + >=app-crypt/gcr-3[gtk] + >=dev-db/sqlite-3.5.9:3 + >=dev-libs/glib-2.40.0:2 + >=dev-libs/json-glib-0.7.6 + >=dev-libs/libgee-0.8.5:0.8 + >=dev-libs/libxml2-2.6.32:2 + gnome-base/dconf + >=media-libs/gexiv2-0.10.4 + media-libs/gst-plugins-base:1.0 + media-libs/gst-plugins-good:1.0 + media-libs/gstreamer:1.0 + media-libs/lcms:2 + >=media-libs/libexif-0.6.16:= + >=media-libs/libgphoto2-2.5:= + >=media-libs/libraw-0.13.2:= + media-plugins/gst-plugins-gdkpixbuf:1.0 + >=net-libs/libsoup-2.42.0:2.4 + net-libs/webkit-gtk:4 + virtual/libgudev:=[introspection] + >=x11-libs/gtk+-3.14.0:3[X] + dev-libs/libgdata + +" +DEPEND="${RDEPEND} + $(vala_depend) + dev-util/itstool + >=sys-devel/gettext-0.19.7 + >=sys-devel/m4-1.4.13 + virtual/pkgconfig +" + +# This probably comes from libraries that +# shotwell-video-thumbnailer links to. +# Nothing we can do at the moment. #435048 +QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer" + +src_prepare() { + vala_src_prepare + gnome2_src_prepare +} + +src_configure() { + gnome2_src_configure --disable-static +} diff --git a/media-gfx/shotwell/shotwell-0.29.2.ebuild b/media-gfx/shotwell/shotwell-0.29.2.ebuild deleted file mode 100644 index fc06ece5175b..000000000000 --- a/media-gfx/shotwell/shotwell-0.29.2.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -GNOME2_LA_PUNT="yes" -VALA_MIN_API_VERSION="0.28" - -inherit gnome2 meson vala - -DESCRIPTION="Shotwell is a photo manager for GNOME 3" -HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell/" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="" - -RDEPEND=" - app-crypt/gcr:=[gtk,vala] - dev-libs/libgdata:=[vala] - dev-libs/libgee:= - media-libs/gexiv2:=[introspection,vala] - media-libs/libexif:= - media-libs/libgphoto2:= - media-libs/libraw:= - net-libs/webkit-gtk:= - x11-libs/gtk+:=[X] -" -DEPEND=" - ${RDEPEND} - $(vala_depend) - dev-util/itstool -" - -src_prepare() { - vala_src_prepare - eapply_user -} diff --git a/media-gfx/shotwell/shotwell-0.29.3.ebuild b/media-gfx/shotwell/shotwell-0.29.3.ebuild deleted file mode 100644 index fc06ece5175b..000000000000 --- a/media-gfx/shotwell/shotwell-0.29.3.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -GNOME2_LA_PUNT="yes" -VALA_MIN_API_VERSION="0.28" - -inherit gnome2 meson vala - -DESCRIPTION="Shotwell is a photo manager for GNOME 3" -HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell/" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="" - -RDEPEND=" - app-crypt/gcr:=[gtk,vala] - dev-libs/libgdata:=[vala] - dev-libs/libgee:= - media-libs/gexiv2:=[introspection,vala] - media-libs/libexif:= - media-libs/libgphoto2:= - media-libs/libraw:= - net-libs/webkit-gtk:= - x11-libs/gtk+:=[X] -" -DEPEND=" - ${RDEPEND} - $(vala_depend) - dev-util/itstool -" - -src_prepare() { - vala_src_prepare - eapply_user -} diff --git a/media-gfx/shotwell/shotwell-0.30.2.ebuild b/media-gfx/shotwell/shotwell-0.30.2.ebuild new file mode 100644 index 000000000000..167dc43d928a --- /dev/null +++ b/media-gfx/shotwell/shotwell-0.30.2.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +VALA_MIN_API_VERSION="0.40" + +inherit gnome.org gnome2-utils meson vala xdg + +DESCRIPTION="Open source photo manager for GNOME" +HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="opencv udev" + +COMMON_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.4: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? ( >=virtual/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="${COMMON_DEPEND} + media-plugins/gst-plugins-gdkpixbuf:1.0 + media-plugins/gst-plugins-meta:1.0 +" +DEPEND="${COMMON_DEPEND} + $(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] +" + +src_prepare() { + xdg_src_prepare + vala_src_prepare +} + +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) + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} -- cgit v1.2.3