diff --git a/configure.ac b/configure.ac index 28a47493..9aadc73e 100644 --- a/configure.ac +++ b/configure.ac @@ -447,6 +447,7 @@ fi PKG_CHECK_MODULES(XORG, [xorg-server >= $required_xorg_server_version xproto fontsproto pixman-1 >= $required_pixman_version $REQUIRED_MODULES]) ABI_VERSION=`$PKG_CONFIG --variable=abi_videodrv xorg-server` XSERVER_VERSION=`$PKG_CONFIG --modversion xorg-server` +PIXMAN_VERSION=`$PKG_CONFIG --modversion pixman-1` if test "x$ONLY_UMS" = "xyes"; then UMS="yes" @@ -914,6 +915,7 @@ fi echo "" echo "AC_PACKAGE_STRING will be compiled with:" echo " Xorg Video ABI version: $ABI_VERSION (xorg-server-$XSERVER_VERSION)" +echo " pixman version: pixman-1-$PIXMAN_VERSION" echo " Acceleration backends:$accel_msg" echo " Additional debugging support?$debug_msg" echo " Support for Kernel Mode Setting? $KMS" diff --git a/src/sna/blt.c b/src/sna/blt.c index c534f754..9df7b2bc 100644 --- a/src/sna/blt.c +++ b/src/sna/blt.c @@ -30,6 +30,7 @@ #endif #include "sna.h" +#include #if __x86_64__ #define USE_SSE2 1 @@ -1400,7 +1401,7 @@ affine_blt(const void *src, void *dst, int bpp, for (j = 0; j < dst_height; j++) { pixman_fixed_t x, y; - pixman_f_vector_t v; + struct pixman_f_vector v; uint32_t *b; /* reference point is the center of the pixel */