[gentoo-commits] repo/gentoo:master commit in: media-video/cheese/, media-video/cheese/files/

[Matt Turner]

commit:     59a9a772ac2ad618268fc0f29533c02f00f67126
Author:     David Heidelberg <david <AT> ixit <DOT> cz>
AuthorDate: Tue Oct 22 10:05:53 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Feb  2 03:51:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59a9a772

media-video/cheese: bump 3.34.0

- ported to meson
- ported to EAPI7
- make X dependency optional, since meson build do not requires xserver

Closes: https://bugs.gentoo.org/673804
Closes: https://bugs.gentoo.org/698250
Closes: https://github.com/gentoo/gentoo/pull/13378
Signed-off-by: David Heidelberg <david <AT> ixit.cz>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 media-video/cheese/Manifest                        |   1 +
 media-video/cheese/cheese-3.34.0.ebuild            | 103 +++++++++++++
 .../cheese/files/cheese-3.34.0-buildfix.patch      |  17 +++
 ...-3.34.0-help-No-more-menu-bars-in-3.34-UI.patch | 160 +++++++++++++++++++++
 4 files changed, 281 insertions(+)

diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
index dfca397dfc8..bb7880206e1 100644
--- a/media-video/cheese/Manifest
+++ b/media-video/cheese/Manifest
@@ -1 +1,2 @@
 DIST cheese-3.32.1.tar.xz 1487792 BLAKE2B 6e27b68f590aa4f90a8bbbc72972bed96fe9741b4efd849d226751cfd6abe37241fa214240c4a8b0449fb2bc53de1043ac0abd60a06bc884796a4272c07212af SHA512 bdd0ae72e3df596d19ad467dc0222a49b028f2ad8c285d55360813624ca2dac1956463cfd9cea4f2a6ff123070966544cd7254ee2891e973dca42d07061a6c94
+DIST cheese-3.34.0.tar.xz 1077052 BLAKE2B 9719818aebb3472b804d96d79b02ee71b818d098b6eeb54f2075939e95ba651c251d561b4bc79c30a0aae6217a8a29f46f045be9279c9100ba1b0344f1279ba5 SHA512 093b4e5f7f15fd0c445fffd254d4a5035a4e3e91bacccdeeda64a4a7182901646daea5c8596c954a67896f9aaf37dab2309c21e8f026583f59d787a2c1e4c200

diff --git a/media-video/cheese/cheese-3.34.0.ebuild b/media-video/cheese/cheese-3.34.0.ebuild
new file mode 100644
index 00000000000..7d4f0574c48
--- /dev/null
+++ b/media-video/cheese/cheese-3.34.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson vala virtualx xdg-utils
+
+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 ~sparc ~x86"
+IUSE="gtk-doc +introspection test X"
+RESTRICT="test" # Tests fail
+
+REQUIRED_USE="test? ( X )"
+COMMON_DEPEND="
+	>=dev-libs/glib-2.39.90:2
+	>=x11-libs/gtk+-3.13.4:3[introspection?]
+	>=gnome-base/gnome-desktop-2.91.6:3=
+	>=media-libs/libcanberra-0.26[gtk3]
+	>=media-libs/clutter-1.13.2:1.0[introspection?]
+	>=media-libs/clutter-gtk-0.91.8:1.0
+	media-libs/clutter-gst:3.0
+	media-libs/cogl:1.0=[introspection?]
+
+	media-video/gnome-video-effects
+	x11-libs/gdk-pixbuf:2[jpeg,introspection?]
+
+	>=media-libs/gstreamer-1.4:1.0[introspection?]
+	>=media-libs/gst-plugins-base-1.4:1.0[introspection?,ogg,pango,theora,vorbis,X?]
+
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libX11
+	)
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( x11-libs/libXtst )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	>=media-libs/gst-plugins-bad-1.4:1.0
+	>=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-plugins/gst-plugins-vpx-1.4:1.0
+"
+
+BDEPEND="
+	$(vala_depend)
+	app-text/docbook-xml-dtd:4.3
+	dev-util/itstool
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50
+	dev-libs/libxslt
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-buildfix.patch
+	"${FILESDIR}"/${P}-help-No-more-menu-bars-in-3.34-UI.patch
+)
+
+src_prepare() {
+	vala_src_prepare
+
+	default
+}
+
+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() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}

diff --git a/media-video/cheese/files/cheese-3.34.0-buildfix.patch b/media-video/cheese/files/cheese-3.34.0-buildfix.patch
new file mode 100644
index 00000000000..8e2ac282481
--- /dev/null
+++ b/media-video/cheese/files/cheese-3.34.0-buildfix.patch
@@ -0,0 +1,17 @@
+diff --git a/meson.build b/meson.build
+index a4775d44..9d1e5587 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

diff --git a/media-video/cheese/files/cheese-3.34.0-help-No-more-menu-bars-in-3.34-UI.patch b/media-video/cheese/files/cheese-3.34.0-help-No-more-menu-bars-in-3.34-UI.patch
new file mode 100644
index 00000000000..b19c8fa30d5
--- /dev/null
+++ b/media-video/cheese/files/cheese-3.34.0-help-No-more-menu-bars-in-3.34-UI.patch
@@ -0,0 +1,160 @@
+From 9a9e47a3d3e910805bd7c9c1763c66400181f677 Mon Sep 17 00:00:00 2001
+From: Andre Klapper <a9016009@×××.de>
+Date: Sun, 5 Jan 2020 23:35:37 +0100
+Subject: [PATCH] help: No more menu bars in 3.34 UI
+
+---
+ help/C/burst-mode.page            | 5 +++--
+ help/C/pref-countdown.page        | 6 ++++--
+ help/C/pref-flash.page            | 5 +++--
+ help/C/pref-fullscreen.page       | 6 ++++--
+ help/C/pref-image-properties.page | 5 +++--
+ help/C/pref-resolution.page       | 6 ++++--
+ 6 files changed, 21 insertions(+), 12 deletions(-)
+
+diff --git a/help/C/burst-mode.page b/help/C/burst-mode.page
+index a14d3ab8..0a587ca1 100644
+--- a/help/C/burst-mode.page
++++ b/help/C/burst-mode.page
+@@ -9,6 +9,7 @@
+     <revision pkgversion="3.1" date="2011-09-05" status="review"/>
+     <revision pkgversion="3.8" date="2013-04-19" status="review"/>
+     <revision pkgversion="3.12" date="2014-02-21" status="review"/>
++    <revision pkgversion="3.34" date="2020-01-05" status="review"/>
+ 
+     <credit type="author copyright">
+       <name>Julita Inca</name>
+@@ -59,8 +60,8 @@
+ 
+   <steps>
+     <item>
+-      <p>Select
+-      <guiseq><gui style="menu">Cheese</gui><gui style="menuitem">Preferences</gui><gui style="tab">Capture</gui></guiseq>.</p>
++      <p>Press the menu button in the top-right corner of the window and select
++      <guiseq><gui style="menuitem">Preferences</gui><gui style="tab">Capture</gui></guiseq>.</p>
+     </item>
+     <item>
+       <p>Edit the preference settings:</p>
+diff --git a/help/C/pref-countdown.page b/help/C/pref-countdown.page
+index 9077d7a0..8f4b0292 100644
+--- a/help/C/pref-countdown.page
++++ b/help/C/pref-countdown.page
+@@ -9,6 +9,7 @@
+     <revision pkgversion="3.1" date="2011-09-19" status="review"/>
+     <revision pkgversion="3.8" date="2013-04-15" status="review"/>
+     <revision pkgversion="3.12" date="2014-02-21" status="final"/>
++    <revision pkgversion="3.34" date="2020-01-05" status="final"/>
+ 
+     <credit type="author copyright">
+       <name>Julita Inca</name>
+@@ -28,8 +29,9 @@
+   <title>Disable the <gui>Countdown</gui></title>
+ 
+   <p>By default, <app>Cheese</app> counts down from three before taking a
+-  photo. You can disable this feature by selecting
+-  <guiseq><gui>Cheese</gui><gui>Preferences</gui><gui>Capture</gui></guiseq>
++  photo. You can disable this feature by pressing the menu button in the
++  top-right corner of the window, selecting
++  <guiseq><gui style="menuitem">Preferences</gui><gui style="tab">Capture</gui></guiseq>,
+   and unchecking <gui>Countdown</gui>.</p>
+ 
+ </page>
+diff --git a/help/C/pref-flash.page b/help/C/pref-flash.page
+index b6ccd736..52897d2f 100644
+--- a/help/C/pref-flash.page
++++ b/help/C/pref-flash.page
+@@ -9,6 +9,7 @@
+     <revision pkgversion="3.1" date="2011-09-19" status="review"/>
+     <revision pkgversion="3.8" date="2013-04-15" status="review"/>
+     <revision pkgversion="3.12" date="2014-02-21" status="final"/>
++    <revision pkgversion="3.34" date="2020-01-05" status="final"/>
+ 
+     <credit type="author copyright">
+       <name>Julita Inca</name>
+@@ -30,8 +31,8 @@
+   <p>When you take a photo with Cheese, the computer screen briefly turns
+   white.</p>
+ 
+-  <p>To disable this feature, select
+-  <guiseq><gui>Cheese</gui><gui>Preferences</gui><gui>Capture</gui></guiseq>
++  <p>To disable this feature, press the menu button in the top-right corner of the window, select
++  <guiseq><gui style="menuitem">Preferences</gui><gui style="tab">Capture</gui></guiseq>,
+   and uncheck <gui>Fire flash</gui>.</p>
+ 
+ </page>
+diff --git a/help/C/pref-fullscreen.page b/help/C/pref-fullscreen.page
+index a90baaad..7e79f374 100644
+--- a/help/C/pref-fullscreen.page
++++ b/help/C/pref-fullscreen.page
+@@ -7,6 +7,7 @@
+     <link type="guide" xref="index#preferences"/>
+     <revision pkgversion="3.6" date="2012-05-09" status="stub"/>
+     <revision pkgversion="3.12" date="2014-02-21" status="review"/>
++    <revision pkgversion="3.34" date="2020-01-05" status="review"/>
+ 
+     <credit type="author">
+       <name>Ekaterina Gerasimova</name>
+@@ -23,10 +24,11 @@
+   <p>To enable or disable the fullscreen mode:</p>
+ 
+   <steps>
+-    <item><p>Select <guiseq><gui>Cheese</gui><gui>Fullscreen</gui></guiseq></p></item>
++    <item><p>Press the menu button in the top-right corner of the window and select
++      <gui style="menuitem">Fullscreen</gui>.</p></item>
+   </steps>
+ 
+-  <p>If you cannot see the <gui style="menu">Cheese</gui> menu in fullscreen
++  <p>If you cannot see the menu button in fullscreen
+   mode, move your mouse or tap your touchscreen.</p>
+ 
+   <note style="tip">
+diff --git a/help/C/pref-image-properties.page b/help/C/pref-image-properties.page
+index eea2c0e3..7d812596 100644
+--- a/help/C/pref-image-properties.page
++++ b/help/C/pref-image-properties.page
+@@ -10,6 +10,7 @@
+     <revision pkgversion="3.1" date="2011-09-05" status="review"/>
+     <revision pkgversion="3.8" date="2013-04-15" status="review"/>
+     <revision pkgversion="3.12" date="2014-02-21" status="review"/>
++    <revision pkgversion="3.34" date="2020-01-05" status="review"/>
+ 
+     <credit type="author copyright">
+       <name>Julita Inca</name>
+@@ -33,8 +34,8 @@
+ 
+   <steps>
+     <item>
+-      <p>Select
+-      <guiseq><gui>Cheese</gui><gui>Preferences</gui><gui>Image</gui></guiseq>.</p>
++      <p>Press the menu button in the top-right corner of the window and select
++      <guiseq><gui style="menuitem">Preferences</gui><gui style="tab">Image</gui></guiseq>.</p>
+     </item>
+     <item>
+       <p>Move the sliders to find the best settings for your webcam.</p>
+diff --git a/help/C/pref-resolution.page b/help/C/pref-resolution.page
+index a620a4ba..42846841 100644
+--- a/help/C/pref-resolution.page
++++ b/help/C/pref-resolution.page
+@@ -8,6 +8,7 @@
+     <revision pkgversion="3.0" date="2011-08-25" status="candidate"/>
+     <revision pkgversion="3.1" date="2011-09-05" status="review"/>
+     <revision pkgversion="3.12" date="2014-02-21" status="candidate"/>
++    <revision pkgversion="3.34" date="2020-01-05" status="candidate"/>
+ 
+     <credit type="author copyright">
+       <name>Julita Inca</name>
+@@ -38,8 +39,9 @@
+ 
+   <steps>
+     <item>
+-      <p>Select
+-      <guiseq><gui>Cheese</gui><gui>Preferences</gui><gui>Webcam</gui></guiseq>.</p>
++      <p>Press the menu button in the top-right corner of the window and select
++      <guiseq><gui style="menuitem">Preferences</gui><gui style="tab">Webcam</gui></guiseq>.</p>
++
+     </item>
+     <item>
+       <p>Choose a different resolution from the drop-down list. Some webcams
+-- 
+2.24.1
+