summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Neumann <sven@gimp.org>2009-02-18 17:39:31 +0000
committerSven Neumann <neo@src.gnome.org>2009-02-18 17:39:31 +0000
commitf8ad6207ce66858250fe55eb27a141dc089551ba (patch)
treed57b4f61b2204625d9ff8a4301fa3b492a045233
parent9d4106324b79b38e4d20f2b4bdbdc1b029fad267 (diff)
downloadgtk+-f8ad6207ce66858250fe55eb27a141dc089551ba.tar.gz
Merged from trunk:
2009-02-18 Sven Neumann <sven@gimp.org> Merged from trunk: * configure.in: depend on DirectFB >= 1.0.0. There's no point in using an earlier development version. svn path=/branches/gtk-2-14/; revision=22360
-rw-r--r--ChangeLog7
-rw-r--r--configure.in2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 24ad517edd..bdd536a47b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,13 @@
Merged from trunk:
+ * configure.in: depend on DirectFB >= 1.0.0. There's no point in
+ using an earlier development version.
+
+2009-02-18 Sven Neumann <sven@gimp.org>
+
+ Merged from trunk:
+
Bug 554407 – directfb backend does not implement GdkWindowImpl
* gdk/directfb/gdkgeometry-directfb.c
diff --git a/configure.in b/configure.in
index c109e87089..969db2d12b 100644
--- a/configure.in
+++ b/configure.in
@@ -1619,7 +1619,7 @@ AC_SUBST(GDK_PIXBUF_XLIB_DEP_LIBS)
AC_SUBST(GDK_PIXBUF_XLIB_DEP_CFLAGS)
if test "x$gdktarget" = "xdirectfb"; then
- DIRECTFB_REQUIRED_VERSION=0.9.24
+ DIRECTFB_REQUIRED_VERSION=1.0.0
AC_MSG_CHECKING(for DirectFB)
if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb && $PKG_CONFIG --exists cairo-directfb ; then