summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-06-17 22:37:49 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-23 14:26:15 +0100
commit313ae0a7693e14c2497227cd8acc6b473bd88421 (patch)
treefa5944e020c61c3c32d6b243266c2963f5df8a0d /meta
parentd8afd0c9f2fc302aa6c3e88e452806d51b23e3cd (diff)
downloadpoky-313ae0a7693e14c2497227cd8acc6b473bd88421.tar.gz
qemu: Use Gtk+3, add configure patch to find vte
(From OE-Core rev: 0474412a1d2b6b8a35931bb03fa58e31a48133e1) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc2
-rw-r--r--meta/recipes-devtools/qemu/qemu/0001-configure-support-vte-2.91.patch79
-rw-r--r--meta/recipes-devtools/qemu/qemu_2.6.0.bb1
3 files changed, 81 insertions, 1 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index d5925fd575..44e6744f5e 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -119,7 +119,7 @@ PACKAGECONFIG[libcurl] = "--enable-curl,--disable-curl,libcurl,"
119PACKAGECONFIG[nss] = "--enable-smartcard,--disable-smartcard,nss," 119PACKAGECONFIG[nss] = "--enable-smartcard,--disable-smartcard,nss,"
120PACKAGECONFIG[uuid] = "--enable-uuid,--disable-uuid,util-linux," 120PACKAGECONFIG[uuid] = "--enable-uuid,--disable-uuid,util-linux,"
121PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses," 121PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses,"
122PACKAGECONFIG[gtk+] = "--enable-gtk --enable-vte,--disable-gtk --disable-vte,gtk+ libvte," 122PACKAGECONFIG[gtk+] = "--enable-gtk --with-gtkabi=3.0 --enable-vte,--disable-gtk --disable-vte,gtk+3 vte"
123PACKAGECONFIG[libcap-ng] = "--enable-cap-ng,--disable-cap-ng,libcap-ng," 123PACKAGECONFIG[libcap-ng] = "--enable-cap-ng,--disable-cap-ng,libcap-ng,"
124PACKAGECONFIG[ssh2] = "--enable-libssh2,--disable-libssh2,libssh2," 124PACKAGECONFIG[ssh2] = "--enable-libssh2,--disable-libssh2,libssh2,"
125PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,gcrypt," 125PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,gcrypt,"
diff --git a/meta/recipes-devtools/qemu/qemu/0001-configure-support-vte-2.91.patch b/meta/recipes-devtools/qemu/qemu/0001-configure-support-vte-2.91.patch
new file mode 100644
index 0000000000..af0df3b1ab
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/0001-configure-support-vte-2.91.patch
@@ -0,0 +1,79 @@
1From f40a8ceaaf0ee37fcfeb6900960632d7a7085a9f Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Fri, 17 Jun 2016 21:09:03 +0300
4Subject: [PATCH] configure: support vte-2.91
5
6Upstream-status: Backport [c6feff9e09aa99]
7Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
8
9Original commit message below:
10
11From: Cole Robinson <crobinso@redhat.com>
12Date: Fri, 6 May 2016 14:03:12 -0400
13Subject: [PATCH] configure: support vte-2.91
14
15vte >= 0.37 expores API version 2.91, which is where all the active
16development is. qemu builds and runs fine with that version, so use it
17if it's available.
18
19Signed-off-by: Cole Robinson <crobinso@redhat.com>
20Message-id: b4f0375647f7b368d3dbd3834aee58cb0253566a.1462557436.git.crobinso@redhat.com
21Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
22---
23 configure | 17 +++++++++++------
24 1 file changed, 11 insertions(+), 6 deletions(-)
25
26diff --git a/configure b/configure
27index 54a3189..a16fa2b 100755
28--- a/configure
29+++ b/configure
30@@ -2394,20 +2394,25 @@ fi
31
32 if test "$vte" != "no"; then
33 if test "$gtkabi" = "3.0"; then
34- vtepackage="vte-2.90"
35- vteversion="0.32.0"
36+ vteminversion="0.32.0"
37+ if $pkg_config --exists "vte-2.91"; then
38+ vtepackage="vte-2.91"
39+ else
40+ vtepackage="vte-2.90"
41+ fi
42 else
43 vtepackage="vte"
44- vteversion="0.24.0"
45+ vteminversion="0.24.0"
46 fi
47- if $pkg_config --exists "$vtepackage >= $vteversion"; then
48+ if $pkg_config --exists "$vtepackage >= $vteminversion"; then
49 vte_cflags=`$pkg_config --cflags $vtepackage`
50 vte_libs=`$pkg_config --libs $vtepackage`
51+ vteversion=`$pkg_config --modversion $vtepackage`
52 libs_softmmu="$vte_libs $libs_softmmu"
53 vte="yes"
54 elif test "$vte" = "yes"; then
55 if test "$gtkabi" = "3.0"; then
56- feature_not_found "vte" "Install libvte-2.90 devel"
57+ feature_not_found "vte" "Install libvte-2.90/2.91 devel"
58 else
59 feature_not_found "vte" "Install libvte devel"
60 fi
61@@ -4759,6 +4764,7 @@ echo "pixman $pixman"
62 echo "SDL support $sdl"
63 echo "GTK support $gtk"
64 echo "GTK GL support $gtk_gl"
65+echo "VTE support $vte `echo_version $vte $vteversion`"
66 echo "GNUTLS support $gnutls"
67 echo "GNUTLS hash $gnutls_hash"
68 echo "GNUTLS rnd $gnutls_rnd"
69@@ -4771,7 +4777,6 @@ else
70 fi
71 echo "nettle kdf $nettle_kdf"
72 echo "libtasn1 $tasn1"
73-echo "VTE support $vte"
74 echo "curses support $curses"
75 echo "virgl support $virglrenderer"
76 echo "curl support $curl"
77--
782.1.4
79
diff --git a/meta/recipes-devtools/qemu/qemu_2.6.0.bb b/meta/recipes-devtools/qemu/qemu_2.6.0.bb
index 735d013e3b..c4a04359a7 100644
--- a/meta/recipes-devtools/qemu/qemu_2.6.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_2.6.0.bb
@@ -9,6 +9,7 @@ SRC_URI += "file://configure-fix-Darwin-target-detection.patch \
9 file://no-valgrind.patch \ 9 file://no-valgrind.patch \
10 file://pathlimit.patch \ 10 file://pathlimit.patch \
11 file://qemu-2.5.0-cflags.patch \ 11 file://qemu-2.5.0-cflags.patch \
12 file://0001-configure-support-vte-2.91.patch \
12" 13"
13 14
14SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2" 15SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2"