[Qemu-commits] [qemu/qemu] 122abb: pixman: update internal copy to pixman-0.32.6

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 122abbe5fca8104d71d92a4dd850a14420f9373c
      
https://github.com/qemu/qemu/commit/122abbe5fca8104d71d92a4dd850a14420f9373c
  Author: Hu Tao <address@hidden>
  Date:   2014-09-15 (Mon, 15 Sep 2014)

  Changed paths:
    M pixman

  Log Message:
  -----------
  pixman: update internal copy to pixman-0.32.6

commit a93a3af9 introduces use of PIXMAN_TYPE_RGBA, but it's only available
in pixman >= 0.21.8. Although commit f27b2e1d bumped pixman to pixman-0.28.2,
but the change was reverted later by 7b1b5d19.

This patch updates internal copy of pixman to pixman-0.32.6 to fix the
problem.

Signed-off-by: Hu Tao <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 236f282c1c7bb41b0ec3b3d771ca652eb85ed81f
      
https://github.com/qemu/qemu/commit/236f282c1c7bb41b0ec3b3d771ca652eb85ed81f
  Author: Hu Tao <address@hidden>
  Date:   2014-09-15 (Mon, 15 Sep 2014)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: check for pixman-1 version

commit a93a3af9 introduces use of PIXMAN_TYPE_RGBA, but it's only available
in pixman >= 0.21.8. If pixman doesn't meet the version requirement, qemu
will fail to build with following message:

qemu/ui/qemu-pixman.c: In function ‘qemu_pixelformat_from_pixman’:
qemu/ui/qemu-pixman.c:42: error: ‘PIXMAN_TYPE_RGBA’ undeclared (first use in 
this function)
qemu/ui/qemu-pixman.c:42: error: (Each undeclared identifier is reported only 
once
qemu/ui/qemu-pixman.c:42: error: for each function it appears in.)

This patch fixes the problem by checking the pixman version.

Signed-off-by: Hu Tao <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 16ab5046c4a607dddabc8086d4454293af59fc9f
      
https://github.com/qemu/qemu/commit/16ab5046c4a607dddabc8086d4454293af59fc9f
  Author: Peter Maydell <address@hidden>
  Date:   2014-09-15 (Mon, 15 Sep 2014)

  Changed paths:
    M configure
    M pixman

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/kraxel/tags/pull-console-20140915-1' 
into staging

Fix pixman build failure.

# gpg: Signature made Mon 15 Sep 2014 07:15:11 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <address@hidden>"
# gpg:                 aka "Gerd Hoffmann <address@hidden>"
# gpg:                 aka "Gerd Hoffmann (private) <address@hidden>"

* remotes/kraxel/tags/pull-console-20140915-1:
  configure: check for pixman-1 version
  pixman: update internal copy to pixman-0.32.6

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/2b31cd4e0813...16ab5046c4a6