Merge remote-tracking branch 'kraxel/pixman.v5' into staging

* kraxel/pixman.v5:
  pixman: cleanup properly on make distclean
  pixman: add licensing info
  pixman: build internal version early
  pixman: pass cflags, add -fPIC
  pixman: disable gtk
  pixman: set --host for cross builds
  pixman: add output dir to include path

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --combined qemu-pixman.c
index 71a9ea4,063b52d..ac7bc01
--- 1/qemu-pixman.c
--- 2/qemu-pixman.c
+++ b/qemu-pixman.c
@@@ -1,3 -1,8 +1,8 @@@
+ /*
+  * This work is licensed under the terms of the GNU GPL, version 2 or later.
+  * See the COPYING file in the top-level directory.
+  */
+ 
  #include "qemu-pixman.h"
  
  int qemu_pixman_get_type(int rshift, int gshift, int bshift)
@@@ -51,19 -56,6 +56,19 @@@ void qemu_pixman_linebuf_fill(pixman_im
                             0, y, 0, 0, 0, 0, width, 1);
  }
  
 +pixman_image_t *qemu_pixman_mirror_create(pixman_format_code_t format,
 +                                          pixman_image_t *image)
 +{
 +    pixman_image_t *mirror;
 +
 +    mirror = pixman_image_create_bits(format,
 +                                      pixman_image_get_width(image),
 +                                      pixman_image_get_height(image),
 +                                      NULL,
 +                                      pixman_image_get_stride(image));
 +    return mirror;
 +}
 +
  void qemu_pixman_image_unref(pixman_image_t *image)
  {
      if (image == NULL) {

diff --combined qemu-pixman.h
index e267d73,783a392..bee55eb
--- 1/qemu-pixman.h
--- 2/qemu-pixman.h
+++ b/qemu-pixman.h
@@@ -1,3 -1,8 +1,8 @@@
+ /*
+  * This work is licensed under the terms of the GNU GPL, version 2 or later.
+  * See the COPYING file in the top-level directory.
+  */
+ 
  #ifndef QEMU_PIXMAN_H
  #define QEMU_PIXMAN_H
  
@@@ -27,8 -32,6 +32,8 @@@ pixman_image_t *qemu_pixman_linebuf_cre
                                             int width);
  void qemu_pixman_linebuf_fill(pixman_image_t *linebuf, pixman_image_t *fb,
                                int width, int y);
 +pixman_image_t *qemu_pixman_mirror_create(pixman_format_code_t format,
 +                                          pixman_image_t *image);
  void qemu_pixman_image_unref(pixman_image_t *image);
  
  #endif /* QEMU_PIXMAN_H */