12 files changed, 149 insertions, 57 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/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/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/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}"