Merge branch 'org.openembedded.dev' of new.openembedded.org:openembedded into org.openembedded.dev

72 files changed, 1918 insertions, 278 deletions

diff --git a/recipes/autoconf/autoconf-native_2.59.bb b/recipes/autoconf/autoconf-native_2.59.bb
deleted file mode 100644
index a2b9dfa2d0..0000000000
--- a/recipes/autoconf/autoconf-native_2.59.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require autoconf_${PV}.bb
-
-PR = "${INC_PR}.0"
-
-DEPENDS = "m4-native gnu-config-native"
-RDEPENDS_${PN} = "m4-native gnu-config-native"
-
-S = "${WORKDIR}/autoconf-${PV}"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/autoconf-${PV}"
-
-inherit native
diff --git a/recipes/autoconf/autoconf-native_2.61.bb b/recipes/autoconf/autoconf-native_2.61.bb
deleted file mode 100644
index b7480cdc11..0000000000
--- a/recipes/autoconf/autoconf-native_2.61.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require autoconf_${PV}.bb
-PR = "${INC_PR}.0"
-
-DEPENDS = "m4-native gnu-config-native"
-RDEPENDS_${PN} = "m4-native gnu-config-native"
-
-SRC_URI += "file://fix_path_xtra.patch;patch=1"
-
-S = "${WORKDIR}/autoconf-${PV}"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/autoconf-${PV}"
-
-inherit native
diff --git a/recipes/autoconf/autoconf-native_2.63.bb b/recipes/autoconf/autoconf-native_2.63.bb
deleted file mode 100644
index b7480cdc11..0000000000
--- a/recipes/autoconf/autoconf-native_2.63.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require autoconf_${PV}.bb
-PR = "${INC_PR}.0"
-
-DEPENDS = "m4-native gnu-config-native"
-RDEPENDS_${PN} = "m4-native gnu-config-native"
-
-SRC_URI += "file://fix_path_xtra.patch;patch=1"
-
-S = "${WORKDIR}/autoconf-${PV}"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/autoconf-${PV}"
-
-inherit native
diff --git a/recipes/autoconf/autoconf.inc b/recipes/autoconf/autoconf.inc
index a561bf1e25..17602858cb 100644
--- a/recipes/autoconf/autoconf.inc
+++ b/recipes/autoconf/autoconf.inc
@@ -5,7 +5,10 @@ HOMEPAGE = "http://www.gnu.org/software/autoconf/"
 SECTION = "devel"
 DEPENDS += "m4-native"
 RDEPENDS_${PN} = "m4 perl gnu-config"
-INC_PR = "r8"
+DEPENDS_virtclass-native = "m4-native gnu-config-native"
+RDEPENDS_${PN}_virtclass-native = "m4-native gnu-config-native"
+
+INC_PR = "r9"
 
 SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2;name=autoconf \
 	   file://program_prefix.patch;patch=1"
@@ -20,3 +23,6 @@ do_configure_prepend () {
 		export ac_cv_prog_gnu_m4="${ac_cv_prog_gnu_m4=yes}"
 	fi
 }
+
+PARALLEL_MAKE = ""
+BBCLASSEXTEND = "native"
diff --git a/recipes/autoconf/autoconf_2.61.bb b/recipes/autoconf/autoconf_2.61.bb
index 53733a90f8..e104bad6d2 100644
--- a/recipes/autoconf/autoconf_2.61.bb
+++ b/recipes/autoconf/autoconf_2.61.bb
@@ -2,8 +2,6 @@ require autoconf.inc
 
 PR = "${INC_PR}.1"
 
-PARALLEL_MAKE = ""
-
 SRC_URI += "file://autoreconf-include.patch;patch=1 \
 	   file://autoreconf-exclude.patch;patch=1 \
 	   file://autoreconf-foreign.patch;patch=1 \
@@ -12,3 +10,5 @@ SRC_URI += "file://autoreconf-include.patch;patch=1 \
 	   file://config-site.patch;patch=1 \
 	   file://autoconf-dont-execute-perl.patch;patch=1 \
 	   "
