merge of '0675e9a3e7f3d9faa1311df4548be2e200c02760'

     and 'ed7f086a6f3dc6bc06899e467a960cd37d7f2a9c'

36 files changed, 752 insertions, 67 deletions

diff --git a/packages/dgen/dgen-sdl-1.23/fix-configure-and-make.patch b/packages/dgen/dgen-sdl-1.23/fix-configure-and-make.patch
index a6fff7adf9..4d1fbb6518 100644
--- a/packages/dgen/dgen-sdl-1.23/fix-configure-and-make.patch
+++ b/packages/dgen/dgen-sdl-1.23/fix-configure-and-make.patch
@@ -1,7 +1,8 @@
-diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/Makefile.am dgen-sdl-1.23/Makefile.am
---- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/Makefile.am	2001-02-22 00:14:21 +00:00
-+++ dgen-sdl-1.23/Makefile.am	2005-02-24 23:21:05 +00:00
-@@ -5,7 +5,7 @@
+Index: dgen-sdl-1.23/Makefile.am
+===================================================================
+--- dgen-sdl-1.23.orig/Makefile.am
++++ dgen-sdl-1.23/Makefile.am
+@@ -5,7 +5,7 @@ include $(top_srcdir)/Makefile.asm.am
  DIST_SUBDIRS = star musa mz80 sdl
  SUBDIRS = @CPUDIRS@ @INTERFACE@
  
@@ -10,9 +11,10 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/Makefile.am dgen-sdl-1.23/Makefile.
  
  bin_PROGRAMS = dgen tobin
  
-diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/Makefile.asm.am dgen-sdl-1.23/Makefile.asm.am
---- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/Makefile.asm.am	2000-01-14 00:55:49 +00:00
-+++ dgen-sdl-1.23/Makefile.asm.am	2005-02-24 23:21:05 +00:00
+Index: dgen-sdl-1.23/Makefile.asm.am
+===================================================================
+--- dgen-sdl-1.23.orig/Makefile.asm.am
++++ dgen-sdl-1.23/Makefile.asm.am
 @@ -1,5 +1,5 @@
  # Tell how to make assembler files
 -SUFFIXES += .asmu .asm
@@ -20,10 +22,11 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/Makefile.asm.am dgen-sdl-1.23/Makef
  
  .asm.o:
  	@NASM@ -f @NASM_FMT@ $<
-diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/configure.in dgen-sdl-1.23/configure.in
---- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/configure.in	2001-07-02 19:34:18 +01:00
-+++ dgen-sdl-1.23/configure.in	2005-02-25 00:20:08 +00:00
-@@ -62,41 +62,39 @@
+Index: dgen-sdl-1.23/configure.in
+===================================================================
+--- dgen-sdl-1.23.orig/configure.in
++++ dgen-sdl-1.23/configure.in
+@@ -62,41 +62,39 @@ CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
  EXTRAOBJS=
  
  dnl Check for SDL joystick
@@ -31,20 +34,15 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/configure.in dgen-sdl-1.23/configur
 -AC_CHECK_HEADER(SDL_joystick.h, JOYSTICK_SUPPORT=SDL,
 -	dnl Check for Linux joystick as a backup
 -	AC_CHECK_HEADER(linux/joystick.h, JOYSTICK_SUPPORT=LINUX))
-+AC_CHECK_HEADER(SDL_joystick.h, JOYSTICK_SUPPORT=SDL, JOYSTICK_SUPPORT=no)
- 
+-
 -dnl Check for X (so we can find the OpenGL headers)
 -AC_PATH_XTRA
 -CFLAGS="$CFLAGS $X_CFLAGS"
 -CXXFLAGS="$CXXFLAGS $X_CFLAGS"
 -LIBS="$LIBS $X_LIBS"
-+#dnl Check for X (so we can find the OpenGL headers)
-+#AC_PATH_XTRA
-+#CFLAGS="$CFLAGS $X_CFLAGS"
-+#CXXFLAGS="$CXXFLAGS $X_CFLAGS"
-+#LIBS="$LIBS $X_LIBS"
++AC_CHECK_HEADER(SDL_joystick.h, JOYSTICK_SUPPORT=SDL, JOYSTICK_SUPPORT=no)
  
