Merge pull request #15173 from kurtbahartr/master-cheese

Fix build and runtime for GNOME Cheese

multimedia/video/cheese/files/cheese-gcc14.patch

@@ -0,0 +1,27 @@
+From d8b8f27730cca948a5e5346b8ed2db0793bb16e7 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Fri, 19 Jan 2024 21:31:33 +0100
+Subject: [PATCH] libcheese: Add GtkWidget cast to avoid an
+ incompatible-pointer-types error
+
+This is required for compilation with GCC 14.
+---
+ libcheese/cheese-flash.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libcheese/cheese-flash.c b/libcheese/cheese-flash.c
+index 59959dbd..e4023221 100644
+--- a/libcheese/cheese-flash.c
++++ b/libcheese/cheese-flash.c
+@@ -132,7 +132,7 @@ cheese_flash_set_property (GObject      *object,
+       GObject *parent;
+       parent = g_value_get_object (value);
+       if (object != NULL)
+-        priv->parent = g_object_ref (parent);
++        priv->parent = GTK_WIDGET (g_object_ref (parent));
+       else
+         priv->parent = NULL;
+     }
+-- 
+GitLab
+

multimedia/video/cheese/files/cheese-json.patch

@@ -0,0 +1,32 @@
+From 5b4aad3123992badf7f1bfb4c23bff390b9c9494 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 4 Sep 2024 14:01:58 +0000
+Subject: [PATCH] Fix JSON validation
+
+json-glib 1.10 is more strict when parsing the JSON data.
+
+Closes: https://gitlab.gnome.org/GNOME/cheese/-/issues/183
+---
+ data/cheese-viewport.json | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/data/cheese-viewport.json b/data/cheese-viewport.json
+index cf03fcec..132b68d2 100644
+--- a/data/cheese-viewport.json
++++ b/data/cheese-viewport.json
+@@ -53,9 +53,9 @@
+   "type": "ClutterActor",
+   "children":
+   [
+-    'video_preview',
+-    'countdown_layer',
+-    'error_layer'
++    "video_preview",
++    "countdown_layer",
++    "error_layer"
+   ]
+ },
+ {
+-- 
+GitLab
+

multimedia/video/cheese/pspec.xml

@@ -35,11 +35,14 @@
             <Dependency>libgee-devel</Dependency>
             <Dependency>gnome-video-effects</Dependency>
             <Dependency>gst-plugins-bad-devel</Dependency>
+            <Dependency>gnome-video-effects-devel</Dependency>
         </BuildDependencies>
         <Patches>
-        <Patch>cheese-43.0-buildfix.patch</Patch>
+            <Patch>cheese-43.0-buildfix.patch</Patch>
 <!--         <Patch>infinite-loop-thumbnailer.patch</Patch> -->
 <!--         <Patch>fix-gnome40-build.patch</Patch> -->
+            <Patch>cheese-json.patch</Patch>
+<!--            <Patch>cheese-gcc14.patch</Patch> GCC 14'e yükseltince gerekecek. -->
         </Patches>
     </Source>