Merge branch '0.8'

Conflicts:

	NEWS
	configure.ac

2 files changed, 23 insertions, 3 deletions

diff --git a/NEWS b/NEWS
index c354ed9f..898be9a2 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,17 @@ Swfdec 0.10 contains:
 - lots of memory leaks plugged
 - vast amount of other bugfixes
 
+ 0.8.4 ("H264")
+
+Another stable release.
+- support H264, so all Youtube videos play again
+- fix various portability issues for ARM
+- fix rare crash with gotoAndPlay() function
+- fix rare crasher with setTarget() function
+- fix crashes in BitmapData.copyPixels()
+- zero memory before rendering in PulseAudio backend
+- improve Cairo check in testsuite
+
  0.8.2 ("Gametrailers")
 
 Here's the first stable release.
diff --git a/test/swfdec_test.c b/test/swfdec_test.c
index 74c0a8eb..635f053d 100644
--- a/test/swfdec_test.c
+++ b/test/swfdec_test.c
@@ -41,13 +41,22 @@ check_cairo (gboolean verbose)
 #define CAIRO_MIN_MAJOR 1
 #define CAIRO_MIN_MINOR 7
 #define CAIRO_MIN_MICRO 1
-  if (CAIRO_VERSION < CAIRO_VERSION_ENCODE (CAIRO_MIN_MAJOR, CAIRO_MIN_MINOR, CAIRO_MIN_MICRO)) {
+#define CAIRO_MAX_MAJOR 1
+#define CAIRO_MAX_MINOR 9
+#define CAIRO_MAX_MICRO 0
+  if (cairo_version () < CAIRO_VERSION_ENCODE (CAIRO_MIN_MAJOR, CAIRO_MIN_MINOR, CAIRO_MIN_MICRO)) {
     g_print ("ERROR: Cairo version %s cannot be used to run tests; must be at least %u.%u.%u.\n",
-	CAIRO_VERSION_STRING, CAIRO_MIN_MAJOR, CAIRO_MIN_MINOR, CAIRO_MIN_MICRO);
+	cairo_version_string (), CAIRO_MIN_MAJOR, CAIRO_MIN_MINOR, CAIRO_MIN_MICRO);
     return FALSE;
+#ifdef CAIRO_MAX_MAJOR
+  } else if (cairo_version () >= CAIRO_VERSION_ENCODE (CAIRO_MAX_MAJOR, CAIRO_MAX_MINOR, CAIRO_MAX_MICRO)) {
+    g_print ("ERROR: Cairo version %s cannot be used to run tests; must be less than %u.%u.%u.\n",
+	cairo_version_string (), CAIRO_MAX_MAJOR, CAIRO_MAX_MINOR, CAIRO_MAX_MICRO);
+    return FALSE;
+#endif
   } else if (verbose) {
     g_print ("   OK: Cairo version %s is ok; must be at least %u.%u.%u.\n",
-	CAIRO_VERSION_STRING, CAIRO_MIN_MAJOR, CAIRO_MIN_MINOR, CAIRO_MIN_MICRO);
+	cairo_version_string (), CAIRO_MIN_MAJOR, CAIRO_MIN_MINOR, CAIRO_MIN_MICRO);
   }
   return TRUE;
 }