From b73c544c61712f7bd57f3c9a0f6046481f58038b Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Tue, 12 Nov 2013 08:07:50 +0100
Subject: pixman mesa fontconfig git update 12 nov 2013

pixman           commit 741007311087be8a711cc9c76ec00e59a156c850
fontconfig       commit 38acb08d9778ebad2bfc3407532adf8f2e8e667e
mesa             commit 594fa4a208b138b0b9b24cc8de62e6681ebb8d21
---
 pixman/configure.ac       | 4 ++--
 pixman/demos/Makefile.am  | 4 ++--
 pixman/test/thread-test.c | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'pixman')

diff --git a/pixman/configure.ac b/pixman/configure.ac
index 5e512be8e..5910fbb4b 100644
--- a/pixman/configure.ac
+++ b/pixman/configure.ac
@@ -53,8 +53,8 @@ AC_PREREQ([2.57])
 #
 
 m4_define([pixman_major], 0)
-m4_define([pixman_minor], 31)
-m4_define([pixman_micro], 3)
+m4_define([pixman_minor], 33)
+m4_define([pixman_micro], 1)
 
 m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
 
diff --git a/pixman/demos/Makefile.am b/pixman/demos/Makefile.am
index 9be9ab670..e04743d7f 100644
--- a/pixman/demos/Makefile.am
+++ b/pixman/demos/Makefile.am
@@ -1,3 +1,5 @@
+EXTRA_DIST = parrot.c parrot.jpg scale.ui
+
 if HAVE_GTK
 
 AM_CFLAGS = $(OPENMP_CFLAGS)
@@ -28,8 +30,6 @@ DEMOS =				\
 	srgb-test		\
 	scale
 
-EXTRA_DIST = parrot.c parrot.jpg scale.ui
-
 gradient_test_SOURCES = gradient-test.c $(GTK_UTILS)
 alpha_test_SOURCES = alpha-test.c $(GTK_UTILS)
 composite_test_SOURCES = composite-test.c $(GTK_UTILS)
diff --git a/pixman/test/thread-test.c b/pixman/test/thread-test.c
index fa2193302..0b07b269d 100644
--- a/pixman/test/thread-test.c
+++ b/pixman/test/thread-test.c
@@ -1,4 +1,4 @@
-#include <config.h>
+#include "utils.h"
 
 #ifndef HAVE_PTHREADS
 
@@ -12,7 +12,6 @@ int main ()
 
 #include <stdlib.h>
 #include <pthread.h>
-#include "utils.h"
 
 typedef struct
 {
-- 
cgit v1.2.3