Merge lp:~seb128/unity-control-center/use-new-gstreamer into lp:unity-control-center

[Sebastien Bacher]

clean out gstreamer includes, it's not being used directly

clean out gstreamer includes, it's not being used directly

[Iain Lane (laney)]

On Wed, Feb 10, 2016 at 04:34:56PM -0000, Sebastien Bacher wrote:
> You have been requested to review the proposed merge of lp:~seb128/unity-control-center/use-new-gstreamer into lp:unity-control-center.
>
> For more details, see:
> https://code.launchpad.net/~seb128/unity-control-center/use-new-gstreamer/+merge/285455
>
> Update the build-depends to the current gstreamer version

Hum, I guess you thought I might say this, but...

I grepped the source code and it looks like gstreamer isn't actually
used directly, but via cheese - is it necessary for u-c-c to have this
in BD, configure.ac and #include in um-user-accounts.c or should
libcheese give us what we need?

If it is, then this branch is ok I think.

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

[Sebastien Bacher (seb128)]

> is it necessary for u-c-c to have this in BD, configure.ac and #include in um-user-accounts.c or should libcheese give us what we need?

good comment, GNOME still has it this way [1] but I think you are right, I'm going to have a look to drop the direct use for us and forward that upstream as well

[1] https://git.gnome.org/browse/gnome-control-center/tree/configure.ac#n292

[lp:~seb128/unity-control-center/use-new-gstreamer]

12847. By Sebastien Bacher on 2016-02-12

clean out gstreamer includes, it's not being used directly

[Sebastien Bacher (seb128)]

> configure.ac and #include in um-user-accounts.c or should libcheese give us what we need?

ok, updated to remove the direct use of gstreamer

[Sebastien Bacher (seb128)]

upstreamed on https://bugzilla.gnome.org/show_bug.cgi?id=761915

[Iain Lane (laney)]

you beauty

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2015-12-14 10:09:05 +0000
+++ configure.ac	2016-02-12 10:20:47 +0000
@@ -229,7 +229,7 @@
             with_cheese=auto)
 
 if test x"$with_cheese" != x"no" ; then
-   PKG_CHECK_MODULES(CHEESE, gstreamer-1.0 cheese-gtk >= 3.5.91 cheese clutter-gtk-1.0, [have_cheese=yes], [have_cheese=no])
+   PKG_CHECK_MODULES(CHEESE, cheese-gtk >= 3.5.91 cheese clutter-gtk-1.0, [have_cheese=yes], [have_cheese=no])
    if test x${have_cheese} = xyes; then
      AC_DEFINE(HAVE_CHEESE, 1, [Define to 1 to enable cheese webcam support])
    fi

=== modified file 'debian/control'
--- debian/control	2015-12-14 10:09:05 +0000
+++ debian/control	2016-02-12 10:20:47 +0000
@@ -32,7 +32,6 @@
                libgnome-menu-3-dev,
                libgnomekbd-dev,
                libgoa-1.0-dev (>= 3.5.90),
-               libgstreamer-plugins-base0.10-dev,
                libgtk-3-dev (>= 3.10.0),
                libgtop2-dev,
                libibus-1.0-dev (>= 1.5.0),
@@ -109,7 +108,6 @@
         unity (<< 6.2-0ubuntu2~)
 Suggests: gnome-screensaver | xscreensaver,
           gnome-user-guide | ubuntu-docs,
-          gstreamer0.10-pulseaudio,
           libcanberra-gtk-module,
           x11-xserver-utils,
 Provides: unity-control-center-datetime,

=== modified file 'panels/user-accounts/um-user-panel.c'
--- panels/user-accounts/um-user-panel.c	2014-04-04 13:44:16 +0000
+++ panels/user-accounts/um-user-panel.c	2016-02-12 10:20:47 +0000
@@ -34,10 +34,6 @@
 #include <polkit/polkit.h>
 #include <act/act.h>
 
-#ifdef HAVE_CHEESE
-#include <gst/gst.h>
-#endif /* HAVE_CHEESE */
-
 #include "shell/cc-editable-entry.h"
 
 #include "um-editable-button.h"