commit 27df32b5e76190b98f7b31bdd4e8637ed66ead6b
Author: Damien Lespiau <damien lespiau intel com>
Date: Tue Apr 5 15:01:32 2011 +0100
build: Improve the release-message target
Follow the changes from Clutter and generates the full announcement
message automatically.
NEWS | 23 ++++++++++++++---------
README | 6 +++---
build/autotools/Makefile.am.release | 21 +++++++++++++++++++--
configure.ac | 16 +++++++++++++---
4 files changed, 49 insertions(+), 17 deletions(-)
---
diff --git a/NEWS b/NEWS
index 793a24e..0a33fa7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,20 +1,25 @@
clutter-gst 1.3.8 (05/04/2011)
===============================================================================
- * list of changes since 1.3.6
+List of changes since 1.3.6:
- o Implementation of the GstNavigation interface in the sink,
+ o Implementation of the GstNavigation interface in the sink,
- o Initial support of download buffering (opt in),
+ o Initial support of download buffering (opt in),
- o Series of cleanups in VideoTexture (subtitles reset when changing URI,
- state management, seek behaviour, ...)
+ o Series of cleanups in VideoTexture (subtitles reset when changing URI,
+ state management, seek behaviour, ...)
- o The audio volume suffered from an hilariously bad bug that multiplied
- the volume set by 10. Took the opportunity to use GStreamer's
- StreamVolume to expose a cubic volume,
+ o The audio volume suffered from an hilariously bad bug that multiplied
+ the volume set by 10. Took the opportunity to use GStreamer's
+ StreamVolume to expose a cubic volume,
- o Compilation fixes for Windows.
+ o Compilation fixes for Windows.
+
+Many thanks to:
+
+ Lionel Landwerlin
+ Bastien Nocera
clutter-gst 1.3.6 (02/03/2011)
===============================================================================
diff --git a/README b/README
index 763e558..fa90160 100644
--- a/README
+++ b/README
@@ -1,9 +1,9 @@
Clutter-GStreamer README
========================
-Clutter-GStreamer (clutter-gst) is an integration library for using GStreamer
-with Clutter. Its purpose is to implement the ClutterMedia interface using
-GStreamer.
+Clutter-Gst is an integration library for using GStreamer with Clutter.
+It provides a GStreamer sink to upload frames to GL and an actor that
+implements the ClutterMedia interface using playbin2.
Clutter is an open source software library for creating fast, visually
rich and animated graphical user interfaces. It uses OpenGL for drawing
diff --git a/build/autotools/Makefile.am.release b/build/autotools/Makefile.am.release
index 6cf9b09..ab53059 100644
--- a/build/autotools/Makefile.am.release
+++ b/build/autotools/Makefile.am.release
@@ -11,6 +11,9 @@ RELEASE_UPLOAD_DIR = $(RELEASE_UPLOAD_USER)@$(RELEASE_UPLOAD_HOST):upload-sourc
RELEASE_URL_BASE = http://source.clutter-project.org/sources/clutter-gst
RELEASE_URL = $(RELEASE_URL_BASE)/$(CLUTTER_GST_MAJOR_VERSION).$(CLUTTER_GST_MINOR_VERSION)
+GNOME_RELEASE_URL_BASE = http://download.gnome.org/sources/clutter-gst
+GNOME_RELEASE_URL = $(GNOME_RELEASE_URL_BASE)/$(CLUTTER_GST_MAJOR_VERSION).$(CLUTTER_GST_MINOR_VERSION)
+
RELEASE_ANNOUNCE_LIST = clutter-announce clutter-project org (Cc: gnome-announce-list gnome org)
tar_file = $(distdir).tar.bz2
@@ -50,9 +53,12 @@ release-message: $(sha256_file)
@echo " Subject: $(PACKAGE) $(CLUTTER_GST_VERSION) ($(CLUTTER_GST_RELEASE_STATUS))"
@echo "Contents:"
@echo "--- CUT HERE ---"
+ @echo "Hi,"
+ @echo ""
@echo "A new $(PACKAGE) $(CLUTTER_GST_RELEASE_STATUS) is now available at:"
@echo ""
@echo " $(RELEASE_URL)/$(tar_file)"
+ @echo " $(GNOME_RELEASE_URL)/$(tar_file)"
@echo ""
@echo "SHA256 Checksum:"
@echo ""
@@ -60,10 +66,10 @@ release-message: $(sha256_file)
@echo ""
@echo "Additionally, a git clone of the source tree:"
@echo ""
- @echo " git clone git://git.clutter-project.org/clutter-gst"
+ @echo " git clone git://git.gnome.org/clutter-gst"
@echo ""
@echo "will include a signed $(CLUTTER_GST_VERSION) tag which points to a commit named:"
- @echo " `git cat-file tag $(CLUTTER_GST_VERSION) | grep ^object | sed -e 's,object ,,'`"
+ @echo " `git cat-file tag $(CLUTTER_GST_VERSION) | grep ^object | $(SED) -e 's,object ,,'`"
@echo ""
@echo "which can be verified with:"
@echo " git verify-tag $(CLUTTER_GST_VERSION)"
@@ -71,6 +77,17 @@ release-message: $(sha256_file)
@echo "and can be checked out with a command such as:"
@echo " git checkout -b build $(CLUTTER_GST_VERSION)"
@echo ""
+ @echo "Clutter-Gst is an integration library for using GStreamer with Clutter."
+ @echo "It provides a GStreamer sink to upload frames to GL and an actor that"
+ @echo "implements the ClutterMedia interface using playbin2."
+ @echo ""
+ @echo "Clutter-gst depends on:"
+ @echo ""
+ @echo " GLib â?¥ $(GLIB_REQ_VERSION)"
+ @echo " Clutter â?¥ $(CLUTTER_REQ_VERSION)"
+ @echo " GStreamer â?¥ $(GSTREAMER_REQ_VERSION)"
+ @echo ""
+ @$(SED) -n '1bend;/^clutter-gst /q;:end;4,$$p' $(top_srcdir)/NEWS
@echo "--- CUT HERE ---"
release-publish: release-check
diff --git a/configure.ac b/configure.ac
index d44f567..81e5476 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
# An even micro number indicates a released version.
m4_define(clutter_gst_major_version, 1)
m4_define(clutter_gst_minor_version, 3)
-m4_define(clutter_gst_micro_version, 7)
+m4_define(clutter_gst_micro_version, 8)
m4_define(clutter_api_version, 1.0)
m4_define([clutter_gst_api_version], [1.0])
@@ -75,6 +75,15 @@ m4_define([clutter_gst_release_status],
[release])])])
AC_SUBST([CLUTTER_GST_RELEASE_STATUS], [clutter_gst_release_status])
+# pkg-config requirements
+GLIB_REQ_VERSION=2.18.0
+CLUTTER_REQ_VERSION=1.4.0
+GSTREAMER_REQ_VERSION=0.10.20
+
+AC_SUBST(GLIB_REQ_VERSION)
+AC_SUBST(CLUTTER_REQ_VERSION)
+AC_SUBST(GSTREAMER_REQ_VERSION)
+
dnl ========================================================================
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
@@ -87,6 +96,7 @@ AC_PROG_CC
AM_PROG_CC_C_O
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
+AC_PROG_SED
DOLT
AC_PATH_PROG([GLIB_MKENUMS], [glib-mkenums])
AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
@@ -124,14 +134,14 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "x$have_python" = "xyes"])
dnl ========================================================================
-pkg_modules="clutter-1.0 >= 1.4.0 gio-2.0"
+pkg_modules="clutter-1.0 >= $CLUTTER_REQ_VERSION gio-2.0 >= $GLIB_REQ_VERSION"
PKG_CHECK_MODULES(CLUTTER_GST, [$pkg_modules])
dnl ========================================================================
GST_MAJORMINOR=0.10
-pkg_modules="gstreamer-$GST_MAJORMINOR >= 0.10.20 gstreamer-plugins-base-$GST_MAJORMINOR gstreamer-base-$GST_MAJORMINOR gstreamer-interfaces-$GST_MAJORMINOR gstreamer-video-$GST_MAJORMINOR gstreamer-audio-$GST_MAJORMINOR"
+pkg_modules="gstreamer-$GST_MAJORMINOR >= $GSTREAMER_REQ_VERSION gstreamer-plugins-base-$GST_MAJORMINOR gstreamer-base-$GST_MAJORMINOR gstreamer-interfaces-$GST_MAJORMINOR gstreamer-video-$GST_MAJORMINOR gstreamer-audio-$GST_MAJORMINOR"
PKG_CHECK_MODULES(GST, [$pkg_modules])
dnl ========================================================================