fix building failure with pixman
v2 cover fix building failure with pixman
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 series fixes this problem, also bumps pixman to pixman-0.32.6.
changes to v1:
- bump pixman to pixman-0.32.6
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(-)
Signature · 1 line
1.9.3
PATCH v2 1/2 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.
--- pixman | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
pixman +1 -1
@@ -1 +1 @@ -Subproject commit 97336fad32acf802003855cd8bd6477fa49a12e3 +Subproject commit 87eea99e443b389c978cf37efc52788bf03a0ee0
Signature · 1 line
1.9.3
Re: [Qemu-devel] [PATCH v2 1/2] pixman: update internal copy to pixman-0.32.6
Quoted 3 lines · Hu Tao
commit
a93a3af9introduces use ofPIXMAN_TYPE_RGBA, but it's only available in pixman >= 0.21.8. Although commitf27b2e1dbumped pixman to pixman-0.28.2, but the change was reverted later by7b1b5d19.
Ah, so my memory wasn't totally wrong, the update got reverted (apparently by mistake). Thanks for the patches, I'll go prepare a pull request.
cheers,
Gerd
PATCH v2 2/2 configure: check for pixman-1 version
In reply to Hu Taocommit 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.
--- configure | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
configure +3 -2
@@ -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:" \
Signature · 1 line
1.9.3