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

Update to 3.13.92

Browse Source 
Split camera service out to a subpackage. Additionally, use pkgconfig
for BuildRequires and tidy the spec file.
This commit is contained in:
David King 2014-09-15 22:27:26 +01:00
parent 02296ab7d3
commit 390be1b28a
4 changed files with 66 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -59,3 +59,4 @@ cheese-2.31.1.tar.bz2
/cheese-3.13.1.tar.xz /cheese-3.13.1.tar.xz
/cheese-3.13.4.tar.xz /cheese-3.13.4.tar.xz
/cheese-3.13.90.1.tar.xz /cheese-3.13.90.1.tar.xz
/cheese-3.13.92.tar.xz

62
cheese-3.13.90.1-fix-crash-when-animating-countdown.patch
View File

@ -1,62 +0,0 @@
From 6efd4960cfc57bea26fb7d169a5f600164f0bfd9 Mon Sep 17 00:00:00 2001
From: David King <amigadave@amigadave.com>
Date: Tue, 9 Sep 2014 16:50:09 +0100
Subject: [PATCH] Fix crash when animating countdown
https://bugzilla.gnome.org/show_bug.cgi?id=735285
---
src/cheese-countdown.vala | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/cheese-countdown.vala b/src/cheese-countdown.vala
index d8f4e4f..736b0ee 100644
--- a/src/cheese-countdown.vala
+++ b/src/cheese-countdown.vala
@@ -24,6 +24,8 @@ internal class Cheese.Countdown : GLib.Object
public delegate void CountdownCallback ();
private Clutter.Text countdown_actor;
private unowned CountdownCallback completed_callback;
+ private Clutter.PropertyTransition pulse_in;
+ private Clutter.PropertyTransition pulse_out;
private int current_value = 0;
private GLib.Settings settings;
public bool running;
@@ -46,14 +48,13 @@ internal class Cheese.Countdown : GLib.Object
*/
private void fade_out ()
{
- var pulse_out = new Clutter.PropertyTransition ("opacity");
+ pulse_out = new Clutter.PropertyTransition ("opacity");
pulse_out.set_duration (500);
pulse_out.set_from_value (255);
pulse_out.set_to_value (0);
- pulse_out.remove_on_complete = true;
pulse_out.completed.connect (fade_in);
-
- this.countdown_actor.add_transition ("pulse-out", pulse_out);
+ pulse_out.animatable = countdown_actor;
+ pulse_out.start ();
}
/**
@@ -72,14 +73,13 @@ internal class Cheese.Countdown : GLib.Object
this.countdown_actor.text = this.current_value.to_string ();
this.current_value--;
- var pulse_in = new Clutter.PropertyTransition ("opacity");
+ pulse_in = new Clutter.PropertyTransition ("opacity");
pulse_in.set_duration (500);
pulse_in.set_from_value (0);
pulse_in.set_to_value (255);
- pulse_in.remove_on_complete = true;
pulse_in.completed.connect (fade_out);
-
- this.countdown_actor.add_transition ("pulse-in", pulse_in);
+ pulse_in.animatable = countdown_actor;
+ pulse_in.start ();
}
/**
--
2.1.0

104
cheese.spec
View File

@ -1,41 +1,39 @@
Name: cheese Name: cheese
Epoch: 2 Epoch: 2
Version: 3.13.90.1 Version: 3.13.92
Release: 2%{?dist} Release: 1%{?dist}
Summary: Application for taking pictures and movies from a webcam Summary: Application for taking pictures and movies from a webcam
Group: Amusements/Graphics Group: Amusements/Graphics
License: GPLv2+ License: GPLv2+
URL: http://projects.gnome.org/cheese/ URL: https://wiki.gnome.org/Apps/Cheese
#VCS: git:git://git.gnome.org/cheese #VCS: git:git://git.gnome.org/cheese
Source0: http://download.gnome.org/sources/cheese/3.13/%{name}-%{version}.tar.xz Source0: https://download.gnome.org/sources/%{name}/3.13/%{name}-%{version}.tar.xz
# http://bugzilla.gnome.org/show_bug.cgi?id=735285
Patch0: cheese-3.13.90.1-fix-crash-when-animating-countdown.patch
BuildRequires: gtk3-devel >= 3.0.0 BuildRequires: chrpath
BuildRequires: gstreamer1-devel BuildRequires: desktop-file-utils
BuildRequires: gstreamer1-plugins-bad-free-devel BuildRequires: docbook-dtds
BuildRequires: gstreamer1-plugins-base-devel BuildRequires: docbook-style-xsl
BuildRequires: cairo-devel >= 1.4.0 BuildRequires: gettext
BuildRequires: docbook-dtds BuildRequires: intltool
BuildRequires: docbook-style-xsl BuildRequires: itstool
BuildRequires: librsvg2-devel >= 2.18.0 BuildRequires: libXtst-devel
BuildRequires: evolution-data-server-devel BuildRequires: vala-devel
BuildRequires: libXxf86vm-devel BuildRequires: pkgconfig(clutter-1.0)
BuildRequires: libXtst-devel BuildRequires: pkgconfig(clutter-gst-2.0)
BuildRequires: desktop-file-utils BuildRequires: pkgconfig(clutter-gtk-1.0)
BuildRequires: gettext BuildRequires: pkgconfig(gdk-pixbuf-2.0)
BuildRequires: intltool BuildRequires: pkgconfig(gio-2.0)
BuildRequires: libgudev1-devel BuildRequires: pkgconfig(glib-2.0)
BuildRequires: libcanberra-devel BuildRequires: pkgconfig(gnome-desktop-3.0)
BuildRequires: clutter-devel BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: clutter-gtk-devel BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: clutter-gst2-devel BuildRequires: pkgconfig(gstreamer-pbutils-1.0)
BuildRequires: vala-devel BuildRequires: pkgconfig(gstreamer-plugins-bad-1.0)
BuildRequires: gnome-video-effects BuildRequires: pkgconfig(gudev-1.0)
BuildRequires: gnome-desktop3-devel BuildRequires: pkgconfig(libcanberra-gtk3)
BuildRequires: chrpath BuildRequires: pkgconfig(x11)
BuildRequires: itstool BuildRequires: /usr/bin/xsltproc
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires: gstreamer1-plugins-good Requires: gstreamer1-plugins-good
@ -46,6 +44,15 @@ Requires: gnome-video-effects
Cheese is a Photobooth-inspired GNOME application for taking pictures and Cheese is a Photobooth-inspired GNOME application for taking pictures and
videos from a webcam. It can also apply fancy graphical effects. videos from a webcam. It can also apply fancy graphical effects.
%package camera-service
Summary: Webcam D-Bus service
Group: System Environment/Libraries
License: GPLv3+
%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 %package libs
Summary: Webcam display and capture widgets Summary: Webcam display and capture widgets
Group: System Environment/Libraries Group: System Environment/Libraries
@ -65,28 +72,31 @@ Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
This package contains the libraries and header files that are needed This package contains the libraries and header files that are needed
for writing applications that require a webcam display widget. for writing applications that require a webcam display widget.
%prep %prep
%setup -q %setup -q
%patch0 -p1
%build %build
%configure --disable-static %configure --disable-static
make %{?_smp_mflags} make V=1 %{?_smp_mflags}
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make DESTDIR=%{buildroot} INSTALL="install -p" install
rm -f $RPM_BUILD_ROOT%{_libdir}/libcheese.{a,la} rm -f %{buildroot}%{_libdir}/libcheese.{a,la}
rm -f $RPM_BUILD_ROOT%{_libdir}/libcheese-gtk.{a,la} rm -f %{buildroot}%{_libdir}/libcheese-gtk.{a,la}
%find_lang %{name} --with-gnome %find_lang %{name} --with-gnome
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/cheese chrpath --delete %{buildroot}%{_bindir}/cheese
chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libcheese-gtk.so.* chrpath --delete %{buildroot}%{_libdir}/libcheese-gtk.so.*
%check %check
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Cheese.desktop desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Cheese.desktop
%post %post
touch --no-create %{_datadir}/icons/hicolor >&/dev/null || : touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
@ -98,30 +108,37 @@ if [ $1 -eq 0 ]; then
gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
fi fi
%posttrans %posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
%post libs %post libs
/sbin/ldconfig /sbin/ldconfig
if [ $1 -eq 1 ] ; then if [ $1 -eq 1 ] ; then
glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
fi fi
%postun libs %postun libs
/sbin/ldconfig /sbin/ldconfig
glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%files %files
%doc AUTHORS README %doc AUTHORS README
%{_bindir}/cheese %{_bindir}/cheese
%{_libexecdir}/gnome-camera-service
%{_datadir}/applications/org.gnome.Cheese.desktop %{_datadir}/applications/org.gnome.Cheese.desktop
%{_datadir}/icons/hicolor/*/apps/cheese.png %{_datadir}/icons/hicolor/*/apps/cheese.png
%{_datadir}/appdata/org.gnome.Cheese.appdata.xml %{_datadir}/appdata/org.gnome.Cheese.appdata.xml
%{_datadir}/dbus-1/services/org.gnome.Camera.service
%{_datadir}/dbus-1/services/org.gnome.Cheese.service %{_datadir}/dbus-1/services/org.gnome.Cheese.service
%{_mandir}/man1/cheese.1.gz %{_mandir}/man1/cheese.1.gz
%files camera-service
%doc COPYING.GPL3
%{_libexecdir}/gnome-camera-service
%{_datadir}/dbus-1/services/org.gnome.Camera.service
%files -f %{name}.lang libs %files -f %{name}.lang libs
%doc COPYING %doc COPYING
%{_libdir}/libcheese.so.* %{_libdir}/libcheese.so.*
@ -138,7 +155,14 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%{_libdir}/pkgconfig/cheese-gtk.pc %{_libdir}/pkgconfig/cheese-gtk.pc
%{_datadir}/gir-1.0/Cheese-3.0.gir %{_datadir}/gir-1.0/Cheese-3.0.gir
%changelog %changelog
* Mon Sep 15 2014 David King <amigadave@amigadave.com> - 2:3.13.92-1
- Update to 3.13.92
- Split camera service out to a subpackage
- Use pkgconfig for BuildRequires
- Tidy spec file
* Tue Sep 09 2014 David King <amigadave@amigadave.com> - 2:3.13.90.1-2 * Tue Sep 09 2014 David King <amigadave@amigadave.com> - 2:3.13.90.1-2
- Fix crash when showing photo countdown (#1133394) - Fix crash when showing photo countdown (#1133394)

2
sources
View File

@ -1 +1 @@
4836d9cdbf4637185bb0ee214499e957 cheese-3.13.90.1.tar.xz 1a5ef652fbad23db249402cd468c01be cheese-3.13.92.tar.xz