Release 1.7.4 (snapshot)

As a bare minimum we want to ensure that are releases are able to build
with support for gles1, gles2, gl, egl and glx. Previously we only
checked the build with gl + glx enabled and our last release actually
missed a header file required for building with egl.

.gitignore

@@ -16,7 +16,6 @@ compile
 README
 stamp-enum-types
 stamp-marshal
-/ChangeLog*
 /build/autotools/*.m4
 !/build/autotools/introspection.m4
 !/build/autotools/as-linguas.m4

ChangeLog

@@ -0,0 +1,20 @@
+Cogl does not distribute a static Changelog with releases because we feel that
+the Git log does a better job of tracking all the detailed source code changes
+that are made to Cogl.
+
+If you just want a high level overview of what has changed between Cogl
+releases then please see the NEWS file that we distribute.
+
+You can clone Cogl via Git using:
+
+$ git clone git://git.gnome.org/cogl.git
+
+You can see the log using:
+
+$ git log
+
+Or you can look at the log for a particular release by specifying
+a release tag name like:
+
+$ git log 1.7.2
+

Makefile.am

@@ -16,8 +16,14 @@ EXTRA_DIST = \
 CLEANFILES=
 DISTCLEANFILES=
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-maintainer-flags --enable-profile
+DISTCHECK_CONFIGURE_FLAGS = \
+	--enable-gtk-doc \
+	--enable-maintainer-flags \
+	--enable-profile \
+	--enable-gles1 \
+	--enable-gles2 \
+	--enable-gl \
+	--enable-xlib-egl-platform \
+	--enable-glx
 
-# .release requires .changelog rules
-include $(top_srcdir)/build/autotools/Makefile.am.changelog
 include $(top_srcdir)/build/autotools/Makefile.am.release

NEWS

@@ -1,7 +1,67 @@
+Cogl 1.7.4                                                         2011-07-19
+===============================================================================
+
+  • List of changes since Cogl 1.7.2
+
+   » Optimize pipeline unparent operation using embedded lists instead
+     of using GList API.
+   » Remove the old matrix operation code we had before pulling in the
+     mesa based code, and flatten all our matrix utilities back into one
+     maintainable file.
+   » Expose cogl_framebuffer_get_red/green/blue/alpha bits to query
+     the precision for a framebuffer's color channels.
+   » Numerous reference manual updates
+   » Fix some memory leaks in CoglPipeline that weren't captured in
+     bugzilla.
+   » Fix some EGL winsys issues that weren't captured in bugzilla.
+   » Switch to dynamically loading libGL, libGLESv2 or libGLES[v1]_CM
+     at runtime so it's possible to distribute a libcogl that can choose
+     to work with any of these at runtime. This can simplify packaging
+     on distros that have numerous packages that provide a platform
+     specific GL/GLES driver and certainly helps during the development
+     process when evaluating the pros-and-cons of different drivers for
+     a given platform.
+   » Clean up lots of inconsistencies with platform specific APIs, so
+     we follow the naming convention of cogl_<platform>_object_method.
+   » Remove cogl_set_default_context from experimental 2.0 api, since
+     we are aiming to remove the default context for 2.0
+   » Ensure the experimental 2.0 reference manual gets a unique
+     DOC_MODULE name so that distro's trying to package cogl don't end
+     up installing the 1.x and 2.0 manuals to the same location
+   » Add a program cache for the GLSL backend, a bit like we have for
+     the ARBfp backend. This can be a big boost in performance for some
+     apps depending on your platform.
+   » Adds dither_enable getter and setter API for CoglFramebuffer so
+     that Clutter doesn't need to use the GL API directly when picking.
+     We need to get to the point where Clutter doesn't need to link
+     against libGL directly so Clutter can take advantage of runtime
+     driver selection by Cogl.
+   » Use MESA_pack_invert extension in cogl_read_pixels to avoid
+     needing to manually flip pixel data read in bottom-up order to a
+     top-down order.
+   » Fix the hello example to actually clear the framebuffer at the
+     start of the frame instead of unintentionally relying on the driver
+     to have cleared the framebuffer.
+
+  • List of bugs fixes since Cogl 1.7.2
+
+    https://bugzilla.gnome.org:
+
+    #652514 - CoglPipeline could embed the list nodes for the
+              children directly in the CoglPipeline struct
+    #654440 - _cogl_winsys_context_init crash
+    #654718 - clutter 1.6.16 compile issues
+
+Many thanks to:
+    Neil Roberts
+    Damien Lespiau
+    Emmanuele Bassi
+    Takeshi AIHANA
+
 Cogl 1.7.2                                                         2011-07-01
 ===============================================================================
 
-  • List of changes since Clutter 1.7.0
+  • List of changes since Cogl 1.7.0
 
    » Add an example program to draw a 3D crate
 
@@ -21,7 +81,7 @@ Cogl 1.7.2                                                         2011-07-01
 
    » Fixed building against GLES.
 
-  • List of bugs fixes since Clutter 1.7.0
+  • List of bugs fixes since Cogl 1.7.0
 
     https://bugzilla.gnome.org:
 

build/autotools/Makefile.am.changelog

@@ -1,78 +0,0 @@
-# Taken from Cairo - build/Makefile.am.changelog
-# Modified to fit the Cogl build environment
-
-CURR_CHANGELOG_VERSION=1.$$(echo "($(COGL_1_MINOR_VERSION)+1)/2*2" | bc)
-# examines $version
-PREV_CHANGELOG_VERSION=$$(if test "x$$(echo "($$version-0.1)*2/2"|bc)" = "x$$(echo "$$version*2/2"|bc)"; \
-			  then echo "$$version-$$(echo "$$version" | sed 's/[0-9]/0/g;s/[0-9]$$/2/')"; \
-			  else echo "$$version-1.0"; \
-			  fi | bc | sed 's/[.]0*/./;s/^0[.]\?$$/initial/;s/[.]$$/.0/')
-
-CHANGELOGS = ChangeLog \
-	`version=$(CURR_CHANGELOG_VERSION); \
-	version=$(PREV_CHANGELOG_VERSION); \
-	while test "x$$version" != xinitial; do \
-		echo ChangeLog.pre-$$version; \
-		version=$(PREV_CHANGELOG_VERSION); \
-	done`
-
-CLEANFILES += $(srcdir)/ChangeLog.cache-*
-
-changelogs:
-	@$(MAKE) $(AM_MAKEFLAGS) $(CHANGELOGS)
-
-dist-hook: changelogs
-	changelogs="$(CHANGELOGS)"; \
-	for changelog in $$changelogs; do \
-		cp $(srcdir)/$$changelog $(distdir)/ 2>/dev/null || \
-		cp $$changelog $(distdir)/; \
-	done
-
-$(srcdir)/ChangeLog:
-	@if test -d "$(srcdir)/.git"; then \
-		version=$(CURR_CHANGELOG_VERSION); \
-		prev=$(PREV_CHANGELOG_VERSION).0; \
-		nearest_tag=`git describe | sed 's/-.*//'`; \
-		before=$(srcdir)/ChangeLog.cache-$$prev..$$nearest_tag; \
-		after=$(srcdir)/ChangeLog.cache-$$nearest_tag..; \
-		$(MAKE) $(AM_MAKEFLAGS) $$before $$after && \
-		echo Creating $@ && \
-		{ echo '# Generated by configure.  Do not edit.'; echo; \
-		  cat $$after; echo; cat $$before; } > $@; \
-	else \
-		test -f $@ || \
-		(echo A git checkout is required to generate $@ >&2 && \
-		 echo A git checkout is required to generate this file >> $@); \
-	fi
-
-DISTCLEANFILES += ChangeLog.cache-*
-
-ChangeLog.cache-*..: .git
-
-ChangeLog%: $(srcdir)/ChangeLog%
-
-$(srcdir)/ChangeLog.cache-% $(srcdir)/ChangeLog.pre-%:
-	@echo Creating $@
-	@if test -d "$(srcdir)/.git"; then \
-	  (cd "$(srcdir)" && \
-	  version=$$(echo "$@" | sed 's/.*ChangeLog\([.].*-\)\?//'); \
-	  if echo "$@" | grep -q '^ChangeLog[.]cache'; then \
-		spec=$$version; \
-	  else \
-		to=$$version; \
-		test "x$$version" = x && version=$(CURR_CHANGELOG_VERSION); \
-		from=$(PREV_CHANGELOG_VERSION); \
-		test "x$$to" = x || to=$$to.0; \
-		test "x$$from" = xinitial || from=$$from.0; \
-		spec=$$from..$$to; \
-	  fi; \
-	  echo "spec=$$spec"; \
-	  $(top_srcdir)/build/missing --run git log --stat "$$spec") > $@.tmp \
-	  && mv -f $@.tmp $@ \
-	  || ($(RM) $@.tmp; \
-	      echo Failed to generate $@, your $@ may be outdated >&2); \
-	else \
-	  echo A git checkout is required to generate $@ >&2; \
-	fi
-
-.PHONY: changelogs ChangeLog $(srcdir)/ChangeLog

