Bug fixes for 1.0 M4, Edwin, Mar 3, 2011

PATCH In review Zhai Edwin 2 participants 5 messages Mar 3, 2011 – Mar 4, 2011

lore

Share & tools

lore

Zhai Edwin

author

2011-03-03 12:01 UTC #0 lore raw

cover Bug fixes for 1.0 M4, Edwin, Mar 3, 2011

From: Zhai Edwin <[email protected]>

Saul,
These are bug fixes for 456,751,781. Pls. have a look and pull.

Thanks,
edwin

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: gzhai/fix2
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/fix2

Thanks,
Zhai Edwin <[email protected]>
---

Zhai Edwin (3):
x11vnc: Fix the start failure
sato-icon-theme: Explictly use "Sato" as gtk icon theme
gstreamer: install the sound card driver of es1370

 .../x11vnc/files/starting-fix.patch                |   18 ++++++++++++++++++
 meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb      |    3 ++-
 .../gstreamer/gstreamer_0.10.31.bb                 |    3 +++
 .../sato-icon-theme/sato-icon-theme.inc            |    3 +++
 4 files changed, 26 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-graphics/x11vnc/files/starting-fix.patch

Zhai Edwin

author

2011-03-03 12:01 UTC #1 lore raw

PATCH 1/3 x11vnc: Fix the start failure

From: Zhai Edwin <[email protected]>

Default parameter "-gui" and "-rfbport" make x11vnc failed to start if no "wish" installed.

[BUGID #781] got fixed.

Signed-off-by Zhai Edwin <[email protected]>

---
 .../x11vnc/files/starting-fix.patch                |   18 ++++++++++++++++++
 meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb      |    3 ++-
 2 files changed, 20 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-graphics/x11vnc/files/starting-fix.patch

meta/recipes-graphics/x11vnc/files/starting-fix.patch new file +18 -0

new file mode 100644
index 0000000..f59e801
@@ -0,0 +1,18 @@
+"-gui" & "-rfbport" require "wish" installed, or else x11vnc fails to start.
+Removing these 2 parameters makes x11vnc works well on poky sato image.
+
+
+Signed-off-by: Zhai Edwin <[email protected]>
+Index: x11vnc-0.9.12/x11vnc/x11vnc.desktop
+===================================================================
+--- x11vnc-0.9.12.orig/x11vnc/x11vnc.desktop	2011-03-03 10:33:18.000000000 +0800
++++ x11vnc-0.9.12/x11vnc/x11vnc.desktop	2011-03-03 10:35:20.000000000 +0800
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Name=X11VNC Server
+ Comment=Share this desktop by VNC
+-Exec=x11vnc -gui tray=setpass -rfbport PROMPT -bg -o %%HOME/.x11vnc.log.%%VNCDISPLAY
++Exec=x11vnc -bg -o %%HOME/.x11vnc.log.%%VNCDISPLAY
+ Icon=computer
+ Terminal=false
+ Type=Application

meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb +2 -1

index 87cda2c..129343b 100644
@@ -9,7 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f \
 
 DEPENDS = "openssl virtual/libx11 libxext avahi jpeg zlib"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc-${PV}.tar.gz\
+           file://starting-fix.patch;patch=1"
 
 SRC_URI[md5sum] = "1498a68d02aa7b6c97bf746c073c8d00"
 SRC_URI[sha256sum] = "60a7cceee2c9a5f1c854340b2bae13f975ac55906237042f81f795b28a154a79"

Signature · 1 line

1.6.3.3

Zhai Edwin

author

2011-03-03 12:01 UTC #2 lore raw

PATCH 2/3 sato-icon-theme: Explictly use "Sato" as gtk icon theme

In reply to Zhai Edwin

From: Zhai Edwin <[email protected]>

There is a tricky race condition that "Sato" icons got missing on matchbox-desktop as low priority "hicolor" theme was chosen. Explictly settting "Sato" in gtk config file to avoid this.

[BUGID #456] got fixed.

Signed-off-by Zhai Edwin <[email protected]>

---
 .../sato-icon-theme/sato-icon-theme.inc            |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc +3 -0

index a1669c6..0eff9dd 100644
@@ -16,9 +16,12 @@ PACKAGE_ARCH = "all"
 
 EXTRA_OECONF += "--with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping"
 
+#explictly setting "Sato" as default icon theme to avoid icon missing due to
+#tricky race condition
 pkg_postinst_${PN} () {
         if [ "x$D" != "x" ]; then
                 exit 1
         fi
         gtk-update-icon-cache -q /usr/share/icons/Sato
+        echo 'gtk-icon-theme-name = "Sato"' >> /etc/gtk-2.0/gtkrc
 }

Signature · 1 line

1.6.3.3

Zhai Edwin

author

2011-03-03 12:01 UTC #3 lore raw

PATCH 3/3 gstreamer: install the sound card driver of es1370

In reply to Zhai Edwin

From: Zhai Edwin <[email protected]>

When append "audio" to poky-qemu, emulated sound card like es1370 is exported to guest. This patch install the kernel driver in the poky-image-qemux86/x86_64 to use them.

[BUGID #751]

Signed-off-by Zhai Edwin <[email protected]>

---
 .../gstreamer/gstreamer_0.10.31.bb                 |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

meta/recipes-multimedia/gstreamer/gstreamer_0.10.31.bb +3 -0

index f489e83..96c45eb 100644
@@ -27,6 +27,9 @@ EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=
 #	mv ${WORKDIR}/gstregistrybinary.[ch] ${S}/gst/
 #}
 
+RRECOMMENDS_${PN}_qemux86    += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi"
+RRECOMMENDS_${PN}_qemux86-64 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi"
+
 FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so"
 FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a"
 FILES_${PN}-dbg += " ${libdir}/gstreamer-0.10/.debug/"

Signature · 1 line

1.6.3.3

Saul Wold

2011-03-04 01:27 UTC #4 lore raw

In reply to Zhai Edwin

Quoted 27 lines · Zhai Edwin

From: Zhai Edwin<[email protected]>
Saul,
These are bug fixes for 456,751,781. Pls. have a look and pull.
Thanks,
edwin
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: gzhai/fix2
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/fix2
Thanks,
Zhai Edwin<[email protected]>
---
Zhai Edwin (3):
x11vnc: Fix the start failure
sato-icon-theme: Explictly use "Sato" as gtk icon theme
gstreamer: install the sound card driver of es1370
  .../x11vnc/files/starting-fix.patch                |   18 ++++++++++++++++++
  meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb      |    3 ++-
  .../gstreamer/gstreamer_0.10.31.bb                 |    3 +++
  .../sato-icon-theme/sato-icon-theme.inc            |    3 +++
  4 files changed, 26 insertions(+), 1 deletions(-)

Quoted 7 lines

create mode 100644 meta/recipes-graphics/x11vnc/files/starting-fix.patch
_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky

Merged these into OE-Core and Bernard

Thanks
Sau!