Commit 28520293 authored by Jeremy Bicha's avatar Jeremy Bicha

New upstream version 3.0.26

parents 74ef423e 7e191b67
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -695,7 +695,7 @@ distdir: $(DISTFILES)
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
$(am__post_remove_distdir)
dist-bzip2: distdir
......@@ -720,7 +720,7 @@ dist-shar: distdir
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
$(am__post_remove_distdir)
dist-zip: distdir
......@@ -738,7 +738,7 @@ dist dist-all:
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
......@@ -748,7 +748,7 @@ distcheck: dist
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
......
clutter-gst 3.0.26 (10/03/2018)
===============================================================================
List of changes
o Fix compilation error with -Werror=format-nonliteral
o Rename plugin to avoid dash in the name
Many Thanks to:
Bastien Nocera
Emmanuele Bassi
clutter-gst 3.0.24 (29/03/2016)
===============================================================================
......
# generated automatically by aclocal 1.15 -*- Autoconf -*-
# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -296,7 +296,7 @@ AS_VAR_COPY([$1], [pkg_cv_][$1])
AS_VAR_IF([$1], [""], [$5], [$4])dnl
])dnl PKG_CHECK_VAR
# Copyright (C) 2002-2014 Free Software Foundation, Inc.
# Copyright (C) 2002-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -311,7 +311,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.15], [],
m4_if([$1], [1.15.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
......@@ -327,14 +327,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.15])dnl
[AM_AUTOMAKE_VERSION([1.15.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -386,7 +386,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
# AM_CONDITIONAL -*- Autoconf -*-
# Copyright (C) 1997-2014 Free Software Foundation, Inc.
# Copyright (C) 1997-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -417,7 +417,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -608,7 +608,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -684,7 +684,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -881,7 +881,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -902,7 +902,7 @@ if test x"${install_sh+set}" != xset; then
fi
AC_SUBST([install_sh])])
# Copyright (C) 2003-2014 Free Software Foundation, Inc.
# Copyright (C) 2003-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -923,7 +923,7 @@ AC_SUBST([am__leading_dot])])
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -973,7 +973,7 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
# Copyright (C) 1997-2014 Free Software Foundation, Inc.
# Copyright (C) 1997-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1012,7 +1012,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1041,7 +1041,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1088,7 +1088,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1107,7 +1107,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1188,7 +1188,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
# Copyright (C) 2009-2014 Free Software Foundation, Inc.
# Copyright (C) 2009-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1248,7 +1248,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1276,7 +1276,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
# Copyright (C) 2006-2014 Free Software Foundation, Inc.
# Copyright (C) 2006-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1295,7 +1295,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
# Copyright (C) 2004-2014 Free Software Foundation, Inc.
# Copyright (C) 2004-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......
......@@ -109,21 +109,21 @@ plugin_source_c = \
clutter-gst-auto-video-sink.h \
$(NULL)
libgstclutter_@CLUTTER_GST_MAJORMINOR@_la_SOURCES = \
$(plugin_source_c) \
libcluttergst@CLUTTER_GST_MAJOR_VERSION@_la_SOURCES = \
$(plugin_source_c) \
$(NULL)
plugin_LTLIBRARIES = libgstclutter-@CLUTTER_GST_MAJORMINOR@.la
plugin_LTLIBRARIES = libcluttergst@CLUTTER_GST_MAJOR_VERSION@.la
libgstclutter_@CLUTTER_GST_MAJORMINOR@_la_LIBADD = \
libcluttergst@CLUTTER_GST_MAJOR_VERSION@_la_LIBADD = \
$(PLUGIN_LIBS) \
$(HW_LIBS) \
$(LIBM) \
libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la
libgstclutter_@CLUTTER_GST_MAJORMINOR@_la_LDFLAGS = \
$(GL_LDFLAGS) \
-module -avoid-version \
-no-undefined \
libcluttergst@CLUTTER_GST_MAJOR_VERSION@_la_LDFLAGS = \
$(GL_LDFLAGS) \
-module -avoid-version \
-no-undefined \
$(NULL)
#
......
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -211,19 +211,19 @@ libclutter_gst_@CLUTTER_GST_MAJORMINOR@_la_LINK = $(LIBTOOL) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libclutter_gst_@CLUTTER_GST_MAJORMINOR@_la_LDFLAGS) \
$(LDFLAGS) -o $@
libgstclutter_@CLUTTER_GST_MAJORMINOR@_la_DEPENDENCIES = \
libcluttergst@CLUTTER_GST_MAJOR_VERSION@_la_DEPENDENCIES = \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la
am__objects_8 = clutter-gst-plugin.lo clutter-gst-auto-video-sink.lo \
$(am__objects_1)
am_libgstclutter_@CLUTTER_GST_MAJORMINOR@_la_OBJECTS = \
am_libcluttergst@CLUTTER_GST_MAJOR_VERSION@_la_OBJECTS = \
$(am__objects_8) $(am__objects_1)
libgstclutter_@CLUTTER_GST_MAJORMINOR@_la_OBJECTS = \
$(am_libgstclutter_@CLUTTER_GST_MAJORMINOR@_la_OBJECTS)
libgstclutter_@CLUTTER_GST_MAJORMINOR@_la_LINK = $(LIBTOOL) $(AM_V_lt) \
--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libgstclutter_@CLUTTER_GST_MAJORMINOR@_la_LDFLAGS) \
libcluttergst@CLUTTER_GST_MAJOR_VERSION@_la_OBJECTS = \
$(am_libcluttergst@CLUTTER_GST_MAJOR_VERSION@_la_OBJECTS)
libcluttergst@CLUTTER_GST_MAJOR_VERSION@_la_LINK = $(LIBTOOL) \
$(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libcluttergst@CLUTTER_GST_MAJOR_VERSION@_la_LDFLAGS) \
$(LDFLAGS) -o $@
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
......@@ -260,9 +260,9 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
SOURCES = $(libclutter_gst_@CLUTTER_GST_MAJORMINOR@_la_SOURCES) \
$(libgstclutter_@CLUTTER_GST_MAJORMINOR@_la_SOURCES)
$(libcluttergst@CLUTTER_GST_MAJOR_VERSION@_la_SOURCES)
DIST_SOURCES = $(libclutter_gst_@CLUTTER_GST_MAJORMINOR@_la_SOURCES) \
$(libgstclutter_@CLUTTER_GST_MAJORMINOR@_la_SOURCES)
$(libcluttergst@CLUTTER_GST_MAJOR_VERSION@_la_SOURCES)
RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
ctags-recursive dvi-recursive html-recursive info-recursive \
install-data-recursive install-dvi-recursive \
......@@ -622,21 +622,21 @@ plugin_source_c = \
clutter-gst-auto-video-sink.h \
$(NULL)
libgstclutter_@CLUTTER_GST_MAJORMINOR@_la_SOURCES = \
$(plugin_source_c) \
libcluttergst@CLUTTER_GST_MAJOR_VERSION@_la_SOURCES = \
$(plugin_source_c) \
$(NULL)
plugin_LTLIBRARIES = libgstclutter-@CLUTTER_GST_MAJORMINOR@.la
libgstclutter_@CLUTTER_GST_MAJORMINOR@_la_LIBADD = \
plugin_LTLIBRARIES = libcluttergst@CLUTTER_GST_MAJOR_VERSION@.la
libcluttergst@CLUTTER_GST_MAJOR_VERSION@_la_LIBADD = \
$(PLUGIN_LIBS) \
$(HW_LIBS) \
$(LIBM) \
libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la
libgstclutter_@CLUTTER_GST_MAJORMINOR@_la_LDFLAGS = \
$(GL_LDFLAGS) \
-module -avoid-version \
-no-undefined \
libcluttergst@CLUTTER_GST_MAJOR_VERSION@_la_LDFLAGS = \
$(GL_LDFLAGS) \
-module -avoid-version \
-no-undefined \
$(NULL)
......@@ -762,8 +762,8 @@ clean-pluginLTLIBRARIES:
libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la: $(libclutter_gst_@CLUTTER_GST_MAJORMINOR@_la_OBJECTS) $(libclutter_gst_@CLUTTER_GST_MAJORMINOR@_la_DEPENDENCIES) $(EXTRA_libclutter_gst_@CLUTTER_GST_MAJORMINOR@_la_DEPENDENCIES)
$(AM_V_CCLD)$(libclutter_gst_@CLUTTER_GST_MAJORMINOR@_la_LINK) -rpath $(libdir) $(libclutter_gst_@CLUTTER_GST_MAJORMINOR@_la_OBJECTS) $(libclutter_gst_@CLUTTER_GST_MAJORMINOR@_la_LIBADD) $(LIBS)
libgstclutter-@CLUTTER_GST_MAJORMINOR@.la: $(libgstclutter_@CLUTTER_GST_MAJORMINOR@_la_OBJECTS) $(libgstclutter_@CLUTTER_GST_MAJORMINOR@_la_DEPENDENCIES) $(EXTRA_libgstclutter_@CLUTTER_GST_MAJORMINOR@_la_DEPENDENCIES)
$(AM_V_CCLD)$(libgstclutter_@CLUTTER_GST_MAJORMINOR@_la_LINK) -rpath $(plugindir) $(libgstclutter_@CLUTTER_GST_MAJORMINOR@_la_OBJECTS) $(libgstclutter_@CLUTTER_GST_MAJORMINOR@_la_LIBADD) $(LIBS)
libcluttergst@CLUTTER_GST_MAJOR_VERSION@.la: $(libcluttergst@CLUTTER_GST_MAJOR_VERSION@_la_OBJECTS) $(libcluttergst@CLUTTER_GST_MAJOR_VERSION@_la_DEPENDENCIES) $(EXTRA_libcluttergst@CLUTTER_GST_MAJOR_VERSION@_la_DEPENDENCIES)
$(AM_V_CCLD)$(libcluttergst@CLUTTER_GST_MAJOR_VERSION@_la_LINK) -rpath $(plugindir) $(libcluttergst@CLUTTER_GST_MAJOR_VERSION@_la_OBJECTS) $(libcluttergst@CLUTTER_GST_MAJOR_VERSION@_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
......
......@@ -5,7 +5,6 @@
/* enumerations from "./clutter-gst-types.h" */
#include "./clutter-gst-types.h"
GType
clutter_gst_seek_flags_get_type (void)
{
......
......@@ -7,14 +7,11 @@
#include <glib-object.h>
G_BEGIN_DECLS
/* enumerations from "./clutter-gst-types.h" */
GType clutter_gst_seek_flags_get_type (void) G_GNUC_CONST;
#define CLUTTER_GST_TYPE_SEEK_FLAGS (clutter_gst_seek_flags_get_type())
GType clutter_gst_buffering_mode_get_type (void) G_GNUC_CONST;
#define CLUTTER_GST_TYPE_BUFFERING_MODE (clutter_gst_buffering_mode_get_type())
G_END_DECLS
#endif /* !__CLUTTER_GST_ENUM_TYPES_H__ */
......
#include "clutter-gst-marshal.h"
#include <glib-object.h>
#include <glib-object.h>
#ifdef G_ENABLE_DEBUG
#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v)
......@@ -49,7 +47,6 @@
#define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer
#endif /* !G_ENABLE_DEBUG */
/* VOID:DOUBLE,DOUBLE (./clutter-gst-marshal.list:1) */
void
_clutter_gst_marshal_VOID__DOUBLE_DOUBLE (GClosure *closure,
......@@ -59,13 +56,13 @@ _clutter_gst_marshal_VOID__DOUBLE_DOUBLE (GClosure *closure,
gpointer invocation_hint G_GNUC_UNUSED,
gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__DOUBLE_DOUBLE) (gpointer data1,
gdouble arg_1,
gdouble arg_2,
gpointer data2);
register GMarshalFunc_VOID__DOUBLE_DOUBLE callback;
register GCClosure *cc = (GCClosure*) closure;
register gpointer data1, data2;
typedef void (*GMarshalFunc_VOID__DOUBLE_DOUBLE) (gpointer data1,
gdouble arg1,
gdouble arg2,
gpointer data2);
GCClosure *cc = (GCClosure *) closure;
gpointer data1, data2;
GMarshalFunc_VOID__DOUBLE_DOUBLE callback;
g_return_if_fail (n_param_values == 3);
......@@ -96,13 +93,13 @@ _clutter_gst_marshal_VOID__INT_INT (GClosure *closure,
gpointer invocation_hint G_GNUC_UNUSED,
gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__INT_INT) (gpointer data1,
gint arg_1,
gint arg_2,
gpointer data2);
register GMarshalFunc_VOID__INT_INT callback;
register GCClosure *cc = (GCClosure*) closure;
register gpointer data1, data2;
typedef void (*GMarshalFunc_VOID__INT_INT) (gpointer data1,
gint arg1,
gint arg2,
gpointer data2);
GCClosure *cc = (GCClosure *) closure;
gpointer data1, data2;
GMarshalFunc_VOID__INT_INT callback;
g_return_if_fail (n_param_values == 3);
......@@ -127,18 +124,18 @@ _clutter_gst_marshal_VOID__INT_INT (GClosure *closure,
/* BOOL:OBJECT (./clutter-gst-marshal.list:3) */
void
_clutter_gst_marshal_BOOLEAN__OBJECT (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint G_GNUC_UNUSED,
gpointer marshal_data)
{
typedef gboolean (*GMarshalFunc_BOOLEAN__OBJECT) (gpointer data1,
gpointer arg_1,
gpointer data2);
register GMarshalFunc_BOOLEAN__OBJECT callback;
register GCClosure *cc = (GCClosure*) closure;
register gpointer data1, data2;
typedef gboolean (*GMarshalFunc_BOOLEAN__OBJECT) (gpointer data1,
gpointer arg1,
gpointer data2);
GCClosure *cc = (GCClosure *) closure;
gpointer data1, data2;
GMarshalFunc_BOOLEAN__OBJECT callback;
gboolean v_return;
g_return_if_fail (return_value != NULL);
......
/* This file is generated, all changes will be lost */
#ifndef ___CLUTTER_GST_MARSHAL_MARSHAL_H__
#define ___CLUTTER_GST_MARSHAL_MARSHAL_H__
#ifndef ___clutter_gst_marshal_MARSHAL_H__
#define ___clutter_gst_marshal_MARSHAL_H__
#include <glib-object.h>
#include <glib-object.h>
G_BEGIN_DECLS
/* VOID:DOUBLE,DOUBLE (./clutter-gst-marshal.list:1) */
extern void _clutter_gst_marshal_VOID__DOUBLE_DOUBLE (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
extern
void _clutter_gst_marshal_VOID__DOUBLE_DOUBLE (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:INT,INT (./clutter-gst-marshal.list:2) */
extern void _clutter_gst_marshal_VOID__INT_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
extern
void _clutter_gst_marshal_VOID__INT_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* BOOL:OBJECT (./clutter-gst-marshal.list:3) */
extern void _clutter_gst_marshal_BOOLEAN__OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
extern
void _clutter_gst_marshal_BOOLEAN__OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
#define _clutter_gst_marshal_BOOL__OBJECT _clutter_gst_marshal_BOOLEAN__OBJECT
G_END_DECLS
#endif /* ___clutter_gst_marshal_MARSHAL_H__ */
G_END_DECLS
#endif /* ___CLUTTER_GST_MARSHAL_MARSHAL_H__ */
......@@ -37,6 +37,9 @@
#include "clutter-gst-auto-video-sink.h"
#include "clutter-gst-video-sink.h"
#include "clutter-gst-version.h"
#define CLUTTER_GST_PLUGIN_NAME cluttergst
/* entry point to initialize the plug-in
* initialize the plug-in itself
......@@ -65,7 +68,7 @@ plugin_init (GstPlugin *plugin)
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
clutter-gst3,
G_PASTE (CLUTTER_GST_PLUGIN_NAME, CLUTTER_GST_MAJOR_VERSION),
"Elements to render to ClutterGst actors",
plugin_init,
VERSION,
......
......@@ -42,28 +42,28 @@
*
* ClutterGst major version (e.g. "1", if %CLUTTER_GST_VERSION is "1.2.3")
*/
#define CLUTTER_GST_MAJOR_VERSION (@CLUTTER_GST_MAJOR_VERSION@)
#define CLUTTER_GST_MAJOR_VERSION @CLUTTER_GST_MAJOR_VERSION@
/**
* CLUTTER_GST_MINOR_VERSION:
*
* ClutterGst minor version (e.g. "2", if %CLUTTER_GST_VERSION is "1.2.3")
*/
#define CLUTTER_GST_MINOR_VERSION (@CLUTTER_GST_MINOR_VERSION@)
#define CLUTTER_GST_MINOR_VERSION @CLUTTER_GST_MINOR_VERSION@
/**
* CLUTTER_GST_MICRO_VERSION:
*
* ClutterGst micro version (e.g. "3", if %CLUTTER_GST_VERSION is "1.2.3")
*/
#define CLUTTER_GST_MICRO_VERSION (@CLUTTER_GST_MICRO_VERSION@)
#define CLUTTER_GST_MICRO_VERSION @CLUTTER_GST_MICRO_VERSION@
/**
* CLUTTER_GST_VERSION:
*
* ClutterGst full version (e.g. "1.2.3")
*/
#define CLUTTER_GST_VERSION (@CLUTTER_GST_VERSION@)
#define CLUTTER_GST_VERSION @CLUTTER_GST_VERSION@
/**
* CLUTTER_GST_VERSION_S:
......
......@@ -796,6 +796,9 @@ static const gchar *color_balance_shader =
" return clutter_gst_yuv_to_rgb (corrected_yuv);\n"
"}\n";
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
static void
clutter_gst_video_sink_setup_balance (ClutterGstVideoSink *sink,
CoglPipeline *pipeline)
......@@ -890,6 +893,8 @@ clutter_gst_video_sink_setup_balance (ClutterGstVideoSink *sink,
}
}
#pragma GCC diagnostic pop
/* YUV <-> RGB conversions */
static const gchar *no_color_conversions_shader =
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for clutter-gst 3.0.24.
# Generated by GNU Autoconf 2.69 for clutter-gst 3.0.26.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=clutter-gst>.
#
......@@ -591,8 +591,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='clutter-gst'
PACKAGE_TARNAME='clutter-gst'
PACKAGE_VERSION='3.0.24'
PACKAGE_STRING='clutter-gst 3.0.24'
PACKAGE_VERSION='3.0.26'
PACKAGE_STRING='clutter-gst 3.0.26'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=clutter-gst'
PACKAGE_URL=''
......@@ -1415,7 +1415,7 @@ if test "$ac_init_help" = "long"; then
# 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 3.0.24 to adapt to many kinds of systems.
\`configure' configures clutter-gst 3.0.26 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1486,7 +1486,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of clutter-gst 3.0.24:";;
short | recursive ) echo "Configuration of clutter-gst 3.0.26:";;
esac
cat <<\_ACEOF
......@@ -1632,7 +1632,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
clutter-gst configure 3.0.24
clutter-gst configure 3.0.26
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -2001,7 +2001,7 @@ cat >config.log <<_ACEOF
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 3.0.24, which was
It was created by clutter-gst $as_me 3.0.26, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
......@@ -2872,7 +2872,7 @@ fi
# Define the identity of the package.
PACKAGE='clutter-gst'
VERSION='3.0.24'
VERSION='3.0.26'
cat >>confdefs.h <<_ACEOF
......@@ -3084,8 +3084,8 @@ fi
CLUTTER_GST_MAJOR_VERSION=3
CLUTTER_GST_MINOR_VERSION=0
CLUTTER_GST_MICRO_VERSION=24
CLUTTER_GST_VERSION=3.0.24
CLUTTER_GST_MICRO_VERSION=26
CLUTTER_GST_VERSION=3.0.26
CLUTTER_GST_API_VERSION=3.0
CLUTTER_GST_MAJORMINOR=3.0
CLUTTER_API_VERSION=1.0
......@@ -3101,9 +3101,9 @@ CLUTTER_API_VERSION=1.0
CLUTTER_GST_LT_CURRENT=24
CLUTTER_GST_LT_CURRENT=26
CLUTTER_GST_LT_REV=0
CLUTTER_GST_LT_AGE=24
CLUTTER_GST_LT_AGE=26
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"
......@@ -13677,6 +13677,8 @@ main ()
if (*(data + i) != *(data3 + i))
return 14;
close (fd);
free (data);
free (data3);
return 0;
}
_ACEOF
......@@ -15800,7 +15802,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# 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 3.0.24, which was
This file was extended by clutter-gst $as_me 3.0.26, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -15866,7 +15868,7 @@ _ACEOF
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 3.0.24
clutter-gst config.status 3.0.26
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......
......@@ -3,7 +3,7 @@
# An even micro number indicates a released version.
m4_define(clutter_gst_major_version, 3)
m4_define(clutter_gst_minor_version, 0)
m4_define(clutter_gst_micro_version, 24)
m4_define(clutter_gst_micro_version, 26)
m4_define(clutter_api_version, 1.0)
m4_define([clutter_gst_api_version], [3.0])
......
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@