- dnl Check for OpenGL support in SDL
+-dnl Check for OpenGL support in SDL
 -AC_ARG_WITH(opengl,
 -	    [  --without-opengl        Don't use SDL OpenGL support],
 -	    OPENGL_SUPPORT=$withval, OPENGL_SUPPORT=yes)
@@ -66,8 +64,14 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/configure.in dgen-sdl-1.23/configur
 -    LIBS=$oldLIBS
 -    CPPFLAGS=$oldCPPFLAGS
 -  fi
--
++#dnl Check for X (so we can find the OpenGL headers)
++#AC_PATH_XTRA
++#CFLAGS="$CFLAGS $X_CFLAGS"
++#CXXFLAGS="$CXXFLAGS $X_CFLAGS"
++#LIBS="$LIBS $X_LIBS"
+ 
 -fi
++dnl Check for OpenGL support in SDL
 +OPENGL_SUPPORT=no
 +#AC_ARG_WITH(opengl,
 +#	    [  --without-opengl        Don't use SDL OpenGL support],
@@ -95,7 +99,7 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/configure.in dgen-sdl-1.23/configur
  
  if test x$OPENGL_SUPPORT \!= xno; then
    AC_DEFINE(SDL_OPENGL_SUPPORT)
-@@ -166,8 +164,11 @@
+@@ -166,8 +164,11 @@ changequote([,])
  				else
  					CHOP_=cat
  				fi
@@ -109,10 +113,11 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/configure.in dgen-sdl-1.23/configur
  
  				dnl Check for MMX
  				AC_ARG_WITH(mmx,
-diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/musa/Makefile.am dgen-sdl-1.23/musa/Makefile.am
---- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/musa/Makefile.am	2000-01-29 00:46:22 +00:00
-+++ dgen-sdl-1.23/musa/Makefile.am	2005-02-25 01:10:38 +00:00
-@@ -8,7 +8,10 @@
+Index: dgen-sdl-1.23/musa/Makefile.am
+===================================================================
+--- dgen-sdl-1.23.orig/musa/Makefile.am
++++ dgen-sdl-1.23/musa/Makefile.am
+@@ -8,7 +8,10 @@ noinst_PROGRAMS = m68kmake
  
  noinst_LIBRARIES = libmusa68.a
  
@@ -124,9 +129,10 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/musa/Makefile.am dgen-sdl-1.23/musa
  
  m68kops.c: m68kmake
  	./m68kmake
-diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/mz80/Makefile.am dgen-sdl-1.23/mz80/Makefile.am
---- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/mz80/Makefile.am	2000-10-27 00:08:19 +01:00
-+++ dgen-sdl-1.23/mz80/Makefile.am	2005-02-25 00:22:19 +00:00
+Index: dgen-sdl-1.23/mz80/Makefile.am
+===================================================================
+--- dgen-sdl-1.23.orig/mz80/Makefile.am
++++ dgen-sdl-1.23/mz80/Makefile.am
 @@ -3,13 +3,11 @@
  
  include $(top_srcdir)/Makefile.asm.am
@@ -145,10 +151,11 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/mz80/Makefile.am dgen-sdl-1.23/mz80
  
  EXTRA_DIST = mz80.txt
  
-diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/sdl/Makefile.am dgen-sdl-1.23/sdl/Makefile.am
---- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/sdl/Makefile.am	2001-02-10 19:34:28 +00:00
-+++ dgen-sdl-1.23/sdl/Makefile.am	2005-02-25 01:26:27 +00:00
-@@ -3,11 +3,14 @@
+Index: dgen-sdl-1.23/sdl/Makefile.am
+===================================================================
+--- dgen-sdl-1.23.orig/sdl/Makefile.am
++++ dgen-sdl-1.23/sdl/Makefile.am
+@@ -3,12 +3,15 @@
  
  EXTRA_DIST = dgenfont.pbm chartfont.c
  
@@ -158,16 +165,18 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/sdl/Makefile.am dgen-sdl-1.23/sdl/M
  noinst_PROGRAMS = pbm2df
  
  noinst_LIBRARIES = libpd.a
-+
+ 
 +pbm2df: pbm2df.c
 +	$(HOSTCC) -o pbm2df pbm2df.c
- 
++
  # built sources
  
-diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/star/Makefile.am dgen-sdl-1.23/star/Makefile.am
---- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/star/Makefile.am	2001-07-02 22:48:27 +01:00
-+++ dgen-sdl-1.23/star/Makefile.am	2005-02-24 23:21:05 +00:00
-@@ -7,7 +7,7 @@
+ BUILT_SOURCES = dgenfont.cpp
+Index: dgen-sdl-1.23/star/Makefile.am
+===================================================================
+--- dgen-sdl-1.23.orig/star/Makefile.am
++++ dgen-sdl-1.23/star/Makefile.am
+@@ -7,7 +7,7 @@ include $(top_srcdir)/Makefile.asm.am
  # license)
  EXTRA_DIST = cpudebug.c cpudebug.h star.c starcpu.h stardoc.txt
  
@@ -176,3 +185,17 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/star/Makefile.am dgen-sdl-1.23/star
  
  noinst_LIBRARIES = libstarcpu.a
  
+Index: dgen-sdl-1.23/musa/m68kcpu.h
+===================================================================
+--- dgen-sdl-1.23.orig/musa/m68kcpu.h
++++ dgen-sdl-1.23/musa/m68kcpu.h
+@@ -51,7 +51,8 @@
+ #define int32  long
+ 
+ /* int and unsigned int must be at least 32 bits wide */
+-#define uint   unsigned int
++//#define uint   unsigned int
++typedef unsigned int uint;
+ 
+ 
+ /* Allow for architectures that don't have 8-bit sizes */
diff --git a/packages/dgen/dgen-sdl_1.23.bb b/packages/dgen/dgen-sdl_1.23.bb
index 00a39f9ce1..e682a3163d 100644
--- a/packages/dgen/dgen-sdl_1.23.bb
+++ b/packages/dgen/dgen-sdl_1.23.bb
@@ -1,12 +1,14 @@
-inherit autotools
-
-DEFAULT_PREFERENCE = "-1"
-
-SECTION = "x11/games"
 DESCRIPTION = "DGen/SDL is a Sega Genesis/Mega-drive emulator."
 DEPENDS = "virtual/libsdl"
-SRC_URI = "http://pknet.com/~joe/${PN}-${PV}.tar.gz \
-	   file://fix-configure-and-make.patch;patch=1"
+SECTION = "x11/games"
+LICENSE = "BSD"
+
+SRC_URI = "\
+  http://pknet.com/~joe/${PN}-${PV}.tar.gz \
+  file://fix-configure-and-make.patch;patch=1 \
+"
+
+inherit autotools
 
 EXTRA_OECONF = " --disable-sdltest --without-x --without-opengl --without-nasm --without-mmx --without-star"
 
diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb
index d05e65d281..c93261283f 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 = "r20"
+PR = "r21"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_armv5te = "1"
@@ -14,7 +14,7 @@ FFBRANCH_arm = "arm-neon"
 FFBRANCH ?= "master"
 
 SRCREV = "3692b8de9fae73860be636606cb6344f26e28b1a"
-SRCREV_arm = "af7bda5224b6cdfb0c1f03686d2a6b631a455668"
+SRCREV_arm = "3c4b8ba71b922be6559fcfea3cb990ea3ded234d"
 SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \
 "
 
diff --git a/packages/libusb/libusb-compat-0.0.9+0.1.0-beta1/.mtn2git_empty b/packages/fontconfig/fontconfig-2.6.0/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libusb/libusb-compat-0.0.9+0.1.0-beta1/.mtn2git_empty
+++ b/packages/fontconfig/fontconfig-2.6.0/.mtn2git_empty
diff --git a/packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch b/packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch
new file mode 100644
index 0000000000..17b85f758d
--- /dev/null
+++ b/packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch
@@ -0,0 +1,15 @@
+---
+ fontconfig.pc.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- fontconfig-2.6.0.orig/fontconfig.pc.in
++++ fontconfig-2.6.0/fontconfig.pc.in
+@@ -5,7 +5,7 @@ includedir=@includedir@
+ 
+ Name: Fontconfig
+ Description: Font configuration and customization library
+ Version: @VERSION@
+ Libs: -L${libdir} -lfontconfig
+-Libs.private: @EXPAT_LIBS@ @FREETYPE_LIBS@
++Libs.private: @EXPAT_LIBS@ -L${libdir} -lfreetype
+ Cflags: -I${includedir}
diff --git a/packages/fontconfig/fontconfig-native_2.6.0.bb b/packages/fontconfig/fontconfig-native_2.6.0.bb
new file mode 100644
index 0000000000..541b74634c
--- /dev/null
+++ b/packages/fontconfig/fontconfig-native_2.6.0.bb
@@ -0,0 +1,15 @@
+SECTION = "base"
+LICENSE = "BSD"
+require fontconfig_${PV}.bb
+inherit native
+DEPENDS = "freetype-native expat-native zlib-native"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/fontconfig-${PV}"
+
+EXTRA_OEMAKE = ""
+EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1))]}"
+
+do_stage () {
+	oe_runmake install
+	install fc-lang/fc-lang ${STAGING_BINDIR}
+	install fc-glyphname/fc-glyphname ${STAGING_BINDIR}
+}
diff --git a/packages/fontconfig/fontconfig_2.6.0.bb b/packages/fontconfig/fontconfig_2.6.0.bb
new file mode 100644
index 0000000000..3f7eca4b4e
--- /dev/null
+++ b/packages/fontconfig/fontconfig_2.6.0.bb
@@ -0,0 +1,76 @@
+SECTION = "libs"
+LICENSE = "BSD"
+DESCRIPTION = "A library for configuring and customizing font access."
+DEPENDS = "expat freetype zlib"
+
+SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
+           file://fix-pkgconfig.patch;patch=1"
+
+PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "
+FILES_fontconfig-utils-dbg = "${bindir}/*.dbg"
+FILES_fontconfig-utils = "${bindir}/*"
+
+# Work around past breakage in debian.bbclass
+RPROVIDES_fontconfig-utils = "libfontconfig-utils"
+RREPLACES_fontconfig-utils = "libfontconfig-utils"
+RCONFLICTS_fontconfig-utils = "libfontconfig-utils"
+DEBIAN_NOAUTONAME_fontconfig-utils = "1"
+
+S = "${WORKDIR}/fontconfig-${PV}"
+
+PARALLEL_MAKE = ""
+
+inherit autotools pkgconfig
+
+export HASDOCBOOK="no"
+
+EXTRA_OECONF = " --disable-docs --with-arch=${HOST_ARCH}"
+EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname"
+
+# The tarball has some of the patched files as read only, which
+# patch doesn't like at all
+
+fontconfig_do_unpack() {
+       chmod -R u+rw ${S}
+}
+
+python do_unpack () {
+       bb.build.exec_func('base_do_unpack', d)
+       bb.build.exec_func('fontconfig_do_unpack', d)
+}
+
+do_stage () {
+	oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}/fontconfig
+	for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done
+}
+
+BUILD_CFLAGS += " -I${STAGING_INCDIR}/freetype2"
+
+do_configure_append () {
+	sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-case/Makefile
+	sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-glyphname/Makefile
+	sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-lang/Makefile
+	sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-arch/Makefile
+
+	sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-case/Makefile
+	sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-glyphname/Makefile
+	sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-lang/Makefile
+	sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-arch/Makefile
+
+	sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-case/Makefile
+	sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-glyphname/Makefile
+	sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-lang/Makefile
+	sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-arch/Makefile
+
+	sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-case/Makefile
+	sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-glyphname/Makefile
+	sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-lang/Makefile
+	sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-arch/Makefile
+
+}
+
+do_install () {
+	autotools_do_install
+}
+
diff --git a/packages/glibc/glibc.inc b/packages/glibc/glibc.inc
index 8f9b34b252..c2ee5317bf 100644
--- a/packages/glibc/glibc.inc
+++ b/packages/glibc/glibc.inc
@@ -17,4 +17,6 @@ LEAD_SONAME = "libc.so"
 GLIBC_EXTRA_OECONF ?= ""
 INHIBIT_DEFAULT_DEPS = "1"
 
+ARM_INSTRUCTION_SET = "arm"
+
 PACKAGES = "glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile"
diff --git a/packages/glibc/glibc_2.6.1.bb b/packages/glibc/glibc_2.6.1.bb
index 60eb071032..6faa3df9af 100644
--- a/packages/glibc/glibc_2.6.1.bb
+++ b/packages/glibc/glibc_2.6.1.bb
@@ -1,8 +1,6 @@
 require glibc.inc
 PR = "r10"
 
-ARM_INSTRUCTION_SET = "arm"
-
 PACKAGES_DYNAMIC = "libc6*"
 RPROVIDES_${PN}-dev = "libc6-dev"
 
diff --git a/packages/libusb/libusb1-0.9.0/.mtn2git_empty b/packages/gsoap/gsoap-native/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libusb/libusb1-0.9.0/.mtn2git_empty
+++ b/packages/gsoap/gsoap-native/.mtn2git_empty
diff --git a/packages/gsoap/gsoap-native/use-just-built-binary.patch b/packages/gsoap/gsoap-native/use-just-built-binary.patch
new file mode 100644
index 0000000000..f7e4811f9e
--- /dev/null
+++ b/packages/gsoap/gsoap-native/use-just-built-binary.patch
@@ -0,0 +1,19 @@
+---
+ soapcpp2/wsdl/Makefile.am |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- gsoap-2.7.orig/soapcpp2/wsdl/Makefile.am
++++ gsoap-2.7/soapcpp2/wsdl/Makefile.am
+@@ -13,11 +13,11 @@ SOAP_CPP_SRC=wsdlC.cpp
+ SOAPHEADER=wsdl.h
+ SOAP_FLAGS=-SC -pwsdl
+ BUILT_SOURCES=$(SOAP_CPP_SRC)
+ 
+ $(SOAP_CPP_SRC) : $(SOAPHEADER)
+-	$(SOAP) $(SOAP_FLAGS) $(SOAPHEADER)
++	../src/soapcpp2 $(SOAP_FLAGS) $(SOAPHEADER)
+ 
+ #LIBS=
+ 
+ bin_PROGRAMS=wsdl2h
+ 
diff --git a/packages/gsoap/gsoap-native_2.7.7.bb b/packages/gsoap/gsoap-native_2.7.7.bb
index b7553b404d..206208d329 100644
--- a/packages/gsoap/gsoap-native_2.7.7.bb
+++ b/packages/gsoap/gsoap-native_2.7.7.bb
@@ -1,6 +1,9 @@
 require gsoap_${PV}.bb
 
 DEPENDS = ""
+PR = "r1"
+
+SRC_URI += "file://use-just-built-binary.patch;patch=1"
 
 inherit native
 
