diff --git a/.cheese.metadata b/.cheese.metadata index 41bf6eb..ae7f7dd 100644 --- a/.cheese.metadata +++ b/.cheese.metadata @@ -1 +1 @@ -11b80ec81ce1dd8acadb5e48443f02d3fb2d593b SOURCES/cheese-3.22.1.tar.xz +b135c33058271cef7be1422c939a924e7146187f SOURCES/cheese-3.28.0.tar.xz diff --git a/.gitignore b/.gitignore index 7d187c1..b964be5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/cheese-3.22.1.tar.xz +SOURCES/cheese-3.28.0.tar.xz diff --git a/SOURCES/cheese-3.22.1-fix-device-commandline.patch b/SOURCES/cheese-3.22.1-fix-device-commandline.patch deleted file mode 100644 index c3160c4..0000000 --- a/SOURCES/cheese-3.22.1-fix-device-commandline.patch +++ /dev/null @@ -1,48 +0,0 @@ -From c8c75796ff3e723d77bd68dec3fe91a072b36fc4 Mon Sep 17 00:00:00 2001 -From: Benjamin Berg -Date: Fri, 21 Apr 2017 11:59:39 +0200 -Subject: [PATCH 01/27] Correctly select the given camera device - -Due to a bug in the VAPI file the code would pass a string to the camera -setup routine instead of a CameraDevice object. As the setup routine -already has code to automatically select an appropriate device based on -the name passing an argument is not even required. - -Note that the --device parameter might be somewhat confusing as it -refers to the devices name and not to the /dev/videoX device file. - -https://bugzilla.gnome.org/show_bug.cgi?id=777047 ---- - src/cheese-application.vala | 2 +- - src/vapi/cheese-common.vapi | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/cheese-application.vala b/src/cheese-application.vala -index 633a25eb..ee107395 100644 ---- a/src/cheese-application.vala -+++ b/src/cheese-application.vala -@@ -203,7 +203,7 @@ public class Cheese.Application : Gtk.Application - - try - { -- camera.setup (device); -+ camera.setup (); - } - catch (Error err) - { -diff --git a/src/vapi/cheese-common.vapi b/src/vapi/cheese-common.vapi -index a4c07a96..2ee13f18 100644 ---- a/src/vapi/cheese-common.vapi -+++ b/src/vapi/cheese-common.vapi -@@ -48,7 +48,7 @@ namespace Cheese - public void toggle_effects_pipeline (bool active); - public void connect_effect_texture (Cheese.Effect effect, Clutter.Actor texture); - public void set_video_format (Cheese.VideoFormat format); -- public void setup (string udi) throws GLib.Error; -+ public void setup (Cheese.CameraDevice? device = null) throws GLib.Error; - public void start_video_recording (string filename); - public void stop (); - public void stop_video_recording (); --- -2.13.6 - diff --git a/SPECS/cheese.spec b/SPECS/cheese.spec index 17bfd73..1552b79 100644 --- a/SPECS/cheese.spec +++ b/SPECS/cheese.spec @@ -1,14 +1,12 @@ Name: cheese Epoch: 2 -Version: 3.22.1 -Release: 2%{?dist} +Version: 3.28.0 +Release: 1%{?dist} Summary: Application for taking pictures and movies from a webcam License: GPLv2+ URL: https://wiki.gnome.org/Apps/Cheese -Source0: https://download.gnome.org/sources/%{name}/3.22/%{name}-%{version}.tar.xz -# https://bugzilla.redhat.com/show_bug.cgi?id=1444760 -Patch0: cheese-3.22.1-fix-device-commandline.patch +Source0: https://download.gnome.org/sources/%{name}/3.28/%{name}-%{version}.tar.xz BuildRequires: chrpath BuildRequires: desktop-file-utils @@ -18,14 +16,14 @@ BuildRequires: gettext BuildRequires: intltool BuildRequires: itstool BuildRequires: libXtst-devel -BuildRequires: vala-devel +BuildRequires: vala BuildRequires: pkgconfig(clutter-1.0) BuildRequires: pkgconfig(clutter-gst-3.0) BuildRequires: pkgconfig(clutter-gtk-1.0) BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gnome-desktop-3.0) +BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.27.90 BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gstreamer-pbutils-1.0) @@ -44,18 +42,11 @@ Requires: gnome-video-effects Cheese is a Photobooth-inspired GNOME application for taking pictures and videos from a webcam. It can also apply fancy graphical effects. -%package camera-service -Summary: Webcam D-Bus service -License: GPLv3+ -Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} - -%description camera-service -This package contains a D-Bus service needed for applications that -want to display a webcam dialog in their interface. - %package libs Summary: Webcam display and capture widgets License: GPLv2+ +# Camera service was removed upstream in 3.25.90 +Obsoletes: cheese-camera-service < 2:3.25.90 %description libs This package contains libraries needed for applications that @@ -73,7 +64,6 @@ for writing applications that require a webcam display widget. %prep %setup -q -%patch0 -p1 %build @@ -134,11 +124,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/dbus-1/services/org.gnome.Cheese.service %{_mandir}/man1/cheese.1* -%files camera-service -%license COPYING.GPL3 -%{_libexecdir}/gnome-camera-service -%{_datadir}/dbus-1/services/org.gnome.Camera.service - %files -f %{name}.lang libs %license COPYING %{_libdir}/libcheese.so.* @@ -157,6 +142,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %changelog +* Mon Mar 12 2018 Kalev Lember - 2:3.28.0-1 +- Update to 3.28.0 +- Resolves: #1567170 + * Thu Oct 19 2017 David King - 3.22.1-2 - Fix a device argument crash (#1444760)