commit: 17cfa6b197f218407fc8846654a656416fb50c94 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Mon Feb 20 17:00:23 2023 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Mon Feb 20 17:32:20 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17cfa6b1
media-video/cheese: Drop old versions Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> media-video/cheese/Manifest | 1 - media-video/cheese/cheese-41.1.ebuild | 100 --------------------- ...umb-view-update-for-new-gnome-desktop-API.patch | 49 ---------- .../cheese/files/cheese-3.38.0-buildfix.patch | 17 ---- 4 files changed, 167 deletions(-) diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest index fa260c5eaa37..7f3cd950c1d0 100644 --- a/media-video/cheese/Manifest +++ b/media-video/cheese/Manifest @@ -1,2 +1 @@ -DIST cheese-41.1.tar.xz 1092912 BLAKE2B 9bbfbc59868f39b344b1102f819ca647d82e9dee327f1d2a2e6b30fcfd2c59dd5f79236355d7148e01a4b07d80d630406708d2a152535b5732cfb52690f9f402 SHA512 2c0922dda97f4ce701add45977b405eff9ddbc24eb286e9e05a9f9bfbd7998e8e77ef2a8f1bbce9f8349ff522ee3cb6d6566fa5df80d782e6d844bff69a30074 DIST cheese-43.0.tar.xz 1095328 BLAKE2B 728cf913336f09ae073508d6bf18f7bb0cf4bb0e16ad5d6acd5fb77b75577303b1a2d8820b280a31c15ebdcbf231205881440105c390a0f16681dc5274a74446 SHA512 07ed087490b4024ecbc097c1a62e24fdc0c5c8acac23ba3ed246104655a8b1786faee5caa5e59cfa7b725527b5aedc587b0f99a2b43100497f866966818e345e diff --git a/media-video/cheese/cheese-41.1.ebuild b/media-video/cheese/cheese-41.1.ebuild deleted file mode 100644 index 6c679af36fe3..000000000000 --- a/media-video/cheese/cheese-41.1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit gnome.org gnome2-utils meson vala virtualx xdg - -DESCRIPTION="A cheesy program to take pictures and videos from your webcam" -HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"; - -LICENSE="GPL-2+" -SLOT="0/8" # subslot = libcheese soname version -KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86" -IUSE="gtk-doc +introspection test" -RESTRICT="!test? ( test )" - -DEPEND=" - >=media-libs/clutter-1.13.2:1.0[introspection?] - media-libs/clutter-gst:3.0 - >=media-libs/clutter-gtk-0.91.8:1.0 - x11-libs/gdk-pixbuf:2[jpeg,introspection?] - >=dev-libs/glib-2.39.90:2 - >=gnome-base/gnome-desktop-2.91.6:3= - >=media-libs/gstreamer-1.4:1.0[introspection?] - >=media-libs/gst-plugins-base-1.4:1.0[ogg,pango,theora,vorbis] - >=media-libs/gst-plugins-bad-1.4:1.0 - >=x11-libs/gtk+-3.13.4:3 - >=media-libs/libcanberra-0.26[gtk3] - x11-libs/libX11 - sys-apps/dbus - media-video/gnome-video-effects - introspection? ( >=dev-libs/gobject-introspection-1.56:= ) - - media-libs/cogl:1.0=[introspection?] - -" -RDEPEND="${DEPEND} - >=media-libs/gst-plugins-good-1.4:1.0 - - >=media-plugins/gst-plugins-jpeg-1.4:1.0 - || ( - >=media-plugins/gst-plugins-v4l2-1.4:1.0 - media-video/pipewire[gstreamer,v4l] - ) - >=media-plugins/gst-plugins-vpx-1.4:1.0 -" - -BDEPEND=" - gtk-doc? ( dev-util/gtk-doc ) - dev-libs/libxslt - app-text/docbook-xml-dtd:4.3 - dev-util/itstool - dev-libs/appstream-glib - dev-libs/libxml2:2 - dev-util/glib-utils - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - x11-base/xorg-proto - test? ( x11-libs/libXtst ) - $(vala_depend) -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.38.0-buildfix.patch - "${FILESDIR}"/${PV}-thumb-view-update-for-new-gnome-desktop-API.patch -) - -src_prepare() { - xdg_src_prepare - vala_src_prepare -} - -src_configure() { - local emesonargs=( - $(meson_use gtk-doc gtk_doc) - $(meson_use introspection) - $(meson_use test tests) - -Dman=true - ) - - meson_src_configure - - # Hack: version.xml is not generated if gtk-doc is not enabled - echo ${PV} > docs/reference/version.xml -} - -src_test() { - gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed - virtx meson_src_test -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/media-video/cheese/files/41.1-thumb-view-update-for-new-gnome-desktop-API.patch b/media-video/cheese/files/41.1-thumb-view-update-for-new-gnome-desktop-API.patch deleted file mode 100644 index 3796c721f892..000000000000 --- a/media-video/cheese/files/41.1-thumb-view-update-for-new-gnome-desktop-API.patch +++ /dev/null @@ -1,49 +0,0 @@ -From d58071c56dc46299357c46da5ef9682d8d0abfa4 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro <[email protected]> -Date: Mon, 11 Apr 2022 17:07:21 -0500 -Subject: [PATCH] thumb-view: update for new gnome-desktop API - -See gnome-desktop!132 ---- - src/thumbview/cheese-thumb-view.c | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - -diff --git a/src/thumbview/cheese-thumb-view.c b/src/thumbview/cheese-thumb-view.c -index f01b33df..fce8687d 100644 ---- a/src/thumbview/cheese-thumb-view.c -+++ b/src/thumbview/cheese-thumb-view.c -@@ -134,6 +134,23 @@ cheese_thumb_view_idle_append_item (gpointer data) - - if (!thumb_loc) - { -+#if defined(GNOME_DESKTOP_PLATFORM_VERSION) && GNOME_DESKTOP_PLATFORM_VERSION >= 43 -+ pixbuf = gnome_desktop_thumbnail_factory_generate_thumbnail (factory, uri, mime_type, NULL, &error); -+ if (!pixbuf) -+ { -+ g_warning ("could not generate thumbnail for %s (%s): %s\n", filename, mime_type, error->message); -+ g_clear_error (&error); -+ } -+ else -+ { -+ gnome_desktop_thumbnail_factory_save_thumbnail (factory, pixbuf, uri, mtime.tv_sec, NULL, &error); -+ if (error) -+ { -+ g_warning ("could not save thumbnail for %s (%s): %s\n", filename, mime_type, error->message); -+ g_clear_error (&error); -+ } -+ } -+#else - pixbuf = gnome_desktop_thumbnail_factory_generate_thumbnail (factory, uri, mime_type); - if (!pixbuf) - { -@@ -143,6 +160,7 @@ cheese_thumb_view_idle_append_item (gpointer data) - { - gnome_desktop_thumbnail_factory_save_thumbnail (factory, pixbuf, uri, mtime.tv_sec); - } -+#endif - } - else - { --- -2.35.1 - diff --git a/media-video/cheese/files/cheese-3.38.0-buildfix.patch b/media-video/cheese/files/cheese-3.38.0-buildfix.patch deleted file mode 100644 index a7d685e68628..000000000000 --- a/media-video/cheese/files/cheese-3.38.0-buildfix.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/meson.build b/meson.build -index 7ef4075f..36638472 100644 ---- a/meson.build -+++ b/meson.build -@@ -149,11 +149,7 @@ gnome_video_effects_dep = dependency( - # Recommend some runtime GStreamer plugins. - gst_inspect = find_program('gst-inspect-1.0', required: false) - if gst_inspect.found() -- foreach plugin: ['camerabin', 'vp8enc', 'webmmux'] -- if run_command(gst_inspect, plugin).returncode() != 0 -- warning(plugin + ' was not found. It needs to be installed before Cheese is run') -- endif -- endforeach -+ warning('unable to check for runtime GStreamer plugin dependencies due to Gentoo\'s sandbox: camerabin, vp8enc, webmmux') - else - warning('unable to check for runtime GStreamer plugin dependencies') - endif
