2008-01-25 Emmanuele Bassi <ebassi@openedhand.com>

* clutter/x11/Makefile.am: Add the generated clutter-x11 pkg-config
	file to CLEANFILES, to pass distcheck.

	* Makefile.am:
	* clutter/Makefile.am: Tweak up the Makefiles.

	* README:
	* NEWS: Release 0.5.4

	* configure.ac: Post-release bump to 0.5.5
This commit is contained in:
Emmanuele Bassi 2008-01-25 19:48:26 +00:00
parent 21e55bf635
commit 985fa0c6b3
7 changed files with 89 additions and 38 deletions

View File

@ -1,3 +1,16 @@
2008-01-25 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/x11/Makefile.am: Add the generated clutter-x11 pkg-config
file to CLEANFILES, to pass distcheck.
* Makefile.am:
* clutter/Makefile.am: Tweak up the Makefiles.
* README:
* NEWS: Release 0.5.4
* configure.ac: Post-release bump to 0.5.5
2008-01-25 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-group.c: Use a shorter Z order sorting function,

View File

@ -1,23 +1,24 @@
NULL =
SUBDIRS = clutter tests doc
pcfiles = clutter-$(CLUTTER_FLAVOUR)-$(CLUTTER_API_VERSION).pc
pcfiles = \
clutter-$(CLUTTER_API_VERSION).pc \
clutter-$(CLUTTER_FLAVOUR)-$(CLUTTER_API_VERSION).pc \
$(NULL)
# clutter-<major>.<minor>.pc - for generic dependencies
clutter-$(CLUTTER_API_VERSION).pc: clutter.pc
@cp $< $@
# clutter-<flavour>-<major>.<minor>.pc - for backend-specific dependencies
clutter-$(CLUTTER_FLAVOUR)-$(CLUTTER_API_VERSION).pc: clutter.pc
cp $< $@
@cp $< $@
pkgconfig_DATA = $(pcfiles)
pkgconfigdir = $(libdir)/pkgconfig
DEFAULT_FLAVOUR = @CLUTTER_FLAVOUR@
install-data-hook:
(cd $(DESTDIR)$(pkgconfigdir) && \
test -f clutter-$(DEFAULT_FLAVOUR)-@CLUTTER_MAJORMINOR@.pc && \
rm -f clutter-@CLUTTER_MAJORMINOR@.pc && \
cp -f clutter-$(DEFAULT_FLAVOUR)-@CLUTTER_MAJORMINOR@.pc clutter-@CLUTTER_MAJORMINOR@.pc)
uninstall-local:
rm -f $(DESTDIR)$(pkgconfigdir)/clutter-@CLUTTER_MAJORMINOR@.pc
EXTRA_DIST = clutter.pc.in HACKING
@ -26,6 +27,17 @@ CLEANFILES = $(pcfiles)
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-maintainer-flags
# Extra clean files so that maintainer-clean removes *everything*
MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub \
configure depcomp install-sh ltmain.sh \
Makefile.in missing config.h.in
MAINTAINERCLEANFILES = \
aclocal.m4 \
compile \
config.guess \
config.h.in \
config.sub \
configure \
depcomp \
gtk-doc.make \
install-sh \
ltmain.sh \
Makefile.in \
missing \
$(NULL)

17
NEWS
View File

