diff options
| -rw-r--r-- | ChangeLog | 18 | ||||
| -rw-r--r-- | README | 31 | ||||
| -rw-r--r-- | clutter-gst/Makefile.am | 11 | ||||
| -rw-r--r-- | clutter-gst/clutter-gst-audio.c | 8 | ||||
| -rw-r--r-- | clutter-gst/clutter-gst-audio.h | 9 | ||||
| -rw-r--r-- | clutter-gst/clutter-gst-util.c | 12 | ||||
| -rw-r--r-- | clutter-gst/clutter-gst-util.h | 12 | ||||
| -rw-r--r-- | clutter-gst/clutter-gst-version.h.in | 44 | ||||
| -rw-r--r-- | clutter-gst/clutter-gst-video-sink.c | 11 | ||||
| -rw-r--r-- | clutter-gst/clutter-gst-video-sink.h | 7 | ||||
| -rw-r--r-- | clutter-gst/clutter-gst-video-texture.c | 7 | ||||
| -rw-r--r-- | clutter-gst/clutter-gst-video-texture.h | 7 | ||||
| -rw-r--r-- | clutter-gst/clutter-gst.h | 1 | ||||
| -rw-r--r-- | configure.ac | 72 | ||||
| -rw-r--r-- | examples/video-sink.c | 2 |
15 files changed, 190 insertions, 62 deletions
@@ -1,3 +1,21 @@ +2007-07-06 Emmanuele Bassi <ebassi@openedhand.com> + + * configure.ac: Use the same M4 macros clutter-core uses to set + the various libtool flags and simplify the release process. + + * clutter-gst/clutter-gst.h: + * clutter-gst/clutter-gst-version.h.in: Add version header and + macros for clutter-gst. + + * clutter-gst/*.[ch]: Fix copyright and attributions. + + * clutter-gst/clutter-gst-util.[hc]: Fix second argument of + clutter_gst_init() function call: the underlying libraries + require a pointer to the arguments vector to remove their own + arguments from it. + + * README: Flesh out the description a little. + 2007-07-05 Emmanuele Bassi <ebassi@openedhand.com> * clutter-gst.pc.in: Bump to use Clutter 0.3 here, too. @@ -1,5 +1,28 @@ -Clutter-gst README. -=================== +Clutter-GStreamer README +======================== + +Clutter-GStreamer (clutter-gst) is an integration library for using GStreamer +with Clutter. + +Clutter it an open source software library for creating fast, visually +rich and animated graphical user interfaces. It uses OpenGL for drawing +primitives and has multiple backends, allowing its usage on different +platforms. + +GStreamer is a streaming media framework, based on graphs of filters +which operate on media data. Applications using this library can do +anything from real-time sound processing to playing videos, and just +about anything else media-related. Its plugin-based architecture means +that new data types or processing capabilities can be added simply by +installing new plug-ins. + +Clutter-GStreamer requires: + + GLib >= 2.10.0 + Clutter >= 0.3.0 + GStreamer >= 0.10 + +RELEASE NOTES +======================== + -This package contains a video texture actor and an audio player object for -use with clutter. diff --git a/clutter-gst/Makefile.am b/clutter-gst/Makefile.am index 8475f8f..990b358 100644 --- a/clutter-gst/Makefile.am +++ b/clutter-gst/Makefile.am @@ -1,8 +1,9 @@ -source_h = \ - $(srcdir)/clutter-gst-video-texture.h \ - $(srcdir)/clutter-gst-video-sink.h \ - $(srcdir)/clutter-gst-audio.h \ - $(srcdir)/clutter-gst-util.h +source_h = \ + $(srcdir)/clutter-gst-video-texture.h \ + $(srcdir)/clutter-gst-video-sink.h \ + $(srcdir)/clutter-gst-audio.h \ + $(srcdir)/clutter-gst-util.h \ + $(srcdir)/clutter-gst-version.h source_c = clutter-gst-video-texture.c \ diff --git a/clutter-gst/clutter-gst-audio.c b/clutter-gst/clutter-gst-audio.c index bab4df6..cc60eb7 100644 --- a/clutter-gst/clutter-gst-audio.c +++ b/clutter-gst/clutter-gst-audio.c @@ -1,10 +1,12 @@ /* - * Clutter. + * Clutter-GStreamer. * - * An OpenGL based 'interactive canvas' library. + * GStreamer integration library for Clutter. + * + * clutter-gst-audio.h - Audio streaming object * * Authored By Matthew Allum <mallum@openedhand.com> - * Jorn Baayen <jorn@openedhand.com> + * Jorn Baayen <jorn@openedhand.com> * * Copyright (C) 2006 OpenedHand * diff --git a/clutter-gst/clutter-gst-audio.h b/clutter-gst/clutter-gst-audio.h index 9c77dbe..fbb1d91 100644 --- a/clutter-gst/clutter-gst-audio.h +++ b/clutter-gst/clutter-gst-audio.h @@ -1,10 +1,12 @@ /* - * Clutter. + * Clutter-GStreamer. * - * An OpenGL based 'interactive canvas' library. + * GStreamer integration library for Clutter. + * + * clutter-gst-audio.h - Audio streaming object * * Authored By Matthew Allum <mallum@openedhand.com> - * Jorn Baayen <jorn@openedhand.com> + * Jorn Baayen <jorn@openedhand.com> * * Copyright (C) 2006 OpenedHand * @@ -23,7 +25,6 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ - #ifndef _HAVE_CLUTTER_GST_AUDIO_H #define _HAVE_CLUTTER_GST_AUDIO_H diff --git a/clutter-gst/clutter-gst-util.c b/clutter-gst/clutter-gst-util.c index 5177dd0..89ab9f7 100644 --- a/clutter-gst/clutter-gst-util.c +++ b/clutter-gst/clutter-gst-util.c @@ -1,11 +1,13 @@ /* - * Clutter. + * Clutter-GStreamer. * - * An OpenGL based 'interactive canvas' library. + * GStreamer integration library for Clutter. + * + * clutter-gst-util.h - Miscellaneous functions * * Authored By Matthew Allum <mallum@openedhand.com> * - * Copyright (C) 2007 OpenedHand + * Copyright (C) 2006 OpenedHand * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -41,8 +43,8 @@ * Return value: A #ClutterInitError. */ ClutterInitError -clutter_gst_init (int *argc, - char **argv) +clutter_gst_init (int *argc, + char ***argv) { static gboolean gst_is_initialized = FALSE; diff --git a/clutter-gst/clutter-gst-util.h b/clutter-gst/clutter-gst-util.h index beac1df..b86967e 100644 --- a/clutter-gst/clutter-gst-util.h +++ b/clutter-gst/clutter-gst-util.h @@ -1,11 +1,13 @@ /* - * Clutter. + * Clutter-GStreamer. * - * An OpenGL based 'interactive canvas' library. + * GStreamer integration library for Clutter. + * + * clutter-gst-util.h - Miscellaneous functions * * Authored By Matthew Allum <mallum@openedhand.com> * - * Copyright (C) 2007 OpenedHand + * Copyright (C) 2006 OpenedHand * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,8 +32,8 @@ G_BEGIN_DECLS -ClutterInitError clutter_gst_init (int *argc, - char **argv); +ClutterInitError clutter_gst_init (int *argc, + char ***argv); G_END_DECLS diff --git a/clutter-gst/clutter-gst-version.h.in b/clutter-gst/clutter-gst-version.h.in new file mode 100644 index 0000000..fc26c3c --- /dev/null +++ b/clutter-gst/clutter-gst-version.h.in @@ -0,0 +1,44 @@ +/* + * Clutter-GStreamer. + * + * GStreamer integration library for Clutter. + * + * Authored By Matthew Allum <mallum@openedhand.com> + * + * Copyright (C) 2006 OpenedHand + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __CLUTTER_GST_VERSION_H__ +#define __CLUTTER_GST_VERSION_H__ + +#define CLUTTER_GST_MAJOR_VERSION @CLUTTER_GST_MAJOR_VERSION@ +#define CLUTTER_GST_MINOR_VERSION @CLUTTER_GST_MINOR_VERSION@ +#define CLUTTER_GST_MICRO_VERSION @CLUTTER_GST_MICRO_VERSION@ + +#define CLUTTER_GST_VERSION @CLUTTER_GST_VERSION@ +#define CLUTTER_GST_VERSION_S "@CLUTTER_GST_VERSION@" +#define CLUTTER_GST_VERSION_HEX ((CLUTTER_GST_MAJOR_VERSION << 24) | \ + (CLUTTER_GST_MINOR_VERSION << 16) | \ + (CLUTTER_GST_MICRO_VERSION << 8)) + +#define CLUTTER_GST_CHECK_VERSION(major,minor,micro) \ + (CLUTTER_GST_MAJOR_VERSION > (major) || \ + (CLUTTER_GST_MAJOR_VERSION == (major) && CLUTTER_GST_MINOR_VERSION > (minor)) || \ + (CLUTTER_GST_MAJOR_VERSION == (major) && CLUTTER_GST_MINOR_VERSION == (minor) && CLUTTER_GST_MICRO_VERSION > (micro))) + +#endif /* __CLUTTER_GST_VERSION_H__ */ diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c index 02fa73e..1d8475a 100644 --- a/clutter-gst/clutter-gst-video-sink.c +++ b/clutter-gst/clutter-gst-video-sink.c @@ -1,11 +1,14 @@ /* - * ClutterGstVideoSink + * Clutter-GStreamer. * - * Gstreamer Video Sink that renders to a Clutter Texture. + * GStreamer integration library for Clutter. * - * Authored by Jonathan Matthew <jonathan@kaolin.wh9.net> + * clutter-gst-video-sink.h - Gstreamer Video Sink that renders to a + * Clutter Texture. * - * Copyright (C) 2007 OpenedHand Ltd. + * Authored by Jonathan Matthew <jonathan@kaolin.wh9.net> + * + * Copyright (C) 2007 OpenedHand * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/clutter-gst/clutter-gst-video-sink.h b/clutter-gst/clutter-gst-video-sink.h index 004e07d..587a477 100644 --- a/clutter-gst/clutter-gst-video-sink.h +++ b/clutter-gst/clutter-gst-video-sink.h @@ -1,7 +1,10 @@ /* - * ClutterGstVideoSink + * Clutter-GStreamer. * - * Gstreamer Video Sink that renders to a Clutter Texture. + * GStreamer integration library for Clutter. + * + * clutter-gst-video-sink.h - Gstreamer Video Sink that renders to a + * Clutter Texture. * * Authored by Jonathan Matthew <jonathan@kaolin.wh9.net> * diff --git a/clutter-gst/clutter-gst-video-texture.c b/clutter-gst/clutter-gst-video-texture.c index 62831a7..a6ef84f 100644 --- a/clutter-gst/clutter-gst-video-texture.c +++ b/clutter-gst/clutter-gst-video-texture.c @@ -1,7 +1,10 @@ /* - * Clutter. + * Clutter-GStreamer. * - * An OpenGL based 'interactive canvas' library. + * GStreamer integration library for Clutter. + * + * clutter-gst-video-texture.c - ClutterTexture using GStreamer to display a + * video stream. * * Authored By Matthew Allum <mallum@openedhand.com> * diff --git a/clutter-gst/clutter-gst-video-texture.h b/clutter-gst/clutter-gst-video-texture.h index 2c31382..0b353ac 100644 --- a/clutter-gst/clutter-gst-video-texture.h +++ b/clutter-gst/clutter-gst-video-texture.h @@ -1,7 +1,10 @@ /* - * Clutter. + * Clutter-GStreamer. * - * An OpenGL based 'interactive canvas' library. + * GStreamer integration library for Clutter. + * + * clutter-gst-video-texture.h - ClutterTexture using GStreamer to display a + * video stream. * * Authored By Matthew Allum <mallum@openedhand.com> * diff --git a/clutter-gst/clutter-gst.h b/clutter-gst/clutter-gst.h index f8b57f5..a5d6dda 100644 --- a/clutter-gst/clutter-gst.h +++ b/clutter-gst/clutter-gst.h @@ -7,5 +7,6 @@ #include "clutter-gst-video-sink.h" #include "clutter-gst-audio.h" #include "clutter-gst-util.h" +#include "clutter-gst-version.h" #endif diff --git a/configure.ac b/configure.ac index 47900fb..0da0b74 100644 --- a/configure.ac +++ b/configure.ac @@ -1,31 +1,51 @@ -AC_PREREQ(2.53) - # clutter package version number, (as distinct from shared library version) -# An odd micro number indicates in-progress development, (eg. from CVS) +# An odd micro number indicates in-progress developmen # An even micro number indicates a released version. -m4_define(clutter_gst_version_major, 0) -m4_define(clutter_gst_version_minor, 3) -m4_define(clutter_gst_version_micro, 0) +m4_define(clutter_gst_major_version, 0) +m4_define(clutter_gst_minor_version, 3) +m4_define(clutter_gst_micro_version, 0) + +m4_define([clutter_gst_version], + [clutter_gst_major_version.clutter_gst_minor_version.clutter_gst_micro_version]) + +m4_define([clutter_gst_api_version], + [clutter_gst_major_version.clutter_gst_minor_version]) -AC_INIT([clutter-gst], - clutter_gst_version_major.clutter_gst_version_minor.clutter_gst_version_micro, +# increase the interface age for each release; if the API changes, set to 0 +m4_define([clutter_gst_interface_age], [0]) +m4_define([clutter_gst_binary_age], + [m4_eval(100 * clutter_gst_minor_version + clutter_gst_micro_version)]) + +AC_PREREQ(2.53) + +AC_INIT([clutter-gst], [clutter_gst_version], [http://bugzilla.o-hand.com/enter_bug.cgi?product=Clutter-gst]) AC_CONFIG_SRCDIR([clutter-gst/clutter-gst.h]) AM_CONFIG_HEADER([config.h]) AM_INIT_AUTOMAKE([1.7]) -CLUTTER_GST_MAJORMINOR=clutter_gst_version_major.clutter_gst_version_minor +CLUTTER_GST_MAJOR_VERSION=clutter_gst_major_version +CLUTTER_GST_MINOR_VERSION=clutter_gst_minor_version +CLUTTER_GST_MICRO_VERSION=clutter_gst_micro_version +CLUTTER_GST_VERSION=clutter_gst_version +CLUTTER_GST_API_VERSION=clutter_gst_api_version +CLUTTER_GST_MAJORMINOR=clutter_gst_api_version +AC_SUBST(CLUTTER_GST_MAJOR_VERSION) +AC_SUBST(CLUTTER_GST_MINOR_VERSION) +AC_SUBST(CLUTTER_GST_MICRO_VERSION) +AC_SUBST(CLUTTER_GST_VERSION) +AC_SUBST(CLUTTER_GST_API_VERSION) AC_SUBST(CLUTTER_GST_MAJORMINOR) -# CURRENT, REVISION, AGE -# - library source changed -> increment REVISION -# - interfaces added/removed/changed -> increment CURRENT, REVISION = 0 -# - interfaces added -> increment AGE -# - interfaces removed -> AGE = 0 -CLUTTER_GST_LT_CURRENT=1 -CLUTTER_GST_LT_REV=0 -CLUTTER_GST_LT_AGE=1 +m4_define([lt_current], + [m4_eval(100 * clutter_gst_minor_version + clutter_gst_micro_version - clutter_gst_interface_age)]) +m4_define([lt_revision], [clutter_gst_interface_age]) +m4_define([lt_age], [m4_eval(clutter_gst_binary_age - clutter_gst_interface_age)]) + +CLUTTER_GST_LT_CURRENT=lt_current +CLUTTER_GST_LT_REV=lt_revision +CLUTTER_GST_LT_AGE=lt_age 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" @@ -85,19 +105,21 @@ AC_SUBST(GST_LIBS) AC_SUBST(CLUTTER_GST_CFLAGS) AC_SUBST(CLUTTER_GST_LIBS) -AC_OUTPUT([Makefile -clutter-gst/Makefile -examples/Makefile -doc/Makefile -doc/reference/Makefile -doc/reference/version.xml -clutter-gst.pc +AC_OUTPUT([ + Makefile + clutter-gst/Makefile + clutter-gst/clutter-gst-version.h + examples/Makefile + doc/Makefile + doc/reference/Makefile + doc/reference/version.xml + clutter-gst.pc ]) dnl ======================================================================== echo "" -echo " Clutter-GST $VERSION" +echo " Clutter-GST $VERSION" echo " ===================" echo "" echo " prefix: ${prefix}" diff --git a/examples/video-sink.c b/examples/video-sink.c index 5802896..b6cf84a 100644 --- a/examples/video-sink.c +++ b/examples/video-sink.c @@ -91,7 +91,7 @@ main (int argc, char *argv[]) clutter_group_add (CLUTTER_GROUP (stage), texture); // clutter_actor_set_opacity (texture, 0x11); - clutter_actor_show_all (CLUTTER_GROUP (stage)); + clutter_actor_show_all (stage); clutter_main(); |