rpms/cheese
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add isa to gstreamer plugin Requires (#1988932)

Browse Source 
Resolves: #1988932
This commit is contained in:
David King 2021-08-02 08:39:09 +01:00
parent 40cdc150d5
commit 008207d0e6
2 changed files with 185 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

177
cheese-3.38.0-vala-genericarray.patch Normal file
View File

@ -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

13
cheese.spec
View File

@ -1,7 +1,7 @@
Name: cheese
Epoch: 2
Version: 3.38.0
Release: 4%{?dist}
Release: 5%{?dist}
Summary: Application for taking pictures and movies from a webcam
License: GPLv2+
@ -10,6 +10,7 @@ Source0: https://download.gnome.org/sources/%{name}/3.38/%{name}-%{versio
# https://gitlab.gnome.org/GNOME/cheese/-/merge_requests/39
Patch0: 0001-Fix-infinite-loop-if-thumbnailer-is-not-available.patch
Patch1: cheese-3.38.0-vala-genericarray.patch
BuildRequires: gcc
BuildRequires: meson
@ -22,7 +23,6 @@ BuildRequires: gettext
BuildRequires: itstool
BuildRequires: libXtst-devel
BuildRequires: vala
BuildRequires: git
BuildRequires: pkgconfig(clutter-1.0)
BuildRequires: pkgconfig(clutter-gst-3.0)
BuildRequires: pkgconfig(clutter-gtk-1.0)
@ -40,8 +40,8 @@ BuildRequires: /usr/bin/appstream-util
BuildRequires: /usr/bin/xsltproc
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires: gstreamer1-plugins-good
Requires: gstreamer1-plugins-bad-free
Requires: gstreamer1-plugins-good%{?_isa}
Requires: gstreamer1-plugins-bad-free%{?_isa}
Requires: gnome-video-effects
%description
@ -69,7 +69,7 @@ for writing applications that require a webcam display widget.
%prep
%autosetup -p1 -S git
%autosetup -p1
%build
@ -124,6 +124,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Cheese.desk
%changelog
* Mon Aug 02 2021 David King <amigadave@amigadave.com> - 3.38.0-5
- Add isa to gstreamer plugin Requires (#1988932)
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 2:3.38.0-4
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937