@ -1,8 +1,23 @@
Clutter 0.5.4 (xx/01/2008)
Clutter 0.5.4 (25/01/2008)
==========================
* List of changes between 0.5.2 and 0.5.4
o A clutter-x11-<major>.<minor> pkg-config file is installed along
with the clutter-<major>.<minor> and clutter-<backend>-<major>.<minor>
ones, for libraries and applications depending on the X11-based
backends (GLX and EGLX).
o Textures are correctly unrealized before changing and freeing the
main GL context.
o It is now possible to block the automatic call to clutter_main_quit()
when closing the stage window using the frame controls by connecting
an handler for the ::event signal on the Clutter stage and checking
for the CLUTTER_DELETE event type and returning TRUE. This allows
the usage of other main loops with GLib reactors (like Python's twisted)
with Clutter without triggering assertions by closing the stage window.
* List of bugs fixed
o #564 - Add more precise clutter_qdivx() [Gwenole Beauchesne]

9
README
View File

@ -8,7 +8,7 @@ Clutter currently requires:
* GLib >= 2.14.0
* GdkPixbuf
* Pango 1.18
* Pango >= 1.18
* OpenGL >= 1.2 or OpenGL ES 1.1
* GLX, SDL or an EGL Implementation
@ -211,6 +211,13 @@ Release Notes for Clutter 0.6.0
clutter_effect_scale() function, which now accepts the final scale
factor on both the X and Y axis.
* The clutter_do_event() is now public; it can be used to feed an event to
Clutter and let it generate the capture-bubble signal emissions; it should
not be used by applications.
* In the X11-based backends, the DestroyNotify event is not propagated to
Clutter core if the stage is using a foreign window.
Release Notes for Clutter 0.4.0
-------------------------------

View File

@ -13,20 +13,20 @@ GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
GLIB_MKENUMS=`pkg-config --variable=glib_mkenums glib-2.0`
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/clutter/pango \
-I$(top_srcdir)/clutter/cogl \
-I$(top_srcdir)/clutter/cogl/@CLUTTER_COGL@ \
-I$(top_srcdir)/clutter/json \
-DCLUTTER_PREFIX=\""$(prefix)"\" \
-DCLUTTER_LIBDIR=\""$(libdir)"\" \
-DCLUTTER_DATADIR=\""$(datadir)"\" \
-DG_DISABLE_DEPRECATED \
-DG_LOG_DOMAIN=\"Clutter\" \
-DCLUTTER_JSON_API=1 \
$(GCC_FLAGS) \
$(CLUTTER_CFLAGS) \
$(CLUTTER_DEBUG_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/clutter/pango \
-I$(top_srcdir)/clutter/cogl \
-I$(top_srcdir)/clutter/cogl/$(CLUTTER_COGL) \
-I$(top_srcdir)/clutter/json \
-DCLUTTER_PREFIX=\""$(prefix)"\" \
-DCLUTTER_LIBDIR=\""$(libdir)"\" \
-DCLUTTER_DATADIR=\""$(datadir)"\" \
-DG_DISABLE_DEPRECATED \
-DG_LOG_DOMAIN=\"Clutter\" \
-DCLUTTER_JSON_API=1 \
$(GCC_FLAGS) \
$(CLUTTER_CFLAGS) \
$(CLUTTER_DEBUG_CFLAGS) \
$(NULL)
LDADD = \
@ -172,17 +172,18 @@ source_h_priv = \
clutter-script-private.h \
$(NULL)
libclutter_@CLUTTER_FLAVOUR@_@CLUTTER_API_VERSION@_la_LIBADD = \
$(CLUTTER_LIBS) \
pango/libpangoclutter.la \
@CLUTTER_FLAVOUR@/libclutter-@CLUTTER_FLAVOUR@.la \
cogl/@CLUTTER_COGL@/libclutter-cogl.la \
$(CLUTTER_FLAVOUR)/libclutter-$(CLUTTER_FLAVOUR).la \
cogl/$(CLUTTER_COGL)/libclutter-cogl.la \
json/libclutter-json.la \
$(backendextralib)
libclutter_@CLUTTER_FLAVOUR@_@CLUTTER_API_VERSION@_la_SOURCES = \
$(source_c) $(source_h) $(source_h_priv)
libclutter_@CLUTTER_FLAVOUR@_@CLUTTER_API_VERSION@_la_SOURCES = \
$(source_c) \
$(source_h) \
$(source_h_priv)
libclutter_@CLUTTER_FLAVOUR@_@CLUTTER_API_VERSION@_la_LDFLAGS = $(LDADD)
@ -190,7 +191,7 @@ lib_LTLIBRARIES = $(clutterbackendlib)
EXTRA_LTLIBRARIES = libclutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@.la
clutterdir = $(includedir)/clutter-@CLUTTER_API_VERSION@/clutter
clutterdir = $(includedir)/clutter-$(CLUTTER_API_VERSION)/clutter
clutter_HEADERS = \
$(source_h) \
@ -209,4 +210,5 @@ EXTRA_DIST = \
clutter-marshal.list \
clutter-version.h.in \
clutter-enum-types.h.in \
clutter-enum-types.c.in
clutter-enum-types.c.in \
$(NULL)

View File

@ -28,4 +28,6 @@ libclutter_x11_la_SOURCES = \
clutter-stage-x11.c \
clutter-x11.h
CLEANFILES = clutter-x11-$(CLUTTER_API_VERSION).pc
EXTRA_DIST = clutter-x11.pc.in

View File

@ -3,7 +3,7 @@
# An even micro number indicates a released version.
m4_define([clutter_major_version], [0])
m4_define([clutter_minor_version], [5])
m4_define([clutter_micro_version], [3])
m4_define([clutter_micro_version], [4])
m4_define([clutter_version],
[clutter_major_version.clutter_minor_version.clutter_micro_version])