xserver: Branch 'master' - 2 commits

[Fredrik Höglund]

 configure.ac    |    4 ++--
 render/render.c |    2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 81b64f668541217c1c9518ac4a7e3fdf0a6e4002
Author: Fredrik Höglund <fredrik at kde.org>
Date:   Wed Jul 15 00:38:01 2009 +0200

    Require renderproto >= 0.11 and pixman-1 >= 0.15.14 for the new blend modes.

diff --git a/configure.ac b/configure.ac
index be39c76..43288c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -704,8 +704,8 @@ XEXT_LIB='$(top_builddir)/Xext/libXext.la'
 XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
 
 dnl Core modules for most extensions, et al.
-REQUIRED_MODULES="[randrproto >= 1.2.99.3] [renderproto >= 0.9.3] [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto [xextproto >= 7.0.3] [xproto >= 7.0.13] [xtrans >= 1.2.2] bigreqsproto resourceproto fontsproto [inputproto >= 1.9.99.13] [kbproto >= 1.0.3]"
-REQUIRED_LIBS="xfont xau fontenc [pixman-1 >= 0.15.12]"
+REQUIRED_MODULES="[randrproto >= 1.2.99.3] [renderproto >= 0.11] [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto [xextproto >= 7.0.3] [xproto >= 7.0.13] [xtrans >= 1.2.2] bigreqsproto resourceproto fontsproto [inputproto >= 1.9.99.13] [kbproto >= 1.0.3]"
+REQUIRED_LIBS="xfont xau fontenc [pixman-1 >= 0.15.14]"
 
 dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas
 dnl CONFIG_DBUS_API is true if we want to enable the D-Bus config
commit 0ce42adbf4cff9e7f049d9fc79d588ece5936177
Author: Fredrik Höglund <fredrik at kde.org>
Date:   Wed Jul 15 00:37:05 2009 +0200

    Render: Add support for the PDF blend mode operators.

diff --git a/render/render.c b/render/render.c
index 0e850e3..995ebd9 100644
--- a/render/render.c
+++ b/render/render.c
@@ -681,6 +681,8 @@ PictOpValid (CARD8 op)
 	return TRUE;
     if (PictOpConjointMinimum <= op && op <= PictOpConjointMaximum)
 	return TRUE;
+    if (PictOpBlendMinimum <= op && op <= PictOpBlendMaximum)
+	return TRUE;
     return FALSE;
 }