Date: Tuesday, September 28, 2010 @ 04:08:33 Author: jgc Revision: 91839
upgpkg: cheese 2.32.0-1 Update to 2.32.0 Modified: cheese/trunk/PKGBUILD Deleted: cheese/trunk/bug618203.patch -----------------+ PKGBUILD | 8 +++---- bug618203.patch | 61 ------------------------------------------------------ 2 files changed, 4 insertions(+), 65 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-09-28 08:05:37 UTC (rev 91838) +++ PKGBUILD 2010-09-28 08:08:33 UTC (rev 91839) @@ -2,19 +2,19 @@ # Maintainer: Jan de Groot <[email protected]> pkgname=cheese -pkgver=2.31.92 +pkgver=2.32.0 pkgrel=1 pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others" arch=(i686 x86_64) license=('GPL') -depends=('gnome-desktop>=2.31.92' 'gstreamer0.10-base-plugins>=0.10.30' 'gstreamer0.10-good-plugins>=0.10.24' 'librsvg>=2.31.0' 'gnome-icon-theme>=2.31.0' 'libcanberra>=0.25') +depends=('gnome-desktop>=2.32.0' 'gstreamer0.10-base-plugins>=0.10.30' 'gstreamer0.10-good-plugins>=0.10.24' 'librsvg>=2.32.0' 'gnome-icon-theme>=2.31.0' 'libcanberra>=0.25') makedepends=('pkgconfig' 'gnome-doc-utils>=0.20.1' 'intltool') groups=('gnome-extra') options=('!libtool' '!emptydirs') url="http://www.gnome.org/projects/cheese/"; install=cheese.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.31/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('e23f75a68dc9fe814eaf747b7905eb5c137188f309cc8c960e7e59d03a8c2fc6') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('8debc47113d9889247f411d256a8eca0d8da49e5ab5909c200923945b8d5e087') build() { cd "${srcdir}/${pkgname}-${pkgver}" Deleted: bug618203.patch =================================================================== --- bug618203.patch 2010-09-28 08:05:37 UTC (rev 91838) +++ bug618203.patch 2010-09-28 08:08:33 UTC (rev 91839) @@ -1,61 +0,0 @@ -From 64e2170989f3e7cad39734efceef154b81dd7b4f Mon Sep 17 00:00:00 2001 -From: Filippo Argiolas <[email protected]> -Date: Tue, 20 Jul 2010 18:13:46 +0000 -Subject: Do not create a device if gst initializazion fails - -Currently we create a device with empty caps if the probing pipeline -cannot be started. That's wrong, the device evidendtly doesn't work so -the CheeseCameraDevice object for doesn't have to be created. - -https://bugzilla.gnome.org/show_bug.cgi?id=618203 ---- -diff --git a/libcheese/cheese-camera-device.c b/libcheese/cheese-camera-device.c -index e1786e8..3d96304 100644 ---- a/libcheese/cheese-camera-device.c -+++ b/libcheese/cheese-camera-device.c -@@ -48,7 +48,8 @@ enum CheeseCameraDeviceError - { - CHEESE_CAMERA_DEVICE_ERROR_UNKNOWN, - CHEESE_CAMERA_DEVICE_ERROR_NOT_SUPPORTED, -- CHEESE_CAMERA_DEVICE_ERROR_UNSUPPORTED_CAPS -+ CHEESE_CAMERA_DEVICE_ERROR_UNSUPPORTED_CAPS, -+ CHEESE_CAMERA_DEVICE_ERROR_FAILED_INITIALIZATION - }; - - GST_DEBUG_CATEGORY (cheese_camera_device_cat); -@@ -325,11 +326,32 @@ cheese_camera_device_get_caps (CheeseCameraDevice *device) - CHEESE_CAMERA_DEVICE_ERROR, - CHEESE_CAMERA_DEVICE_ERROR_UNSUPPORTED_CAPS, - _("Device capabilities not supported")); -- - } - - gst_object_unref (pad); - gst_caps_unref (caps); -+ } else { -+ if (msg) { -+ gchar *dbg_info = NULL; -+ gst_message_parse_error (msg, &err, &dbg_info); -+ GST_WARNING ("Failed to start the capability probing pipeline"); -+ GST_WARNING ("Error from element %s: %s, %s", -+ GST_OBJECT_NAME (msg->src), -+ err->message, -+ (dbg_info) ? dbg_info : "no extra debug detail"); -+ g_error_free (err); -+ err = NULL; -+ /* construct_error is meant to be displayed in the UI -+ (although it currently isn't displayed in cheese), -+ err->message from gstreamer is too technical for this -+ purpose, the idea is warn the user about an error and point -+ him to the logs for more info */ -+ g_set_error (&priv->construct_error, -+ CHEESE_CAMERA_DEVICE_ERROR, -+ CHEESE_CAMERA_DEVICE_ERROR_FAILED_INITIALIZATION, -+ _("Failed to initialize device %s for capability probing"), -+ priv->device); -+ } - } - gst_element_set_state (pipeline, GST_STATE_NULL); - gst_object_unref (pipeline); --- -cgit v0.8.3.1