+
+SRC_URI_append_virtclass-native = " file://fix_path_xtra.patch;patch=1"
diff --git a/recipes/autoconf/autoconf_2.63.bb b/recipes/autoconf/autoconf_2.63.bb
index e26c004f64..8c81aff658 100644
--- a/recipes/autoconf/autoconf_2.63.bb
+++ b/recipes/autoconf/autoconf_2.63.bb
@@ -4,10 +4,10 @@ PR = "${INC_PR}.0"
 
 DEFAULT_PREFERENCE = "-1"
 
-PARALLEL_MAKE = ""
-
 SRC_URI += "file://autoreconf-exclude.patch;patch=1 \
 	    file://autoreconf-foreign.patch;patch=1 \
 	    file://autoheader-nonfatal-warnings.patch;patch=1 \
 	    file://autoreconf-gnuconfigize.patch;patch=1 \
 	    file://config-site.patch;patch=1"
+
+SRC_URI_append_virtclass-native = " file://fix_path_xtra.patch;patch=1"
diff --git a/recipes/automake/automake-native.inc b/recipes/automake/automake-native.inc
deleted file mode 100644
index 4e2ac41d81..0000000000
--- a/recipes/automake/automake-native.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SECTION = "devel"
-require automake_${PV}.bb
-DEPENDS += "autoconf-native"
-RDEPENDS_automake-native += "autoconf-native perl-native-runtime"
-
-inherit native
-
-do_stage () {
-	oe_runmake install
-	install -d ${datadir}/aclocal
-}
diff --git a/recipes/automake/automake-native_1.10.2.bb b/recipes/automake/automake-native_1.10.2.bb
deleted file mode 100644
index 92c861f49c..0000000000
--- a/recipes/automake/automake-native_1.10.2.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-PV := "${PV}"
-
-require automake-native.inc
diff --git a/recipes/automake/automake-native_1.11.1.bb b/recipes/automake/automake-native_1.11.1.bb
deleted file mode 100644
index a7857c562d..0000000000
--- a/recipes/automake/automake-native_1.11.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-PV := "${PV}"
-
-require automake-native.inc
-
-DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/automake/automake-native_1.9.6.bb b/recipes/automake/automake-native_1.9.6.bb
deleted file mode 100644
index 92c861f49c..0000000000
--- a/recipes/automake/automake-native_1.9.6.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-PV := "${PV}"
-
-require automake-native.inc
diff --git a/recipes/automake/automake.inc b/recipes/automake/automake.inc
index 74957cc9e9..662f9f8722 100644
--- a/recipes/automake/automake.inc
+++ b/recipes/automake/automake.inc
@@ -2,6 +2,8 @@ DESCRIPTION = "A tool for automatically generating Makefiles."
 LICENSE = "GPL"
 HOMEPAGE = "http://www.gnu.org/software/automake/"
 SECTION = "devel"
+DEPENDS_virtclass-native = "autoconf-native"
+RDEPENDS_automake-native = "autoconf-native perl-native-runtime"
 RDEPENDS_automake += "\
     autoconf \
     perl \
@@ -27,7 +29,7 @@ RDEPENDS_automake += "\
     perl-module-text-parsewords \
     perl-module-vars "
 SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2"
-INC_PR = "r2"
+INC_PR = "r3"
 AUTOMAKE_API = "${@".".join(bb.data.getVar("PV",d,1).split(".")[0:2])}"
 
 inherit autotools
@@ -47,3 +49,5 @@ do_install_append () {
 	ln -sf automake-${AUTOMAKE_API} ${D}${bindir}/automake
 	install -d ${D}${datadir}/aclocal
 }
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/dri/libdrm_git.bb b/recipes/dri/libdrm_git.bb
index 305f952d50..641f740dd0 100644
--- a/recipes/dri/libdrm_git.bb
+++ b/recipes/dri/libdrm_git.bb
@@ -1,7 +1,7 @@
 SECTION = "x11/base"
 LICENSE = "MIT"
 SRC_URI = "git://anongit.freedesktop.org/mesa/drm;protocol=git;branch=master"
-SRC_URI_om-gta02 = "git://git.bitwiz.org.uk/libdrm.git;protocol=git;branch=glamo"
+SRC_URI_shr = "git://git.bitwiz.org.uk/libdrm.git;protocol=git;branch=glamo"
 
 PROVIDES = "drm"
 DEPENDS = "libpthread-stubs virtual/kernel"
@@ -11,14 +11,15 @@ PV = "2.4.18+gitr${SRCREV}"
 PR = "r0"
 
 SRCREV_pn-libdrm ?= "a5c8f55397377994ceeb76ed0ff148ff89eb3a1b"
-SRCREV_pn-libdrm_om-gta02 ?= "b5aec2bd3df736216e86eae28e278172d3ba3362"
+SRCREV_pn-libdrm_shr ?= "b5aec2bd3df736216e86eae28e278172d3ba3362"
 
 DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_om-gta02 = "1"
+DEFAULT_PREFERENCE_shr = "1"
 
 S = "${WORKDIR}/git"
 
 EXTRA_OECONF_append_om-gta02 = " --enable-glamo-experimental-api --disable-radeon --disable-intel"
+EXTRA_OECONF_append_om-gta01 = " --disable-radeon --disable-intel"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/e17/e-wm_svn.bb b/recipes/e17/e-wm_svn.bb
index 7d68ff9d35..d74fbb546f 100644
--- a/recipes/e17/e-wm_svn.bb
+++ b/recipes/e17/e-wm_svn.bb
@@ -3,7 +3,7 @@ DEPENDS = "eet evas ecore edje efreet edbus"
 LICENSE = "MIT BSD"
 SRCNAME = "e"
 PV = "0.16.999.060+svnr${SRCPV}"
-PR = "r12"
+PR = "r13"
 
 inherit e update-alternatives
 
@@ -36,14 +36,6 @@ do_configure_prepend() {
 	autopoint
 }
 
-do_stage() {
-    autotools_stage_all
-    for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.la" -print`; do rm -f $I; done
-    for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.a" -print`; do rm -f $I; done
-    for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.la" -print`; do rm -f $I; done
-    for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.a" -print`; do rm -f $I; done
-}
-
 do_install_append() {
     # customising - should rather make this simple upstream
     install -m 755 ${WORKDIR}/enlightenment_start.oe ${D}/${bindir}
diff --git a/recipes/e17/exalt_svn.bb b/recipes/e17/exalt_svn.bb
index d024d758e2..9dc3b03b59 100644
--- a/recipes/e17/exalt_svn.bb
+++ b/recipes/e17/exalt_svn.bb
@@ -25,9 +25,5 @@ do_install_append() {
 	install -m 0644 org.e.Exalt.service ${D}${datadir}/dbus-1/system-services/
 }
 
-do_stage() {
-	autotools_stage_all
-}
-
 FILES_${PN} += "${datadir}/dbus-1"
 
diff --git a/recipes/ekiga/ekiga/rgb16.patch b/recipes/ekiga/ekiga/rgb16.patch
new file mode 100644
index 0000000000..b9c9ab284a
--- /dev/null
+++ b/recipes/ekiga/ekiga/rgb16.patch
@@ -0,0 +1,51 @@
+From: Ying-Chun Liu (PaulLiu) <paulliu@debian.org>
+Subject: Add RGB16 support
+Last-Update: 2010-02-26
+Index: ekiga-3.2.6/lib/gui/xwindow.cpp
+===================================================================
+--- ekiga-3.2.6.orig/lib/gui/xwindow.cpp	2010-02-26 07:53:47.000000000 -0500
++++ ekiga-3.2.6/lib/gui/xwindow.cpp	2010-02-26 07:57:32.000000000 -0500
+@@ -82,6 +82,7 @@
+   {"RGBA",   1, 0, LSBFirst,     0x000000FF, 0x0000FF00, 0x00FF0000},  //RGBA *
+   {"BGR32",  1, 4, MSBFirst,     0x0000FF00, 0x00FF0000, 0xFF000000},  //BGRA
+   {"BGRA",   1, 0, LSBFirst,     0x00FF0000, 0x0000FF00, 0x000000FF},  //BGRA *
++  {"RGB16", 16, 2, LSBFirst,     0x0000F800, 0x000007E0, 0x0000001F},  //RGB16
+   {NULL, 0, 0, 0, 0, 0, 0}
+ };
+ 
+@@ -1021,6 +1022,17 @@
+       }
+     }
+   }
++  else if (xwattributes.depth == 16) {
++    _depth = 16;
++    if (!XMatchVisualInfo (_display, DefaultScreen (_display), _depth, TrueColor, &_XVInfo)) {
++      PTRACE(4, "X11\tCould not find visual with colordepth of " << _depth  << " bits per pixel");
++      _depth = 24;
++      if (!XMatchVisualInfo (_display, DefaultScreen (_display), _depth, TrueColor, &_XVInfo)) {
++        PTRACE(1, "X11\tCould neither find visual with colordepth of 16 bits per pixel nor with 24 bits per pixel");
++        return false;
++      }
++    }
++  }
+   else {
+     _depth = 24;
+     if (!XMatchVisualInfo (_display, DefaultScreen (_display), _depth, TrueColor, &_XVInfo)) {
+Index: ekiga-3.2.6/lib/pixops/pixops.c
+===================================================================
+--- ekiga-3.2.6.orig/lib/pixops/pixops.c	2010-02-26 07:58:06.000000000 -0500
++++ ekiga-3.2.6/lib/pixops/pixops.c	2010-02-26 07:59:22.000000000 -0500
+@@ -157,6 +157,13 @@
+ 	      INNER_LOOP(4, 4, p32=(guint32*)dest;*p32=*((guint32*)p));
+ 	    }
+ 	}
++      else if (src_channels == 2)
++	{
++	  if (dest_channels == 2)
++	    {
++	      INNER_LOOP (2, 2, dest[0]=p[0];dest[1]=p[1]);
++	    }
++	}
+     }
+ }
+ 
diff --git a/recipes/ekiga/ekiga_git.bb b/recipes/ekiga/ekiga_git.bb
index c5ec7cd83c..91e73d26ff 100644
--- a/recipes/ekiga/ekiga_git.bb
+++ b/recipes/ekiga/ekiga_git.bb
@@ -4,19 +4,30 @@ LICENSE = "GPLv2"
 ARM_INSTRUCTION_SET = "arm"
 
 DEFAULT_PREFERENCE = "1"
-PV = "3.2.6+git"
-PR = "r2+gitr${SRCREV}"
-SRCREV = "4af42b2f4fd8e6b52c2c578bb4a5d5ad9c26e8f2"
+PV = "3.3.1+git"
+PR = "r3+gitr${SRCREV}"
+SRCREV = "c81cabbee7901b6643907d08f9a530308044ec22"
 
 inherit gnome
 
-SRC_URI = "git://git.gnome.org/ekiga;protocol=git;branch=gnome-2-26"
+SRC_URI = "git://git.gnome.org/ekiga;protocol=git;branch=master \
+           file://rgb16.patch;patch=1 \
+"
+
 S = "${WORKDIR}/git"
 
-DEPENDS += " avahi libnotify eds-dbus libgnome gtkmm libsigc++-2.0 gstreamer gst-plugins-good gst-plugins-base gst-plugins-bad opal ptlib gnome-doc-utils"
+DEPENDS += " boost avahi libnotify eds-dbus libgnome gtkmm libsigc++-2.0 gstreamer gst-plugins-good gst-plugins-base gst-plugins-bad opal ptlib gnome-doc-utils"
 RDEPENDS += "gst-plugin-app gst-plugin-video4linux2 opal ptlib"
 
