merge of '55132066284089ca5853bcbb50bbd4990ec25823'

     and '5565cda387e227c33c34f8743f541e7737fc5b1b'

118 files changed, 4118 insertions, 808 deletions

diff --git a/packages/dvbtools/wscan_20080720.bb b/packages/dvbtools/wscan_20080720.bb
new file mode 100644
index 0000000000..b71fb2bf18
--- /dev/null
+++ b/packages/dvbtools/wscan_20080720.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Wscan is a dvb channel scanner that doesn't require an initial frequency table"
+LICENSE = "GPLv2"
+
+SRC_URI = "http://wirbel.htpc-forum.de/w_scan/w_scan-${PV}.tar.bz2"
+S = "${WORKDIR}/w_scan-${PV}"
+
+do_install() {
+	install -d ${D}/${bindir}
+	install -m 0755 w_scan ${D}/${bindir}/
+
+	install -d ${D}/${datadir}/w_scan
+	install -m 0644 *.ids *.classes  ${D}/${datadir}/w_scan/
+}
+
+FILES_${PN} += "${datadir}"
diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb
index c93261283f..0cbfce233c 100644
--- a/packages/ffmpeg/ffmpeg_git.bb
+++ b/packages/ffmpeg/ffmpeg_git.bb
@@ -3,7 +3,7 @@ require ffmpeg.inc
 DEPENDS += "libgsm"
 
 PV = "0.4.9+${PR}+gitr${SRCREV}" 
-PR = "r21"
+PR = "r23"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_armv5te = "1"
@@ -44,7 +44,7 @@ EXTRA_OECONF = " \
         --enable-libfaadbin \
         --enable-libgsm \
         --enable-libmp3lame \
-        --disable-swscale \
+        --enable-swscale \
         --arch=${TARGET_ARCH} \
         --enable-cross-compile \
         --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
@@ -93,8 +93,9 @@ do_stage() {
            install -m 0644 ${S}/libavutil/$h        ${STAGING_INCDIR}/libavutil/$h 
         done
 
-        install -m 0644 ${S}/libswscale/swscale.h ${STAGING_INCDIR}/ffmpeg/swscale.h
-        install -m 0644 ${S}/libswscale/rgb2rgb.h ${STAGING_INCDIR}/ffmpeg/rgb2rgb.h
+        install -d ${STAGING_INCDIR}/libswscale/ 
+        install -m 0644 ${S}/libswscale/*.h ${STAGING_INCDIR}/ffmpeg/
+        install -m 0644 ${S}/libswscale/*.h ${STAGING_INCDIR}/libswscale/
 
         install -d ${STAGING_INCDIR}/libpostproc
         install -d ${STAGING_INCDIR}/postproc 
diff --git a/packages/fvwm/.mtn2git_empty b/packages/fvwm/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/fvwm/.mtn2git_empty
diff --git a/packages/fvwm/files/.mtn2git_empty b/packages/fvwm/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/fvwm/files/.mtn2git_empty
diff --git a/packages/fvwm/files/acinclude.m4.patch b/packages/fvwm/files/acinclude.m4.patch
new file mode 100644
index 0000000000..59c4275bf3
--- /dev/null
+++ b/packages/fvwm/files/acinclude.m4.patch
@@ -0,0 +1,32 @@
+upstream: OE-only
+origin: Yuri Bushmelev <jay4mail at gmail.com>
+comment: disable xft-config calls while cross-compiling
+--- fvwm-2.5.26/acinclude.m4.orig	2008-06-10 01:53:46.000000000 +0400
++++ fvwm-2.5.26/acinclude.m4	2008-06-10 01:53:51.000000000 +0400
+@@ -1225,14 +1225,14 @@
+     XFT_CONFIG=$xft_config_prefix/bin/xft-config
+   fi
+ fi
+-AC_PATH_PROG(XFT_CONFIG, xft-config, no)
++dnl AC_PATH_PROG(XFT_CONFIG, xft-config, no)
+ 
+ min_xft_version=ifelse([$1], ,2.0.0,$1)
+ AC_MSG_CHECKING(for Xft - version >= $min_xft_version)
+ no_xft=""
+ pkg_config_xft_exists=""
+ 
+-if test "$XFT_CONFIG" = "no" ; then
++dnl if test "$XFT_CONFIG" = "no" ; then
+   if test "x$PKG_CONFIG" != "xno" ; then
+     if $PKG_CONFIG --exists 'xft' ; then
+       if $PKG_CONFIG --exists 'xft >= $1' ; then
+@@ -1249,7 +1249,8 @@
+   else
+     no_xft=yes
+   fi
+-else
++dnl else
++if false; then
+   XFT_CFLAGS=`$XFT_CONFIG $xft_config_args --cflags`
+   XFT_LIBS=`$XFT_CONFIG $xft_config_args --libs`
+   xft_config_major_version=`$XFT_CONFIG $xft_config_args --version | \
diff --git a/packages/fvwm/files/oe-configure.ac.patch b/packages/fvwm/files/oe-configure.ac.patch
new file mode 100644
index 0000000000..c140cff5dd
--- /dev/null
+++ b/packages/fvwm/files/oe-configure.ac.patch
@@ -0,0 +1,56 @@
+upstream: OE-only
+origin: Yuri Bushmelev <jay4mail at gmail.com>
+comment: disable mkstemp() safety check, X11/keysym.h check and old libstroke check
+--- fvwm-2.5.26/configure.ac.orig	2008-06-11 15:44:28.000000000 +0400
++++ fvwm-2.5.26/configure.ac	2008-06-11 15:44:46.000000000 +0400
+@@ -1405,7 +1407,8 @@
+ 
+ # check for mkstemp, see the discution on this subject on the fvwm workers
+ # list (2001-02-16 and 2001-02-24)
+-AM_SAFETY_CHECK_MKSTEMP
++#AM_SAFETY_CHECK_MKSTEMP
++AC_DEFINE(HAVE_SAFETY_MKSTEMP)
+ 
+ # If we do not have atexit(), then check for on_exit()
+ if test x$ac_cv_func_atexit = xno; then
+@@ -1465,23 +1468,23 @@
+   problem_gnomehints=": Explicitly disabled"
+ fi
+ 
+-# Define some compatibility macros needed for config.h.
+-mg_DEFINE_IF_NOT([#include <X11/keysym.h>],
+-  [defined XK_Page_Up && defined XK_Page_Down],
+-  [COMPAT_OLD_KEYSYMDEF], [$X_CFLAGS],
+-  [Old AIX systems (3.2.5) don't define some common keysyms.])
+-AH_VERBATIM([_COMPAT_OLD_KEYSYMDEF],
+-[#ifdef COMPAT_OLD_KEYSYMDEF
+-#  define XK_Page_Up   XK_Prior
+-#  define XK_Page_Down XK_Next
+-#endif])
+-
+-if test x"$with_stroke" = xyes; then
+-  mg_DEFINE_IF_NOT([#include <stroke.h>],
+-    [defined STROKE_MAX_SEQUENCE],