Merge remote-tracking branch 'dm/opendreambox-1.6' into test_0921

Conflicts:
	recipes/qt4/qt-4.7.4.inc
	recipes/qt4/qt4-native_4.7.4.bb

diff --cc recipes/enigma2/enigma2.bb
Simple merge

diff --cc recipes/gstreamer/gst-plugin-dvbmediasink.bb
Simple merge

diff --cc recipes/gstreamer/gst-plugins-bad_0.10.21.bb
Simple merge

diff --cc recipes/gstreamer/gst-plugins-bad_0.10.22.bb
index 0000000,268a06d..dae328d
mode 000000,100644..100644
--- /dev/null
--- 2/recipes/gstreamer/gst-plugins-bad_0.10.22.bb
+++ b/recipes/gstreamer/gst-plugins-bad_0.10.22.bb
@@@ -1,0 -1,17 +1,23 @@@
+ require gst-plugins.inc
+ 
+ PR = "${INC_PR}.1"
+ 
+ do_configure_prepend() {
+     sed -i -e s:docs::g Makefile.am
+ }
+ 
+ DEPENDS += "gst-plugins-base"
+ 
+ EXTRA_OECONF_opendreambox += "--disable-apexsink --disable-dvdnav --disable-cdaudio --disable-mpeg2enc --disable-mplex --disable-librfb"
++EXTRA_OECONF_vuplus += "--disable-apexsink --disable-dvdnav --disable-cdaudio --disable-mpeg2enc --disable-mplex --disable-librfb"
+ 
+ SRC_URI_append_opendreambox += " \
+                                file://mpegtsdemux-fix-bd-streamtype-detection.diff;patch=1;pnum=1 \
+                                file://mpegpsdemux-speedup.diff;patch=1;pnum=0 \
+                                file://mpegtsmux_indexing_alignment.diff;patch=1;pnum=1 \
+ "
++SRC_URI_append_vuplus += " \
++                               file://mpegtsdemux-fix-bd-streamtype-detection.diff;patch=1;pnum=1 \
++                               file://mpegpsdemux-speedup.diff;patch=1;pnum=0 \
++                               file://mpegtsmux_indexing_alignment.diff;patch=1;pnum=1 \
++"

diff --cc recipes/gstreamer/gst-plugins-base_0.10.35.bb
index 0000000,5dea7d3..1cfd307
mode 000000,100644..100644
--- /dev/null
--- 2/recipes/gstreamer/gst-plugins-base_0.10.35.bb
+++ b/recipes/gstreamer/gst-plugins-base_0.10.35.bb
@@@ -1,0 -1,18 +1,22 @@@
 -DEPENDS += "${@base_contains('DISTRO', 'opendreambox', 'alsa-lib', 'cdparanoia pango libtheora alsa-lib libsm virtual/libx11 freetype gnome-vfs libxv', d)}"
 -EXTRA_OECONF_opendreambox += "--disable-theora --disable-pango --with-audioresample-format=int"
+ require gst-plugins.inc
+ 
+ SRC_URI_append_opendreambox = " file://samihack.patch;patch=1 \
+ file://d3a44541749f413343d5717c464083cef22a74f1.patch;patch=1 \
+ file://1e0ddb12aa1c2b13c4bc4a13712ebd7f06a6346e.patch;patch=1 \
+ "
++SRC_URI_append_vuplus = " file://samihack.patch;patch=1 \
++file://d3a44541749f413343d5717c464083cef22a74f1.patch;patch=1 \
++file://1e0ddb12aa1c2b13c4bc4a13712ebd7f06a6346e.patch;patch=1 \
++"
+ 
+ PR = "${INC_PR}.0"
+ 
+ PROVIDES += "gst-plugins"
+ 
+ # gst-plugins-base only builds the alsa plugin
+ # if alsa has been built and is present.  You will
+ # not get an error if this is not present, just 
+ # a missing alsa plugin
++DEPENDS += "${@base_contains('DISTRO', 'vuplus', 'alsa-lib', 'cdparanoia pango libtheora alsa-lib libsm virtual/libx11 freetype gnome-vfs libxv', d)}"
++EXTRA_OECONF_vuplus += "--disable-theora --disable-pango --with-audioresample-format=int"
+ 

diff --cc recipes/gstreamer/gst-plugins-ugly_0.10.18.bb
index 0000000,7cb481a..50c348a
mode 000000,100644..100644
--- /dev/null
--- 2/recipes/gstreamer/gst-plugins-ugly_0.10.18.bb
+++ b/recipes/gstreamer/gst-plugins-ugly_0.10.18.bb
@@@ -1,0 -1,15 +1,16 @@@
+ require gst-plugins.inc
+ 
+ SRC_URI_append_opendreambox = " file://dvdsubdec-addproperty-singlebuffer.patch;patch=1"
++SRC_URI_append_vuplus = " file://dvdsubdec-addproperty-singlebuffer.patch;patch=1"
+ 
+ PR = "${INC_PR}.0"
+ 
+ DEPENDS += "gst-plugins-base libsidplay"
+ 
+ python() {
+       # Don't build, if we are building an ENTERPRISE distro
+       enterprise = bb.data.getVar("ENTERPRISE_DISTRO", d, 1)
+       if enterprise == "1":
+               raise bb.parse.SkipPackage("gst-plugins-ugly will only build if ENTERPRISE_DISTRO != 1")
+ }
+ 

diff --cc recipes/python/python_2.6.4.bb
Simple merge

diff --cc recipes/python/python_2.6.7.bb
index 0000000,fd01c12..d6f8694
mode 000000,100644..100644
--- /dev/null
--- 2/recipes/python/python_2.6.7.bb
+++ b/recipes/python/python_2.6.7.bb
@@@ -1,0 -1,146 +1,152 @@@
+ require python.inc
+ DEPENDS = "python-native db gdbm openssl readline sqlite3 tcl zlib\
+            ${@base_contains('DISTRO_FEATURES', 'tk', 'tk', '', d)}"
+ DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
+ DEPENDS_opendreambox = "python-native db gdbm openssl readline sqlite3 zlib"
++DEPENDS_vuplus = "python-native db gdbm openssl readline sqlite3 zlib"
+ # set to .0 on every increase of INC_PR
+ PR = "${INC_PR}.2"
+ 
+ SRC_URI = "\
+   http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
+   file://00-fix-parallel-make.patch;patch=1 \
+   file://01-use-proper-tools-for-cross-build.patch;patch=1 \
+   file://02-remove-test-for-cross.patch;patch=1 \
+   file://03-fix-tkinter-detection.patch;patch=1 \
+   file://04-default-is-optimized.patch;patch=1 \
+   file://05-enable-ctypes-cross-build.patch;patch=1 \
+   file://06-ctypes-libffi-fix-configure.patch;patch=1 \
+   file://ipv6-cross.patch;patch=1 \
+   file://python-module-rpath-fix.patch;patch=1 \
+   file://sitecustomize.py \
+ "
+ 
+ SRC_URI_append_opendreambox = " \
+   file://some_configure_fixes.patch;patch=1;pnum=0 \
++  file://strict_aliasing_site.patch;patch=0;pnum=0 \
++  file://fix_pthread_site.patch;patch=0;pnum=0 \
++  file://forced_largefile_support.patch;patch=1;pnum=1"
++SRC_URI_append_vuplus = " \
++  file://some_configure_fixes.patch;patch=1;pnum=0 \
+   file://strict_aliasing_site.patch;patch=0;pnum=0 \
+   file://fix_pthread_site.patch;patch=0;pnum=0 \
+   file://forced_largefile_support.patch;patch=1;pnum=1"
+ 
+ S = "${WORKDIR}/Python-${PV}"
+ 
+ inherit autotools
+ 
+ # The 3 lines below are copied from the libffi recipe, ctypes ships its own copy of the libffi sources
+ #Somehow gcc doesn't set __SOFTFP__ when passing -mfloatabi=softp :(
+ TARGET_CC_ARCH_append_armv6 = " -D__SOFTFP__"
+ TARGET_CC_ARCH_append_armv7a = " -D__SOFTFP__"
+ 
+ do_configure_prepend() {
+       rm -R ${S}/Lib/plat-linux3 || /bin/true
+       ln -sf ${S}/Lib/plat-linux2 ${S}/Lib/plat-linux3
+       autoreconf -Wcross --verbose --install --force --exclude=autopoint Modules/_ctypes/libffi || oenote "_ctypes failed to autoreconf"
+ }
+ 
+ #
+ # Copy config.h and an appropriate Makefile for distutils.sysconfig,
+ # which laters uses the information out of these to compile extensions
+ #
+ do_compile_prepend() {
+       install -d ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/
+       install -d ${STAGING_LIBDIR}/python${PYTHON_MAJMIN}/config/
+       install -m 0644 pyconfig.h ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/
+       install -m 0644 Makefile Makefile.orig
+       install -m 0644 Makefile Makefile.backup
+       sed -e 's,${includedir},${STAGING_INCDIR},' < Makefile.backup > Makefile
+       install -m 0644 Makefile Makefile.backup
+       sed -e 's,${libdir},${STAGING_LIBDIR},' < Makefile.backup > Makefile
+       install -m 0644 Makefile ${STAGING_LIBDIR}/python${PYTHON_MAJMIN}/config/
+ }
+ 
+ do_compile() {
+       oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
+               HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
+               STAGING_LIBDIR=${STAGING_LIBDIR} \
+               STAGING_INCDIR=${STAGING_INCDIR} \
+               BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+               OPT="${CFLAGS}" libpython${PYTHON_MAJMIN}.so
+ 
+       oe_libinstall -so libpython${PYTHON_MAJMIN} ${STAGING_LIBDIR}
+ 
+       oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
+               HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
+               STAGING_LIBDIR=${STAGING_LIBDIR} \
+               STAGING_INCDIR=${STAGING_INCDIR} \
+               BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+               RUNSHARED= OPT="${CFLAGS}"
+ }
+ 
+ do_stage() {
+       install -m 0644 Include/*.h ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/
+       oe_libinstall -a -so libpython${PYTHON_MAJMIN} ${STAGING_LIBDIR}
+ }
+ 
+ do_install() {
+       install -m 0644 Makefile.orig Makefile
+       
+       oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
+               HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
+               STAGING_LIBDIR=${STAGING_LIBDIR} \
+               STAGING_INCDIR=${STAGING_INCDIR} \
+               BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+               DESTDIR=${D} LIBDIR=${libdir} RUNSHARED= install
+ 
+       install -m 0644 ${WORKDIR}/sitecustomize.py ${D}/${libdir}/python${PYTHON_MAJMIN}
+ 
+       # remove hardcoded ccache, see http://bugs.openembedded.net/show_bug.cgi?id=4144
+       sed -i -e s,ccache,'$(CCACHE)', ${D}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile
+ }
+ 
+ do_install_append() {
+       # remove unecessary files from python-distutils' packages
+       rm ${D}/${libdir}/python${PYTHON_MAJMIN}/config/libpython2.6.a
+       rm ${D}/${libdir}/python${PYTHON_MAJMIN}/distutils/command/win*
+ }
+ 
+ require python-${PYTHON_MAJMIN}-manifest.inc
+ 
+ # manual dependency additions
+ RPROVIDES_python-core = "python"
+ RRECOMMENDS_python-core = "python-readline"
+ RRECOMMENDS_python-crypt = "openssl"
+ 
+ # add sitecustomize
+ FILES_python-core += "${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py"
+ # ship 2to3
+ FILES_python-core += "${bindir}/2to3"
+ 
+ # package libpython2
+ PACKAGES =+ "libpython2"
+ FILES_libpython2 = "${libdir}/libpython*.so*"
+ 
+ # additional stuff -dev
+ 
+ FILES_${PN}-dev = "\
+   ${includedir} \
+   ${libdir}/lib*${SOLIBSDEV} \
+   ${libdir}/*.la \
+   ${libdir}/*.a \
+   ${libdir}/*.o \
+   ${libdir}/pkgconfig \
+   ${base_libdir}/*.a \
+   ${base_libdir}/*.o \
+   ${datadir}/aclocal \
+   ${datadir}/pkgconfig \
+ "
+ 
+ # catch debug extensions (isn't that already in python-core-dbg?)
+ FILES_python-dbg += "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/.debug"
+ 
+ # catch all the rest (unsorted)
+ PACKAGES += "python-misc"
+ FILES_python-misc = "${libdir}/python${PYTHON_MAJMIN}"
+ RDEPENDS_python-misc += "python-shell"
+ 
+ # catch manpage
+ PACKAGES += "python-man"
+ FILES_python-man = "${datadir}/man"