build/autotools/Makefile.am.release

@@ -37,7 +37,7 @@ release-tag:
 	  fi \
 	fi
 
-release-check: release-verify-even-micro release-verify-sane-changelogs release-verify-news
+release-check: release-verify-even-micro release-verify-news
 	TAR_OPTIONS="$(TAR_OPTIONS)" $(MAKE) $(AM_MAKEFLAGS) distcheck
 
 release-verify-news:
@@ -49,14 +49,6 @@ release-verify-news:
 	   false); else :; fi
 	@echo "Good."
 
-release-verify-sane-changelogs: changelogs
-	@echo -n "Checking that the ChangeLog files are sane..."
-	@if grep -q "is required to generate" $(CHANGELOGS); then \
-	  (echo "Ouch." && \
-	   echo "Some of the ChangeLogs are not generated correctly." && \
-	   echo "Remove ChangeLog* and make changelogs" && false); else :; fi
-	@echo "Good."
-
 release-verify-even-micro:
 	@echo -n "Checking that $(VERSION) has an even micro component..."
 	@test "$(COGL_1_MICRO_VERSION)" = "`echo $(COGL_1_MICRO_VERSION)/2*2 | bc`" || \
@@ -165,5 +157,4 @@ release-publish: release-check
 	release-publish \
 	release-tag \
 	release-upload \