@@ -11,4 +14,3 @@ do_stage() {
 do_install() {
 	:
 }
-
diff --git a/packages/libusb/libusb-compat-0.0.9+0.1.0-beta2/.mtn2git_empty b/packages/libusb/libusb-compat-0.0.9+0.1.0-beta2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libusb/libusb-compat-0.0.9+0.1.0-beta2/.mtn2git_empty
diff --git a/packages/libusb/libusb-compat-0.0.9+0.1.0-beta1/0.1.0-beta1-gcc3.4-fix.patch b/packages/libusb/libusb-compat-0.0.9+0.1.0-beta2/0.1.0-beta1-gcc3.4-fix.patch
index 501ba3fb29..501ba3fb29 100644
--- a/packages/libusb/libusb-compat-0.0.9+0.1.0-beta1/0.1.0-beta1-gcc3.4-fix.patch
+++ b/packages/libusb/libusb-compat-0.0.9+0.1.0-beta2/0.1.0-beta1-gcc3.4-fix.patch
diff --git a/packages/libusb/libusb-compat_0.0.9+0.1.0-beta1.bb b/packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb
index fec42b1df7..34cc1ac50d 100644
--- a/packages/libusb/libusb-compat_0.0.9+0.1.0-beta1.bb
+++ b/packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb
@@ -5,15 +5,15 @@ SECTION = "libs"
 LICENSE = "LGPL"
 
 PE = "1"
-PR = "r1"
+PR = "r0"
 
 DEPENDS = "libusb1"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-0.1.0-beta1.tar.bz2 \
+SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-0.1.0-beta2.tar.bz2 \
 					file://0.1.0-beta1-gcc3.4-fix.patch;patch=1 \
           "
 
-S = "${WORKDIR}/libusb-compat-0.1.0-beta1"
+S = "${WORKDIR}/libusb-compat-0.1.0-beta2"
 
 inherit autotools pkgconfig binconfig lib_package
 
diff --git a/packages/libusb/libusb1-0.9.2/.mtn2git_empty b/packages/libusb/libusb1-0.9.2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libusb/libusb1-0.9.2/.mtn2git_empty
diff --git a/packages/libusb/libusb1-0.9.0/0.9.0-gcc3.4-compat-fix.patch b/packages/libusb/libusb1-0.9.2/0.9.0-gcc3.4-compat-fix.patch
index 1b06945d1a..1b06945d1a 100644
--- a/packages/libusb/libusb1-0.9.0/0.9.0-gcc3.4-compat-fix.patch
+++ b/packages/libusb/libusb1-0.9.2/0.9.0-gcc3.4-compat-fix.patch
diff --git a/packages/libusb/libusb1_0.9.0.bb b/packages/libusb/libusb1_0.9.2.bb
index ce102c0cfc..2c144f053d 100644
--- a/packages/libusb/libusb1_0.9.0.bb
+++ b/packages/libusb/libusb1_0.9.2.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://libusb.sf.net"
 SECTION = "libs"
 LICENSE = "LGPL"
 
-PR = "r1"
+PR = "r0"
 
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \
diff --git a/packages/linux/linux-neuros_git.bb b/packages/linux/linux-neuros_git.bb
index 563a2c5aaa..77b68decf6 100644
--- a/packages/linux/linux-neuros_git.bb
+++ b/packages/linux/linux-neuros_git.bb
@@ -2,10 +2,10 @@ require linux.inc
 
 DESCRIPTION = "Linux kernel for Neuros OSD devices"
 
-SRCREV = "d2867be8abb7d67442cec3ae13d782f1254835d8"
+SRCREV = "3560f6dca0c8dd97d9e2a935f68303effb3b8cc5"
 
 PV = "2.6.23-${PR}+git${SRCREV}"
-PR = "r9"
+PR = "r10"
 
 COMPATIBLE_MACHINE = "(neuros-osd|neuros-osd2)"
 
diff --git a/packages/nandlogical/.mtn2git_empty b/packages/nandlogical/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nandlogical/.mtn2git_empty
diff --git a/packages/nandlogical/files/.mtn2git_empty b/packages/nandlogical/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nandlogical/files/.mtn2git_empty
diff --git a/packages/nandlogical/files/nandlogical.c b/packages/nandlogical/files/nandlogical.c
new file mode 100644
index 0000000000..d88d1c212f
--- /dev/null
+++ b/packages/nandlogical/files/nandlogical.c
@@ -0,0 +1,386 @@
+/*
+   NAND logical utility for Sharp Zaurus SL-C7x0/860/7500/Cxx00
+   version 1.0
+   Copyright 2006 Alexander Chukov <sash@pdaXrom.org>
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+ */
+
+#define _GNU_SOURCE
+#include <ctype.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <getopt.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <asm/types.h>
+#include <mtd/mtd-user.h>
+
+int fd;
+
+unsigned char *readbuf;
+unsigned char *oobbuf;
+unsigned long *log2phy;
+
+struct mtd_oob_buf oob = {0, 16, NULL};
+
+struct nand_oobinfo none_oobinfo = {
+	.useecc = MTD_NANDECC_OFF,
+};
+
+#define NAND_LOGICAL_SIZE (7 * 1024 * 1024)
+
+/////////////////////////////////////////////////////////////////////
+// oob structure
+/////////////////////////////////////////////////////////////////////
+
+#define NAND_NOOB_LOGADDR_00		8
+#define NAND_NOOB_LOGADDR_01		9
+#define NAND_NOOB_LOGADDR_10		10
+#define NAND_NOOB_LOGADDR_11		11
+#define NAND_NOOB_LOGADDR_20		12
+#define NAND_NOOB_LOGADDR_21		13
+
+static uint nand_get_logical_no(unsigned char *oob)
+{
+    unsigned short us,bit;
+    int par;
+    int good0, good1;
+
+    if(oob[NAND_NOOB_LOGADDR_00] == oob[NAND_NOOB_LOGADDR_10] &&
+       oob[NAND_NOOB_LOGADDR_01] == oob[NAND_NOOB_LOGADDR_11]){
+	good0 = NAND_NOOB_LOGADDR_00;
+	good1 = NAND_NOOB_LOGADDR_01;
+    }else
+    if(oob[NAND_NOOB_LOGADDR_10] == oob[NAND_NOOB_LOGADDR_20] &&
+       oob[NAND_NOOB_LOGADDR_11] == oob[NAND_NOOB_LOGADDR_21]){
+	good0 = NAND_NOOB_LOGADDR_10;
+	good1 = NAND_NOOB_LOGADDR_11;
+    }else
+    if(oob[NAND_NOOB_LOGADDR_20] == oob[NAND_NOOB_LOGADDR_00] &&
+       oob[NAND_NOOB_LOGADDR_21] == oob[NAND_NOOB_LOGADDR_01]){
+	good0 = NAND_NOOB_LOGADDR_20;
+	good1 = NAND_NOOB_LOGADDR_21;
+    }else{
+	return (uint)-1;
+    }
+
+    us = (((unsigned short)(oob[good0]) & 0x00ff) << 0) |
+	 (((unsigned short)(oob[good1]) & 0x00ff) << 8);
+
+    par = 0;
+    for(bit = 0x0001; bit != 0; bit <<= 1){
+	if(us & bit){
+	    par++;
+	}
+    }
+    if(par & 1){
+	return (uint)-2;
+    }
+
+    if(us == 0xffff){
+	return 0xffff;
+    }else{
+	return ((us & 0x07fe) >> 1);
+    }
+}
+
+static void nand_set_logical_no(uint log_no, unsigned char *oob)
+{
+    unsigned short us,bit;
+    int par;
+
+    us = (((log_no & 0x03ff) << 1) | 0x1000);
+
+    par = 0;
+    for(bit = 0x0001; bit != 0; bit <<= 1){
+	if(us & bit){
+	    par++;
+	}
+    }
+    if(par & 1){
+	us |= 0x0001;
+    }
+
+    oob[NAND_NOOB_LOGADDR_00] = (unsigned char)((us & 0x00ff) >> 0);
+    oob[NAND_NOOB_LOGADDR_01] = (unsigned char)((us & 0xff00) >> 8);
+    oob[NAND_NOOB_LOGADDR_10] = oob[NAND_NOOB_LOGADDR_00];
+    oob[NAND_NOOB_LOGADDR_11] = oob[NAND_NOOB_LOGADDR_01];
+    oob[NAND_NOOB_LOGADDR_20] = oob[NAND_NOOB_LOGADDR_00];
+    oob[NAND_NOOB_LOGADDR_21] = oob[NAND_NOOB_LOGADDR_01];
+}
+
+void scan_logical(int blocks, int erasesize)
+{
+    int i;
+    unsigned long offset;
+    int ret = 1;
+    for (i = 0; i < blocks; i++)
+	log2phy[i] = (uint) -1;
+    offset = 0;
+    for (i = 0; i < blocks; i++) {
+	oob.start = offset;
+	ret = ioctl(fd, MEMREADOOB, &oob);
+
+	//ret = nand_read_raw(nand, oobuf, offset, nand->writesize, nand->oobsize);
+	if (!ret) {
+    	    int log_no = nand_get_logical_no(oobbuf);
+	    if (((int)log_no >= 0) && (log_no < blocks)) {
+		log2phy[log_no] = offset;
+		//printf("NAND logical - %08X -> %04X\n", offset, log_no * erasesize);
+	    } else {
+		//printf("NAND logical - %08X - skip (%x)\n", offset, log_no);
+	    }
+	} else {
+	    //printf("NAND logical - offset %x read OOB problem\n", offset);
+	}
+	offset += erasesize;
+    }
+}
+
+unsigned long add_logical(unsigned long ofs, int blocks, int erasesize, int bs)
+{
+    erase_info_t erase;
+    unsigned long offset = 0;
+    int i;
+    int ret;
+
+    erase.length = erasesize;
+
+    for (i = 0; i < blocks; i++) {
+	oob.start = offset;
+	ret = ioctl(fd, MEMREADOOB, &oob);
+
+	if (!ret) {
+    	    int log_no = nand_get_logical_no(oobbuf);
+
+//printf("-- %x\n", log_no);
+
+	    if ((short)log_no == -1) {
+		int j = 0;
+		{
+		loff_t offs = offset;
+		erase.start = offset;
+		int ret = ioctl(fd, MEMGETBADBLOCK, &offs);
+		if (ret > 0) {
+		    printf ("\nSkipping bad block at 0x%08x\n", erase.start);
+		    goto nextblock;
+		} else if (ret < 0) {
+			perror("ioctl(MEMGETBADBLOCK)");
+			exit(1);
+		} else {
+			printf("%x - no bad block\n", offset);
+		}
+		
+		if (ioctl(fd, MEMERASE, &erase) != 0) {
+		    perror("ioctl(MEMERASE)");
+		    goto nextblock;
+		}
+
+		//printf("%x - erased\n", offset);
+
+		}
+
+		//printf("NAND logical - found free block %x, mapped as %x\n", offset, ofs);
+
+		log2phy[ofs / erasesize] = offset;
+
+		return offset;
+	    } else {
+		//fprintf(stderr, "found: %x\n", log_no);
+	    }
+	} else {
+	    perror ("ioctl(MEMREADOOB)");
+	}
+    
+    nextblock:
+        offset += erasesize;
+    }
+    
+    return (unsigned long)-1;
+}
+
+void usage(void)
+{
+	fprintf(stderr, "Usage:\nnandlogical <mtd char device> READ|WRITE <start> <length> <file>\n");
+	exit(1);
+}
+
+int main(int argc, char *argv[])
+{
+	mtd_info_t meminfo;
+	char *mtddev;
+	int blocks;
+	unsigned long start_addr;
+	unsigned long end_addr;
+	unsigned long length;
+	unsigned long ofs;
+	int bs;
+	int ofd;
+	int func_write = 0;
+	int oobinfochanged = 0;
+	struct nand_oobinfo old_oobinfo;
+
+	if (argc < 6)
+	    usage();
+
+	if (strcmp(argv[2], "WRITE") == 0)
+	    func_write = 1;
+	else if (strcmp(argv[2], "READ") != 0)
+	    usage();
+	
+	mtddev = argv[1];
+	start_addr = strtoul(argv[3], NULL, 0);
+	length = strtoul(argv[4], NULL, 0);
+
+	if (func_write) {
+	    if ((ofd = open(argv[5], O_RDONLY)) == -1) {
+		perror("open input file");
+		exit(1);
+	    }
+	    /* Open MTD device */
+	    if ((fd = open(mtddev, O_RDWR)) == -1) {
+	        perror("open flash");
+		exit (1);
+	    }
+	} else {
+	    if ((ofd = open(argv[5], O_WRONLY | O_TRUNC | O_CREAT, 0644)) == -1) {
+		perror ("open outfile");
+		exit(1);
+	    }
+	    /* Open MTD device */
+	    if ((fd = open(mtddev, O_RDONLY)) == -1) {
+		perror("open flash");
+	        exit (1);
+	    }
+	}
+
+	/* Fill in MTD device capability structure */
+	if (ioctl(fd, MEMGETINFO, &meminfo) != 0) {
+	    perror("MEMGETINFO");
+	    close(fd);
+	    exit (1);
+	}
+
+	/* Make sure device page sizes are valid */
+	if (!(meminfo.oobsize == 64 && meminfo.writesize == 2048) &&
+	    !(meminfo.oobsize == 16 && meminfo.writesize == 512) &&
+	    !(meminfo.oobsize == 8 && meminfo.writesize == 256)) {
+	    fprintf(stderr, "Unknown flash (not normal NAND)\n");
+	    close(fd);
+	    exit(1);
+	}
+
+	//printf("erasesize %x\nwritesize %x\noobsize %x\nsize %x\n", meminfo.erasesize, meminfo.writesize, meminfo.oobsize, meminfo.size);
+	
+	blocks = NAND_LOGICAL_SIZE / meminfo.erasesize;
+	log2phy = (unsigned long *) malloc(blocks * sizeof(unsigned long));
+	readbuf = (char *)malloc(meminfo.erasesize);
+	oobbuf = (char *)malloc(meminfo.writesize);	
+	oob.ptr = oobbuf;
+
+	scan_logical(blocks, meminfo.erasesize);
+	
+	//printf("Start: %x\nEnd: %x\n", start_addr, length);
+	
+	end_addr = start_addr + length;
+	bs = meminfo.writesize;
+
+	for (ofs = start_addr; ofs < end_addr ; ofs+=bs) {
+	    int new_logical_added = 0;
+	    int offset = log2phy[ofs / meminfo.erasesize];
+	    
+	    if ((int)offset < 0 && func_write) {
+		//printf("add logical block...\n");
+		offset = add_logical(ofs, blocks, meminfo.erasesize, bs);
+		new_logical_added = 1;
+	    }
+	    
+	    if ((int)offset < 0) {
+	        printf("NAND logical - offset %08X not found\n", ofs);
+		goto closeall;
+	    }
+
+	    offset += ofs % meminfo.erasesize;
+
+	    //printf(":%x\n", offset);
+
+	    if (func_write) {
+		int len;
+		memset(readbuf, 0xff, bs);
+		len = read(ofd, readbuf, bs);
+		if (len > 0) {
+#if 1
+			if (ofs % meminfo.erasesize == 0) {
+			    int j;
+			    erase_info_t erase;
+			    erase.start = offset;
+			    erase.length = meminfo.erasesize;
+			    if (ioctl(fd, MEMERASE, &erase) != 0) {
+				printf("ioctl(MEMERASE) %x\n", offset);
+				//goto nextblock;
+			    }
+			    //printf("Erased\n");
+
+			    for (j = 0; j < meminfo.erasesize; j+=bs) {
+				int log_no;
+				oob.start = offset + j;
+				oob.length = 16;
+
+				memset(oobbuf, 0xff, 16);
+				nand_set_logical_no(ofs / meminfo.erasesize, oobbuf);
+				if (ioctl(fd, MEMWRITEOOB, &oob) != 0) {
+				    //perror ("ioctl(MEMWRITEOOB)");
+				    printf("NAND logical add - MEMWRITEOOB error %x\n", offset + j);
+				    exit(1);
+				}
+				memset(oobbuf, 0xff, 16);
+				if (ioctl(fd, MEMREADOOB, &oob) != 0) {
+				    perror ("ioctl(MEMREADOOB)");
+				    exit(1);
+				}
+				log_no = nand_get_logical_no(oobbuf);
+				//printf("%x:1 write %x, read %x\n", offset + j, ofs / meminfo.erasesize, log_no);
+			    }
+
+			}
+#endif
+			if (pwrite(fd, readbuf, bs, offset) != bs) {
+				perror ("pwrite");
+				goto closeall;
+			}
+
+		} else
+		    break;
+	    } else {
+		if (pread(fd, readbuf, bs, offset) != bs) {
+		    perror("pread");
+		    goto closeall;
+		}
+		write(ofd, readbuf, ((end_addr - ofs) < bs)?(end_addr - ofs):bs);
+	    }
+	}
+
+ closeall:
+
+	free(log2phy);
+	free(readbuf);
+	free(oobbuf);
+	close(fd);
+	close(ofd);
+	
+	return 0;
+}
diff --git a/packages/nandlogical/nandlogical_1.0.0.bb b/packages/nandlogical/nandlogical_1.0.0.bb
new file mode 100644
index 0000000000..7d8fc04b4e
--- /dev/null
+++ b/packages/nandlogical/nandlogical_1.0.0.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Nandlogical for Sharp mtd1"
+LICENSE = "GPL"
+DEPENDS = "mtd-utils"
+COMPATIBLE_MACHINE = "(c7x0)"
+PR = "r0"
+
+SRC_URI = "file://nandlogical.c"
+
+S = "${WORKDIR}/${P}"
+
+do_compile () {
+	${CC} -o nandlogical ${WORKDIR}/nandlogical.c -static
+}
+
+do_install () {
+	install -d ${D}${bindir}/
+	install -m 0755 ${WORKDIR}/${P}/nandlogical ${D}${bindir}/
+}
diff --git a/packages/neuros-pkggen/files/package.c b/packages/neuros-pkggen/files/package.c
index 70f219514d..6ac94f9874 100644
--- a/packages/neuros-pkggen/files/package.c
+++ b/packages/neuros-pkggen/files/package.c
@@ -387,7 +387,7 @@ int main(int argc, char *argv[])
     }
 
     /* packet firmware to package */
-    if (pack_firmware(fp_w, hw_len, 4, &argv[3]) != 0)
+    if (pack_firmware(fp_w, hw_len, argc - 3, &argv[3]) != 0)
         return(-1);
     /* packet upk_desc and version info */
     if (pack_ver_info(fp_w, hw_len+phd->p_headsize, argv[2]) != 0)
diff --git a/packages/neuros-pkggen/neuros-pkggen-native.bb b/packages/neuros-pkggen/neuros-pkggen-native.bb
index 2c5b5c40e2..13625622d2 100644
--- a/packages/neuros-pkggen/neuros-pkggen-native.bb
+++ b/packages/neuros-pkggen/neuros-pkggen-native.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Tool to generate ready to flash .pkg files for neuros machines"
 LICENSE = "GPLv2"
-PR = "r2"
+PR = "r3"
 
 inherit native
 
diff --git a/packages/neuros-public/neuros-app-photoalbum_git.bb b/packages/neuros-public/neuros-app-photoalbum_git.bb
new file mode 100644
index 0000000000..3bbf248724
--- /dev/null
+++ b/packages/neuros-public/neuros-app-photoalbum_git.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Neuros photoalbum app"
+LICENSE = "GPL"
+
+PV = "0.0+${PR}+gitr${SRCREV}"
+PR = "r0"
+
+DEPENDS = "qt-embedded"
+
+inherit qtopia4core
+
+SRCREV = "2e08d843f04a98738e66507f70fe3f503c263bff"
+SRC_URI = "git://git.neurostechnology.com/git/app-photoalbum;protocol=git"
+S = "${WORKDIR}/git/"
+
+do_install() {
+	install -d ${D}/${bindir}
+	install -m 0755  ${S}/build/photoalbum ${D}/${bindir}
+}
+
+
diff --git a/packages/neuros-public/neuros-app-vplayer_git.bb b/packages/neuros-public/neuros-app-vplayer_git.bb
new file mode 100644
index 0000000000..67f62b3fb7
--- /dev/null
+++ b/packages/neuros-public/neuros-app-vplayer_git.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Neuros videoplayer app"
+LICENSE = "GPL"
+
+PV = "0.0+${PR}+gitr${SRCREV}"
+PR = "r0"
+
+DEPENDS = "qt-embedded"
+
+inherit qtopia4core
+
+SRCREV = "8f8347f0baf46b9c4fa89afc743c726c651ed4a1"
+SRC_URI = "git://git.neurostechnology.com/git/app-vplayer;protocol=git"
+S = "${WORKDIR}/git/"
+
+do_install() {
+	install -d ${D}/${bindir}
+	install -m 0755  ${S}/build/vplayer ${D}/${bindir}
+}
+
+
diff --git a/packages/neuros-public/neuros-lib-gui_git.bb b/packages/neuros-public/neuros-lib-gui_git.bb
new file mode 100644
index 0000000000..02c770fc71
--- /dev/null
+++ b/packages/neuros-public/neuros-lib-gui_git.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "Neuros lib-gui"
+LICENSE = "GPL"
+
+PV = "0.0+${PR}+gitr${SRCREV}"
+PR = "r0"
+
+DEPENDS = "qt-embedded"
+
+inherit qtopia4core
+
+SRCREV = "bac10d263a4bb9e01db16d7dd356de315a3ffed7"
+SRC_URI = "git://git.neurostechnology.com/git/lib-gui;protocol=git"
+S = "${WORKDIR}/git/"
+
+do_install() {
+	install -d ${D}/${libdir}/
+	install -m 0755 ${S}/build/lib* ${D}/${libdir}
+}
+
+do_stage() {
+	install -d ${STAGING_LIBDIR}
+	install -m 0755 ${S}/build/lib* ${STAGING_LIBDIR}	
+}
diff --git a/packages/neuros-public/neuros-lib-widgets_git.bb b/packages/neuros-public/neuros-lib-widgets_git.bb
index 45dde3c14a..2dbe457bd3 100644
--- a/packages/neuros-public/neuros-lib-widgets_git.bb
+++ b/packages/neuros-public/neuros-lib-widgets_git.bb
@@ -2,13 +2,13 @@ DESCRIPTION = "Neuros qt-plugins"
 LICENSE = "GPL"
 
 PV = "0.0+${PR}+gitr${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "qt-embedded"
 
 inherit qtopia4core
 
-SRCREV = "9988829eab1428f03f5f5dba8866b2f4da267d67"
+SRCREV = "af9e7b73d0313046587cddaec5f879c78ce05d1a"
 SRC_URI = "git://git.neurostechnology.com/git/lib-widgets;protocol=git"
 S = "${WORKDIR}/git/"
 
diff --git a/packages/neuros-public/neuros-nwm_git.bb b/packages/neuros-public/neuros-nwm_git.bb
index 6dbbd4cabd..0f0dcf857d 100644
--- a/packages/neuros-public/neuros-nwm_git.bb
+++ b/packages/neuros-public/neuros-nwm_git.bb
@@ -2,13 +2,13 @@ DESCRIPTION = "Neuros window manager"
 LICENSE = "GPL"
 
 PV = "0.0+${PR}+gitr${SRCREV}"
-PR = "r2"
+PR = "r4"
 
 DEPENDS = "qt-embedded"
 
 inherit qtopia4core
 
-SRCREV = "d0b6789dde38d321d3c90c04512a4ea43e28e79e"
+SRCREV = "e6c30ba6e5be217ca4bf7e98e00f87bb7241872c"
 SRC_URI = "git://git.neurostechnology.com/git/app-nwm;protocol=git"
 S = "${WORKDIR}/git/"
 
