haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix pixman build failure.

Browse source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJUFoPvAAoJEEy22O7T6HE4yLEP/0HecguJwlOkcOEhsKj69/h3
 vJtUxYLyO2uC6fS/Ep8MGeGGOgbEcuB5QJNhcPoqNPT9JYaDeosJv9d8+9qFaROb
 hnUHnkKZ7iztfglZeuVFZxpXcLFrObG5+G4wCh2wQvgrkYDfXBahFiKNxmIsg+54
 ovV6KaL/nVwcxMWmKu27X3InAAUjEVlirQCCgDu8hqORD1xUw+UlpK/BywPVIGG0
 6pvi7tCnmxvFkFOVxp3R2CRVTbmzRLArOptVaatFpHujInPAVC0Xtf5o+kILFDLc
 7MioHsXfSvhhatFX268L2+IIfw/G2vSAZWCYAPI6vsJuRBRkpAOWarY0wSdHC/i1
 PxVMg766JUL+oiIbOImFM2rvDWHzHotT3Z8wBisEkggcXmCBHz3DGU1P6H7a0m2Z
 NojAIiym4MWDwKSq8AQYvLe4nWdJcqMKgJuR8JnoZeZq4LgEzOwyg2WKEAMB9o/b
 9/NUyVY8uB7NhsBg3+mr3oawRUnEQRg+QuqbHqLj6C+oYFo+c43F5oyERQdKluRX
 Px6nZ8ejwtleTqZ0AVdRMjcT9BKZCC4maTqzHC5eyBrQJq4T0mVu/XNHHlIsAl2y
 v30AQ24DooxoBnYdliML1BNsq5tuatyaIuenav6hDrEFBtwfMPymxPs5T1WGpMMt
 LM/h1x2yLQ1wrR0+ij0E
 =2/Ns
 -----END PGP SIGNATURE-----

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) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* 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 <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2014-09-15 16:42:28 +01:00
parent 2b31cd4e08 236f282c1c
commit 16ab5046c4
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
configure vendored
View file

@ -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:" \

2
pixman

@ -1 +1 @@
Subproject commit 97336fad32acf802003855cd8bd6477fa49a12e3
Subproject commit 87eea99e443b389c978cf37efc52788bf03a0ee0