Skip to contentSkip to conversation

Fixes for multilib, qemugl and vte

PATCH New [email protected] 1 participant 6 messages Feb 28, 2012

lore
Share & tools
lore

[email protected]

author
#0 lore raw

cover Fixes for multilib, qemugl and vte

From: Zhai Edwin <[email protected]>

All,
These are patches to fix bugs and multilib on latest master. Pls. pull.

Thanks,
Edwin

The following changes since commit 927bec5f72230be4f2452d9ef5a747b2c00cb781:

bitbake.conf: Create a new filter variable BB_HASHCONFIG_WHITELIST (2012-02-27 20:10:41 +0000)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib gzhai/master2
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/master2

Zhai Edwin (5):
vte: fix scroll issue
gnupg: Fix for multilib
libskba: Fix for multilib
qemugl: Fix gl apps failure on qemu-x86-64
self-hosted: Fix multiple libx11 error

 meta/recipes-core/tasks/task-self-hosted.bb        |    4 +-
 .../mesa/qemugl/call_opengl_fix.patch              |   40 ++++++-
 meta/recipes-graphics/mesa/qemugl_git.bb           |    2 +-
 meta/recipes-support/gnupg/gnupg_2.0.18.bb         |    2 +-
 meta/recipes-support/libksba/libksba_1.2.0.bb      |    2 +-
 meta/recipes-support/vte/vte.inc                   |    3 +-
 meta/recipes-support/vte/vte/scrollbar_fix.patch   |  122 ++++++++++++++++++++
 7 files changed, 167 insertions(+), 8 deletions(-)
 create mode 100644 meta/recipes-support/vte/vte/scrollbar_fix.patch
author
#2 lore raw

PATCH 2/5 gnupg: Fix for multilib

From: Zhai Edwin <[email protected]>

Signed-off-by Zhai Edwin <[email protected]>
---
 meta/recipes-support/gnupg/gnupg_2.0.18.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-support/gnupg/gnupg_2.0.18.bb +1 -1
index 6712269..abcb5fb 100644
@@ -8,7 +8,7 @@ DEPENDS = "pth libassuan libksba zlib bzip2 readline libgcrypt"
 
 inherit autotools gettext
 
-SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
+SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2"
 
 SRC_URI[md5sum] = "2f37e0722666a0fedbe4d9f9227ac4d7"
 SRC_URI[sha256sum] = "48aedd762ca443fb952a9e859efe3c66706d7c2c9c77c32dbdbac4fe962dae5b"
Signature · 1 line
1.7.1
author
#1 lore raw

PATCH 1/5 vte: fix scroll issue

In reply to [email protected]

From: Zhai Edwin <[email protected]>

On qemu x86-64, scrollbar in vte got broken with one commit to change the way of emiting "changed" signal. This patch revert it as work around.

[YOCTO #1906] got fixed.

Signed-off-by Zhai Edwin <[email protected]>
---
 meta/recipes-support/vte/vte.inc                 |    3 +-
 meta/recipes-support/vte/vte/scrollbar_fix.patch |  122 ++++++++++++++++++++++
 2 files changed, 124 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-support/vte/vte/scrollbar_fix.patch
meta/recipes-support/vte/vte.inc +2 -1
index 7971673..5e05608 100644
@@ -6,7 +6,8 @@ RDEPENDS_libvte = "vte-termcap"
 
 inherit gnome
 
-SRC_URI += "file://introspection.patch"
+SRC_URI += "file://introspection.patch\ 
+            file://scrollbar_fix.patch"
 
 EXTRA_OECONF = "--disable-gtk-doc --disable-python --disable-introspection"
meta/recipes-support/vte/vte/scrollbar_fix.patch new file +122 -0

122 lines not on this page · raw message

Signature · 1 line
1.7.1
author
#3 lore raw

PATCH 3/5 libskba: Fix for multilib

In reply to [email protected]

From: Zhai Edwin <[email protected]>

Signed-off-by Zhai Edwin <[email protected]>
---
 meta/recipes-support/libksba/libksba_1.2.0.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-support/libksba/libksba_1.2.0.bb +1 -1
index 6489cc5..1d8d287 100644
@@ -7,7 +7,7 @@ DEPENDS = "libgpg-error"
 
 inherit autotools binconfig
 
-SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${PN}/${PN}-${PV}.tar.bz2"
+SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2"
 
 SRC_URI[md5sum] = "e797f370b69b4dc776499d6a071ae137"
 SRC_URI[sha256sum] = "09afce65b03d027cbec10d21464f4f651cdfd269e38b404f83e48d3e2a3c934b"
Signature · 1 line
1.7.1
author
#4 lore raw

PATCH 4/5 qemugl: Fix gl apps failure on qemu-x86-64

In reply to [email protected]

From: Zhai Edwin <[email protected]>

Extend commit 028968 to qemu x86-64, where stack disorder happen due to register handling via push/pop.

[YOCTO #1927] fixed

Signed-off-by Zhai Edwin <[email protected]>
---
 .../mesa/qemugl/call_opengl_fix.patch              |   40 +++++++++++++++++++-
 meta/recipes-graphics/mesa/qemugl_git.bb           |    2 +-
 2 files changed, 39 insertions(+), 3 deletions(-)
meta/recipes-graphics/mesa/qemugl/call_opengl_fix.patch +38 -2
index c5e3592..342f49b 100644
@@ -16,8 +16,8 @@ Upstream-Status: Pending
 Signed-off-by: Zhai Edwin <[email protected]>
 Index: git/opengl_client.c
 ===================================================================
---- git.orig/opengl_client.c	2011-09-19 19:44:51.000000000 +0800
-+++ git/opengl_client.c	2011-09-22 10:11:04.000000000 +0800
+--- git.orig/opengl_client.c	2012-02-28 15:26:28.000000000 +0800
++++ git/opengl_client.c	2012-02-28 15:29:18.000000000 +0800
 @@ -1076,23 +1076,29 @@
  {
  #if defined(__i386__)

@@ -56,3 +56,39 @@ Index: git/opengl_client.c
    __asm__ ("mov %%eax, %0"::"m"(ret));
  #ifdef WIN32
    __asm__ ("movl (%%esp),%%ecx;movl %%ecx,%%fs:0;addl $8,%%esp;" : : : "%ecx");
+@@ -1100,20 +1106,27 @@
+   return ret;
+ #elif defined(__x86_64__)
+   int ret;
+-  __asm__ ("push %rbx");
+-  __asm__ ("push %rcx");
+-  __asm__ ("push %rdx");
+-  __asm__ ("push %rsi");
++  long bx, cx, dx, si;
++
++  /* save registers before opengl call */
++  __asm__ ("mov %%rbx, %0"::"m"(bx));
++  __asm__ ("mov %%rcx, %0"::"m"(cx));
++  __asm__ ("mov %%rdx, %0"::"m"(dx));
++  __asm__ ("mov %%rsi, %0"::"m"(si));
++
+   __asm__ ("mov %0, %%eax"::"m"(func_number));
+   __asm__ ("mov %0, %%ebx"::"m"(pid));
+   __asm__ ("mov %0, %%rcx"::"m"(ret_string));
+   __asm__ ("mov %0, %%rdx"::"m"(args));
+   __asm__ ("mov %0, %%rsi"::"m"(args_size));
+   __asm__ ("int $0x99");
+-  __asm__ ("pop %rsi");
+-  __asm__ ("pop %rdx");
+-  __asm__ ("pop %rcx");
+-  __asm__ ("pop %rbx");
++
++  /* restore registers */
++  __asm__ ("mov %0, %%rbx"::"m"(bx));
++  __asm__ ("mov %0, %%rcx"::"m"(cx));
++  __asm__ ("mov %0, %%rdx"::"m"(dx));
++  __asm__ ("mov %0, %%rsi"::"m"(si));
++
+   __asm__ ("mov %%eax, %0"::"m"(ret));
+   return ret;
+ #else
meta/recipes-graphics/mesa/qemugl_git.bb +1 -1
index e3552ec..66f4e17 100644
@@ -18,7 +18,7 @@ S = "${WORKDIR}/git"
 SRCREV = "d888bbc723c00d197d34a39b5b7448660ec1b1c0"
 
 PV = "0.0+git${SRCPV}"
-PR = "r8"
+PR = "r9"
 
 DEFAULT_PREFERENCE = "-1"
Signature · 1 line
1.7.1
author
#5 lore raw

PATCH 5/5 self-hosted: Fix multiple libx11 error

In reply to [email protected]

From: Zhai Edwin <[email protected]>

Self-hosted needs package libx11-dev, which is ambiguous as virtual/libx11 is provided by libx11 or libx11-trim. This patch explictly set the perferred one, libx11-trim-dev, to avoid this.

Signed-off-by Zhai Edwin <[email protected]>
---
 meta/recipes-core/tasks/task-self-hosted.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-core/tasks/task-self-hosted.bb +2 -2
index 586a461..a6cf75f 100644
@@ -3,7 +3,7 @@
 #
 
 DESCRIPTION = "Create Basic Image Tasks"
-PR = "r6"
+PR = "r7"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"

@@ -189,6 +189,6 @@ RDEPENDS_task-self-hosted-graphics = "\
     libglu-dev \
     libsdl \
     libsdl-dev \
-    libx11-dev \
+    libx11-trim-dev \
     python-pygtk \
     "
Signature · 1 line
1.7.1