@@ -19,4 +19,8 @@ do_configure_prepend() {
 do_install() {
     install -d ${D}/${bindir}
     install -m 0755  ${S}/build/nwm ${D}/${bindir}
+	install -d ${D}/${libdir}
+	ln -sf ${datadir}/fonts ${D}/${libdir}/fonts
 }
+
+FILES_${PN} += "${libdir}/fonts"
diff --git a/packages/neuros-public/neuros-qt-plugins_git.bb b/packages/neuros-public/neuros-qt-plugins_git.bb
index 62a9d43fca..57f9c9a68e 100644
--- a/packages/neuros-public/neuros-qt-plugins_git.bb
+++ b/packages/neuros-public/neuros-qt-plugins_git.bb
@@ -2,13 +2,13 @@ DESCRIPTION = "Neuros qt-plugins"
 LICENSE = "GPL"
 
 PV = "0.0+${PR}+gitr${SRCREV}"
-PR = "r2"
+PR = "r3"
 
 DEPENDS = "qt-embedded"
 
 inherit qtopia4core
 
-SRCREV = "6787bd510524155d783e1bce323fc5a14cf9ebd2"
+SRCREV = "d344957a0731d31cbe5ef5e1f64defbb1627d162"
 SRC_URI = "git://git.neurostechnology.com/git/qt-plugins;protocol=git"
 S = "${WORKDIR}/git/osdir"
 
diff --git a/packages/nfs-utils/nfs-utils_1.1.2.bb b/packages/nfs-utils/nfs-utils_1.1.2.bb
index 67adf6e964..bcdabd59e5 100644
--- a/packages/nfs-utils/nfs-utils_1.1.2.bb
+++ b/packages/nfs-utils/nfs-utils_1.1.2.bb
@@ -3,6 +3,8 @@ PRIORITY = "optional"
 SECTION = "console/network"
 LICENSE = "GPL"
 
+PR = "2"
+
 DEPENDS = "tcp-wrappers libevent"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \
@@ -45,14 +47,17 @@ do_install() {
 	install -m 0755 ${WORKDIR}/nfsserver ${D}${sysconfdir}/init.d/nfsserver
 
 	install -d ${D}${sbindir}
+	install -d ${D}${base_sbindir}
 	install -m 0755 ${S}/utils/exportfs/exportfs ${D}${sbindir}/exportfs
 	install -m 0755 ${S}/utils/mountd/mountd ${D}${sbindir}/mountd
-	install -m 0755 ${S}/utils/mount/mount.nfs ${D}${sbindir}/mount.nfs
+	install -m 0755 ${S}/utils/mount/mount.nfs ${D}${base_sbindir}/mount.nfs
 	install -m 0755 ${S}/utils/nfsd/nfsd ${D}${sbindir}/nfsd
 	install -m 0755 ${S}/utils/nfsstat/nfsstat ${D}${sbindir}/nfsstat
 	install -m 0755 ${S}/utils/showmount/showmount ${D}${sbindir}/showmount
 	install -m 0755 ${S}/utils/statd/statd ${D}${sbindir}/statd
 
+	ln -s ${D}/${base_sbindir}/mount.nfs ${D}/${base_sbindir}/mount.nfs4
+
 	install -d ${D}${mandir}/man8
 	install -m 0644 ${S}/utils/exportfs/exportfs.man ${D}${mandir}/man8/exportfs.8
 	install -m 0644 ${S}/utils/mountd/mountd.man ${D}${mandir}/man8/mountd.8
@@ -61,3 +66,6 @@ do_install() {
 	install -m 0644 ${S}/utils/showmount/showmount.man ${D}${mandir}/man8/showmount.8
 	install -m 0644 ${S}/utils/statd/statd.man ${D}${mandir}/man8/statd.8
 }
+
+PACKAGES =+ "nfs-utils-client"
+FILES_nfs-utils-client = "${base_sbindir}/mount.nfs ${base_sbindir}/mount.nfs4"
diff --git a/packages/opensync/libopensync-0.36/build-in-src.patch b/packages/opensync/libopensync-0.36/build-in-src.patch
new file mode 100644
index 0000000000..1810b339a6
--- /dev/null
+++ b/packages/opensync/libopensync-0.36/build-in-src.patch
@@ -0,0 +1,18 @@
+---
+ cmake/OpenSyncInternal.cmake.in |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- libopensync-0.36.orig/cmake/OpenSyncInternal.cmake.in
++++ libopensync-0.36/cmake/OpenSyncInternal.cmake.in
+@@ -5,11 +5,10 @@ INCLUDE( OpenSyncTesting )
+ INCLUDE( OpenSyncPackaging )
+ INCLUDE( OpenSyncPlugin )
+ INCLUDE( OpenSyncPlatforms )
+ INCLUDE( MacroEnsureOutOfSourceBuild )
+ 
+-MACRO_ENSURE_OUT_OF_SOURCE_BUILD("${CMAKE_PROJECT_NAME} doesn't allow to build within the source directory. Please, create a seperate build directory and run 'cmake ${PROJECT_SOURCE_DIR} [options]'!")
+ 
+ 
+ SET( OPENSYNC_PLUGINDIR "@OPENSYNC_PLUGINDIR@" )
+ SET( OPENSYNC_FORMATSDIR "@OPENSYNC_FORMATSDIR@" )
+ SET( OPENSYNC_PYTHON_PLUGINDIR "@OPENSYNC_PYTHON_PLUGINDIR@" )
diff --git a/packages/opensync/libopensync-0.36/cmake.patch b/packages/opensync/libopensync-0.36/cmake.patch
new file mode 100644
index 0000000000..0884e4cb79
--- /dev/null
+++ b/packages/opensync/libopensync-0.36/cmake.patch
@@ -0,0 +1,18 @@
+---
+ opensync/CMakeLists.txt |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- libopensync-0.36.orig/opensync/CMakeLists.txt
++++ libopensync-0.36/opensync/CMakeLists.txt
+@@ -55,11 +55,10 @@ SET( libopensync_LIB_SRCS
+ ADD_LIBRARY( opensync SHARED ${libopensync_LIB_SRCS} )
+ 
+ TARGET_LINK_LIBRARIES( opensync ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${GMODULE2_LIBRARIES} ${LIBXML2_LIBRARIES} ${SQLITE3_LIBRARIES} )
+ 
+ SET_TARGET_PROPERTIES( opensync PROPERTIES VERSION 1.0.0 SOVERSION 1 )
+-SET_TARGET_PROPERTIES( opensync PROPERTIES LINK_FLAGS ${SYMBOLS_VISIBILITY} )
+ 
+ IF ( OPENSYNC_UNITTESTS )
+ 	ADD_LIBRARY( opensync-testing SHARED ${libopensync_LIB_SRCS} )
+ 	TARGET_LINK_LIBRARIES( opensync-testing ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${GMODULE2_LIBRARIES} ${LIBXML2_LIBRARIES} ${SQLITE3_LIBRARIES} )
+ ENDIF ( OPENSYNC_UNITTESTS )
diff --git a/packages/opensync/libopensync-0.36/no-python-check.patch b/packages/opensync/libopensync-0.36/no-python-check.patch
new file mode 100644
index 0000000000..08a53cb9eb
--- /dev/null
+++ b/packages/opensync/libopensync-0.36/no-python-check.patch
@@ -0,0 +1,18 @@
+---
+ CMakeLists.txt |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- libopensync-0.36.orig/CMakeLists.txt
++++ libopensync-0.36/CMakeLists.txt
+@@ -26,11 +26,10 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BIN
+ 
+ FIND_PACKAGE( GLIB2 REQUIRED )
+ FIND_PACKAGE( Sqlite3 REQUIRED )
+ FIND_PACKAGE( LibXml2 REQUIRED )
+ FIND_PACKAGE( SWIG )	
+-FIND_PACKAGE( PythonLibs )
+ FIND_PACKAGE( Check )
+ 
+ ADD_SUBDIRECTORY( opensync )
+ ADD_SUBDIRECTORY( formats )
+ ADD_SUBDIRECTORY( tools )
diff --git a/packages/vlc/vlc-davinci_0.8.6h.bb b/packages/vlc/vlc-davinci_0.8.6h.bb
index 26fba388c3..4c6b19231b 100644
--- a/packages/vlc/vlc-davinci_0.8.6h.bb
+++ b/packages/vlc/vlc-davinci_0.8.6h.bb
@@ -4,9 +4,9 @@ LICENSE = "GPL"
 PRIORITY = "optional"
 SECTION = "multimedia"
 
-SRCREV = "d13ee15ec1547dd34a3290684573f91df359f589"
+SRCREV = "e712a114e04a1070f1afdf31ec668cb28eda513c"
 
-PR = "r4"
+PR = "r5"
 
 PV = "0.8.6h+${PR}+gitr${SRCREV}"