gentoo resync : 29.12.2022

3 files changed, 114 insertions, 0 deletions

diff --git a/media-libs/clutter-gst/Manifest b/media-libs/clutter-gst/Manifest
index 7529b84150bf..ab9be5c01362 100644
--- a/media-libs/clutter-gst/Manifest
+++ b/media-libs/clutter-gst/Manifest
@@ -1,3 +1,5 @@
+AUX 3.0.27-video-sink-Remove-RGBx-BGRx-support.patch 2406 BLAKE2B 936bdb2306030eb615b555f3d82ef14808a6f840f1b0eb9de4016b5cb7fa733c27efaadbcbb48ea2b40a65a989877dd3f12b3481491f60a82dd406a88cd7e857 SHA512 00ead4f4785c33b846caf74de79d7b44ec41499d44f16775cf1881b4c5d3a10e6b2a17eb60deafba19cd41f9d760d1df6b0b61299d6cb620e2b909871c369660
 DIST clutter-gst-3.0.27.tar.xz 404972 BLAKE2B 6861e6a0e8770b1d0c1a1d3ca593b2f8b5ea381614d063c040ee92e4099d8b4e43d25fa6058f7d1c146fdf94766b20e7aa69fa6fc6725b46af4a3ed976aa05cc SHA512 27271d9b2241a35cf7f61c4e9e25126d578494843c947cbeac6b5ad1dc8726c7a2a056239617ec39b04a7671a45dcbe2a65c364b10ed470f7c857647f8c36cac
 EBUILD clutter-gst-3.0.27-r1.ebuild 1439 BLAKE2B 5d32b0b52a270b73a7070bdadb84711ca75ffb78b802cac23f012645fb394c6ee44df804f0391c34e585fb4186856a6b82e6095e47577b6fe6f4344f2150424a SHA512 0d66197c99965ff613531baac0c551093ea5e4f448d226bf890689ce60c873d840d260e15fc5603e1fb0197dd49fb764a763e453a551df029c23a3e2d49cd2f4
+EBUILD clutter-gst-3.0.27-r2.ebuild 1291 BLAKE2B 223e4478cef41f70494b2082f6794aa4db83c7d7a8835cb373b10d5da46ebca60f172826e3f220967a945071ed3f03398b849a11110d33a46da9d090febef27a SHA512 c1ffa673c6d97c4556f5a4ba870c16b65ebd952a30ecb752cd2ee1d8c2d4fcb7943e5809a9de5d08ca9665d3bd98da5f909aa1e6b9a18a8cbea202051bf5f441
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-libs/clutter-gst/clutter-gst-3.0.27-r2.ebuild b/media-libs/clutter-gst/clutter-gst-3.0.27-r2.ebuild
new file mode 100644
index 000000000000..3b28b0d10ce9
--- /dev/null
+++ b/media-libs/clutter-gst/clutter-gst-3.0.27-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2
+
+HOMEPAGE="https://blogs.gnome.org/clutter/"
+DESCRIPTION="GStreamer integration library for Clutter"
+
+LICENSE="LGPL-2.1+"
+SLOT="3.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="X debug +introspection udev"
+
+# >=cogl-1.18 provides cogl-2.0-experimental
+DEPEND="
+	>=dev-libs/glib-2.20:2
+	>=media-libs/clutter-1.20:1.0=[X=,introspection?]
+	>=media-libs/cogl-1.18:1.0=[introspection?]
+	>=media-libs/gstreamer-1.4:1.0[introspection?]
+	>=media-libs/gst-plugins-bad-1.4:1.0
+	>=media-libs/gst-plugins-base-1.4:1.0[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.6.8:= )
+	udev? ( dev-libs/libgudev )
+"
+# uses goom from gst-plugins-good
+RDEPEND="${DEPEND}
+	>=media-libs/gst-plugins-good-1.4:1.0
+	!udev? ( media-plugins/gst-plugins-v4l2 )
+"
+BDEPEND="
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.11
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-video-sink-Remove-RGBx-BGRx-support.patch
+)
+
+src_configure() {
+	# --enable-gl-texture-upload is experimental
+	gnome2_src_configure \
+		--disable-maintainer-flags \
+		--enable-debug=$(usex debug yes minimum) \
+		$(use_enable introspection) \
+		$(use_enable udev)
+}
diff --git a/media-libs/clutter-gst/files/3.0.27-video-sink-Remove-RGBx-BGRx-support.patch b/media-libs/clutter-gst/files/3.0.27-video-sink-Remove-RGBx-BGRx-support.patch
new file mode 100644
index 000000000000..fba6addc08cf
--- /dev/null
+++ b/media-libs/clutter-gst/files/3.0.27-video-sink-Remove-RGBx-BGRx-support.patch
@@ -0,0 +1,63 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
+Date: Tue, 26 Apr 2022 23:06:51 +0000
+Subject: [PATCH] video-sink: Remove RGBx/BGRx support
+
+The rgb24 renderer uses the wrong pixel stride and the rgb32 renderer
+assumes alpha is meaningful. We can use neither.
+
+Fixes: https://gitlab.gnome.org/GNOME/cheese/-/issues/51
+---
+ clutter-gst/clutter-gst-video-sink.c | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c
+index 2cbabe6043ca..2c1c10c7810b 100644
+--- a/clutter-gst/clutter-gst-video-sink.c
++++ b/clutter-gst/clutter-gst-video-sink.c
+@@ -98,8 +98,6 @@ GST_DEBUG_CATEGORY_STATIC (clutter_gst_video_sink_debug);
+   "I420,"                                       \
+   "RGBA,"                                       \
+   "BGRA,"                                       \
+-  "RGBx,"                                       \
+-  "BGRx,"                                       \
+   "RGB,"                                        \
+   "BGR,"                                        \
+   "NV12 }"
+@@ -1392,21 +1390,21 @@ static ClutterGstRenderer rgb32_glsl_renderer =
+                      ";"
+ #endif
+                      MAKE_CAPS (GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY,
+-                                "{ RGBA, BGRA, RGBx, BGRx }")),
++                                "{ RGBA, BGRA }")),
+     1, /* n_layers */
+     clutter_gst_rgb32_glsl_setup_pipeline,
+     clutter_gst_rgb32_upload,
+     clutter_gst_rgb32_upload_gl,
+     clutter_gst_dummy_shutdown,
+   };
+ 
+ static ClutterGstRenderer rgb32_renderer =
+   {
+     "RGB 32",
+     CLUTTER_GST_RGB32,
+     0,
+     GST_STATIC_CAPS (MAKE_CAPS (GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY,
+-                                "{ RGBA, BGRA, RGBx, BGRx }")),
++                                "{ RGBA, BGRA }")),
+     2, /* n_layers */
+     clutter_gst_rgb32_setup_pipeline,
+     clutter_gst_rgb32_upload,
+@@ -1907,12 +1905,10 @@ clutter_gst_video_sink_parse_caps (GstCaps *caps,
+       format = CLUTTER_GST_NV12;
+       break;
+     case GST_VIDEO_FORMAT_RGB:
+-    case GST_VIDEO_FORMAT_RGBx:
+       format = CLUTTER_GST_RGB24;
+       bgr = FALSE;
+       break;
+     case GST_VIDEO_FORMAT_BGR:
+-    case GST_VIDEO_FORMAT_BGRx:
+       format = CLUTTER_GST_RGB24;
+       bgr = TRUE;
+       break;