propagate from branch 'org.openembedded.nslu2-linux' (head c344fe8206f75436b7afc51a0294cd7ee00d9a1b)

            to branch 'org.openembedded.dev' (head 19ca81b748a204f3987b4f91c4436385cf1ebd81)

75 files changed, 173 insertions, 7747 deletions

diff --git a/packages/altboot/altboot.bb b/packages/altboot/altboot.bb
index a0b5996d6c..a322dacdd9 100644
--- a/packages/altboot/altboot.bb
+++ b/packages/altboot/altboot.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Matthias 'CoreDump' Hentges  <oe@hentges.net>"
 LICENSE = "GPL"
  
 
-PR = "r7"
+PR = "r8"
 
 
 SRC_URI = "file://altboot-menu \
diff --git a/packages/altboot/files/akita/altboot.cfg b/packages/altboot/files/akita/altboot.cfg
index 254aac95a2..8361b28f2a 100644
--- a/packages/altboot/files/akita/altboot.cfg
+++ b/packages/altboot/files/akita/altboot.cfg
@@ -6,6 +6,7 @@ TIMEOUT="3"
 REAL_INIT="/sbin/init.sysvinit"
 SH_SHELL="/bin/sh"
 IMAGE_PATH="boot-images"
+IMAGE_TYPE="ext2"
 FSCK_IMAGES="yes"
 SD_DEVICE="/dev/mmcda1"
 SD_KERNEL_MODULE="/lib/modules/2.4.20/kernel/drivers/block/sharp_mmcsd_m.o"
diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func
index 642587b630..0598c8ce93 100644
--- a/packages/altboot/files/altboot.func
+++ b/packages/altboot/files/altboot.func
@@ -151,8 +151,9 @@ pivot_image() {
 	if [ "$IMAGE_TYPE" = "" ]; then
 		IMAGE_TYPE="auto"
 	fi
-	mount -t $IMAGE_TYPE /dev/loop0 /media/image || die "mount /dev/loop0 /media/image failed!"
-
+	# If mount fails it has the tendency to spew out a _lot_ of error messages.
+	# We direct the output to /dev/null so the user can see which step actually failed.
+	mount -t $IMAGE_TYPE /dev/loop0 /media/image >/dev/null 2>&1 || die "mount -t $IMAGE_TYPE  /dev/loop0 /media/image failed!"
 
 	mkdir -p /media/image/media/ROM || die "mkdir -p /media/image/media/ROM failed"
 
diff --git a/packages/altboot/files/collie/altboot.cfg b/packages/altboot/files/collie/altboot.cfg
index 5b979e7ae4..9d2560f76b 100644
--- a/packages/altboot/files/collie/altboot.cfg
+++ b/packages/altboot/files/collie/altboot.cfg
@@ -7,6 +7,7 @@ TIMEOUT="3"
 REAL_INIT="/sbin/init.sysvinit"
 SH_SHELL="/bin/sh"
 IMAGE_PATH="boot-images"
+IMAGE_TYPE="ext2"
 FSCK_IMAGES="no"
 SD_DEVICE="/dev/mmcda1"
 SD_KERNEL_MODULE="/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o"
diff --git a/packages/altboot/files/poodle/altboot.cfg b/packages/altboot/files/poodle/altboot.cfg
index 5b979e7ae4..9d2560f76b 100644
--- a/packages/altboot/files/poodle/altboot.cfg
+++ b/packages/altboot/files/poodle/altboot.cfg
@@ -7,6 +7,7 @@ TIMEOUT="3"
 REAL_INIT="/sbin/init.sysvinit"
 SH_SHELL="/bin/sh"
 IMAGE_PATH="boot-images"
+IMAGE_TYPE="ext2"
 FSCK_IMAGES="no"
 SD_DEVICE="/dev/mmcda1"
 SD_KERNEL_MODULE="/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o"
diff --git a/packages/e17/eclair_20050810.bb b/packages/e17/eclair_20050810.bb
index ba1e8fb10d..62385e141c 100644
--- a/packages/e17/eclair_20050810.bb
+++ b/packages/e17/eclair_20050810.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Eclair is the E17 multi media player"
 SECTION = "e/apps"
-DEPENDS = "freetype eet virtual/evas virtual/ecore embryo virtual/imlib2 edje-native edje emotion libxml2 sqlite3 taglibc"
+DEPENDS = "evas-x11 ecore-x11 embryo imlib2-x11 edje-native edje libxine-x11 emotion esmart libxml2 sqlite3 taglibc"
 LICENSE = "MIT"
 HOMEPAGE = "http://www.enlightenment.org"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
@@ -12,8 +12,6 @@ S = "${WORKDIR}/eclair"
 
 inherit autotools
 
-BROKEN = "1"
-
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
 
 FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
diff --git a/packages/e17/entice_20050810.bb b/packages/e17/entice_20050810.bb
index 667d3f4da8..094944ead4 100644
--- a/packages/e17/entice_20050810.bb
+++ b/packages/e17/entice_20050810.bb
@@ -1,12 +1,12 @@
 DESCRIPTION = "Entice is the E17 picture viewer"
 SECTION = "e/apps"
 # can also depend on GIMP for editing
-DEPENDS = "virtual/evas edb virtual/ecore edje"
+DEPENDS = "edb evas-x11 ecore-x11 edje epsilon esmart"
 LICENSE = "MIT"
 HOMEPAGE = "http://www.enlightenment.org"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 CVSDATE = "${PV}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/entice"
 S = "${WORKDIR}/entice"
diff --git a/packages/libxine/libxine-1.0.0-beta12/.mtn2git_empty b/packages/e17/entrance/Sessions/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libxine/libxine-1.0.0-beta12/.mtn2git_empty
+++ b/packages/e17/entrance/Sessions/.mtn2git_empty
diff --git a/packages/e17/entrance/Sessions/Enlightenment b/packages/e17/entrance/Sessions/Enlightenment
new file mode 100644
index 0000000000..4d33bbb2e9
--- /dev/null
+++ b/packages/e17/entrance/Sessions/Enlightenment
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+enlightenment
+
diff --git a/packages/libxine/libxine-1.0.0-rc5/.mtn2git_empty b/packages/e17/entrance/Xinit.d/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libxine/libxine-1.0.0-rc5/.mtn2git_empty
+++ b/packages/e17/entrance/Xinit.d/.mtn2git_empty
diff --git a/packages/e17/entrance/Xinit.d/50-calibrate b/packages/e17/entrance/Xinit.d/50-calibrate
new file mode 100644
index 0000000000..922b335c85
--- /dev/null
+++ b/packages/e17/entrance/Xinit.d/50-calibrate
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if ! test -e /etc/pointercal
+then
+	xtscal
+fi
+
diff --git a/packages/e17/entrance/Xinit.d/99-Entrance b/packages/e17/entrance/Xinit.d/99-Entrance
new file mode 100644
index 0000000000..297cc909fe
--- /dev/null
+++ b/packages/e17/entrance/Xinit.d/99-Entrance
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+entrance
+
diff --git a/packages/e17/entrance/config-db.patch b/packages/e17/entrance/config-db.patch
index 5e965057ba..f326ac50c9 100644
--- a/packages/e17/entrance/config-db.patch
+++ b/packages/e17/entrance/config-db.patch
@@ -1,15 +1,22 @@
---- entrance/data/config/build_config.sh.in~	2005-08-13 02:56:11.000000000 -0700
-+++ entrance/data/config/build_config.sh.in	2005-08-13 02:56:35.000000000 -0700
+--- entrance/data/config/build_config.sh.in.orig	2005-08-14 18:19:30.912299673 +0200
++++ entrance/data/config/build_config.sh.in	2005-08-14 18:21:36.309692562 +0200
 @@ -3,7 +3,7 @@
  rm -f $DB
  
  # set auth to 1 for pam, 2 for shadow
 -edb_ed $DB add /entrance/auth int @auth_mode@
-+edb_ed $DB add /entrance/auth int 0
++edb_ed $DB add /entrance/auth int 2
  
  # uncomment the below to enable experimental OpenGL hardware acceleration
  #edb_ed $DB add /entrance/engine int 1
-@@ -25,25 +25,25 @@
+@@ -19,31 +19,31 @@
+ #edb_ed $DB add /entrance/fonts/1/str str "/usr/X11R6/lib/X11/fonts/Truetype/"
+ edb_ed $DB add /entrance/greeting/before str "Welcome to "
+ edb_ed $DB add /entrance/greeting/after str ""
+-edb_ed $DB add /entrance/session/count int 8
++edb_ed $DB add /entrance/session/count int 4
+ edb_ed $DB add /entrance/session/0/session str "default"
+ edb_ed $DB add /entrance/session/0/title str "Default"
  edb_ed $DB add /entrance/session/0/icon str "default.png"
  edb_ed $DB add /entrance/session/1/icon str "enlightenment.png"
  edb_ed $DB add /entrance/session/1/title str "Enlightenment"
diff --git a/packages/e17/entrance_20050810.bb b/packages/e17/entrance_20050810.bb
index 251698c233..de00734985 100644
--- a/packages/e17/entrance_20050810.bb
+++ b/packages/e17/entrance_20050810.bb
@@ -2,18 +2,21 @@ DESCRIPTION = "Entrace is the Enlightenment login manager"
 SECTION = "e/apps"
 LICENSE = "MIT"
 # can also use pam and crypt
-DEPENDS = "edb evas-x11 ecore-x11 edje esmart"
-RDEPENDS += "bash"
+DEPENDS = "edb evas-x11 ecore-x11 edje esmart gpe-dm"
+RDEPENDS += "bash gpe-dm"
 HOMEPAGE = "http://www.enlightenment.org"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 CVSDATE = "${PV}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/entrance \
            file://longer-sleep.patch;patch=1 \
            file://Xserver.patch;patch=1 \
            file://config-db.patch;patch=1 \
-           file://allow-missing-xsession.patch;patch=1"
+           file://allow-missing-xsession.patch;patch=1 \
+	   file://Xinit.d \
+	   file://Sessions"
+	   
 S = "${WORKDIR}/entrance"
 
 inherit autotools
@@ -21,4 +24,14 @@ inherit autotools
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc \
                 --with-xsession=/etc/X11/Xsession"
 
-FILES += "${datadir}"
\ No newline at end of file
+FILES += "${datadir}"
+
+do_install_append() {
+	install -d ${D}/etc/X11/Xinit.d
+	install -d ${D}/etc/X11/Xsession.d
+	install -d ${D}/etc/X11/Sessions
+	
+	install -m 755 ${WORKDIR}/Xinit.d/* ${D}/etc/X11/Xinit.d
+	install -m 755 ${WORKDIR}/Sessions/* ${D}/etc/X11/Sessions
+	
+}
diff --git a/packages/e17/examine_20050810.bb b/packages/e17/examine_20050810.bb
index 6e79fd946f..244bf2bcaf 100644
--- a/packages/e17/examine_20050810.bb
+++ b/packages/e17/examine_20050810.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "examine, the program configurator"
 DEPENDS = "virtual/ecore ewl"
 LICENSE = "MIT"
-SECTION = "e"
+SECTION = "e/apps"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 PR = "r0"
 CVSDATE = "${PV}"
diff --git a/packages/efl/emotion_0.0.1.004.bb b/packages/efl/emotion_0.0.1.004.bb
index 5ca5214b94..0d87e6b394 100644
--- a/packages/efl/emotion_0.0.1.004.bb
+++ b/packages/efl/emotion_0.0.1.004.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Emotion is a multimedia library based on libxine"
 LICENSE = "MIT"
-DEPENDS = "eet virtual/evas edje virtual/ecore embryo libxine"
+DEPENDS = "eet virtual/evas edje virtual/ecore embryo virtual/libxine"
 
 inherit efl
diff --git a/packages/libxine/libxine-1.0/.mtn2git_empty b/packages/gnet/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libxine/libxine-1.0/.mtn2git_empty
+++ b/packages/gnet/.mtn2git_empty
diff --git a/packages/gnet/gnet_2.0.7.bb b/packages/gnet/gnet_2.0.7.bb
new file mode 100644
index 0000000000..d5e93c4000
--- /dev/null
+++ b/packages/gnet/gnet_2.0.7.bb
@@ -0,0 +1,10 @@
+DESCRIPTION =	"GNet is a simple network library. It is written in C, object-oriented, and built upon GLib."
+LICENSE =	"LGPL"
+HOMEPAGE =	"http://www.gnetlibrary.org/"
+
+SRC_URI =	"http://www.gnetlibrary.org/src/gnet-2.0.7.tar.gz"
+DEPENDS =	"glib-2.0"
+
+EXTRA_OECONF =	"--disable-pthreads"
+
+inherit pkgconfig autotools		
diff --git a/packages/gxine/gxine_0.4.1.bb b/packages/gxine/gxine_0.4.1.bb
index ef68a314de..b171d1e9a9 100644
--- a/packages/gxine/gxine_0.4.1.bb
+++ b/packages/gxine/gxine_0.4.1.bb
@@ -2,8 +2,8 @@ DESCRIPTION = "gxine is a front-end for libxine."
 SECTION = "x11/multimedia"
 LICENSE = "GPL"
 MAINTAINER = "Chris Lord <cwiiis@handhelds.org>"
-DEPENDS = "gtk+ libxine"
-PR = "r1"
+DEPENDS = "gtk+ libxine-x11"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/gxine/gxine_0.4.1enhanced.bb b/packages/gxine/gxine_0.4.1enhanced.bb
index 2ad90c789c..189eccdd02 100644
--- a/packages/gxine/gxine_0.4.1enhanced.bb
+++ b/packages/gxine/gxine_0.4.1enhanced.bb
@@ -2,7 +2,8 @@ DESCRIPTION = "gxine is a front-end for libxine."
 SECTION = "x11/multimedia"
 LICENSE = "GPL"
 MAINTAINER = "Chris Lord <cwiiis@handhelds.org>"
-DEPENDS = "gtk+ libxine"
+DEPENDS = "gtk+ libxine-x11"
+PR = "r1"
 
 # Long list of RDEPENDS required to playback mp3/ogg audio and mpeg/mpeg4 video
 RDEPENDS = "libxine-plugin-vo-out-xshm \
diff --git a/packages/libxine/libxine-1.0.0-beta12/configure.ac.patch b/packages/libxine/libxine-1.0.0-beta12/configure.ac.patch
deleted file mode 100644
index 7eda48ab25..0000000000
--- a/packages/libxine/libxine-1.0.0-beta12/configure.ac.patch
+++ /dev/null
@@ -1,152 +0,0 @@
---- xine-lib/configure.ac	2003-08-10 15:20:01.000000000 +0200
-+++ xine-lib/configure.ac.patched	2003-08-10 15:23:42.000000000 +0200
-@@ -506,10 +506,10 @@
- dnl ---------------------------------------------
- dnl check for SDL
- dnl ---------------------------------------------
--AM_PATH_SDL(1.1.5, 
--	AC_DEFINE(HAVE_SDL,1,[Define this if you have SDL library installed]),
--	[])
--AM_CONDITIONAL(HAVE_SDL, [test x"$no_sdl" != x"yes"])
-+dnl AM_PATH_SDL(1.1.5, 
-+dnl	AC_DEFINE(HAVE_SDL,1,[Define this if you have SDL library installed]),
-+dnl	[])
-+dnl AM_CONDITIONAL(HAVE_SDL, [test x"$no_sdl" != x"yes"])
- 
- 
- dnl ---------------------------------------------
-@@ -608,19 +608,19 @@
- dnl Ogg/Theora libs.
- dnl ---------------------------------------------
- 
--AM_PATH_OGG(
--           [ AM_PATH_THEORA(AC_DEFINE