* [PATCH 1/5] vte: fix scroll issue
2012-02-28 8:00 [PATCH 0/5] Fixes for multilib, qemugl and vte edwin.zhai
@ 2012-02-28 8:00 ` edwin.zhai
2012-02-28 8:00 ` [PATCH 2/5] gnupg: Fix for multilib edwin.zhai
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: edwin.zhai @ 2012-02-28 8:00 UTC (permalink / raw)
To: openembedded-core
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 5297 bytes --]
From: Zhai Edwin <edwin.zhai@intel.com>
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 <edwin.zhai@intel.com>
---
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
diff --git a/meta/recipes-support/vte/vte.inc b/meta/recipes-support/vte/vte.inc
index 7971673..5e05608 100644
--- a/meta/recipes-support/vte/vte.inc
+++ b/meta/recipes-support/vte/vte.inc
@@ -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"
diff --git a/meta/recipes-support/vte/vte/scrollbar_fix.patch b/meta/recipes-support/vte/vte/scrollbar_fix.patch
new file mode 100644
index 0000000..707377a
--- /dev/null
+++ b/meta/recipes-support/vte/vte/scrollbar_fix.patch
@@ -0,0 +1,122 @@
+On qemu x86-64, matchbox-terminal has broken scrollbar, because of following
+commit in vte. This patch revert it as work around.
+
+Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+
+Upstream-Status: Inappropriate [workaround]
+
+commit 6eadb8494797e44910b86b5e101823cf527c04e1
+Author: Kristian Høgsberg <krh@bitplanet.net>
+Date: Thu Jul 15 09:07:51 2010 -0400
+
+ Use accessors for setting adjustment
+
+ We use g_object_freeze_notify() to emit the same amount of ::changed
+ signals.
+
+Index: vte-0.28.2/src/vte.c
+===================================================================
+--- vte-0.28.2.orig/src/vte.c 2011-08-29 05:31:45.000000000 +0800
++++ vte-0.28.2/src/vte.c 2012-02-21 11:03:22.000000000 +0800
+@@ -2018,15 +2018,13 @@
+ glong v;
+ gdouble current;
+
+- g_object_freeze_notify (G_OBJECT (terminal->adjustment));
+-
+ v = _vte_ring_delta (screen->row_data);
+ current = gtk_adjustment_get_lower(terminal->adjustment);
+ if (current != v) {
+ _vte_debug_print(VTE_DEBUG_ADJ,
+ "Changing lower bound from %.0f to %ld\n",
+ current, v);
+- gtk_adjustment_set_lower(terminal->adjustment, v);
++ terminal->adjustment->lower = v;
+ changed = TRUE;
+ }
+
+@@ -2039,19 +2037,19 @@
+ _vte_debug_print(VTE_DEBUG_ADJ,
+ "Changing upper bound from %.0f to %ld\n",
+ current, v);
+- gtk_adjustment_set_upper(terminal->adjustment, v);
++ terminal->adjustment->upper = v;
+ changed = TRUE;
+ }
+
+- g_object_thaw_notify (G_OBJECT (terminal->adjustment));
+-
+- if (changed)
++ if (changed) {
+ _vte_debug_print(VTE_DEBUG_SIGNALS,
+ "Emitting adjustment_changed.\n");
++ gtk_adjustment_changed(terminal->adjustment);
++ }
+ terminal->pvt->adjustment_changed_pending = FALSE;
+ }
+ if (terminal->pvt->adjustment_value_changed_pending) {
+- glong v, delta;
++ glong v;
+ _vte_debug_print(VTE_DEBUG_SIGNALS,
+ "Emitting adjustment_value_changed.\n");
+ terminal->pvt->adjustment_value_changed_pending = FALSE;
+@@ -2062,9 +2060,9 @@
+ * via the adjustment - e.g. user interaction with the
+ * scrollbar
+ */
+- delta = terminal->pvt->screen->scroll_delta;
++ terminal->adjustment->value = terminal->pvt->screen->scroll_delta;
+ terminal->pvt->screen->scroll_delta = v;
+- gtk_adjustment_set_value(terminal->adjustment, delta);
++ gtk_adjustment_value_changed(terminal->adjustment);
+ }
+ }
+ }
+@@ -2141,15 +2139,13 @@
+
+ _vte_terminal_adjust_adjustments(terminal);
+
+- g_object_freeze_notify(G_OBJECT(terminal->adjustment));
+-
+ /* The step increment should always be one. */
+ v = gtk_adjustment_get_step_increment(terminal->adjustment);
+ if (v != 1) {
+ _vte_debug_print(VTE_DEBUG_ADJ,
+ "Changing step increment from %.0lf to %ld\n",
+ v, terminal->row_count);
+- gtk_adjustment_set_step_increment(terminal->adjustment, 1);
++ terminal->adjustment->step_increment = 1;
+ changed = TRUE;
+ }
+
+@@ -2160,8 +2156,7 @@
+ _vte_debug_print(VTE_DEBUG_ADJ,
+ "Changing page size from %.0f to %ld\n",
+ v, terminal->row_count);
+- gtk_adjustment_set_page_size(terminal->adjustment,
+- terminal->row_count);
++ terminal->adjustment->page_size = terminal->row_count;
+ changed = TRUE;
+ }
+
+@@ -2173,16 +2168,15 @@
+ "Changing page increment from "
+ "%.0f to %ld\n",
+ v, terminal->row_count);
+- gtk_adjustment_set_page_increment(terminal->adjustment,
+- terminal->row_count);
++ terminal->adjustment->page_increment = terminal->row_count;
+ changed = TRUE;
+ }
+
+- g_object_thaw_notify(G_OBJECT(terminal->adjustment));
+-
+- if (changed)
++ if (changed) {
+ _vte_debug_print(VTE_DEBUG_SIGNALS,
+ "Emitting adjustment_changed.\n");
++ gtk_adjustment_changed(terminal->adjustment);
++ }
+ }
+
+ /* Scroll a fixed number of lines up or down in the current screen. */
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/5] gnupg: Fix for multilib
2012-02-28 8:00 [PATCH 0/5] Fixes for multilib, qemugl and vte edwin.zhai
2012-02-28 8:00 ` [PATCH 1/5] vte: fix scroll issue edwin.zhai
@ 2012-02-28 8:00 ` edwin.zhai
2012-02-28 8:00 ` [PATCH 3/5] libskba: " edwin.zhai
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: edwin.zhai @ 2012-02-28 8:00 UTC (permalink / raw)
To: openembedded-core
From: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
meta/recipes-support/gnupg/gnupg_2.0.18.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-support/gnupg/gnupg_2.0.18.bb b/meta/recipes-support/gnupg/gnupg_2.0.18.bb
index 6712269..abcb5fb 100644
--- a/meta/recipes-support/gnupg/gnupg_2.0.18.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.0.18.bb
@@ -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"
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/5] libskba: Fix for multilib
2012-02-28 8:00 [PATCH 0/5] Fixes for multilib, qemugl and vte edwin.zhai
2012-02-28 8:00 ` [PATCH 1/5] vte: fix scroll issue edwin.zhai
2012-02-28 8:00 ` [PATCH 2/5] gnupg: Fix for multilib edwin.zhai
@ 2012-02-28 8:00 ` edwin.zhai
2012-02-28 8:00 ` [PATCH 4/5] qemugl: Fix gl apps failure on qemu-x86-64 edwin.zhai
2012-02-28 8:00 ` [PATCH 5/5] self-hosted: Fix multiple libx11 error edwin.zhai
4 siblings, 0 replies; 6+ messages in thread
From: edwin.zhai @ 2012-02-28 8:00 UTC (permalink / raw)
To: openembedded-core
From: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
meta/recipes-support/libksba/libksba_1.2.0.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-support/libksba/libksba_1.2.0.bb b/meta/recipes-support/libksba/libksba_1.2.0.bb
index 6489cc5..1d8d287 100644
--- a/meta/recipes-support/libksba/libksba_1.2.0.bb
+++ b/meta/recipes-support/libksba/libksba_1.2.0.bb
@@ -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"
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/5] qemugl: Fix gl apps failure on qemu-x86-64
2012-02-28 8:00 [PATCH 0/5] Fixes for multilib, qemugl and vte edwin.zhai
` (2 preceding siblings ...)
2012-02-28 8:00 ` [PATCH 3/5] libskba: " edwin.zhai
@ 2012-02-28 8:00 ` edwin.zhai
2012-02-28 8:00 ` [PATCH 5/5] self-hosted: Fix multiple libx11 error edwin.zhai
4 siblings, 0 replies; 6+ messages in thread
From: edwin.zhai @ 2012-02-28 8:00 UTC (permalink / raw)
To: openembedded-core
From: Zhai Edwin <edwin.zhai@intel.com>
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 <edwin.zhai@intel.com>
---
.../mesa/qemugl/call_opengl_fix.patch | 40 +++++++++++++++++++-
meta/recipes-graphics/mesa/qemugl_git.bb | 2 +-
2 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-graphics/mesa/qemugl/call_opengl_fix.patch b/meta/recipes-graphics/mesa/qemugl/call_opengl_fix.patch
index c5e3592..342f49b 100644
--- a/meta/recipes-graphics/mesa/qemugl/call_opengl_fix.patch
+++ b/meta/recipes-graphics/mesa/qemugl/call_opengl_fix.patch
@@ -16,8 +16,8 @@ Upstream-Status: Pending
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
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
diff --git a/meta/recipes-graphics/mesa/qemugl_git.bb b/meta/recipes-graphics/mesa/qemugl_git.bb
index e3552ec..66f4e17 100644
--- a/meta/recipes-graphics/mesa/qemugl_git.bb
+++ b/meta/recipes-graphics/mesa/qemugl_git.bb
@@ -18,7 +18,7 @@ S = "${WORKDIR}/git"
SRCREV = "d888bbc723c00d197d34a39b5b7448660ec1b1c0"
PV = "0.0+git${SRCPV}"
-PR = "r8"
+PR = "r9"
DEFAULT_PREFERENCE = "-1"
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 5/5] self-hosted: Fix multiple libx11 error
2012-02-28 8:00 [PATCH 0/5] Fixes for multilib, qemugl and vte edwin.zhai
` (3 preceding siblings ...)
2012-02-28 8:00 ` [PATCH 4/5] qemugl: Fix gl apps failure on qemu-x86-64 edwin.zhai
@ 2012-02-28 8:00 ` edwin.zhai
4 siblings, 0 replies; 6+ messages in thread
From: edwin.zhai @ 2012-02-28 8:00 UTC (permalink / raw)
To: openembedded-core
From: Zhai Edwin <edwin.zhai@intel.com>
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 <edwin.zhai@intel.com>
---
meta/recipes-core/tasks/task-self-hosted.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/tasks/task-self-hosted.bb b/meta/recipes-core/tasks/task-self-hosted.bb
index 586a461..a6cf75f 100644
--- a/meta/recipes-core/tasks/task-self-hosted.bb
+++ b/meta/recipes-core/tasks/task-self-hosted.bb
@@ -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 \
"
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread