[arch-commits] Commit in clutter-gst/trunk (2 files)

[Jan Steffens]

    Date: Tuesday, April 26, 2022 @ 23:15:06
  Author: heftig
Revision: 444068

3.0.27-4: FS#74222 fix cheese

Added:
  clutter-gst/trunk/0001-video-sink-Remove-RGBx-BGRx-support.patch
Modified:
  clutter-gst/trunk/PKGBUILD

------------------------------------------------+
 0001-video-sink-Remove-RGBx-BGRx-support.patch |   63 +++++++++++++++++++++++
 PKGBUILD                                       |   23 +++++---
 2 files changed, 77 insertions(+), 9 deletions(-)

Added: 0001-video-sink-Remove-RGBx-BGRx-support.patch
===================================================================
--- 0001-video-sink-Remove-RGBx-BGRx-support.patch	                        (rev 0)
+++ 0001-video-sink-Remove-RGBx-BGRx-support.patch	2022-04-26 23:15:06 UTC (rev 444068)
@@ -0,0 +1,63 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <heftig at 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;

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-26 21:41:12 UTC (rev 444067)
+++ PKGBUILD	2022-04-26 23:15:06 UTC (rev 444068)
@@ -1,8 +1,8 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
 
 pkgname=clutter-gst
 pkgver=3.0.27
-pkgrel=3
+pkgrel=4
 pkgdesc="GStreamer bindings for clutter"
 url="https://gitlab.gnome.org/GNOME/clutter-gst"
 arch=(x86_64)
@@ -10,25 +10,30 @@
 depends=(clutter gst-plugins-base-libs libxdamage libgudev gdk-pixbuf2)
 makedepends=(gobject-introspection gtk-doc git gst-plugins-good)
 optdepends=("gst-plugins-good: Video camera capture")
+options=(debug)
 _commit=01a461da1bdb3b29edd2d198b877ec0765af1f39  # tags/3.0.27^0
-source=("git+https://gitlab.gnome.org/GNOME/clutter-gst.git#commit=$_commit")
-sha256sums=('SKIP')
+source=("git+https://gitlab.gnome.org/GNOME/clutter-gst.git#commit=$_commit"
+        0001-video-sink-Remove-RGBx-BGRx-support.patch)
+sha256sums=('SKIP'
+            '818d20462b9ac623e036d205dc28c07e17045f913fa652a79f73996310be067a')
 
 pkgver() {
   cd $pkgname
-  git describe --tags | sed 's/-/+/g'
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
 }
 
 prepare() {
   cd $pkgname
-  git tag -f 3.0.26 7e191b675decc87bca263f08c1b01a694c74d44a  # Fixup missing tag
+
+  # https://bugs.archlinux.org/task/74222
+  git apply -3 ../0001-video-sink-Remove-RGBx-BGRx-support.patch
+
   NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
   cd $pkgname
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --enable-gtk-doc
+  ./configure --prefix=/usr --sysconfdir=/etc --enable-gtk-doc
 
   # https://bugzilla.gnome.org/show_bug.cgi?id=655517
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
@@ -46,4 +51,4 @@
   make DESTDIR="$pkgdir" install
 }
 
-# vim:set ts=2 sw=2 et:
+# vim:set sw=2 et: