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

Proposed by Sebastien Bacher on 2016-02-09
Status: Merged
Approved by: Iain Lane on 2016-02-12
Approved revision: 12847
Merged at revision: 12850
Proposed branch: lp:~seb128/unity-control-center/use-new-gstreamer
Merge into: lp:unity-control-center
Diff against target: 47 lines (+1/-7)
3 files modified
configure.ac (+1/-1)
debian/control (+0/-2)
panels/user-accounts/um-user-panel.c (+0/-4)
To merge this branch: bzr merge lp:~seb128/unity-control-center/use-new-gstreamer
Reviewer Review Type Date Requested Status
Iain Lane 2016-02-10 Approve on 2016-02-12
Unity Control Center development team 2016-02-09 Pending
Review via email: mp+285455@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Iain Lane (laney) wrote :

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) wrote :

> 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

12847. By Sebastien Bacher on 2016-02-12

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

Sebastien Bacher (seb128) wrote :

> 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

Iain Lane (laney) wrote :

you beauty

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2015-12-14 10:09:05 +0000
3+++ configure.ac 2016-02-12 10:20:47 +0000
4@@ -229,7 +229,7 @@
5 with_cheese=auto)
6
7 if test x"$with_cheese" != x"no" ; then
8- PKG_CHECK_MODULES(CHEESE, gstreamer-1.0 cheese-gtk >= 3.5.91 cheese clutter-gtk-1.0, [have_cheese=yes], [have_cheese=no])
9+ PKG_CHECK_MODULES(CHEESE, cheese-gtk >= 3.5.91 cheese clutter-gtk-1.0, [have_cheese=yes], [have_cheese=no])
10 if test x${have_cheese} = xyes; then
11 AC_DEFINE(HAVE_CHEESE, 1, [Define to 1 to enable cheese webcam support])
12 fi
13
14=== modified file 'debian/control'
15--- debian/control 2015-12-14 10:09:05 +0000
16+++ debian/control 2016-02-12 10:20:47 +0000
17@@ -32,7 +32,6 @@
18 libgnome-menu-3-dev,
19 libgnomekbd-dev,
20 libgoa-1.0-dev (>= 3.5.90),
21- libgstreamer-plugins-base0.10-dev,
22 libgtk-3-dev (>= 3.10.0),
23 libgtop2-dev,
24 libibus-1.0-dev (>= 1.5.0),
25@@ -109,7 +108,6 @@
26 unity (<< 6.2-0ubuntu2~)
27 Suggests: gnome-screensaver | xscreensaver,
28 gnome-user-guide | ubuntu-docs,
29- gstreamer0.10-pulseaudio,
30 libcanberra-gtk-module,
31 x11-xserver-utils,
32 Provides: unity-control-center-datetime,
33
34=== modified file 'panels/user-accounts/um-user-panel.c'
35--- panels/user-accounts/um-user-panel.c 2014-04-04 13:44:16 +0000
36+++ panels/user-accounts/um-user-panel.c 2016-02-12 10:20:47 +0000
37@@ -34,10 +34,6 @@
38 #include <polkit/polkit.h>
39 #include <act/act.h>
40
41-#ifdef HAVE_CHEESE
42-#include <gst/gst.h>
43-#endif /* HAVE_CHEESE */
44-
45 #include "shell/cc-editable-entry.h"
46
47 #include "um-editable-button.h"

Subscribers

People subscribed via source and target branches