-	release-verify-even-micro \
-	release-verify-sane-changelogs
+	release-verify-even-micro

configure.ac

@@ -25,7 +25,7 @@ m4_define([cogl_version],
 dnl Since the core Cogl library has to also maintain support for the
 dnl Cogl 1.x API for Clutter then we track the 1.x version separately.
 m4_define([cogl_1_minor_version], [7])
-m4_define([cogl_1_micro_version], [3])
+m4_define([cogl_1_micro_version], [4])
 m4_define([cogl_1_version], [1.cogl_1_minor_version.cogl_1_micro_version])
 
 dnl ================================================================
@@ -55,7 +55,7 @@ dnl ================================================================
 #
 #  5. If any interfaces have been removed since the last public release,
 #     then set AGE to 0.
-m4_define([cogl_lt_current], 1)
+m4_define([cogl_lt_current], 2)
 m4_define([cogl_lt_revision], 0)
 m4_define([cogl_lt_age], 0)
 # We do also tell libtool the pretty version:
@@ -70,7 +70,7 @@ dnl ================================================================
 # libtool version info we don't automatically derive this from the
 # pretty version number because we want to test the results of
 # updating the version number in advance of a release.
-m4_define([cogl_release_status], [git])
+m4_define([cogl_release_status], [snapshot])
 
 AC_INIT(cogl, [cogl_1_version])
 AC_CONFIG_SRCDIR(cogl/cogl.h)

doc/RELEASING

@@ -21,7 +21,7 @@ When making a new release;
 
  - Run:
 
-     $ ./autogen.sh --enable-gtk-doc --enable-profile
+     $ ./autogen.sh --enable-gtk-doc --enable-profile --enable-gles1 --enable-gles2 --enable-gl --enable-xlib-egl-platform --enable-glx
      $ make all
      $ make install
 
@@ -59,6 +59,7 @@ done
  - Read the release comments in configure.ac
     - Bump cogl_1_minor_version to the next even number
     - Don't change the 2.0 version number
+    - Update the libtool versioning
     - Update the cogl_release_status status to "release" or "snapshot"
       as appropriate.
     - commit the changes.