Merge lp:~noskcaj/ubuntu/utopic/clutter-gst-2.0/2.0.12 into lp:ubuntu/utopic/clutter-gst-2.0

[Jackson Doak]

New upstream bugfix release

[Sebastien Bacher (seb128)]

Thanks, that version got synced from Debian, https://launchpad.net/ubuntu/+source/clutter-gst-2.0/2.0.12-1

Unmerged revisions

11. By Jackson Doak on 2014-06-30

* New upstream release.
* debian/control: Bump gstreamer versions to >= 1.2

=== modified file 'NEWS'
--- NEWS	2014-04-14 20:13:16 +0000
+++ NEWS	2014-06-30 02:31:21 +0000
@@ -1,3 +1,18 @@
+clutter-gst 2.0.12 (1/06/2014)
+===============================================================================
+
+List of changes since 2.0.10
+
+ o Depend on GStreamer 2.0
+
+ o Fix build issues
+
+
+Many Thanks to:
+
+    Antoine Jacoutot
+    Ryan Lortie
+
 clutter-gst 2.0.10 (10/01/2014)
 ===============================================================================
 

=== modified file 'aclocal.m4'
--- aclocal.m4	2014-04-14 20:13:16 +0000
+++ aclocal.m4	2014-06-30 02:31:21 +0000
@@ -20,6 +20,221 @@
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
+# 
+# Copyright © 2004 Scott James Remnant <[e-mail]>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_default([$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+   	AC_MSG_RESULT([no])
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT])[]dnl
+        ])
+elif test $pkg_failed = untried; then
+     	AC_MSG_RESULT([no])
+	m4_default([$4], [AC_MSG_FAILURE(
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+        ])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	$3
+fi[]dnl
+])# PKG_CHECK_MODULES
+
+
+# PKG_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable pkgconfigdir as the location where a module
+# should install pkg-config .pc files. By default the directory is
+# $libdir/pkgconfig, but the default can be changed by passing
+# DIRECTORY. The user can override through the --with-pkgconfigdir
+# parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+    [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_INSTALLDIR
+
+
+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable noarch_pkgconfigdir as the location where a
+# module should install arch-independent pkg-config .pc files. By
+# default the directory is $datadir/pkgconfig, but the default can be
+# changed by passing DIRECTORY. The user can override through the
+# --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+    [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_NOARCH_INSTALLDIR
+
+
+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# -------------------------------------------
+# Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])# PKG_CHECK_VAR
+
 # Copyright (C) 2002-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -573,7 +788,8 @@
 END
     AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
   fi
-fi])
+fi
+])
 
 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -1147,166 +1363,6 @@
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-# 
-# Copyright © 2004 Scott James Remnant <[e-mail]>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_default([$2], [:])
-m4_ifvaln([$3], [else
-  $3])dnl
-fi])
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
-    pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
-    PKG_CHECK_EXISTS([$3],
-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes ],
-		     [pkg_failed=yes])
- else
-    pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
-   	AC_MSG_RESULT([no])
-        _PKG_SHORT_ERRORS_SUPPORTED
-        if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-        else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-	m4_default([$4], [AC_MSG_ERROR(
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT])[]dnl
-        ])
-elif test $pkg_failed = untried; then
-     	AC_MSG_RESULT([no])
-	m4_default([$4], [AC_MSG_FAILURE(
-[The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
-        ])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-        AC_MSG_RESULT([yes])
-	$3
-fi[]dnl
-])# PKG_CHECK_MODULES
-
 m4_include([build/autotools/as-am-really-silent.m4])
 m4_include([build/autotools/as-compiler-flag.m4])
 m4_include([build/autotools/gtk-doc.m4])

=== modified file 'clutter-gst/Makefile.am'
--- clutter-gst/Makefile.am	2013-03-07 15:58:21 +0000
+++ clutter-gst/Makefile.am	2014-06-30 02:31:21 +0000
@@ -142,7 +142,7 @@
 		--include=GstAudio-1.0 \
 		--add-init-section="clutter_gst_init(0,NULL);" \
 		--library=libclutter-gst-@CLUTTER_GST_API_VERSION@.la \
-		--libtool="$(top_builddir)/libtool" \
+		--libtool="${LIBTOOL}" \
 		--output $@ \
 		--pkg gobject-2.0 \
 		--pkg clutter-1.0 \

=== modified file 'clutter-gst/Makefile.in'
--- clutter-gst/Makefile.in	2014-04-14 20:13:16 +0000
+++ clutter-gst/Makefile.in	2014-06-30 02:31:21 +0000
@@ -1257,7 +1257,7 @@
 @HAVE_INTROSPECTION_TRUE@		--include=GstAudio-1.0 \
 @HAVE_INTROSPECTION_TRUE@		--add-init-section="clutter_gst_init(0,NULL);" \
 @HAVE_INTROSPECTION_TRUE@		--library=libclutter-gst-@CLUTTER_GST_API_VERSION@.la \
-@HAVE_INTROSPECTION_TRUE@		--libtool="$(top_builddir)/libtool" \
+@HAVE_INTROSPECTION_TRUE@		--libtool="${LIBTOOL}" \
 @HAVE_INTROSPECTION_TRUE@		--output $@ \
 @HAVE_INTROSPECTION_TRUE@		--pkg gobject-2.0 \
 @HAVE_INTROSPECTION_TRUE@		--pkg clutter-1.0 \

