[Qemu-devel] [PULL 0/2] Fix pixman build failure.

[Qemu-devel] [PULL 0/2] Fix pixman build failure.

[Gerd Hoffmann]

  Hi,

Here comes the pixman upgrade to fix the recent build failures.

please pull,
  Gerd

The following changes since commit 0dfa7e30126364c434a48cb37a1a41119e536c2a:

  Merge remote-tracking branch 'remotes/kraxel/tags/pull-console-20140905-2' into staging (2014-09-11 11:44:17 +0100)

are available in the git repository at:


  git://git.kraxel.org/qemu tags/pull-console-20140915-1

for you to fetch changes up to 236f282c1c7bb41b0ec3b3d771ca652eb85ed81f:

  configure: check for pixman-1 version (2014-09-15 08:14:19 +0200)

----------------------------------------------------------------
Fix pixman build failure.

----------------------------------------------------------------
Hu Tao (2):
      pixman: update internal copy to pixman-0.32.6
      configure: check for pixman-1 version

 configure | 5 +++--
 pixman    | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

[Qemu-devel] [PULL 1/2] pixman: update internal copy to pixman-0.32.6

[Gerd Hoffmann]

From: Hu Tao <hutao@cn.fujitsu.com>

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 <hutao@cn.fujitsu.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 pixman | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pixman b/pixman
index 97336fa..87eea99 160000
--- a/pixman
+++ b/pixman
@@ -1 +1 @@
-Subproject commit 97336fad32acf802003855cd8bd6477fa49a12e3
+Subproject commit 87eea99e443b389c978cf37efc52788bf03a0ee0
-- 
1.8.3.1

[Qemu-devel] [PULL 2/2] configure: check for pixman-1 version

[Gerd Hoffmann]

From: Hu Tao <hutao@cn.fujitsu.com>

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 <hutao@cn.fujitsu.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 configure | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 961bf6f..1a9daa5 100755
--- a/configure
+++ b/configure
@@ -2737,7 +2737,7 @@ fi
 if test "$pixman" = ""; then
   if test "$want_tools" = "no" -a "$softmmu" = "no"; then
     pixman="none"
-  elif $pkg_config pixman-1 > /dev/null 2>&1; then
+  elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; then
     pixman="system"
   else
     pixman="internal"
@@ -2753,11 +2753,12 @@ if test "$pixman" = "none"; then
   pixman_cflags=
   pixman_libs=
 elif test "$pixman" = "system"; then
+  # pixman version has been checked above
   pixman_cflags=`$pkg_config --cflags pixman-1`
   pixman_libs=`$pkg_config --libs pixman-1`
 else
   if test ! -d ${source_path}/pixman/pixman; then
-    error_exit "pixman not present. Your options:" \
+    error_exit "pixman >= 0.21.8 not present. Your options:" \
         "  (1) Preferred: Install the pixman devel package (any recent" \
         "      distro should have packages as Xorg needs pixman too)." \
         "  (2) Fetch the pixman submodule, using:" \
-- 
1.8.3.1

Re: [Qemu-devel] [PULL 0/2] Fix pixman build failure.

[Peter Maydell]

On 14 September 2014 23:23, Gerd Hoffmann <kraxel@redhat.com> wrote:
>   Hi,
>
> Here comes the pixman upgrade to fix the recent build failures.
>
> please pull,
>   Gerd
>
> The following changes since commit 0dfa7e30126364c434a48cb37a1a41119e536c2a:
>
>   Merge remote-tracking branch 'remotes/kraxel/tags/pull-console-20140905-2' into staging (2014-09-11 11:44:17 +0100)
>
> are available in the git repository at:
>
>
>   git://git.kraxel.org/qemu tags/pull-console-20140915-1
>
> for you to fetch changes up to 236f282c1c7bb41b0ec3b3d771ca652eb85ed81f:
>
>   configure: check for pixman-1 version (2014-09-15 08:14:19 +0200)
>
> ----------------------------------------------------------------
> Fix pixman build failure.
>
> ----------------------------------------------------------------
> Hu Tao (2):
>       pixman: update internal copy to pixman-0.32.6
>       configure: check for pixman-1 version
>
>  configure | 5 +++--
>  pixman    | 2 +-
>  2 files changed, 4 insertions(+), 3 deletions(-)
>


Applied, thanks.

-- PMM