propagate from branch 'org.openembedded.dev' (head d8bfa63aa913e7227790ba2d02253cfbecce61ab)

            to branch 'org.openembedded.dev.avr32' (head bb1b18fc3fa0562c4c7bd85bb0d9617c62261f2e)

6 files changed, 37 insertions, 4 deletions

diff --git a/packages/python/python-pydirectfb/.mtn2git_empty b/packages/python/python-pydirectfb/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/python/python-pydirectfb/.mtn2git_empty
diff --git a/packages/python/python-pydirectfb/fix-directfb-detection.patch b/packages/python/python-pydirectfb/fix-directfb-detection.patch
new file mode 100644
index 0000000000..c8b7cc805a
--- /dev/null
+++ b/packages/python/python-pydirectfb/fix-directfb-detection.patch
@@ -0,0 +1,16 @@
+Index: pydirectfb/setup.py
+===================================================================
+--- pydirectfb.orig/setup.py
++++ pydirectfb/setup.py
+@@ -11,9 +11,10 @@
+     Check dependencies add add the flags to include_dirs, library_dirs and
+     libraries. The basic logic is taken from pygame.
+     """
+-    command = name + '-config --version --cflags --libs 2>/dev/null'
++    command = 'pkg-config %s --modversion --cflags --libs 2>/dev/null' % name
+     try:
+         config = os.popen(command).readlines()
++        print config
+         if len(config) == 0:
+             raise ValueError, 'command not found'
+         flags  = (' '.join(config[1:]) + ' ').split()
diff --git a/packages/python/python-pydirectfb_cvs.bb b/packages/python/python-pydirectfb_cvs.bb
new file mode 100644
index 0000000000..cc0f3cfcd9
--- /dev/null
+++ b/packages/python/python-pydirectfb_cvs.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "DirectFB Bindings"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "GPL"
+SRCNAME = "pydirectfb"
+PV = "0.0.0+cvs${SRCDATE}"
+PR = "ml0"
+
+SRC_URI = "cvs://anonymous@pydirectfb.cvs.sourceforge.net/cvsroot/pydirectfb;module=pydirectfb \
+           file://fix-directfb-detection.patch;patch=1"
+S = "${WORKDIR}/${SRCNAME}"
+
+inherit distutils
+	
diff --git a/packages/python/python-pygtk_2.10.4.bb b/packages/python/python-pygtk_2.10.4.bb
index d53e3d5105..1af2093556 100644
--- a/packages/python/python-pygtk_2.10.4.bb
+++ b/packages/python/python-pygtk_2.10.4.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Python GTK+ 2.10.x Bindings"
 SECTION = "devel/python"
 # needs gtk+ 2.10.x
-DEPENDS = "gtk+ libglade"
+DEPENDS = "gtk+ libglade python-pycairo python-pygobject"
 RDEPENDS = "python-shell python-pycairo python-pygobject"
 PROVIDES = "python-pygtk2"
 SRCNAME = "pygtk"
@@ -13,8 +13,10 @@ SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${SRCNAME}-${PV}.tar
            file://acinclude.m4"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-EXTRA_OECONF = "--disable-docs"
-EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
+EXTRA_OECONF = "\
+  --disable-docs \
+  --with-python-includes=${STAGING_INCDIR}/../ \
+"
 
 inherit autotools pkgconfig distutils-base
 
diff --git a/packages/python/python-pyqt_4.3.1.bb b/packages/python/python-pyqt_4.3.3.bb
index d9c45ec14c..74a16c4720 100644
--- a/packages/python/python-pyqt_4.3.1.bb
+++ b/packages/python/python-pyqt_4.3.3.bb
@@ -22,7 +22,8 @@ inherit qt4x11 sip distutils-base
 PARALLEL_MAKE = ""
 
 QMAKE_PROFILES = "pyqt.pro"
-EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_1 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility"
+# NOTE: match with qt version we have in OE
+EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_2 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility"
 EXTRA_OEMAKE = " MAKEFLAGS= "
 
 SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml"
diff --git a/packages/python/python-sip_4.7.1.bb b/packages/python/python-sip_4.7.3.bb
index fc87b01e53..fc87b01e53 100644
--- a/packages/python/python-sip_4.7.1.bb
+++ b/packages/python/python-sip_4.7.3.bb