07d2889ef8
Update to v2.6.1 stable release. OBS-URL: https://build.opensuse.org/request/show/419833 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=311
71 lines
2.5 KiB
Diff
71 lines
2.5 KiB
Diff
From eeb106a711b51266bf05f3895e01575357414ec6 Mon Sep 17 00:00:00 2001
|
|
From: Cole Robinson <crobinso@redhat.com>
|
|
Date: Fri, 6 May 2016 14:03:12 -0400
|
|
Subject: [PATCH] configure: support vte-2.91
|
|
|
|
vte >= 0.37 expores API version 2.91, which is where all the active
|
|
development is. qemu builds and runs fine with that version, so use it
|
|
if it's available.
|
|
|
|
Signed-off-by: Cole Robinson <crobinso@redhat.com>
|
|
Message-id: b4f0375647f7b368d3dbd3834aee58cb0253566a.1462557436.git.crobinso@redhat.com
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
(cherry picked from commit c6feff9e09aa999b77a37f532adbb89682ecb1b6)
|
|
[BR: BSC#988855]
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
configure | 17 +++++++++++------
|
|
1 file changed, 11 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/configure b/configure
|
|
index 51dc704..8f1948c 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -2396,20 +2396,25 @@ fi
|
|
|
|
if test "$vte" != "no"; then
|
|
if test "$gtkabi" = "3.0"; then
|
|
- vtepackage="vte-2.90"
|
|
- vteversion="0.32.0"
|
|
+ vteminversion="0.32.0"
|
|
+ if $pkg_config --exists "vte-2.91"; then
|
|
+ vtepackage="vte-2.91"
|
|
+ else
|
|
+ vtepackage="vte-2.90"
|
|
+ fi
|
|
else
|
|
vtepackage="vte"
|
|
- vteversion="0.24.0"
|
|
+ vteminversion="0.24.0"
|
|
fi
|
|
- if $pkg_config --exists "$vtepackage >= $vteversion"; then
|
|
+ if $pkg_config --exists "$vtepackage >= $vteminversion"; then
|
|
vte_cflags=`$pkg_config --cflags $vtepackage`
|
|
vte_libs=`$pkg_config --libs $vtepackage`
|
|
+ vteversion=`$pkg_config --modversion $vtepackage`
|
|
libs_softmmu="$vte_libs $libs_softmmu"
|
|
vte="yes"
|
|
elif test "$vte" = "yes"; then
|
|
if test "$gtkabi" = "3.0"; then
|
|
- feature_not_found "vte" "Install libvte-2.90 devel"
|
|
+ feature_not_found "vte" "Install libvte-2.90/2.91 devel"
|
|
else
|
|
feature_not_found "vte" "Install libvte devel"
|
|
fi
|
|
@@ -4807,6 +4812,7 @@ echo "pixman $pixman"
|
|
echo "SDL support $sdl"
|
|
echo "GTK support $gtk"
|
|
echo "GTK GL support $gtk_gl"
|
|
+echo "VTE support $vte `echo_version $vte $vteversion`"
|
|
echo "GNUTLS support $gnutls"
|
|
echo "GNUTLS hash $gnutls_hash"
|
|
echo "GNUTLS rnd $gnutls_rnd"
|
|
@@ -4815,7 +4821,6 @@ echo "libgcrypt kdf $gcrypt_kdf"
|
|
echo "nettle $nettle `echo_version $nettle $nettle_version`"
|
|
echo "nettle kdf $nettle_kdf"
|
|
echo "libtasn1 $tasn1"
|
|
-echo "VTE support $vte"
|
|
echo "curses support $curses"
|
|
echo "virgl support $virglrenderer"
|
|
echo "curl support $curl"
|