=== modified file 'clutter-gst/clutter-gst-version.h'
--- clutter-gst/clutter-gst-version.h	2014-04-14 20:13:16 +0000
+++ clutter-gst/clutter-gst-version.h	2014-06-30 02:31:21 +0000
@@ -56,21 +56,21 @@
  *
  * ClutterGst micro version (e.g. "3", if %CLUTTER_GST_VERSION is "1.2.3")
  */
-#define CLUTTER_GST_MICRO_VERSION   (10)
+#define CLUTTER_GST_MICRO_VERSION   (12)
 
 /**
  * CLUTTER_GST_VERSION:
  *
  * ClutterGst full version (e.g. "1.2.3")
  */
-#define CLUTTER_GST_VERSION         (2.0.10)
+#define CLUTTER_GST_VERSION         (2.0.12)
 
 /**
  * CLUTTER_GST_VERSION_S:
  *
  * ClutterGst full version, encoded as a string.
  */
-#define CLUTTER_GST_VERSION_S       "2.0.10"
+#define CLUTTER_GST_VERSION_S       "2.0.12"
 
 /**
  * CLUTTER_GST_VERSION_HEX:

=== modified file 'configure'
--- configure	2014-04-14 20:13:16 +0000
+++ configure	2014-06-30 02:31:21 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for clutter-gst 2.0.10.
+# Generated by GNU Autoconf 2.69 for clutter-gst 2.0.12.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=clutter-gst>.
 #
@@ -591,8 +591,8 @@
 # Identity of this package.
 PACKAGE_NAME='clutter-gst'
 PACKAGE_TARNAME='clutter-gst'
-PACKAGE_VERSION='2.0.10'
-PACKAGE_STRING='clutter-gst 2.0.10'
+PACKAGE_VERSION='2.0.12'
+PACKAGE_STRING='clutter-gst 2.0.12'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=clutter-gst'
 PACKAGE_URL=''
 
@@ -1396,7 +1396,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures clutter-gst 2.0.10 to adapt to many kinds of systems.
+\`configure' configures clutter-gst 2.0.12 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1466,7 +1466,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of clutter-gst 2.0.10:";;
+     short | recursive ) echo "Configuration of clutter-gst 2.0.12:";;
    esac
   cat <<\_ACEOF
 
@@ -1602,7 +1602,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-clutter-gst configure 2.0.10
+clutter-gst configure 2.0.12
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1971,7 +1971,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by clutter-gst $as_me 2.0.10, which was
+It was created by clutter-gst $as_me 2.0.12, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2842,7 +2842,7 @@
 
 # Define the identity of the package.
  PACKAGE='clutter-gst'
- VERSION='2.0.10'
+ VERSION='2.0.12'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3051,12 +3051,13 @@
   fi
 fi
 
+
 echo \#buildapi-variable-no-builddir >/dev/null
 
 CLUTTER_GST_MAJOR_VERSION=2
 CLUTTER_GST_MINOR_VERSION=0
-CLUTTER_GST_MICRO_VERSION=10
-CLUTTER_GST_VERSION=2.0.10
+CLUTTER_GST_MICRO_VERSION=12
+CLUTTER_GST_VERSION=2.0.12
 CLUTTER_GST_API_VERSION=2.0
 CLUTTER_GST_MAJORMINOR=2.0
 CLUTTER_API_VERSION=1.0
@@ -3072,9 +3073,9 @@
 
 
 
-CLUTTER_GST_LT_CURRENT=10
+CLUTTER_GST_LT_CURRENT=12
 CLUTTER_GST_LT_REV=0
-CLUTTER_GST_LT_AGE=10
+CLUTTER_GST_LT_AGE=12
 CLUTTER_GST_LT_VERSION="$CLUTTER_GST_LT_CURRENT:$CLUTTER_GST_LT_REV:$CLUTTER_GST_LT_AGE"
 CLUTTER_GST_LT_LDFLAGS="-version-info $CLUTTER_GST_LT_VERSION"
 
@@ -3175,8 +3176,8 @@
 GLIB_REQ_VERSION=2.18.0
 COGL_REQ_VERSION=1.10.0
 CLUTTER_REQ_VERSION=1.6.0
-GSTREAMER_REQ_VERSION=1.0.0
-GST_PLUGINS_BAD_REQ_VERSION=1.0.0
+GSTREAMER_REQ_VERSION=1.2.0
+GST_PLUGINS_BAD_REQ_VERSION=1.2.0
 
 
 
@@ -15057,7 +15058,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by clutter-gst $as_me 2.0.10, which was
+This file was extended by clutter-gst $as_me 2.0.12, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15123,7 +15124,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-clutter-gst config.status 2.0.10
+clutter-gst config.status 2.0.12
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.ac'
--- configure.ac	2014-04-14 20:13:16 +0000
+++ configure.ac	2014-06-30 02:31:21 +0000
@@ -3,7 +3,7 @@
 # An even micro number indicates a released version.
 m4_define(clutter_gst_major_version, 2)
 m4_define(clutter_gst_minor_version, 0)
-m4_define(clutter_gst_micro_version, 10)
+m4_define(clutter_gst_micro_version, 12)
 
 m4_define(clutter_api_version, 1.0)
 m4_define([clutter_gst_api_version], [2.0])
@@ -81,8 +81,8 @@
 GLIB_REQ_VERSION=2.18.0
 COGL_REQ_VERSION=1.10.0
 CLUTTER_REQ_VERSION=1.6.0
-GSTREAMER_REQ_VERSION=1.0.0
-GST_PLUGINS_BAD_REQ_VERSION=1.0.0
+GSTREAMER_REQ_VERSION=1.2.0
+GST_PLUGINS_BAD_REQ_VERSION=1.2.0
 
 AC_SUBST(GLIB_REQ_VERSION)
 AC_SUBST(CLUTTER_REQ_VERSION)

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-26 22:29:05 +0000
+++ debian/changelog	2014-06-30 02:31:21 +0000
@@ -1,3 +1,10 @@
+clutter-gst-2.0 (2.0.12-0ubuntu1) utopic; urgency=medium
+
+  * New upstream release.
+  * debian/control: Bump gstreamer versions to >= 1.2
+
+ -- Jackson Doak <[e-mail]>  Mon, 30 Jun 2014 11:13:56 +1000
+
 clutter-gst-2.0 (2.0.10-1build1) utopic; urgency=high
 
   * No change rebuild against cogl 20.

=== modified file 'debian/control'
--- debian/control	2014-04-14 20:13:16 +0000
+++ debian/control	2014-06-30 02:31:21 +0000
@@ -6,7 +6,8 @@
 Source: clutter-gst-2.0
 Section: libs
 Priority: optional
-Maintainer: Debian GNOME Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: Gustavo Noronha Silva <[e-mail]>, Michael Biebl <[e-mail]>, Sjoerd Simons <[e-mail]>
 Build-Depends: debhelper (>= 8.1.3),
                cdbs (>= 0.4.93~),
@@ -15,8 +16,8 @@
                libglib2.0-0 (>= 2.18.0),
                libclutter-1.0-dev (>= 1.13.0),
                libcogl-dev (>= 1.10.0),
-               libgstreamer1.0-dev (>= 1.0.0),
-               libgstreamer-plugins-base1.0-dev (>= 1.0.0),
+               libgstreamer1.0-dev (>= 1.2.0),
+               libgstreamer-plugins-base1.0-dev (>= 1.2.0),
                libgirepository1.0-dev (>= 0.9.12-4~),
                gobject-introspection (>= 0.9.12-4~)
 Standards-Version: 3.9.4
@@ -42,8 +43,8 @@
          gstreamer1.0-clutter (= ${binary:Version}),
          pkg-config,
          libclutter-1.0-dev (>= 1.6.10-3),
-         libgstreamer1.0-dev (>= 1.0.0),
-         libgstreamer-plugins-base1.0-dev (>= 1.0.0),
+         libgstreamer1.0-dev (>= 1.2.0),
+         libgstreamer-plugins-base1.0-dev (>= 1.2.0),
          ${misc:Depends}
 Suggests: libclutter-gst-2.0-doc
 Description: Open GL based interactive canvas library GStreamer elements (development files)

=== modified file 'debian/control.in'
--- debian/control.in	2013-08-22 23:33:12 +0000
+++ debian/control.in	2014-06-30 02:31:21 +0000
@@ -1,7 +1,8 @@
 Source: clutter-gst-2.0
 Section: libs
 Priority: optional
-Maintainer: Debian GNOME Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 8.1.3),
                cdbs (>= 0.4.93~),
@@ -10,8 +11,8 @@
                libglib2.0-0 (>= 2.18.0),
                libclutter-1.0-dev (>= 1.13.0),
                libcogl-dev (>= 1.10.0),
-               libgstreamer1.0-dev (>= 1.0.0),
-               libgstreamer-plugins-base1.0-dev (>= 1.0.0),
+               libgstreamer1.0-dev (>= 1.2.0),
+               libgstreamer-plugins-base1.0-dev (>= 1.2.0),
                libgirepository1.0-dev (>= 0.9.12-4~),
                gobject-introspection (>= 0.9.12-4~)
 Standards-Version: 3.9.4
@@ -37,8 +38,8 @@
          gstreamer1.0-clutter (= ${binary:Version}),
          pkg-config,
          libclutter-1.0-dev (>= 1.6.10-3),
-         libgstreamer1.0-dev (>= 1.0.0),
-         libgstreamer-plugins-base1.0-dev (>= 1.0.0),
+         libgstreamer1.0-dev (>= 1.2.0),
+         libgstreamer-plugins-base1.0-dev (>= 1.2.0),
          ${misc:Depends}
 Suggests: libclutter-gst-2.0-doc
 Description: Open GL based interactive canvas library GStreamer elements (development files)

=== modified file 'doc/reference/Makefile.in'
--- doc/reference/Makefile.in	2014-04-14 20:13:16 +0000
+++ doc/reference/Makefile.in	2014-06-30 02:31:21 +0000
@@ -668,6 +668,8 @@
 	    files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
 	    if test "x$$files" != "x" ; then \
 	        for file in $$files ; do \
+	            destdir=`dirname $(abs_builddir)/$$file` ;\
+	            test -d "$$destdir" || mkdir -p "$$destdir"; \
 	            test -f $(abs_srcdir)/$$file && \
 	                cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
 	        done; \

=== modified file 'doc/reference/html/ClutterGstPlayer.html'
--- doc/reference/html/ClutterGstPlayer.html	2014-04-14 20:13:16 +0000
+++ doc/reference/html/ClutterGstPlayer.html	2014-06-30 02:31:21 +0000
@@ -2,10 +2,10 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Clutter Gst 2.0.10
+<title>Clutter Gst 2.0.12
  Reference Manual: ClutterGstPlayer</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="index.html" title="Clutter Gst 2.0.10 Reference Manual">
+<link rel="home" href="index.html" title="Clutter Gst 2.0.12 Reference Manual">
 <link rel="up" href="ch02.html" title="Clutter Actors And Objects">
 <link rel="prev" href="ch02.html" title="Clutter Actors And Objects">
 <link rel="next" href="ClutterGstVideoTexture.html" title="ClutterGstVideoTexture">

=== modified file 'doc/reference/html/ClutterGstVideoSink.html'
--- doc/reference/html/ClutterGstVideoSink.html	2014-04-14 20:13:16 +0000
+++ doc/reference/html/ClutterGstVideoSink.html	2014-06-30 02:31:21 +0000
@@ -2,10 +2,10 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Clutter Gst 2.0.10
+<title>Clutter Gst 2.0.12
  Reference Manual: ClutterGstVideoSink</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="index.html" title="Clutter Gst 2.0.10 Reference Manual">
+<link rel="home" href="index.html" title="Clutter Gst 2.0.12 Reference Manual">
 <link rel="up" href="ch02.html" title="Clutter Actors And Objects">
 <link rel="prev" href="ClutterGstVideoTexture.html" title="ClutterGstVideoTexture">
 <link rel="next" href="clutter-gst-Utilities.html" title="Utilities">

=== modified file 'doc/reference/html/ClutterGstVideoTexture.html'
--- doc/reference/html/ClutterGstVideoTexture.html	2014-04-14 20:13:16 +0000
+++ doc/reference/html/ClutterGstVideoTexture.html	2014-06-30 02:31:21 +0000
@@ -2,10 +2,10 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Clutter Gst 2.0.10
+<title>Clutter Gst 2.0.12
  Reference Manual: ClutterGstVideoTexture</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="index.html" title="Clutter Gst 2.0.10 Reference Manual">
+<link rel="home" href="index.html" title="Clutter Gst 2.0.12 Reference Manual">
 <link rel="up" href="ch02.html" title="Clutter Actors And Objects">
 <link rel="prev" href="ClutterGstPlayer.html" title="ClutterGstPlayer">
 <link rel="next" href="ClutterGstVideoSink.html" title="ClutterGstVideoSink">

=== modified file 'doc/reference/html/ch01.html'
--- doc/reference/html/ch01.html	2014-04-14 20:13:16 +0000
+++ doc/reference/html/ch01.html	2014-06-30 02:31:21 +0000
@@ -2,12 +2,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Clutter Gst 2.0.10
+<title>Clutter Gst 2.0.12
  Reference Manual: Clutter Gst Overview</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="index.html" title="Clutter Gst 2.0.10 Reference Manual">
-<link rel="up" href="index.html" title="Clutter Gst 2.0.10 Reference Manual">
-<link rel="prev" href="index.html" title="Clutter Gst 2.0.10 Reference Manual">
+<link rel="home" href="index.html" title="Clutter Gst 2.0.12 Reference Manual">
+<link rel="up" href="index.html" title="Clutter Gst 2.0.12 Reference Manual">
+<link rel="prev" href="index.html" title="Clutter Gst 2.0.12 Reference Manual">
 <link rel="next" href="ch02.html" title="Clutter Actors And Objects">
 <meta name="generator" content="GTK-Doc V1.19.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">

=== modified file 'doc/reference/html/ch02.html'
--- doc/reference/html/ch02.html	2014-04-14 20:13:16 +0000
+++ doc/reference/html/ch02.html	2014-06-30 02:31:21 +0000
@@ -2,11 +2,11 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Clutter Gst 2.0.10
+<title>Clutter Gst 2.0.12
  Reference Manual: Clutter Actors And Objects</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="index.html" title="Clutter Gst 2.0.10 Reference Manual">
-<link rel="up" href="index.html" title="Clutter Gst 2.0.10 Reference Manual">
+<link rel="home" href="index.html" title="Clutter Gst 2.0.12 Reference Manual">
+<link rel="up" href="index.html" title="Clutter Gst 2.0.12 Reference Manual">
 <link rel="prev" href="ch01.html" title="Clutter Gst Overview">
 <link rel="next" href="ClutterGstPlayer.html" title="ClutterGstPlayer">
 <meta name="generator" content="GTK-Doc V1.19.1 (XML mode)">

=== modified file 'doc/reference/html/clutter-gst-Utilities.html'
--- doc/reference/html/clutter-gst-Utilities.html	2014-04-14 20:13:16 +0000
+++ doc/reference/html/clutter-gst-Utilities.html	2014-06-30 02:31:21 +0000
@@ -2,10 +2,10 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Clutter Gst 2.0.10
+<title>Clutter Gst 2.0.12
  Reference Manual: Utilities</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="index.html" title="Clutter Gst 2.0.10 Reference Manual">
+<link rel="home" href="index.html" title="Clutter Gst 2.0.12 Reference Manual">
 <link rel="up" href="ch02.html" title="Clutter Actors And Objects">
 <link rel="prev" href="ClutterGstVideoSink.html" title="ClutterGstVideoSink">
 <link rel="next" href="clutter-gst-Versioning-Macros.html" title="Versioning Macros">

=== modified file 'doc/reference/html/clutter-gst-Versioning-Macros.html'
--- doc/reference/html/clutter-gst-Versioning-Macros.html	2014-04-14 20:13:16 +0000
+++ doc/reference/html/clutter-gst-Versioning-Macros.html	2014-06-30 02:31:21 +0000
@@ -2,10 +2,10 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Clutter Gst 2.0.10
+<title>Clutter Gst 2.0.12
  Reference Manual: Versioning Macros</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="index.html" title="Clutter Gst 2.0.10 Reference Manual">
+<link rel="home" href="index.html" title="Clutter Gst 2.0.12 Reference Manual">
 <link rel="up" href="ch02.html" title="Clutter Actors And Objects">
 <link rel="prev" href="clutter-gst-Utilities.html" title="Utilities">
 <link rel="next" href="license.html" title="Appendix A. License">
@@ -74,7 +74,7 @@
 <hr>
 <div class="refsect2">
 <a name="CLUTTER-GST-MICRO-VERSION:CAPS"></a><h3>CLUTTER_GST_MICRO_VERSION</h3>
-<pre class="programlisting">#define CLUTTER_GST_MICRO_VERSION   (10)
+<pre class="programlisting">#define CLUTTER_GST_MICRO_VERSION   (12)
 </pre>
 <p>
 ClutterGst micro version (e.g. "3", if <a class="link" href="clutter-gst-Versioning-Macros.html#CLUTTER-GST-VERSION:CAPS" title="CLUTTER_GST_VERSION"><code class="literal">CLUTTER_GST_VERSION</code></a> is "1.2.3")
@@ -83,7 +83,7 @@
 <hr>
 <div class="refsect2">
 <a name="CLUTTER-GST-VERSION:CAPS"></a><h3>CLUTTER_GST_VERSION</h3>
-<pre class="programlisting">#define CLUTTER_GST_VERSION         (2.0.10)
+<pre class="programlisting">#define CLUTTER_GST_VERSION         (2.0.12)
 </pre>
 <p>
 ClutterGst full version (e.g. "1.2.3")
@@ -92,7 +92,7 @@
 <hr>
 <div class="refsect2">
 <a name="CLUTTER-GST-VERSION-S:CAPS"></a><h3>CLUTTER_GST_VERSION_S</h3>
-<pre class="programlisting">#define CLUTTER_GST_VERSION_S       "2.0.10"
+<pre class="programlisting">#define CLUTTER_GST_VERSION_S       "2.0.12"
 </pre>
 <p>
 ClutterGst full version, encoded as a string.

=== modified file 'doc/reference/html/clutter-gst.devhelp2'
--- doc/reference/html/clutter-gst.devhelp2	2014-04-14 20:13:16 +0000
+++ doc/reference/html/clutter-gst.devhelp2	2014-06-30 02:31:21 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!DOCTYPE book PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "">
-<book xmlns="http://www.devhelp.net/book" title="Clutter Gst 2.0.10&#10; Reference Manual" link="index.html" author="" name="clutter-gst" version="2" language="c">
+<book xmlns="http://www.devhelp.net/book" title="Clutter Gst 2.0.12&#10; Reference Manual" link="index.html" author="" name="clutter-gst" version="2" language="c">
   <chapters>
     <sub name="Clutter Gst Overview" link="ch01.html"/>
     <sub name="Clutter Actors And Objects" link="ch02.html">

=== modified file 'doc/reference/html/index.html'
--- doc/reference/html/index.html	2014-04-14 20:13:16 +0000
+++ doc/reference/html/index.html	2014-06-30 02:31:21 +0000
@@ -2,10 +2,10 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Clutter Gst 2.0.10
- Reference Manual: Clutter Gst 2.0.10 Reference Manual</title>
+<title>Clutter Gst 2.0.12
+ Reference Manual: Clutter Gst 2.0.12 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="index.html" title="Clutter Gst 2.0.10 Reference Manual">
+<link rel="home" href="index.html" title="Clutter Gst 2.0.12 Reference Manual">
 <link rel="next" href="ch01.html" title="Clutter Gst Overview">
 <meta name="generator" content="GTK-Doc V1.19.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
@@ -14,9 +14,9 @@
 <div class="book">
 <div class="titlepage">
 <div>
-<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">Clutter Gst 2.0.10
+<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">Clutter Gst 2.0.12
  Reference Manual</p></th></tr></table></div>
-<div><p class="releaseinfo">Version 2.0.10
+<div><p class="releaseinfo">Version 2.0.12
 </p></div>
 <div><p class="copyright">Copyright © 2006, 2007, 2008 OpenedHand LTD</p></div>
 <div><p class="copyright">Copyright © 2009, 2010 Intel Corporation</p></div>

=== modified file 'doc/reference/html/license.html'
--- doc/reference/html/license.html	2014-04-14 20:13:16 +0000
+++ doc/reference/html/license.html	2014-06-30 02:31:21 +0000
@@ -2,11 +2,11 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Clutter Gst 2.0.10
+<title>Clutter Gst 2.0.12
  Reference Manual: Appendix A. License</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
-<link rel="home" href="index.html" title="Clutter Gst 2.0.10 Reference Manual">
-<link rel="up" href="index.html" title="Clutter Gst 2.0.10 Reference Manual">
+<link rel="home" href="index.html" title="Clutter Gst 2.0.12 Reference Manual">
+<link rel="up" href="index.html" title="Clutter Gst 2.0.12 Reference Manual">
 <link rel="prev" href="clutter-gst-Versioning-Macros.html" title="Versioning Macros">
 <meta name="generator" content="GTK-Doc V1.19.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">

=== modified file 'doc/reference/version.xml'
--- doc/reference/version.xml	2014-04-14 20:13:16 +0000
+++ doc/reference/version.xml	2014-06-30 02:31:21 +0000
@@ -1,1 +1,1 @@
-2.0.10
+2.0.12

=== modified file 'examples/Makefile.am'
--- examples/Makefile.am	2012-08-27 18:35:24 +0000
+++ examples/Makefile.am	2014-06-30 02:31:21 +0000
@@ -2,27 +2,27 @@
 
 noinst_PROGRAMS = video-player video-sink video-sink-navigation
 
-INCLUDES = -I$(top_srcdir) \
-	   $(MAINTAINER_CFLAGS) \
-	   $(NULL)
+AM_CPPFLAGS = -I$(top_srcdir) \
+		$(MAINTAINER_CFLAGS) \
+		$(NULL)
 
 video_player_SOURCES = video-player.c
 video_player_CFLAGS = $(CLUTTER_GST_CFLAGS) $(GST_CFLAGS)
-video_player_LDFLAGS = \
+video_player_LDADD = \
     $(CLUTTER_GST_LIBS) \
     $(GST_LIBS)   \
     $(top_builddir)/clutter-gst/libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la
 
 video_sink_SOURCES = video-sink.c
 video_sink_CFLAGS = $(CLUTTER_GST_CFLAGS) $(GST_CFLAGS)
-video_sink_LDFLAGS = \
+video_sink_LDADD = \
     $(CLUTTER_GST_LIBS) \
     $(GST_LIBS)   \
     $(top_builddir)/clutter-gst/libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la
 
 video_sink_navigation_SOURCES = video-sink-navigation.c
 video_sink_navigation_CFLAGS = $(CLUTTER_GST_CFLAGS) $(GST_CFLAGS)
-video_sink_navigation_LDFLAGS = \
+video_sink_navigation_LDADD = \
     $(CLUTTER_GST_LIBS) \
     $(GST_LIBS)   \
     $(top_builddir)/clutter-gst/libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la

=== modified file 'examples/Makefile.in'
--- examples/Makefile.in	2014-04-14 20:13:16 +0000
+++ examples/Makefile.in	2014-06-30 02:31:21 +0000
@@ -104,28 +104,34 @@
 PROGRAMS = $(noinst_PROGRAMS)
 am_video_player_OBJECTS = video_player-video-player.$(OBJEXT)
 video_player_OBJECTS = $(am_video_player_OBJECTS)
-video_player_LDADD = $(LDADD)
+am__DEPENDENCIES_1 =
+video_player_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) \
+	$(top_builddir)/clutter-gst/libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
 video_player_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(video_player_CFLAGS) \
-	$(CFLAGS) $(video_player_LDFLAGS) $(LDFLAGS) -o $@
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_video_sink_OBJECTS = video_sink-video-sink.$(OBJEXT)
 video_sink_OBJECTS = $(am_video_sink_OBJECTS)
-video_sink_LDADD = $(LDADD)
+video_sink_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(top_builddir)/clutter-gst/libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la
 video_sink_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(video_sink_CFLAGS) \
-	$(CFLAGS) $(video_sink_LDFLAGS) $(LDFLAGS) -o $@
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_video_sink_navigation_OBJECTS =  \
 	video_sink_navigation-video-sink-navigation.$(OBJEXT)
 video_sink_navigation_OBJECTS = $(am_video_sink_navigation_OBJECTS)
-video_sink_navigation_LDADD = $(LDADD)
+video_sink_navigation_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) \
+	$(top_builddir)/clutter-gst/libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la
 video_sink_navigation_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(video_sink_navigation_CFLAGS) $(CFLAGS) \
-	$(video_sink_navigation_LDFLAGS) $(LDFLAGS) -o $@
+	$(video_sink_navigation_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -350,27 +356,27 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 NULL = #
-INCLUDES = -I$(top_srcdir) \
-	   $(MAINTAINER_CFLAGS) \
-	   $(NULL)
+AM_CPPFLAGS = -I$(top_srcdir) \
+		$(MAINTAINER_CFLAGS) \
+		$(NULL)
 
 video_player_SOURCES = video-player.c
 video_player_CFLAGS = $(CLUTTER_GST_CFLAGS) $(GST_CFLAGS)
-video_player_LDFLAGS = \
+video_player_LDADD = \
     $(CLUTTER_GST_LIBS) \
     $(GST_LIBS)   \
     $(top_builddir)/clutter-gst/libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la
 
 video_sink_SOURCES = video-sink.c
 video_sink_CFLAGS = $(CLUTTER_GST_CFLAGS) $(GST_CFLAGS)
-video_sink_LDFLAGS = \
+video_sink_LDADD = \
     $(CLUTTER_GST_LIBS) \
     $(GST_LIBS)   \
     $(top_builddir)/clutter-gst/libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la
 
 video_sink_navigation_SOURCES = video-sink-navigation.c
 video_sink_navigation_CFLAGS = $(CLUTTER_GST_CFLAGS) $(GST_CFLAGS)
-video_sink_navigation_LDFLAGS = \
+video_sink_navigation_LDADD = \
     $(CLUTTER_GST_LIBS) \
     $(GST_LIBS)   \
     $(top_builddir)/clutter-gst/libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la

=== modified file 'gtk-doc.make'
--- gtk-doc.make	2014-04-14 20:13:16 +0000
+++ gtk-doc.make	2014-06-30 02:31:21 +0000
@@ -88,6 +88,8 @@
 	    files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
 	    if test "x$$files" != "x" ; then \
 	        for file in $$files ; do \
+	            destdir=`dirname $(abs_builddir)/$$file` ;\
+	            test -d "$$destdir" || mkdir -p "$$destdir"; \
 	            test -f $(abs_srcdir)/$$file && \
 	                cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
 	        done; \

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2012-08-27 18:35:24 +0000
+++ tests/Makefile.am	2014-06-30 02:31:21 +0000
@@ -8,41 +8,41 @@
 	test-video-texture-new-unref-loop	\
 	$(NULL)
 
-INCLUDES = -I$(top_srcdir)      \
-	   $(MAINTAINER_CFLAGS) \
-	   $(NULL)
+AM_CPPFLAGS = -I$(top_srcdir)      \
+		$(MAINTAINER_CFLAGS) \
+		$(NULL)
 
 test_alpha_SOURCES = test-alpha.c
 test_alpha_CFLAGS  = $(CLUTTER_GST_CFLAGS) $(GST_CFLAGS)
-test_alpha_LDFLAGS =		\
+test_alpha_LDADD =		\
 	$(CLUTTER_GST_LIBS)	\
 	$(GST_LIBS)		\
 	$(top_builddir)/clutter-gst/libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la
 
 test_rgb_upload_SOURCES = test-rgb-upload.c
 test_rgb_upload_CFLAGS  = $(CLUTTER_GST_CFLAGS) $(GST_CFLAGS)
-test_rgb_upload_LDFLAGS =	\
+test_rgb_upload_LDADD =	\
 	$(CLUTTER_GST_LIBS)	\
 	$(GST_LIBS)		\
 	$(top_builddir)/clutter-gst/libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la
 
 test_start_stop_SOURCES = test-start-stop.c
 test_start_stop_CFLAGS  = $(CLUTTER_GST_CFLAGS) $(GST_CFLAGS)
-test_start_stop_LDFLAGS =	\
+test_start_stop_LDADD =	\
 	$(CLUTTER_GST_LIBS)	\
 	$(GST_LIBS)		\
 	$(top_builddir)/clutter-gst/libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la
 
 test_yuv_upload_SOURCES = test-yuv-upload.c
 test_yuv_upload_CFLAGS  = $(CLUTTER_GST_CFLAGS) $(GST_CFLAGS)
-test_yuv_upload_LDFLAGS =	\
+test_yuv_upload_LDADD =	\
 	$(CLUTTER_GST_LIBS)	\
 	$(GST_LIBS)		\
 	$(top_builddir)/clutter-gst/libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la
 
 test_video_texture_new_unref_loop_SOURCES = test-video-texture-new-unref-loop.c
 test_video_texture_new_unref_loop_CFLAGS  = $(CLUTTER_GST_CFLAGS) $(GST_CFLAGS)
-test_video_texture_new_unref_loop_LDFLAGS =	\
+test_video_texture_new_unref_loop_LDADD =	\
 	$(CLUTTER_GST_LIBS)			\
 	$(GST_LIBS)				\
 	$(top_builddir)/clutter-gst/libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la

=== modified file 'tests/Makefile.in'
--- tests/Makefile.in	2014-04-14 20:13:16 +0000
+++ tests/Makefile.in	2014-06-30 02:31:21 +0000
@@ -106,46 +106,56 @@
 PROGRAMS = $(noinst_PROGRAMS)
 am_test_alpha_OBJECTS = test_alpha-test-alpha.$(OBJEXT)
 test_alpha_OBJECTS = $(am_test_alpha_OBJECTS)
-test_alpha_LDADD = $(LDADD)
+am__DEPENDENCIES_1 =
+test_alpha_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(top_builddir)/clutter-gst/libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
 test_alpha_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_alpha_CFLAGS) \
-	$(CFLAGS) $(test_alpha_LDFLAGS) $(LDFLAGS) -o $@
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_test_rgb_upload_OBJECTS =  \
 	test_rgb_upload-test-rgb-upload.$(OBJEXT)
 test_rgb_upload_OBJECTS = $(am_test_rgb_upload_OBJECTS)
-test_rgb_upload_LDADD = $(LDADD)
+test_rgb_upload_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) \
+	$(top_builddir)/clutter-gst/libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la
 test_rgb_upload_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(test_rgb_upload_CFLAGS) $(CFLAGS) $(test_rgb_upload_LDFLAGS) \
-	$(LDFLAGS) -o $@
+	$(test_rgb_upload_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+	-o $@
 am_test_start_stop_OBJECTS =  \
 	test_start_stop-test-start-stop.$(OBJEXT)
 test_start_stop_OBJECTS = $(am_test_start_stop_OBJECTS)
-test_start_stop_LDADD = $(LDADD)
+test_start_stop_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) \
+	$(top_builddir)/clutter-gst/libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la
 test_start_stop_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(test_start_stop_CFLAGS) $(CFLAGS) $(test_start_stop_LDFLAGS) \
-	$(LDFLAGS) -o $@
+	$(test_start_stop_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+	-o $@
 am_test_video_texture_new_unref_loop_OBJECTS = test_video_texture_new_unref_loop-test-video-texture-new-unref-loop.$(OBJEXT)
 test_video_texture_new_unref_loop_OBJECTS =  \
 	$(am_test_video_texture_new_unref_loop_OBJECTS)
-test_video_texture_new_unref_loop_LDADD = $(LDADD)
+test_video_texture_new_unref_loop_DEPENDENCIES =  \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(top_builddir)/clutter-gst/libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la
 test_video_texture_new_unref_loop_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(test_video_texture_new_unref_loop_CFLAGS) $(CFLAGS) \
-	$(test_video_texture_new_unref_loop_LDFLAGS) $(LDFLAGS) -o $@
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_test_yuv_upload_OBJECTS =  \
 	test_yuv_upload-test-yuv-upload.$(OBJEXT)
 test_yuv_upload_OBJECTS = $(am_test_yuv_upload_OBJECTS)
-test_yuv_upload_LDADD = $(LDADD)
+test_yuv_upload_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) \
+	$(top_builddir)/clutter-gst/libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la
 test_yuv_upload_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(test_yuv_upload_CFLAGS) $(CFLAGS) $(test_yuv_upload_LDFLAGS) \
-	$(LDFLAGS) -o $@
+	$(test_yuv_upload_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+	-o $@
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -374,41 +384,41 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 NULL = #
-INCLUDES = -I$(top_srcdir)      \
-	   $(MAINTAINER_CFLAGS) \
-	   $(NULL)
+AM_CPPFLAGS = -I$(top_srcdir)      \
+		$(MAINTAINER_CFLAGS) \
+		$(NULL)
 
 test_alpha_SOURCES = test-alpha.c
 test_alpha_CFLAGS = $(CLUTTER_GST_CFLAGS) $(GST_CFLAGS)
-test_alpha_LDFLAGS = \
+test_alpha_LDADD = \
 	$(CLUTTER_GST_LIBS)	\
 	$(GST_LIBS)		\
 	$(top_builddir)/clutter-gst/libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la
 
 test_rgb_upload_SOURCES = test-rgb-upload.c
 test_rgb_upload_CFLAGS = $(CLUTTER_GST_CFLAGS) $(GST_CFLAGS)
-test_rgb_upload_LDFLAGS = \
+test_rgb_upload_LDADD = \
 	$(CLUTTER_GST_LIBS)	\
 	$(GST_LIBS)		\
 	$(top_builddir)/clutter-gst/libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la
 
 test_start_stop_SOURCES = test-start-stop.c
 test_start_stop_CFLAGS = $(CLUTTER_GST_CFLAGS) $(GST_CFLAGS)
-test_start_stop_LDFLAGS = \
+test_start_stop_LDADD = \
 	$(CLUTTER_GST_LIBS)	\
 	$(GST_LIBS)		\
 	$(top_builddir)/clutter-gst/libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la
 
 test_yuv_upload_SOURCES = test-yuv-upload.c
 test_yuv_upload_CFLAGS = $(CLUTTER_GST_CFLAGS) $(GST_CFLAGS)
-test_yuv_upload_LDFLAGS = \
+test_yuv_upload_LDADD = \
 	$(CLUTTER_GST_LIBS)	\
 	$(GST_LIBS)		\
 	$(top_builddir)/clutter-gst/libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la
 
 test_video_texture_new_unref_loop_SOURCES = test-video-texture-new-unref-loop.c
 test_video_texture_new_unref_loop_CFLAGS = $(CLUTTER_GST_CFLAGS) $(GST_CFLAGS)
-test_video_texture_new_unref_loop_LDFLAGS = \
+test_video_texture_new_unref_loop_LDADD = \
 	$(CLUTTER_GST_LIBS)			\
 	$(GST_LIBS)				\
 	$(top_builddir)/clutter-gst/libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la