xf86-video-intel: 2 commits - configure.ac NEWS src/compat-api.h src/sna/fb

[Chris Wilson]

 NEWS                |    7 +++++++
 configure.ac        |    2 +-
 src/compat-api.h    |    2 ++
 src/sna/fb/fbpict.c |    5 +----
 src/sna/fb/fbpict.h |   20 +++++++++++++-------
 5 files changed, 24 insertions(+), 12 deletions(-)

New commits:
commit 65c320e677b8ab4d745568b33f381d5865bf8b73
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Feb 10 14:20:59 2013 +0000

    2.21.2 release

diff --git a/NEWS b/NEWS
index 518e30f..e19d657 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+Release 2.21.2 (2013-02-10)
+===========================
+Pass the brown paper bags, I need half a dozen or so. That seemingly
+innocuous build fix with xorg-1.13 happned to have the little side-effect
+of breaking glyph rendering with xorg-1.12 and older on 64-bit machines.
+
+
 Release 2.21.1 (2013-02-10)
 ===========================
 A fix for a potential GPU hang on 945gm (GMA3100) and earlier chipsets,
diff --git a/configure.ac b/configure.ac
index 971bd6f..3a4b6db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-intel],
-        [2.21.1],
+        [2.21.2],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         [xf86-video-intel])
 AC_CONFIG_SRCDIR([Makefile.am])
commit 0d75b19979b1ac14353765e2bb84c6a466129109
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Feb 10 15:47:53 2013 +0000

    sna: Restore glyphs with xorg-1.12
    
    That simple and innocuous build fix for xorg-1.13 bizarrely causes
    missing glyphs with earlier Xorgs.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/compat-api.h b/src/compat-api.h
index 2a912e5..6d147c7 100644
--- a/src/compat-api.h
+++ b/src/compat-api.h
@@ -28,8 +28,10 @@
 #ifndef COMPAT_API_H
 #define COMPAT_API_H
 
+#include <xorg-server.h>
 #include <xorgVersion.h>
 
+#include <picturestr.h>
 #ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR
 #define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum]
 #define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p
diff --git a/src/sna/fb/fbpict.c b/src/sna/fb/fbpict.c
index 27bed14..906a5f3 100644
--- a/src/sna/fb/fbpict.c
+++ b/src/sna/fb/fbpict.c
@@ -25,11 +25,8 @@
 
 #include <string.h>
 
-#include <picturestr.h>
-#include <mipict.h>
-#include <fbpict.h>
-
 #include "fb.h"
+#include "fbpict.h"
 
 static void
 SourceValidateOnePicture(PicturePtr picture)
diff --git a/src/sna/fb/fbpict.h b/src/sna/fb/fbpict.h
index 1ce09df..5601385 100644
--- a/src/sna/fb/fbpict.h
+++ b/src/sna/fb/fbpict.h
@@ -24,17 +24,23 @@
 #ifndef FBPICT_H
 #define FBPICT_H
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <picturestr.h>
+
 #include "sfb.h"
 
 extern void
 fbComposite(CARD8 op,
-            PicturePtr pSrc,
-            PicturePtr pMask,
-            PicturePtr pDst,
-            INT16 xSrc,
-            INT16 ySrc,
-            INT16 xMask,
-            INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width, CARD16 height);
+	    PicturePtr pSrc,
+	    PicturePtr pMask,
+	    PicturePtr pDst,
+	    INT16 xSrc, INT16 ySrc,
+	    INT16 xMask, INT16 yMask,
+	    INT16 xDst, INT16 yDst,
+	    CARD16 width, CARD16 height);
 
 extern pixman_image_t *image_from_pict(PicturePtr pict,
 				       Bool has_clip,