diff -Nru gst-plugins-good0.10-0.10.30/debian/changelog gst-plugins-good0.10-0.10.30/debian/changelog --- gst-plugins-good0.10-0.10.30/debian/changelog 2012-02-09 12:40:30.000000000 +0000 +++ gst-plugins-good0.10-0.10.30/debian/changelog 2012-03-22 12:15:46.000000000 +0000 @@ -1,3 +1,16 @@ +gst-plugins-good0.10 (0.10.30-1ubuntu7.1+ti1.5.4.1+1) oneiric; urgency=low + + * New Ubuntu release, 0.10.30-1ubuntu7.1 + + -- Olivier Naudan Thu, 22 Mar 2012 08:13:12 -0400 + +gst-plugins-good0.10 (0.10.30-1ubuntu7.1) oneiric-proposed; urgency=low + + * Backport a patch from upstream to not fail when querying some + optional control for a v4l2 device. (LP: #947808) + + -- Timo Aaltonen Tue, 06 Mar 2012 11:58:32 +0200 + gst-plugins-good0.10 (0.10.30-1ubuntu7+ti1.5.4.1+1) oneiric; urgency=low * Refreshed TI patches based on commit 630b7c37 diff -Nru gst-plugins-good0.10-0.10.30/debian/patches/08-dont-fail-on-control-query.patch gst-plugins-good0.10-0.10.30/debian/patches/08-dont-fail-on-control-query.patch --- gst-plugins-good0.10-0.10.30/debian/patches/08-dont-fail-on-control-query.patch 1970-01-01 00:00:00.000000000 +0000 +++ gst-plugins-good0.10-0.10.30/debian/patches/08-dont-fail-on-control-query.patch 2012-03-22 11:58:40.000000000 +0000 @@ -0,0 +1,42 @@ +commit c1c858f2733aba9fd8f6120656b0db20a66b6c77 +Author: Gary Ching-Pang Lin +Date: Thu Feb 16 17:14:20 2012 +0800 + + v4l2src: failure to query some optional controls is not a fatal error + + Don't post a (fatal) error message on the bus just because we + failed to query some control. Fixes issue with built-in + Suyin Corp webcam for HP notebook (usbid 064e:e28a) on + OpenSuse 12.1, where querying red/blue balance fails. + + https://bugzilla.gnome.org/show_bug.cgi?id=670197 + +Index: gst-plugins-good0.10-0.10.30/sys/v4l2/v4l2_calls.c +=================================================================== +--- gst-plugins-good0.10-0.10.30.orig/sys/v4l2/v4l2_calls.c 2011-06-14 16:44:20.000000000 +0300 ++++ gst-plugins-good0.10-0.10.30/sys/v4l2/v4l2_calls.c 2012-03-06 12:03:30.934352681 +0200 +@@ -250,7 +250,7 @@ + + control.id = n; + if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_QUERYCTRL, &control) < 0) { +- if (errno == EINVAL) { ++ if (errno == EINVAL || errno == EIO) { + if (n < V4L2_CID_PRIVATE_BASE) { + GST_DEBUG_OBJECT (e, "skipping control %08x", n); + /* continue so that we also check private controls */ +@@ -260,12 +260,9 @@ + break; + } + } else { +- GST_ELEMENT_ERROR (e, RESOURCE, SETTINGS, +- (_("Failed getting controls attributes on device '%s'."), +- v4l2object->videodev), +- ("Failed querying control %d on device '%s'. (%d - %s)", +- n, v4l2object->videodev, errno, strerror (errno))); +- return FALSE; ++ GST_WARNING_OBJECT (e, "Failed querying control %d on device '%s'. " ++ "(%d - %s)", n, v4l2object->videodev, errno, strerror (errno)); ++ continue; + } + } + if (control.flags & V4L2_CTRL_FLAG_DISABLED) { diff -Nru gst-plugins-good0.10-0.10.30/debian/patches/series gst-plugins-good0.10-0.10.30/debian/patches/series --- gst-plugins-good0.10-0.10.30/debian/patches/series 2012-02-09 12:36:55.000000000 +0000 +++ gst-plugins-good0.10-0.10.30/debian/patches/series 2012-03-22 12:00:17.000000000 +0000 @@ -36,4 +36,5 @@ 04_move_farsight_plugins_to_good.patch 05_move_shm_to_good.patch 06_shm_fixes.patch +08-dont-fail-on-control-query.patch 99_ltmain_as-needed.patch