| Message ID | 20250128131656.61467-1-brgl@bgdev.pl |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [meta-gnome] cheese: new recipe | expand |
On Tue, Jan 28, 2025 at 5:17 AM Bartosz Golaszewski <brgl@bgdev.pl> wrote: > > From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> > > Add a recipe for cheese - a Gnome application for taking photos and > videos with webcams. > > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> > --- > ...kWidget-cast-to-avoid-an-incompatibl.patch | 29 +++++++++++++++++++ > .../recipes-gnome/cheese/cheese_44.1.bb | 26 +++++++++++++++++ > 2 files changed, 55 insertions(+) > create mode 100644 meta-gnome/recipes-gnome/cheese/cheese/0001-libcheese-Add-GtkWidget-cast-to-avoid-an-incompatibl.patch > create mode 100644 meta-gnome/recipes-gnome/cheese/cheese_44.1.bb > > diff --git a/meta-gnome/recipes-gnome/cheese/cheese/0001-libcheese-Add-GtkWidget-cast-to-avoid-an-incompatibl.patch b/meta-gnome/recipes-gnome/cheese/cheese/0001-libcheese-Add-GtkWidget-cast-to-avoid-an-incompatibl.patch > new file mode 100644 > index 0000000000..8d2d413149 > --- /dev/null > +++ b/meta-gnome/recipes-gnome/cheese/cheese/0001-libcheese-Add-GtkWidget-cast-to-avoid-an-incompatibl.patch > @@ -0,0 +1,29 @@ > +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. > + > +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/cheese/-/merge_requests/70] > +--- > + 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; > + } > +-- > +2.45.2 > + > diff --git a/meta-gnome/recipes-gnome/cheese/cheese_44.1.bb b/meta-gnome/recipes-gnome/cheese/cheese_44.1.bb > new file mode 100644 > index 0000000000..c58d475675 > --- /dev/null > +++ b/meta-gnome/recipes-gnome/cheese/cheese_44.1.bb > @@ -0,0 +1,26 @@ > +SUMMARY = "Take photos and videos with your webcam, with fun graphical effects" > +SECTION = "x11/gnome" > +LICENSE = "GPL-2.0-or-later" > +LIC_FILES_CHKSUM = "file://COPYING;md5=a17cb0a873d252440acfdf9b3d0e7fbf" > + > +inherit gnomebase gobject-introspection vala itstool gtk-icon-cache gsettings gnome-help gtk-doc > + > +SRC_URI += "file://0001-libcheese-Add-GtkWidget-cast-to-avoid-an-incompatibl.patch" > + > +SRC_URI[archive.sha256sum] = "5f2185c4c99e54ddf2b8baf60c82819950e54952e132e8639875f3edcbf8f68e" > + > +DEPENDS += " \ > + clutter-1.0 \ > + clutter-gst-3.0 \ > + clutter-gtk-1.0 \ > + gnome-desktop \ > + libcanberra \ > + libxslt-native \ > +" > + > +GTKDOC_MESON_OPTION = "gtk_doc" > + > +# Man page build wants to access sourceforge > +EXTRA_OEMESON += "-Dman=false" > + > +FILES:${PN} += "/usr/share/" perhaps use ${datadir} here instead of hardcoding /usr/share > -- > 2.45.2 >
diff --git a/meta-gnome/recipes-gnome/cheese/cheese/0001-libcheese-Add-GtkWidget-cast-to-avoid-an-incompatibl.patch b/meta-gnome/recipes-gnome/cheese/cheese/0001-libcheese-Add-GtkWidget-cast-to-avoid-an-incompatibl.patch new file mode 100644 index 0000000000..8d2d413149 --- /dev/null +++ b/meta-gnome/recipes-gnome/cheese/cheese/0001-libcheese-Add-GtkWidget-cast-to-avoid-an-incompatibl.patch @@ -0,0 +1,29 @@ +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. + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/cheese/-/merge_requests/70] +--- + 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; + } +-- +2.45.2 + diff --git a/meta-gnome/recipes-gnome/cheese/cheese_44.1.bb b/meta-gnome/recipes-gnome/cheese/cheese_44.1.bb new file mode 100644 index 0000000000..c58d475675 --- /dev/null +++ b/meta-gnome/recipes-gnome/cheese/cheese_44.1.bb @@ -0,0 +1,26 @@ +SUMMARY = "Take photos and videos with your webcam, with fun graphical effects" +SECTION = "x11/gnome" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=a17cb0a873d252440acfdf9b3d0e7fbf" + +inherit gnomebase gobject-introspection vala itstool gtk-icon-cache gsettings gnome-help gtk-doc + +SRC_URI += "file://0001-libcheese-Add-GtkWidget-cast-to-avoid-an-incompatibl.patch" + +SRC_URI[archive.sha256sum] = "5f2185c4c99e54ddf2b8baf60c82819950e54952e132e8639875f3edcbf8f68e" + +DEPENDS += " \ + clutter-1.0 \ + clutter-gst-3.0 \ + clutter-gtk-1.0 \ + gnome-desktop \ + libcanberra \ + libxslt-native \ +" + +GTKDOC_MESON_OPTION = "gtk_doc" + +# Man page build wants to access sourceforge +EXTRA_OEMESON += "-Dman=false" + +FILES:${PN} += "/usr/share/"