-EXTRA_OECONF = "--enable-static-libs   --disable-ldap --disable-gnome --enable-gstreamer   --disable-gdu --disable-scrollkeeper "
+EXTRA_OECONF = " \
+#  --enable-static-libs \
+  --disable-ldap \
+  --disable-gnome \
+  --enable-gstreamer \
+  --disable-gdu \
+  --disable-scrollkeeper  \
+  --with-boost-signals=boost_signals-mt \
+"
 
 do_configure_prepend() {
 	touch gnome-doc-utils.make
@@ -27,5 +38,6 @@ do_configure_append() {
  	find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g
 }
 
+FILES_${PN}-dbg += "${libdir}/ekiga/*/plugins/.debug ${libdir}/ekiga/*/.debug"
 FILES_${PN} += "${datadir}/dbus-1 ${datadir}/icons"
 
diff --git a/recipes/ekiga/opal_3.8.0.bb b/recipes/ekiga/opal_3.8.0.bb
new file mode 100644
index 0000000000..371d6aedad
--- /dev/null
+++ b/recipes/ekiga/opal_3.8.0.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Open Phone Abstraction Library, implementation of the ITU H.323 teleconferencing protocol, and successor of the openh323 library."
+LICENSE = "MPL"
+
+inherit gnome
+
+DEPENDS += " ffmpeg ptlib virtual/libsdl openldap"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/opalvoip/opal-${PV}.tar.bz2;name=opal \
+          "
+SRC_URI[opal.md5sum] = "6fd24f0250974a234c5a3d239fc95d21"
+SRC_URI[opal.sha256sum] = "80af07c69c7ec0402c1360ab03818ffe7629d1ef80e7dbb8cf66d40e0c95c365"
+
+EXTRA_OECONF = "--enable-localgsm --disable-spandsp "
+ARM_INSTRUCTION_SET = "arm"
+
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+do_configure() {
+	libtoolize --force
+	gnu-configize
+	oe_runconf
+}
+
+FILES_${PN} += "${libdir}/opal-${PV}/*/*.so ${libdir}/opal-${PV}/*/*/*.so"
+FILES_${PN}-dbg += "${libdir}/opal-${PV}/*/.debug ${libdir}/opal-${PV}/*/*/.debug"
diff --git a/recipes/ekiga/ptlib/rgb16.patch b/recipes/ekiga/ptlib/rgb16.patch
new file mode 100644
index 0000000000..f908337e3f
--- /dev/null
+++ b/recipes/ekiga/ptlib/rgb16.patch
@@ -0,0 +1,142 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_RGB565.patch.dpatch by Ying-Chun Liu (PaulLiu) <paulliu@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add support of bpp 16 mode
+
+@DPATCH@
+diff -urNad ptlib-2.6.5~/src/ptlib/common/vconvert.cxx ptlib-2.6.5/src/ptlib/common/vconvert.cxx
+--- ptlib-2.6.5~/src/ptlib/common/vconvert.cxx	2010-02-26 03:25:23.000000000 -0500
++++ ptlib-2.6.5/src/ptlib/common/vconvert.cxx	2010-02-26 03:54:32.000000000 -0500
+@@ -135,6 +135,11 @@
+       unsigned redOffset,
+       unsigned blueOffset
+     ) const;
++    PBoolean YUV420PtoRGB565(
++      const BYTE * yuv,
++      BYTE * rgb,
++      PINDEX * bytesReturned
++    ) const;
+     PBoolean SwapRedAndBlue(
+       const BYTE * src,
+       BYTE * dst,
+@@ -1657,6 +1662,92 @@
+   return PTrue;
+ }
+ 
++PBoolean PStandardColourConverter::YUV420PtoRGB565(const BYTE * srcFrameBuffer,
++