* [gentoo-commits] repo/gentoo:master commit in: media-video/cheese/, media-video/cheese/files/
@ 2020-02-02 3:53 Matt Turner
0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2020-02-02 3:53 UTC (permalink / raw
To: gentoo-commits
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 +++
| 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
--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@gmx.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
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/cheese/, media-video/cheese/files/
@ 2021-04-15 15:36 Matt Turner
0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2021-04-15 15:36 UTC (permalink / raw
To: gentoo-commits
commit: b3060f7fc321c1c1a87cf024b8ec4f8170b25861
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 15 15:32:14 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 15 15:32:14 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3060f7f
media-video/cheese: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
media-video/cheese/Manifest | 1 -
media-video/cheese/cheese-3.34.0-r1.ebuild | 96 -------------
.../cheese/files/cheese-3.34.0-buildfix.patch | 17 ---
| 160 ---------------------
4 files changed, 274 deletions(-)
diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
index 9d5e7b77261..777126265c8 100644
--- a/media-video/cheese/Manifest
+++ b/media-video/cheese/Manifest
@@ -1,2 +1 @@
-DIST cheese-3.34.0.tar.xz 1077052 BLAKE2B 9719818aebb3472b804d96d79b02ee71b818d098b6eeb54f2075939e95ba651c251d561b4bc79c30a0aae6217a8a29f46f045be9279c9100ba1b0344f1279ba5 SHA512 093b4e5f7f15fd0c445fffd254d4a5035a4e3e91bacccdeeda64a4a7182901646daea5c8596c954a67896f9aaf37dab2309c21e8f026583f59d787a2c1e4c200
DIST cheese-3.38.0.tar.xz 1086428 BLAKE2B b26a19a019de0385bdd7adbc55c873ebceca90a8f477d2041ef4a5045654f46ee8f7fdfc64f5fd34e059116528cc790610353791a7cbd13d7927a8c3abf38132 SHA512 210b50fc79a7b3a72c94163fe0dd76f7f29f576c1085c671c2c6c3b7f59ee362aec288f885a590ebfd9530534b6a6bad569c6df57874b9fcecf7e9f1ba9531ae
diff --git a/media-video/cheese/cheese-3.34.0-r1.ebuild b/media-video/cheese/cheese-3.34.0-r1.ebuild
deleted file mode 100644
index fd904b0cdcc..00000000000
--- a/media-video/cheese/cheese-3.34.0-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 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 ~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-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}"/${P}-buildfix.patch
- "${FILESDIR}"/${P}-help-No-more-menu-bars-in-3.34-UI.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() {
- 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/cheese-3.34.0-buildfix.patch b/media-video/cheese/files/cheese-3.34.0-buildfix.patch
deleted file mode 100644
index 8e2ac282481..00000000000
--- a/media-video/cheese/files/cheese-3.34.0-buildfix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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
deleted file mode 100644
index b19c8fa30d5..00000000000
--- a/media-video/cheese/files/cheese-3.34.0-help-No-more-menu-bars-in-3.34-UI.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-From 9a9e47a3d3e910805bd7c9c1763c66400181f677 Mon Sep 17 00:00:00 2001
-From: Andre Klapper <a9016009@gmx.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
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/cheese/, media-video/cheese/files/
@ 2021-08-25 13:27 Pacho Ramos
0 siblings, 0 replies; 4+ messages in thread
From: Pacho Ramos @ 2021-08-25 13:27 UTC (permalink / raw
To: gentoo-commits
commit: 80b26c2a7326cf9babddc39f0526de0eb3a0742b
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 25 13:27:12 2021 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Aug 25 13:27:12 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80b26c2a
media-video/cheese: Apply fixes from Fedora
Important fixes to get support for latest vala and solve important memory
leaks
Closes: https://bugs.gentoo.org/667350
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
media-video/cheese/cheese-3.38.0-r1.ebuild | 97 +++++++++++
...nite-loop-if-thumbnailer-is-not-available.patch | 88 ++++++++++
.../files/cheese-3.38.0-vala-genericarray.patch | 177 +++++++++++++++++++++
3 files changed, 362 insertions(+)
diff --git a/media-video/cheese/cheese-3.38.0-r1.ebuild b/media-video/cheese/cheese-3.38.0-r1.ebuild
new file mode 100644
index 00000000000..9b233fac219
--- /dev/null
+++ b/media-video/cheese/cheese-3.38.0-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 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 ~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-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}"/${P}-buildfix.patch
+ "${FILESDIR}"/${P}-Fix-infinite-loop-if-thumbnailer-is-not-available.patch
+ "${FILESDIR}"/${P}-vala-genericarray.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() {
+ 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/cheese-3.38.0-Fix-infinite-loop-if-thumbnailer-is-not-available.patch b/media-video/cheese/files/cheese-3.38.0-Fix-infinite-loop-if-thumbnailer-is-not-available.patch
new file mode 100644
index 00000000000..5a27eb6e784
--- /dev/null
+++ b/media-video/cheese/files/cheese-3.38.0-Fix-infinite-loop-if-thumbnailer-is-not-available.patch
@@ -0,0 +1,88 @@
+From e7046d564a6f76c1af8f5640ac9c569e07284ec0 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 18 Sep 2020 12:06:45 +0200
+Subject: [PATCH] Fix infinite loop if thumbnailer is not available
+
+The code in cheese_thumb_view_idle_append_item() in
+src/thumbview/cheese-thumb-view.c didn't pop the list of items to
+thumbnail if thumbnailing failed.
+
+ #0 0x00007f4a60e55314 in open64 () at /lib64/libc.so.6
+ #1 0x00007f4a60de6386 in _IO_file_open () at /lib64/libc.so.6
+ #2 0x00007f4a60de655a in __GI__IO_file_fopen () at /lib64/libc.so.6
+ #3 0x00007f4a60dd9aad in __fopen_internal () at /lib64/libc.so.6
+ #4 0x00007f4a6157a43f in gdk_pixbuf_new_from_file () at /lib64/libgdk_pixbuf-2.0.so.0
+ #5 0x00007f4a61e84b3a in gnome_desktop_thumbnail_factory_lookup () at /lib64/libgnome-desktop-3.so.19
+ #6 0x000055cef476046f in cheese_thumb_view_idle_append_item ()
+ #7 0x00007f4a6124f47b in g_idle_dispatch () at /lib64/libglib-2.0.so.0
+ #8 0x00007f4a612537af in g_main_context_dispatch () at /lib64/libglib-2.0.so.0
+ #9 0x00007f4a61253b38 in g_main_context_iterate.constprop () at /lib64/libglib-2.0.so.0
+ #10 0x00007f4a61253c03 in g_main_context_iteration () at /lib64/libglib-2.0.so.0
+ #11 0x00007f4a6146a7ca in g_application_run () at /lib64/libgio-2.0.so.0
+ #12 0x000055cef4758547 in _vala_main ()
+ #13 0x00007f4a60d8a042 in __libc_start_main () at /lib64/libc.so.6
+ #14 0x000055cef47554be in _start ()
+
+ #0 0x00007f4a60ec562d in __strlen_avx2 () at /lib64/libc.so.6
+ #1 0x00007f4a61275de8 in g_str_has_suffix () at /lib64/libglib-2.0.so.0
+ #2 0x00007f4a618c0072 in icon_name_is_symbolic () at /lib64/libgtk-3.so.0
+ #3 0x00007f4a618c00b1 in theme_dir_get_icon_suffix () at /lib64/libgtk-3.so.0
+ #4 0x00007f4a618c32ed in theme_lookup_icon () at /lib64/libgtk-3.so.0
+ #5 0x00007f4a618c3adf in real_choose_icon () at /lib64/libgtk-3.so.0
+ #6 0x00007f4a618c4762 in gtk_icon_theme_lookup_icon_for_scale () at /lib64/libgtk-3.so.0
+ #7 0x00007f4a618c5105 in gtk_icon_theme_load_icon_for_scale () at /lib64/libgtk-3.so.0
+ #8 0x000055cef47605c9 in cheese_thumb_view_idle_append_item ()
+ #9 0x00007f4a6124f47b in g_idle_dispatch () at /lib64/libglib-2.0.so.0
+ #10 0x00007f4a612537af in g_main_context_dispatch () at /lib64/libglib-2.0.so.0
+ #11 0x00007f4a61253b38 in g_main_context_iterate.constprop () at /lib64/libglib-2.0.so.0
+ #12 0x00007f4a61253c03 in g_main_context_iteration () at /lib64/libglib-2.0.so.0
+ #13 0x00007f4a6146a7d8 in g_application_run () at /lib64/libgio-2.0.so.0
+ #14 0x000055cef4758547 in _vala_main ()
+ #15 0x00007f4a60d8a042 in __libc_start_main () at /lib64/libc.so.6
+ #16 0x000055cef47554be in _start ()
+
+Closes: #81
+---
+ src/thumbview/cheese-thumb-view.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/thumbview/cheese-thumb-view.c b/src/thumbview/cheese-thumb-view.c
+index 1d2d88f5..232fd4b6 100644
+--- a/src/thumbview/cheese-thumb-view.c
++++ b/src/thumbview/cheese-thumb-view.c
+@@ -92,7 +92,7 @@ GtkWidget * cheese_thumb_view_new (void);
+ static gboolean
+ cheese_thumb_view_idle_append_item (gpointer data)
+ {
+- CheeseThumbViewIdleData *item = g_queue_peek_head (data);
++ CheeseThumbViewIdleData *item = g_queue_pop_head (data);
+ CheeseThumbView *thumb_view;
+ CheeseThumbViewPrivate *priv;
+
+@@ -119,6 +119,7 @@ cheese_thumb_view_idle_append_item (gpointer data)
+ if (!info)
+ {
+ g_warning ("Invalid filename\n");
++ g_slice_free (CheeseThumbViewIdleData, item);
+ return TRUE;
+ }
+ g_file_info_get_modification_time (info, &mtime);
+@@ -167,6 +168,7 @@ cheese_thumb_view_idle_append_item (gpointer data)
+ if (error)
+ {
+ g_warning ("%s", error->message);
++ g_slice_free (CheeseThumbViewIdleData, item);
+ return TRUE;
+ }
+ }
+@@ -183,7 +185,6 @@ cheese_thumb_view_idle_append_item (gpointer data)
+ g_object_unref (pixbuf);
+ g_object_unref (file);
+ g_slice_free (CheeseThumbViewIdleData, item);
+- g_queue_pop_head (data);
+
+ return TRUE;
+ }
+--
+2.28.0
+
diff --git a/media-video/cheese/files/cheese-3.38.0-vala-genericarray.patch b/media-video/cheese/files/cheese-3.38.0-vala-genericarray.patch
new file mode 100644
index 00000000000..dcbd1c1b2c5
--- /dev/null
+++ b/media-video/cheese/files/cheese-3.38.0-vala-genericarray.patch
@@ -0,0 +1,177 @@
+From 7cf6268e54620bbbe5e6e61800c50fb0cb4bea57 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Corentin=20No=C3=ABl?= <corentin@elementary.io>
+Date: Fri, 16 Oct 2020 19:56:26 +0200
+Subject: [PATCH] Change GLib.PtrArray into GLib.GenericArray
+
+This is the vala-friendly way of handling GPtrArray.
+Fix several memory leaks on the go and unnecessary reference increase.
+---
+ src/cheese-preferences.vala | 26 ++++++++++++--------------
+ src/cheese-window.vala | 22 +++++++++++-----------
+ src/vapi/cheese-common.vapi | 2 +-
+ 3 files changed, 24 insertions(+), 26 deletions(-)
+
+diff --git a/src/cheese-preferences.vala b/src/cheese-preferences.vala
+index f56af7e0..80a92431 100644
+--- a/src/cheese-preferences.vala
++++ b/src/cheese-preferences.vala
+@@ -100,7 +100,7 @@ public PreferencesDialog (Cheese.Camera camera)
+ */
+ private void initialize_camera_devices ()
+ {
+- unowned GLib.PtrArray devices = camera.get_camera_devices ();
++ GLib.GenericArray<unowned Cheese.CameraDevice> devices = camera.get_camera_devices ();
+ camera_model = new Gtk.ListStore (2, typeof (string), typeof (Cheese.CameraDevice));
+
+ source_combo.model = camera_model;
+@@ -357,13 +357,13 @@ public PreferencesDialog (Cheese.Camera camera)
+ */
+ private void on_camera_update_num_camera_devices ()
+ {
+- unowned GLib.PtrArray devices = camera.get_camera_devices ();
+- Cheese.CameraDevice dev;
++ GLib.GenericArray<unowned Cheese.CameraDevice> devices = camera.get_camera_devices ();
++ unowned Cheese.CameraDevice dev;
+
+ // Add (if) / Remove (else) a camera device.
+- if (devices.len > camera_model.iter_n_children (null))
++ if (devices.length > camera_model.iter_n_children (null))
+ {
+- dev = (Cheese.CameraDevice) devices.index (devices.len - 1);
++ dev = devices.get (devices.length - 1);
+ add_camera_device(dev);
+ }
+ else
+@@ -382,12 +382,11 @@ public PreferencesDialog (Cheese.Camera camera)
+ bool device_removed = false;
+ devices.foreach ((device) =>
+ {
+- var old_device = (Cheese.CameraDevice) device;
+ Cheese.CameraDevice new_device;
+ camera_model.get (iter, 1, out new_device, -1);
+
+ // Found the device that was removed.
+- if (old_device != new_device)
++ if (device != new_device)
+ {
+ remove_camera_device (iter, new_device, active_device);
+ device_removed = true;
+@@ -418,17 +417,16 @@ public PreferencesDialog (Cheese.Camera camera)
+ *
+ * @param device a Cheese.CameraDevice to add to the device combo box model
+ */
+- private void add_camera_device (void *device)
++ private void add_camera_device (Cheese.CameraDevice device)
+ {
+ TreeIter iter;
+- Cheese.CameraDevice dev = (Cheese.CameraDevice) device;
+
+ camera_model.append (out iter);
+ camera_model.set (iter,
+- 0, dev.get_name (),
+- 1, dev);
++ 0, device.get_name (),
++ 1, device);
+
+- if (camera.get_selected_device () == dev)
++ if (camera.get_selected_device () == device)
+ source_combo.set_active_iter (iter);
+
+ if (camera_model.iter_n_children (null) > 1)
+@@ -445,12 +443,12 @@ public PreferencesDialog (Cheese.Camera camera)
+ private void remove_camera_device (TreeIter iter, Cheese.CameraDevice device_node,
+ Cheese.CameraDevice active_device_node)
+ {
+- unowned GLib.PtrArray devices = camera.get_camera_devices ();
++ GLib.GenericArray<unowned Cheese.CameraDevice> devices = camera.get_camera_devices ();
+
+ // Check if the camera that we want to remove, is the active one
+ if (device_node == active_device_node)
+ {
+- if (devices.len > 0)
++ if (devices.length > 0)
+ set_new_available_camera_device (iter);
+ else
+ this.hide ();
+diff --git a/src/cheese-window.vala b/src/cheese-window.vala
+index ff069808..cc119b68 100644
+--- a/src/cheese-window.vala
++++ b/src/cheese-window.vala
+@@ -1216,9 +1216,9 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
+ */
+ public void on_switch_camera_clicked ()
+ {
+- Cheese.CameraDevice selected;
+- Cheese.CameraDevice next = null;
+- GLib.PtrArray cameras;
++ unowned Cheese.CameraDevice selected;
++ unowned Cheese.CameraDevice next = null;
++ GLib.GenericArray<unowned Cheese.CameraDevice> cameras;
+ uint i;
+
+ if (camera == null)
+@@ -1235,9 +1235,9 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
+
+ cameras = camera.get_camera_devices ();
+
+- for (i = 0; i < cameras.len; i++)
++ for (i = 0; i < cameras.length; i++)
+ {
+- next = (Cheese.CameraDevice )cameras.index (i);
++ next = cameras.get (i);
+
+ if (next == selected)
+ {
+@@ -1245,13 +1245,13 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
+ }
+ }
+
+- if (i + 1 < cameras.len)
++ if (i + 1 < cameras.length)
+ {
+- next = (Cheese.CameraDevice )cameras.index (i + 1);
++ next = cameras.get (i + 1);
+ }
+ else
+ {
+- next = (Cheese.CameraDevice )cameras.index (0);
++ next = cameras.get (0);
+ }
+
+ if (next == selected)
+@@ -1269,8 +1269,8 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
+ */
+ public void set_switch_camera_button_state ()
+ {
+- Cheese.CameraDevice selected;
+- GLib.PtrArray cameras;
++ unowned Cheese.CameraDevice selected;
++ GLib.GenericArray<unowned Cheese.CameraDevice> cameras;
+
+ if (camera == null)
+ {
+@@ -1288,7 +1288,7 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
+
+ cameras = camera.get_camera_devices ();
+
+- if (cameras.len > 1)
++ if (cameras.length > 1)
+ {
+ switch_camera_button.set_visible (true);
+ return;
+diff --git a/src/vapi/cheese-common.vapi b/src/vapi/cheese-common.vapi
+index 6517cdfc..e4ae7ad3 100644
+--- a/src/vapi/cheese-common.vapi
++++ b/src/vapi/cheese-common.vapi
+@@ -35,7 +35,7 @@ namespace Cheese
+ [CCode (has_construct_function = false)]
+ public Camera (Clutter.Actor video_texture, string camera_device_node, int x_resolution, int y_resolution);
+ public bool get_balance_property_range (string property, double min, double max, double def);
+- public unowned GLib.PtrArray get_camera_devices ();
++ public GLib.GenericArray<unowned Cheese.CameraDevice> get_camera_devices ();
+ public unowned Cheese.VideoFormat get_current_video_format ();
+ public int get_num_camera_devices ();
+ public unowned Cheese.CameraDevice get_selected_device ();
+--
+GitLab
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/cheese/, media-video/cheese/files/
@ 2022-12-13 1:25 Matt Turner
0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2022-12-13 1:25 UTC (permalink / raw
To: gentoo-commits
commit: 31ca68772ee946656f301d35a941c29590612a5b
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 12 19:31:09 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Dec 13 01:22:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31ca6877
media-video/cheese: Version bump to 43.0
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
media-video/cheese/Manifest | 1 +
media-video/cheese/cheese-43.0.ebuild | 100 +++++++++++++++++++++
.../cheese/files/cheese-43.0-buildfix.patch | 20 +++++
3 files changed, 121 insertions(+)
diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
index fda8b5ce5545..fa260c5eaa37 100644
--- a/media-video/cheese/Manifest
+++ b/media-video/cheese/Manifest
@@ -1 +1,2 @@
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-43.0.ebuild b/media-video/cheese/cheese-43.0.ebuild
new file mode 100644
index 000000000000..354d62a26bd6
--- /dev/null
+++ b/media-video/cheese/cheese-43.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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}-43.0-buildfix.patch
+)
+
+src_prepare() {
+ default
+ vala_setup
+ xdg_environment_reset
+}
+
+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/cheese-43.0-buildfix.patch b/media-video/cheese/files/cheese-43.0-buildfix.patch
new file mode 100644
index 000000000000..25cd98362eb8
--- /dev/null
+++ b/media-video/cheese/files/cheese-43.0-buildfix.patch
@@ -0,0 +1,20 @@
+diff --git a/meson.build b/meson.build
+index 9174b428..c8d489cc 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, check: false).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
+--
+2.37.4
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-12-13 1:25 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-15 15:36 [gentoo-commits] repo/gentoo:master commit in: media-video/cheese/, media-video/cheese/files/ Matt Turner
-- strict thread matches above, loose matches on Subject: below --
2022-12-13 1:25 Matt Turner
2021-08-25 13:27 Pacho Ramos
2020-02-02 3:53 Matt Turner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox