[PATCH 0/2] Fixes for qemu, gtk+3

Openembedded Core Discussions
 help / color / mirror / Atom feed

* [PATCH 0/2] Fixes for qemu, gtk+3
@ 2016-06-17 19:37 Jussi Kukkonen
  2016-06-17 19:37 ` [PATCH 1/2] gtk+3: Make sure gdkx.h is updated Jussi Kukkonen
  2016-06-17 19:37 ` [PATCH 2/2] qemu: Use Gtk+3, add configure patch to find vte Jussi Kukkonen
  0 siblings, 2 replies; 4+ messages in thread
From: Jussi Kukkonen @ 2016-06-17 19:37 UTC (permalink / raw)
  To: Openembedded-core

Qemu has a non-default PACKAGECONFIG "gtk+", the patch updates that
to work with gtk+3. Also included is a fix for the first bug I
already found in the gtk+3 "--disable-opengl" patch.

Have good weekend,
 Jussi


The following changes since commit 7b9e1f5ad8a427356f2ec516b1718138a7d3c64e:

  cmake.bbclass: set the modules directory correctly (2016-06-17 17:14:55 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib jku/qemu-vte
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/qemu-vte

Jussi Kukkonen (2):
  gtk+3: Make sure gdkx.h is updated
  qemu: Use Gtk+3, add configure patch to find vte

 meta/recipes-devtools/qemu/qemu.inc                |  2 +-
 .../qemu/0001-configure-support-vte-2.91.patch     | 79 ++++++++++++++++++++++
 meta/recipes-devtools/qemu/qemu_2.6.0.bb           |  1 +
 .../0001-Add-disable-opengl-configure-option.patch | 19 +++---
 4 files changed, 91 insertions(+), 10 deletions(-)
 create mode 100644 meta/recipes-devtools/qemu/qemu/0001-configure-support-vte-2.91.patch

-- 
2.1.4



^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH 1/2] gtk+3: Make sure gdkx.h is updated
  2016-06-17 19:37 [PATCH 0/2] Fixes for qemu, gtk+3 Jussi Kukkonen
@ 2016-06-17 19:37 ` Jussi Kukkonen
  2016-06-22 11:19   ` Jussi Kukkonen
  2016-06-17 19:37 ` [PATCH 2/2] qemu: Use Gtk+3, add configure patch to find vte Jussi Kukkonen
  1 sibling, 1 reply; 4+ messages in thread
From: Jussi Kukkonen @ 2016-06-17 19:37 UTC (permalink / raw)
  To: Openembedded-core

Always run the Makefile rule that modifies gdkx.h (for opengl
disabling), but only do the modification if the file is not
correct already.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../0001-Add-disable-opengl-configure-option.patch    | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/meta/recipes-gnome/gtk+/gtk+3/0001-Add-disable-opengl-configure-option.patch b/meta/recipes-gnome/gtk+/gtk+3/0001-Add-disable-opengl-configure-option.patch
index a963334..2306614 100644
--- a/meta/recipes-gnome/gtk+/gtk+3/0001-Add-disable-opengl-configure-option.patch
+++ b/meta/recipes-gnome/gtk+/gtk+3/0001-Add-disable-opengl-configure-option.patch
@@ -1,4 +1,4 @@
-From c77afa19881d955d759879aeae8bbd88613dd4fe Mon Sep 17 00:00:00 2001
+From 91814d22387370e47384206e67729a26a5729192 Mon Sep 17 00:00:00 2001
 From: Jussi Kukkonen <jussi.kukkonen@intel.com>
 Date: Thu, 16 Jun 2016 15:11:34 +0300
 Subject: [PATCH] Add --disable-opengl configure option
@@ -28,7 +28,7 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
  gdk/gdkgl.c                       | 10 +++++++
  gdk/gdkglcontext.c                |  6 ++++
  gdk/gdkwindow.c                   | 14 +++++++++-
- gdk/x11/Makefile.am               | 28 ++++++++++++++++---
+ gdk/x11/Makefile.am               | 29 ++++++++++++++++---
  gdk/x11/gdkdisplay-x11.c          |  6 ++--
  gdk/x11/gdkscreen-x11.c           |  5 ++++
  gdk/x11/gdkwindow-x11.c           |  4 +++
@@ -41,7 +41,7 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
  gtk/inspector/general.c           |  6 ++++
  tests/Makefile.am                 | 10 +++++--
  testsuite/gtk/objects-finalize.c  |  2 ++
- 21 files changed, 257 insertions(+), 78 deletions(-)
+ 21 files changed, 258 insertions(+), 78 deletions(-)
  create mode 100644 gdk/x11/gdkx-with-gl-context.h
  create mode 100644 gdk/x11/gdkx-without-gl-context.h
  delete mode 100644 gdk/x11/gdkx.h
@@ -412,7 +412,7 @@ index c34c113..3025e96 100644
            cairo_region_destroy (opaque_region);
  
 diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
-index c488a31..d0aa7ce 100644
+index c488a31..576f8e1 100644
 --- a/gdk/x11/Makefile.am
 +++ b/gdk/x11/Makefile.am
 @@ -39,8 +39,6 @@ libgdk_x11_la_SOURCES = 	\
@@ -424,7 +424,7 @@ index c488a31..d0aa7ce 100644
  	gdkkeys-x11.c		\
  	gdkmain-x11.c		\
  	gdkproperty-x11.c	\
-@@ -53,14 +51,30 @@ libgdk_x11_la_SOURCES = 	\
+@@ -53,14 +51,31 @@ libgdk_x11_la_SOURCES = 	\
  	gdkwindow-x11.h		\
  	gdkxftdefaults.c	\
  	gdkxid.c		\
@@ -449,14 +449,15 @@ index c488a31..d0aa7ce 100644
 +endif
 +
 +BUILT_SOURCES = gdkx.h
-+
++.PHONY: gdkx.h
 +gdkx.h:
-+	$(AM_V_GEN) cd $(srcdir) && cp $(GDKX_HEADER) gdkx.h
++	$(AM_V_GEN) cd $(srcdir) \
++	&& (cmp -s $(GDKX_HEADER) gdkx.h || cp $(GDKX_HEADER) gdkx.h )
 +
  libgdkx11include_HEADERS = 	\
  	gdkx-autocleanups.h	\
  	gdkx11applaunchcontext.h \
-@@ -74,7 +88,6 @@ libgdkx11include_HEADERS = 	\
+@@ -74,7 +89,6 @@ libgdkx11include_HEADERS = 	\
  	gdkx11display.h		\
  	gdkx11displaymanager.h	\
  	gdkx11dnd.h		\
@@ -464,7 +465,7 @@ index c488a31..d0aa7ce 100644
  	gdkx11keys.h		\
  	gdkx11property.h	\
  	gdkx11screen.h		\
-@@ -83,9 +96,16 @@ libgdkx11include_HEADERS = 	\
+@@ -83,9 +97,16 @@ libgdkx11include_HEADERS = 	\
  	gdkx11visual.h		\
  	gdkx11window.h
  
-- 
2.1.4



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH 2/2] qemu: Use Gtk+3, add configure patch to find vte
  2016-06-17 19:37 [PATCH 0/2] Fixes for qemu, gtk+3 Jussi Kukkonen
  2016-06-17 19:37 ` [PATCH 1/2] gtk+3: Make sure gdkx.h is updated Jussi Kukkonen
@ 2016-06-17 19:37 ` Jussi Kukkonen
  1 sibling, 0 replies; 4+ messages in thread
From: Jussi Kukkonen @ 2016-06-17 19:37 UTC (permalink / raw)
  To: Openembedded-core

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 meta/recipes-devtools/qemu/qemu.inc                |  2 +-
 .../qemu/0001-configure-support-vte-2.91.patch     | 79 ++++++++++++++++++++++
 meta/recipes-devtools/qemu/qemu_2.6.0.bb           |  1 +
 3 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-devtools/qemu/qemu/0001-configure-support-vte-2.91.patch

diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index d5925fd..44e6744 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,"
 PACKAGECONFIG[nss] = "--enable-smartcard,--disable-smartcard,nss,"
 PACKAGECONFIG[uuid] = "--enable-uuid,--disable-uuid,util-linux,"
 PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses,"
-PACKAGECONFIG[gtk+] = "--enable-gtk --enable-vte,--disable-gtk --disable-vte,gtk+ libvte,"
+PACKAGECONFIG[gtk+] = "--enable-gtk --with-gtkabi=3.0 --enable-vte,--disable-gtk --disable-vte,gtk+3 vte"
 PACKAGECONFIG[libcap-ng] = "--enable-cap-ng,--disable-cap-ng,libcap-ng,"
 PACKAGECONFIG[ssh2] = "--enable-libssh2,--disable-libssh2,libssh2,"
 PACKAGECONFIG[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 0000000..af0df3b
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/0001-configure-support-vte-2.91.patch
@@ -0,0 +1,79 @@
+From f40a8ceaaf0ee37fcfeb6900960632d7a7085a9f Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Fri, 17 Jun 2016 21:09:03 +0300
+Subject: [PATCH] configure: support vte-2.91
+
+Upstream-status: Backport [c6feff9e09aa99]
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+
+Original commit message below:
+
+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>
+---
+ configure | 17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/configure b/configure
+index 54a3189..a16fa2b 100755
+--- a/configure
++++ b/configure
+@@ -2394,20 +2394,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
+@@ -4759,6 +4764,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"
+@@ -4771,7 +4777,6 @@ else
+ fi
+ echo "nettle kdf        $nettle_kdf"
+ echo "libtasn1          $tasn1"
+-echo "VTE support       $vte"
+ echo "curses support    $curses"
+ echo "virgl support     $virglrenderer"
+ echo "curl support      $curl"
+-- 
+2.1.4
+
diff --git a/meta/recipes-devtools/qemu/qemu_2.6.0.bb b/meta/recipes-devtools/qemu/qemu_2.6.0.bb
index 735d013..c4a0435 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 \
             file://no-valgrind.patch \
             file://pathlimit.patch \
             file://qemu-2.5.0-cflags.patch \
+            file://0001-configure-support-vte-2.91.patch \
 "
 
 SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2"
-- 
2.1.4



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/2] gtk+3: Make sure gdkx.h is updated
  2016-06-17 19:37 ` [PATCH 1/2] gtk+3: Make sure gdkx.h is updated Jussi Kukkonen
@ 2016-06-22 11:19   ` Jussi Kukkonen
  0 siblings, 0 replies; 4+ messages in thread
From: Jussi Kukkonen @ 2016-06-22 11:19 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer

[-- Attachment #1: Type: text/plain, Size: 4018 bytes --]

On 17 June 2016 at 22:37, Jussi Kukkonen <jussi.kukkonen@intel.com> wrote:

> Always run the Makefile rule that modifies gdkx.h (for opengl
> disabling), but only do the modification if the file is not
> correct already.
>

Please don't take this patch: I'll include it in a bigger update.

The qemu patch (2/2) is still good.

Thanks,
  Jussi


Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
> ---
>  .../0001-Add-disable-opengl-configure-option.patch    | 19
> ++++++++++---------
>  1 file changed, 10 insertions(+), 9 deletions(-)
>
> diff --git
> a/meta/recipes-gnome/gtk+/gtk+3/0001-Add-disable-opengl-configure-option.patch
> b/meta/recipes-gnome/gtk+/gtk+3/0001-Add-disable-opengl-configure-option.patch
> index a963334..2306614 100644
> ---
> a/meta/recipes-gnome/gtk+/gtk+3/0001-Add-disable-opengl-configure-option.patch
> +++
> b/meta/recipes-gnome/gtk+/gtk+3/0001-Add-disable-opengl-configure-option.patch
> @@ -1,4 +1,4 @@
> -From c77afa19881d955d759879aeae8bbd88613dd4fe Mon Sep 17 00:00:00 2001
> +From 91814d22387370e47384206e67729a26a5729192 Mon Sep 17 00:00:00 2001
>  From: Jussi Kukkonen <jussi.kukkonen@intel.com>
>  Date: Thu, 16 Jun 2016 15:11:34 +0300
>  Subject: [PATCH] Add --disable-opengl configure option
> @@ -28,7 +28,7 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
>   gdk/gdkgl.c                       | 10 +++++++
>   gdk/gdkglcontext.c                |  6 ++++
>   gdk/gdkwindow.c                   | 14 +++++++++-
> - gdk/x11/Makefile.am               | 28 ++++++++++++++++---
> + gdk/x11/Makefile.am               | 29 ++++++++++++++++---
>   gdk/x11/gdkdisplay-x11.c          |  6 ++--
>   gdk/x11/gdkscreen-x11.c           |  5 ++++
>   gdk/x11/gdkwindow-x11.c           |  4 +++
> @@ -41,7 +41,7 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
>   gtk/inspector/general.c           |  6 ++++
>   tests/Makefile.am                 | 10 +++++--
>   testsuite/gtk/objects-finalize.c  |  2 ++
> - 21 files changed, 257 insertions(+), 78 deletions(-)
> + 21 files changed, 258 insertions(+), 78 deletions(-)
>   create mode 100644 gdk/x11/gdkx-with-gl-context.h
>   create mode 100644 gdk/x11/gdkx-without-gl-context.h
>   delete mode 100644 gdk/x11/gdkx.h
> @@ -412,7 +412,7 @@ index c34c113..3025e96 100644
>             cairo_region_destroy (opaque_region);
>
>  diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
> -index c488a31..d0aa7ce 100644
> +index c488a31..576f8e1 100644
>  --- a/gdk/x11/Makefile.am
>  +++ b/gdk/x11/Makefile.am
>  @@ -39,8 +39,6 @@ libgdk_x11_la_SOURCES =      \
> @@ -424,7 +424,7 @@ index c488a31..d0aa7ce 100644
>         gdkkeys-x11.c           \
>         gdkmain-x11.c           \
>         gdkproperty-x11.c       \
> -@@ -53,14 +51,30 @@ libgdk_x11_la_SOURCES =    \
> +@@ -53,14 +51,31 @@ libgdk_x11_la_SOURCES =    \
>         gdkwindow-x11.h         \
>         gdkxftdefaults.c        \
>         gdkxid.c                \
> @@ -449,14 +449,15 @@ index c488a31..d0aa7ce 100644
>  +endif
>  +
>  +BUILT_SOURCES = gdkx.h
> -+
> ++.PHONY: gdkx.h
>  +gdkx.h:
> -+      $(AM_V_GEN) cd $(srcdir) && cp $(GDKX_HEADER) gdkx.h
> ++      $(AM_V_GEN) cd $(srcdir) \
> ++      && (cmp -s $(GDKX_HEADER) gdkx.h || cp $(GDKX_HEADER) gdkx.h )
>  +
>   libgdkx11include_HEADERS =    \
>         gdkx-autocleanups.h     \
>         gdkx11applaunchcontext.h \
> -@@ -74,7 +88,6 @@ libgdkx11include_HEADERS =   \
> +@@ -74,7 +89,6 @@ libgdkx11include_HEADERS =   \
>         gdkx11display.h         \
>         gdkx11displaymanager.h  \
>         gdkx11dnd.h             \
> @@ -464,7 +465,7 @@ index c488a31..d0aa7ce 100644
>         gdkx11keys.h            \
>         gdkx11property.h        \
>         gdkx11screen.h          \
> -@@ -83,9 +96,16 @@ libgdkx11include_HEADERS =  \
> +@@ -83,9 +97,16 @@ libgdkx11include_HEADERS =  \
>         gdkx11visual.h          \
>         gdkx11window.h
>
> --
> 2.1.4
>
>

[-- Attachment #2: Type: text/html, Size: 5302 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2016-06-22 11:20 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-17 19:37 [PATCH 0/2] Fixes for qemu, gtk+3 Jussi Kukkonen
2016-06-17 19:37 ` [PATCH 1/2] gtk+3: Make sure gdkx.h is updated Jussi Kukkonen
2016-06-22 11:19   ` Jussi Kukkonen
2016-06-17 19:37 ` [PATCH 2/2] qemu: Use Gtk+3, add configure patch to find vte Jussi Kukkonen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox