From 6a2cf86c83d5551c596febdde181fdf91c567ded Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 12 Aug 2005 20:13:11 +0000
Subject: Don't use devfs names in ipaq-pxa270 fstab

---
 packages/base-files/base-files/ipaq-pxa270/fstab | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/base-files/base-files/ipaq-pxa270/fstab b/packages/base-files/base-files/ipaq-pxa270/fstab
index 5ef8d116e0..8c38a5fda2 100644
--- a/packages/base-files/base-files/ipaq-pxa270/fstab
+++ b/packages/base-files/base-files/ipaq-pxa270/fstab
@@ -1,5 +1,5 @@
-/dev/mtdblock/2 	/		jffs2	defaults		1  1		
-/dev/mtdblock/3 	/home   jffs2   defaults        1  1
+/dev/mtdblock2 	/		jffs2	defaults		1  1		
+/dev/mtdblock3 	/home   jffs2   defaults        1  1
 
 proc            /proc		proc    defaults        0  0
 sys             /sys        sysfs	defaults        0  0
-- 
cgit v1.2.3


From bcd885cfec712825d6638e74582fd9860773b870 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 12 Aug 2005 20:47:33 +0000
Subject: add a font to the image to make xtscal work (the e stuff has its own
 fonts)

---
 packages/meta/meta-e-x11.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/meta/meta-e-x11.bb b/packages/meta/meta-e-x11.bb
index 9e0a90ecbc..8c2729dabe 100644
--- a/packages/meta/meta-e-x11.bb
+++ b/packages/meta/meta-e-x11.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "Meta-package for Enlightenment/X11"
 LICENSE = "MIT"
 PACKAGES = "task-enlightenment-x11"
+PR = "r1"
 
 FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \
               e##http://openzaurus.org/official/unstable/3.5.2/feed/e"
@@ -10,8 +11,8 @@ ALLOW_EMPTY = 1
 #
 # X
 #
-DEPENDS  += "diet-x11 rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo"
-RDEPENDS += "         rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo"
+DEPENDS  += "diet-x11 rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo fontconfig ttf-bitstream-vera"
+RDEPENDS += "         rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo            ttf-bitstream-vera"
 
 #
 # E
-- 
cgit v1.2.3


From 4dce70dbb585c6751d6ad28d770994a76f172b28 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 12 Aug 2005 21:52:26 +0000
Subject: add mrxvt, a multi-tabbed rxvt

---
 packages/mrxvt/.mtn2git_empty          |  0
 packages/mrxvt/files/.mtn2git_empty    |  0
 packages/mrxvt/files/fix-compile.patch | 25 +++++++++++++++++++++++++
 packages/mrxvt/mrxvt_0.4.1.bb          | 14 ++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 100644 packages/mrxvt/.mtn2git_empty
 create mode 100644 packages/mrxvt/files/.mtn2git_empty
 create mode 100644 packages/mrxvt/files/fix-compile.patch
 create mode 100644 packages/mrxvt/mrxvt_0.4.1.bb

diff --git a/packages/mrxvt/.mtn2git_empty b/packages/mrxvt/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/mrxvt/files/.mtn2git_empty b/packages/mrxvt/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/mrxvt/files/fix-compile.patch b/packages/mrxvt/files/fix-compile.patch
new file mode 100644
index 0000000000..25794dc5fd
--- /dev/null
+++ b/packages/mrxvt/files/fix-compile.patch
@@ -0,0 +1,25 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- mrxvt-0.4.1/src/rxvt.h~fix-compile
++++ mrxvt-0.4.1/src/rxvt.h
+@@ -387,15 +387,8 @@
+ ** which in turn is unsafe without checking.
+ ** Untainted defines the type of data that is safe.
+ */
+-#ifdef __GNUC__
+-# define $tainted
+-# define $untainted
+-# define TAINTED	$tainted
+-# define UNTAINTED	$untainted
+-#else
+-# define TAINTED
+-# define UNTAINTED
+-#endif
++#define TAINTED
++#define UNTAINTED
+ 
+ 
+ /*
diff --git a/packages/mrxvt/mrxvt_0.4.1.bb b/packages/mrxvt/mrxvt_0.4.1.bb
new file mode 100644
index 0000000000..1efbf58d9d
--- /dev/null
+++ b/packages/mrxvt/mrxvt_0.4.1.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "MRXVT is a lightweight and powerful X terminal emulator based on aterm and rxvt"
+HOMEPAGE = "http://materm.sourceforge.net"
+AUTHOR = "Jimmy Zhou <jimmyzhou@users.sf.net>"
+LICENSE = "GPL"
+SECTION = "x11/apps"
+DEPENDS = "x11 xext xpm jpeg libpng"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/materm/mrxvt-${PV}.tar.gz \
+           file://fix-compile.patch;patch=1"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-everything --disable-debug"
-- 
cgit v1.2.3


From 73769ef9efc2a0868dfb0ec3e63530e5c2ab5b17 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 12 Aug 2005 21:53:37 +0000
Subject: Fix DEPENDS for inkscape 0.42

---
 packages/inkscape/inkscape_0.42.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/inkscape/inkscape_0.42.bb b/packages/inkscape/inkscape_0.42.bb
index e97d862812..9795e88594 100644
--- a/packages/inkscape/inkscape_0.42.bb
+++ b/packages/inkscape/inkscape_0.42.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "Inkscape is an SVG-based graphics editor featuring alpha \
 blending, node editing, SVG to PNG export, and more. Its goal is for features \
 similar to Illustrator, CorelDraw, Visio, etc."
 MAINTAINER = "Koen Kooi <koen@handhelds.org>"
-DEPENDS = "libgc intltool-native gtk+ libart-lgpl libxml2 libsigc++-1.2 popt"
+DEPENDS = "libgc intltool-native gtk+ gtkmm glibmm libart-lgpl libxslt librsvg libxml2 libsigc++-1.2 popt"
 LICENSE = "GPL"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/inkscape/inkscape-${PV}.tar.bz2"
-- 
cgit v1.2.3


From 571a4fc239ca4358c47664c26683370354ce4f6f Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Sat, 13 Aug 2005 00:41:45 +0000
Subject: Make clean and distclean for EFL Automatically install named binaries
 when compiling native Add more files/directories to theme and dev packages

---
 classes/efl.bbclass | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/classes/efl.bbclass b/classes/efl.bbclass
index f160ee8a90..752881314d 100644
--- a/classes/efl.bbclass
+++ b/classes/efl.bbclass
@@ -8,6 +8,11 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit autotools pkgconfig binconfig
 
+do_prepsources () {
+  make clean distclean || true
+}
+addtask prepsources after do_fetch before do_unpack
+
 INHIBIT_AUTO_STAGE_INCLUDES  = "1"
 INHIBIT_NATIVE_STAGE_INSTALL = "1"
 
@@ -42,11 +47,30 @@ do_stage_append () {
 	do
 		install -m 0644 ${libdirectory}/$i ${STAGING_INCDIR}
 	done
+
+	# Install binaries automatically for native builds
+	if [ "${@binconfig_suffix(d)}" = "-native" ]
+	then
+
+		# Most EFL binaries start with the package name
+		for i in src/bin/${SRCNAME}*
+		do
+			if [ -x $i -a -f $i ]
+			then
+
+				# Don't install anything with an extension (.so, etc)
+				if echo $i | grep -v \\.
+				then
+					${HOST_SYS}-libtool --mode=install install -m 0755 $i ${STAGING_BINDIR}
+				fi
+			fi
+		done
+	fi
 }
 
 PACKAGES = "${SRCNAME}-dev ${SRCNAME}-examples ${SRCNAME}-themes ${SRCNAME}"
 FILES_${SRCNAME} = "${libdir}"
-FILES_${SRCNAME}-theme = "${datadir}/${SRCNAME}/themes"
-FILES_${SRCNAME}-dev += "${bindir}/${SRCNAME}-config ${libdir}/pkgconfig"
+FILES_${SRCNAME}-theme = "${datadir}/${SRCNAME}/themes ${datadir}/${SRCNAME}/data ${datadir}/${SRCNAME}/fonts ${datadir}/${SRCNAME}/pointers ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/users ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/styles"
+FILES_${SRCNAME}-dev += "${bindir}/${SRCNAME}-config ${libdir}/pkgconfig ${datadir}/${SRCNAME}/include"
 FILES_${SRCNAME}-examples = "${bindir} ${datadir}"
 
-- 
cgit v1.2.3


From cef4e511868d109e5775ba2d21f7ef988b86f9a4 Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Sat, 13 Aug 2005 00:50:47 +0000
Subject: Fix dependencies for all EFL and E17 packages Fix problems with
 edje/embryo (stage .inc files) Add a patch for e-wm which will automatically
 scroll menus onto the screen when the cursor is within 5px of the edge of the
 screen Enable edb frontends for GTK and ncurses

---
 packages/e17/e-utils_20050810.bb                   |  2 +-
 .../e17/e-wm/fudge_screen_edges_for_menu.patch     | 29 ++++++++++++++++++++++
 packages/e17/e-wm_20050810.bb                      |  5 ++--
 packages/e17/entice_20050810.bb                    |  3 ++-
 packages/e17/entrance_20050810.bb                  |  5 ++--
 packages/efl/e_20050810.bb                         |  2 +-
 packages/efl/ecore-native_0.9.9.013.bb             |  2 +-
 packages/efl/ecore.inc                             |  3 ++-
 packages/efl/edb-native_1.0.5.004.bb               |  2 ++
 packages/efl/edb_1.0.5.004.bb                      |  4 +--
 packages/efl/edje-native_0.5.0.013.bb              | 10 ++++----
 packages/efl/edje_0.5.0.013.bb                     |  8 +++---
 packages/efl/embryo-native_0.9.1.013.bb            |  5 ++--
 packages/efl/embryo_0.9.1.013.bb                   |  1 -
 packages/efl/emotion_0.0.1.004.bb                  |  2 +-
 packages/efl/engrave_20050810.bb                   |  3 ++-
 packages/efl/epsilon_0.3.0.004.bb                  |  2 +-
 packages/efl/esmart_0.9.0.004.bb                   |  2 +-
 packages/efl/evas-native_0.9.9.013.bb              |  2 +-
 packages/efl/evas.inc                              |  3 ++-
 packages/efl/ewl_0.0.4.004.bb                      |  2 +-
 packages/efl/imlib2.inc                            |  1 +
 22 files changed, 67 insertions(+), 31 deletions(-)
 create mode 100644 packages/e17/e-wm/fudge_screen_edges_for_menu.patch

diff --git a/packages/e17/e-utils_20050810.bb b/packages/e17/e-utils_20050810.bb
index 273c7622e6..00fa240264 100644
--- a/packages/e17/e-utils_20050810.bb
+++ b/packages/e17/e-utils_20050810.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Enlightenment Window Manager Utilities"
-DEPENDS = "freetype eet evas-x11 ecore-x11 edje engrave esmart epsilon ewl imlib2-x11 e17"
+DEPENDS = "virtual/ecore virtual/evas esmart edje eet ewl engrave virtual/imlib2 e epsilon"
 LICENSE = "MIT"
 SECTION = "e/apps"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
diff --git a/packages/e17/e-wm/fudge_screen_edges_for_menu.patch b/packages/e17/e-wm/fudge_screen_edges_for_menu.patch
new file mode 100644
index 0000000000..c203fd4ae0
--- /dev/null
+++ b/packages/e17/e-wm/fudge_screen_edges_for_menu.patch
@@ -0,0 +1,29 @@
+--- e/src/bin/e_menu.c.~1.38.~	2005-07-25 02:55:44.000000000 -0700
++++ e/src/bin/e_menu.c	2005-08-11 15:36:23.000000000 -0700
+@@ -1968,22 +1968,22 @@
+ 	E_Menu *m;
+ 
+ 	m = l->data;
+-	if (m->cur.x < m->zone->x)
++	if (m->cur.x < m->zone->x + 5)
+ 	  {
+ 	     i = m->zone->x - m->cur.x;
+ 	     if (i > outl) outl = i;
+ 	  }
+-	if (m->cur.y < m->zone->y)
++	if (m->cur.y < m->zone->y + 5)
+ 	  {
+ 	     i = m->zone->y - m->cur.y;
+ 	     if (i > outt) outt = i;
+ 	  }
+-	if ((m->cur.x + m->cur.w) > (m->zone->w))
++	if ((m->cur.x + m->cur.w) > (m->zone->w - 5))
+ 	  {
+ 	     i = m->cur.x + m->cur.w - (m->zone->x + m->zone->w);
+ 	     if (i > outr) outr = i;
+ 	  }
+-	if ((m->cur.y + m->cur.h) > (m->zone->h))
++	if ((m->cur.y + m->cur.h) > (m->zone->h - 5))
+ 	  {
+ 	     i = m->cur.y + m->cur.h - (m->zone->y + m->zone->h);
+ 	     if (i > outb) outb = i;
diff --git a/packages/e17/e-wm_20050810.bb b/packages/e17/e-wm_20050810.bb
index 2f6b3c3443..b5b137eb16 100644
--- a/packages/e17/e-wm_20050810.bb
+++ b/packages/e17/e-wm_20050810.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "E17 - the Enlightenment Window Mananger"
-DEPENDS = "freetype eet evas-x11 ecore-x11 embryo imlib2-x11 edje-native e"
+DEPENDS = "virtual/evas virtual/ecore edje eet embryo e"
 LICENSE = "MIT"
 SECTION = "e/apps"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
@@ -7,7 +7,8 @@ CVSDATE = "${PV}"
 PR = "r0"
 
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e \
-           file://fix-configure.patch;patch=1"
+           file://fix-configure.patch;patch=1 \
+           file://fudge_screen_edges_for_menu.patch;patch=1"
 S = "${WORKDIR}/e"
 
 inherit autotools
diff --git a/packages/e17/entice_20050810.bb b/packages/e17/entice_20050810.bb
index fc4d8c51af..ac454e7189 100644
--- a/packages/e17/entice_20050810.bb
+++ b/packages/e17/entice_20050810.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "Entice is a picture viewer"
 SECTION = "e/apps"
-DEPENDS = "freetype eet virtual/evas virtual/ecore embryo virtual/imlib2 edje-native"
+# can also depend on GIMP for editing
+DEPENDS = "virtual/evas edb virtual/ecore edje"
 LICENSE = "MIT"
 HOMEPAGE = "http://www.enlightenment.org"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
diff --git a/packages/e17/entrance_20050810.bb b/packages/e17/entrance_20050810.bb
index afc0e82825..471b7d31bb 100644
--- a/packages/e17/entrance_20050810.bb
+++ b/packages/e17/entrance_20050810.bb
@@ -1,7 +1,8 @@
-DESCRIPTION = "Entrace is the Enlightenment login manager for X11"
+DESCRIPTION = "Entrace is the Enlightenment login manager"
 SECTION = "e/apps"
 LICENSE = "MIT"
-DEPENDS = "ecore-x11 edje-native embryo-native esmart"
+# can also use pam and crypt
+DEPENDS = "edb virtual/evas virtual/ecore edje esmart"
 HOMEPAGE = "http://www.enlightenment.org"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 CVSDATE = "${PV}"
diff --git a/packages/efl/e_20050810.bb b/packages/efl/e_20050810.bb
index 3451bd8d64..be10a5553a 100644
--- a/packages/efl/e_20050810.bb
+++ b/packages/efl/e_20050810.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Enlightenment Window Mananger Library"
-DEPENDS = "freetype eet evas-x11 ecore-x11 embryo imlib2-x11 edje-native edje"
+DEPENDS = "virtual/evas virtual/ecore edje eet embryo"
 LICENSE = "MIT"
 CVSDATE = "${PV}"
 PR = "r0"
diff --git a/packages/efl/ecore-native_0.9.9.013.bb b/packages/efl/ecore-native_0.9.9.013.bb
index 30b6f78370..6968415d34 100644
--- a/packages/efl/ecore-native_0.9.9.013.bb
+++ b/packages/efl/ecore-native_0.9.9.013.bb
@@ -1,3 +1,3 @@
 include ecore-fb_${PV}.bb
 inherit native
-DEPENDS = "curl-native edb-native eet-native evas-native freetype-native"
+DEPENDS = "curl-native eet-native evas-native"
diff --git a/packages/efl/ecore.inc b/packages/efl/ecore.inc
index 38c64e4615..ecd5fef642 100644
--- a/packages/efl/ecore.inc
+++ b/packages/efl/ecore.inc
@@ -3,7 +3,8 @@ foundation libraries. It makes makes doing selections, drag and drop, event loop
 timeouts and idle handlers fast, optimized, and convenient."
 LEAD_SONAME = "libecore.so"
 LICENSE = "MIT"
-DEPENDS = "curl edb eet virtual/evas freetype edb-native"
+# can also have openssl, dbus
+DEPENDS = "virtual/evas curl eet"
 
 inherit efl
 
diff --git a/packages/efl/edb-native_1.0.5.004.bb b/packages/efl/edb-native_1.0.5.004.bb
index 234b0e05e5..d83a3b77c6 100644
--- a/packages/efl/edb-native_1.0.5.004.bb
+++ b/packages/efl/edb-native_1.0.5.004.bb
@@ -2,6 +2,8 @@ include edb_${PV}.bb
 inherit native
 DEPENDS = "zlib-native"
 
+EXTRA_OECONF += "--disable-gtk --disable-ncurses"
+
 do_stage_append () {
 	install -m 0755 tools/.libs/edb_ed ${STAGING_BINDIR}
 }
diff --git a/packages/efl/edb_1.0.5.004.bb b/packages/efl/edb_1.0.5.004.bb
index 2dace0cb07..0a04a42844 100644
--- a/packages/efl/edb_1.0.5.004.bb
+++ b/packages/efl/edb_1.0.5.004.bb
@@ -1,12 +1,10 @@
 DESCRIPTION = "EDB is a database convenience library wrapped around the \
 Berkeley DB 2.7.7 by Sleepycat Software."
-DEPENDS = "zlib"
+DEPENDS = "zlib ncurses gtk+"
 LICENSE = "BSD"
 PR = "r0"
 
 inherit efl
 
-EXTRA_OECONF = "--disable-gtk --disable-ncurses"
-
 libdirectory = "src"
 
diff --git a/packages/efl/edje-native_0.5.0.013.bb b/packages/efl/edje-native_0.5.0.013.bb
index 8f15b4edab..d09bc2aaf0 100644
--- a/packages/efl/edje-native_0.5.0.013.bb
+++ b/packages/efl/edje-native_0.5.0.013.bb
@@ -1,6 +1,6 @@
 include edje_${PV}.bb
 inherit native
-DEPENDS = "freetype-native evas-native ecore-native embryo-native eet-native edb-native imlib2-native"
+DEPENDS = "evas-native ecore-native eet-native embryo-native imlib2-native"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/edje"
 
 EXTRA_OECONF = "--with-fb-only \
@@ -15,8 +15,8 @@ do_configure_prepend() {
 }
 
 do_stage_append() {
-	for i in ${BINARIES}
-	do
-		${HOST_SYS}-libtool --mode=install install -m 0755 src/bin/$i ${STAGING_BINDIR}
-	done
+	edje_data_dir=`${STAGING_BINDIR}/edje-config-native --datadir`
+	# could also use ${STAGING_DATADIR}/edje/include
+	install -d $edje_data_dir/include
+	install -m 0644 data/include/edje.inc $edje_data_dir/include
 }
diff --git a/packages/efl/edje_0.5.0.013.bb b/packages/efl/edje_0.5.0.013.bb
index 40c2002860..5cab345943 100644
--- a/packages/efl/edje_0.5.0.013.bb
+++ b/packages/efl/edje_0.5.0.013.bb
@@ -1,13 +1,13 @@
 DESCRIPTION = "Edje is a complex graphical design & layout library."
-DEPENDS = "freetype virtual/evas virtual/ecore embryo eet edb edje-native"
+# can also install vim data files
+DEPENDS = "virtual/evas virtual/ecore eet embryo edje-native virtual/imlib2"
 LICENSE = "MIT"
 PR = "r0"
 
 inherit efl
 
-EXTRA_OECONF = "--disable-edje-cc --enable-fb-only"
 LEAD_SONAME = "libedje.so"
 
-libraries += "libedje_edit"
+FILES_${PN}-dev += "${bindir}"
 
-BINARIES = "edje edje_ls edje_test edje_cc edje_decc edje_thumb"
+RDEPENDS_${PN}-dev += "cpp"
\ No newline at end of file
diff --git a/packages/efl/embryo-native_0.9.1.013.bb b/packages/efl/embryo-native_0.9.1.013.bb
index ba24e954bc..a33adb7bd2 100644
--- a/packages/efl/embryo-native_0.9.1.013.bb
+++ b/packages/efl/embryo-native_0.9.1.013.bb
@@ -2,5 +2,6 @@ include embryo_${PV}.bb
 inherit native
 
 do_stage_append() {
-	${HOST_SYS}-libtool --mode=install install -m 0755 src/bin/embryo_cc ${STAGING_BINDIR}
-}
+	install -d ${STAGING_DATADIR}/embryo/include
+	install -m 0644 include/default.inc ${STAGING_DATADIR}/embryo/include
+}
\ No newline at end of file
diff --git a/packages/efl/embryo_0.9.1.013.bb b/packages/efl/embryo_0.9.1.013.bb
index ee193e5c4d..54f3ddabad 100644
--- a/packages/efl/embryo_0.9.1.013.bb
+++ b/packages/efl/embryo_0.9.1.013.bb
@@ -7,4 +7,3 @@ LICENSE = "MIT"
 PR = "r0"
 
 inherit efl
-
diff --git a/packages/efl/emotion_0.0.1.004.bb b/packages/efl/emotion_0.0.1.004.bb
index 9fe32ce26b..5ca5214b94 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 = "libxine"
+DEPENDS = "eet virtual/evas edje virtual/ecore embryo libxine"
 
 inherit efl
diff --git a/packages/efl/engrave_20050810.bb b/packages/efl/engrave_20050810.bb
index 13e68259a9..8ee284fb19 100644
--- a/packages/efl/engrave_20050810.bb
+++ b/packages/efl/engrave_20050810.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "Engrave is an Edje Editing Library"
 LICENSE = "MIT"
-DEPENDS = "jpeg edb ecore-x11 evas-x11 edje imlib2-x11"
+# also requires yacc and lex on host
+DEPENDS = "virtual/evas virtual/ecore"
 
 inherit efl
 
diff --git a/packages/efl/epsilon_0.3.0.004.bb b/packages/efl/epsilon_0.3.0.004.bb
index d8dc08e11f..ab19043550 100644
--- a/packages/efl/epsilon_0.3.0.004.bb
+++ b/packages/efl/epsilon_0.3.0.004.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Epsilon is a flexable and powerful image thumbnailing library \
 that is complient with the freedesktop.org Thumbnail Managing Standard."
 LICENSE = "GPL"
-DEPENDS = "edje epeg libpng virtual/imlib2"
+DEPENDS = "virtual/imlib2 epeg libpng virtual/evas virtual/ecore perl-native edje"
 
 inherit efl
 
diff --git a/packages/efl/esmart_0.9.0.004.bb b/packages/efl/esmart_0.9.0.004.bb
index 90b8aca6f9..beb936e37b 100644
--- a/packages/efl/esmart_0.9.0.004.bb
+++ b/packages/efl/esmart_0.9.0.004.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "ESmart is a collection of smart Evas objects"
 LICENSE = "MIT"
-DEPENDS = "edje-native eet evas-x11 ecore-x11 epsilon embryo imlib2-x11 jpeg libtool"
+DEPENDS = "virtual/evas virtual/ecore virtual/imlib2 epsilon edje libtool"
 PR = "r1"
 
 inherit efl
diff --git a/packages/efl/evas-native_0.9.9.013.bb b/packages/efl/evas-native_0.9.9.013.bb
index a29967a051..3eaa12cf9e 100644
--- a/packages/efl/evas-native_0.9.9.013.bb
+++ b/packages/efl/evas-native_0.9.9.013.bb
@@ -1,3 +1,3 @@
 include evas-fb_${PV}.bb
 inherit native
-DEPENDS = "freetype-native"
+DEPENDS = "freetype-native libpng-native jpeg-native eet-native edb-native"
diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc
index 0588d8e28c..60f60f3c82 100644
--- a/packages/efl/evas.inc
+++ b/packages/efl/evas.inc
@@ -3,7 +3,8 @@ anti-aliased text, smooth super and sub-images, alpha-blend, as well as drop \
 down to using normal X11 primitives such as pixmaps, lines and rectangles if \
 your CPU or graphics hardware are too slow."
 LICENSE = "MIT"
-DEPENDS = "libpng jpeg edb eet freetype"
+# can also depend on valgrind (?)
+DEPENDS = "freetype libpng jpeg eet edb"
 
 inherit efl
 
diff --git a/packages/efl/ewl_0.0.4.004.bb b/packages/efl/ewl_0.0.4.004.bb
index 36d8c5c860..92db160a25 100644
--- a/packages/efl/ewl_0.0.4.004.bb
+++ b/packages/efl/ewl_0.0.4.004.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "The Enlightened Widget Library, \
 a simple-to-use general purpose widget library based on the enlightenment foundation libraries."
-DEPENDS = "edb eet virtual/evas virtual/ecore etox edje"
+DEPENDS = "edb virtual/evas virtual/ecore edje emotion"
 LICENSE = "MIT"
 PR = "r0"
 
diff --git a/packages/efl/imlib2.inc b/packages/efl/imlib2.inc
index b4a2f267fc..a6982e21c7 100644
--- a/packages/efl/imlib2.inc
+++ b/packages/efl/imlib2.inc
@@ -1,5 +1,6 @@
 DESCRIPTION = "A graphic library for file loading, saving, rendering, and manipulation."
 LICENSE = "BSD"
+# can also depend on tiff34, ungif or gif, z, bz2, id3tag
 DEPENDS = "freetype libpng jpeg"
 
 inherit efl
-- 
cgit v1.2.3


From a2482dcc3faa3e48ecd726ef8bfcc01dc0c034a6 Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Sat, 13 Aug 2005 01:44:06 +0000
Subject: Set entrance, esmart, and e-wm back to -x11 dependencies Add
 e-modules bb file

---
 packages/e17/e-modules_20050810.bb | 14 ++++++++++++++
 packages/e17/e-wm_20050810.bb      |  2 +-
 packages/e17/entrance_20050810.bb  |  2 +-
 packages/efl/esmart_0.9.0.004.bb   |  2 +-
 4 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 packages/e17/e-modules_20050810.bb

diff --git a/packages/e17/e-modules_20050810.bb b/packages/e17/e-modules_20050810.bb
new file mode 100644
index 0000000000..4aa4c09bb5
--- /dev/null
+++ b/packages/e17/e-modules_20050810.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Enlightenment Window Manager Extra Modules"
+DEPENDS = "virtual/ecore virtual/evas esmart edje eet e"
+LICENSE = "MIT"
+SECTION = "e/apps"
+MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
+CVSDATE = "${PV}"
+PR = "r0"
+
+inherit autotools
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e_modules"
+S = "${WORKDIR}/e_modules"
+
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}"
diff --git a/packages/e17/e-wm_20050810.bb b/packages/e17/e-wm_20050810.bb
index b5b137eb16..180f2f8c86 100644
--- a/packages/e17/e-wm_20050810.bb
+++ b/packages/e17/e-wm_20050810.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "E17 - the Enlightenment Window Mananger"
-DEPENDS = "virtual/evas virtual/ecore edje eet embryo e"
+DEPENDS = "evas-x11 ecore-x11 edje eet embryo e"
 LICENSE = "MIT"
 SECTION = "e/apps"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
diff --git a/packages/e17/entrance_20050810.bb b/packages/e17/entrance_20050810.bb
index 471b7d31bb..4a7bc20361 100644
--- a/packages/e17/entrance_20050810.bb
+++ b/packages/e17/entrance_20050810.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Entrace is the Enlightenment login manager"
 SECTION = "e/apps"
 LICENSE = "MIT"
 # can also use pam and crypt
-DEPENDS = "edb virtual/evas virtual/ecore edje esmart"
+DEPENDS = "edb evas-x11 ecore-x11 edje esmart"
 HOMEPAGE = "http://www.enlightenment.org"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 CVSDATE = "${PV}"
diff --git a/packages/efl/esmart_0.9.0.004.bb b/packages/efl/esmart_0.9.0.004.bb
index beb936e37b..beae7a7bc1 100644
--- a/packages/efl/esmart_0.9.0.004.bb
+++ b/packages/efl/esmart_0.9.0.004.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "ESmart is a collection of smart Evas objects"
 LICENSE = "MIT"
-DEPENDS = "virtual/evas virtual/ecore virtual/imlib2 epsilon edje libtool"
+DEPENDS = "evas-x11 ecore-x11 virtual/imlib2 epsilon edje libtool"
 PR = "r1"
 
 inherit efl
-- 
cgit v1.2.3


From b2addc1c684112f426246ac842c0e2a3b37c069c Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Sat, 13 Aug 2005 01:57:39 +0000
Subject: stage src/bin/e_*.h as well

---
 packages/efl/e_20050810.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/efl/e_20050810.bb b/packages/efl/e_20050810.bb
index be10a5553a..ff55d47360 100644
--- a/packages/efl/e_20050810.bb
+++ b/packages/efl/e_20050810.bb
@@ -25,7 +25,7 @@ do_compile() {
 	oe_runmake -C src/lib
 }
 
-headers = "E_Lib.h"
+headers = "E_Lib.h ../bin/e_*.h"
 
 do_install() {
 	oe_runmake -C src/lib install DESTDIR=${D}
-- 
cgit v1.2.3


From dfd54dd6a4ac5e18a9cbedaf4a4b6574c3847e4b Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Sat, 13 Aug 2005 04:27:05 +0000
Subject: Specify edje_cc for e-modules

---
 packages/e17/e-modules_20050810.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/e17/e-modules_20050810.bb b/packages/e17/e-modules_20050810.bb
index 4aa4c09bb5..1764c21450 100644
--- a/packages/e17/e-modules_20050810.bb
+++ b/packages/e17/e-modules_20050810.bb
@@ -11,4 +11,6 @@ inherit autotools
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e_modules"
 S = "${WORKDIR}/e_modules"
 
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
+
 FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}"
-- 
cgit v1.2.3


From abd94547d55b393d2ec8e9fd6ba7a5ebc1bd87d7 Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Sat, 13 Aug 2005 05:35:02 +0000
Subject: esound-gpe needs to inherit from binconfig as well to install the
 esd-config file (this fixed libxine trying to link against
 /usr/lib/libasound.la) Note: this won't actually take effect until pkgconfig
 and binconfig are altered not to kill each other (see mailing list)

---
 packages/esound/esound-gpe_20020817.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/esound/esound-gpe_20020817.bb b/packages/esound/esound-gpe_20020817.bb
index 4c7e80f7c6..c3cdb784af 100644
--- a/packages/esound/esound-gpe_20020817.bb
+++ b/packages/esound/esound-gpe_20020817.bb
@@ -11,7 +11,7 @@ SRC_URI = "${HANDHELDS_CVS};module=gpe/base/esound \
 
 S = "${WORKDIR}/esound"
 
-inherit autotools pkgconfig
+inherit autotools binconfig pkgconfig
 
 EXTRA_OECONF = "--disable-alsa"
 
-- 
cgit v1.2.3


From db714350cce5928ea601419bb79381d4907d03e6 Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Sat, 13 Aug 2005 06:41:45 +0000
Subject: Remove extra spaces around "=" causing shell script syntax errors

---
 packages/altboot/files/altboot.func | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func
index 3a6c743f0d..17cba10741 100644
--- a/packages/altboot/files/altboot.func
+++ b/packages/altboot/files/altboot.func
@@ -149,7 +149,7 @@ pivot_image() {
 	# Busybox's "mount" doesn't seem to like "-o loop" for some reason
 	# It works on collie and b0rks on poodle.
 	if [ "$IMAGE_TYPE" = "" ]; then
-		$IMAGE_TYPE = "auto"
+		$IMAGE_TYPE="auto"
 	fi
 	mount -t $IMAGE_TYPE /dev/loop0 /media/image || die "mount /dev/loop0 /media/image failed!"
 
-- 
cgit v1.2.3


From c8c264c88b374728b04cffc3bd66a5cdb05c60ff Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Sat, 13 Aug 2005 06:56:14 +0000
Subject: Remove evoak as it no longer builds and is not depended on by
 anything

---
 packages/evoak/.mtn2git_empty |  0
 packages/evoak/evoak_0.0.1.bb | 21 ---------------------
 2 files changed, 21 deletions(-)
 delete mode 100644 packages/evoak/.mtn2git_empty
 delete mode 100644 packages/evoak/evoak_0.0.1.bb

diff --git a/packages/evoak/.mtn2git_empty b/packages/evoak/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/evoak/evoak_0.0.1.bb b/packages/evoak/evoak_0.0.1.bb
deleted file mode 100644
index 551dc8eca5..0000000000
--- a/packages/evoak/evoak_0.0.1.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-HOMEPAGE = "http://www.enlightenment.org"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "ecore evas edje embryo eet"
-LICENSE = "MIT"
-
-SRC_URI = "http://www.rasterman.com/files/evoak-${PV}.tar.gz"
-S = "${WORKDIR}/evoak-${PV}"
-
-inherit autotools binconfig
-
-#FIXME: evoak fails to build, because it doesn't realize that
-#our ecore was built without X support.  Ecore should really
-#be installing a copy of its config.h, and Evoak should be
-#ifdefing blocks of code based on the ecore build options.
-BROKEN = "1"
-
-do_stage () {
-	oe_libinstall -C src/lib libvoak ${STAGING_LIBDIR}/
-	install -m 0644 ${S}/src/lib/Evoak.h ${STAGING_INCDIR}/
-}
-- 
cgit v1.2.3


From 4dd4a258f7414b4b883d34e964700f55b46a3103 Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Sat, 13 Aug 2005 06:57:53 +0000
Subject: Also remove extra $ causing syntax errors

---
 packages/altboot/files/altboot.func | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func
index 17cba10741..642587b630 100644
--- a/packages/altboot/files/altboot.func
+++ b/packages/altboot/files/altboot.func
@@ -149,7 +149,7 @@ pivot_image() {
 	# Busybox's "mount" doesn't seem to like "-o loop" for some reason
 	# It works on collie and b0rks on poodle.
 	if [ "$IMAGE_TYPE" = "" ]; then
-		$IMAGE_TYPE="auto"
+		IMAGE_TYPE="auto"
 	fi
 	mount -t $IMAGE_TYPE /dev/loop0 /media/image || die "mount /dev/loop0 /media/image failed!"
 
-- 
cgit v1.2.3


From 344ce87c05155c4fff8b2091b78552b8213b951d Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Sat, 13 Aug 2005 10:23:11 +0000
Subject: Add patches and configuration to make entrance(d) actually work

---
 packages/e17/entrance/Xserver.patch                | 22 +++++++++
 packages/e17/entrance/allow-missing-xsession.patch | 19 ++++++++
 packages/e17/entrance/config-db.patch              | 56 ++++++++++++++++++++++
 packages/e17/entrance_20050810.bb                  | 11 ++++-
 4 files changed, 106 insertions(+), 2 deletions(-)
 create mode 100644 packages/e17/entrance/Xserver.patch
 create mode 100644 packages/e17/entrance/allow-missing-xsession.patch
 create mode 100644 packages/e17/entrance/config-db.patch

diff --git a/packages/e17/entrance/Xserver.patch b/packages/e17/entrance/Xserver.patch
new file mode 100644
index 0000000000..296a7bccf4
--- /dev/null
+++ b/packages/e17/entrance/Xserver.patch
@@ -0,0 +1,22 @@
+--- entrance/src/daemon/Entranced.h.~1.7.~	2004-05-19 21:02:09.000000000 -0700
++++ entrance/src/daemon/Entranced.h	2005-08-13 02:00:02.000000000 -0700
+@@ -18,7 +18,7 @@
+ 
+ #define ENTRANCED_DEBUG 1
+ 
+-#define X_SERVER "/usr/X11R6/bin/X -quiet"
++#define X_SERVER "/etc/X11/Xserver"
+ //#define X_SERVER "/usr/X11R6/bin/Xnest -full"
+ #define X_DISP ":0"             /* only used if DISPLAY variable is NOT set */
+ #define ENTRANCE PREFIX "/bin/entrance_wrapper"
+--- entrance/src/daemon/spawner.c.~1.25.~	2005-05-28 02:31:14.000000000 -0700
++++ entrance/src/daemon/spawner.c	2005-08-13 02:20:13.000000000 -0700
+@@ -155,7 +155,7 @@
+         sigaction(SIGUSR1, &_entrance_x_sa, NULL);
+       /* FIXME: need to parse command and NOT go thru /bin/sh!!!! */
+       /* why? some /bin/sh's wont pass on this SIGUSR1 thing... */
+-        execl("/bin/sh", "/bin/sh", "-c", x_cmd, NULL);
++        execl("/bin/bash", "/bin/bash", "-c", x_cmd, NULL);
+         syslog(LOG_WARNING, "Could not execute X server.");
+         exit(1);
+      default:
diff --git a/packages/e17/entrance/allow-missing-xsession.patch b/packages/e17/entrance/allow-missing-xsession.patch
new file mode 100644
index 0000000000..c475e46fe2
--- /dev/null
+++ b/packages/e17/entrance/allow-missing-xsession.patch
@@ -0,0 +1,19 @@
+--- entrance/configure.in.~1.42.~	2005-07-29 23:15:58.000000000 -0700
++++ entrance/configure.in	2005-08-13 03:11:41.000000000 -0700
+@@ -190,11 +190,11 @@
+ 	    fi
+ 	]
+ )
+-if test ! -x $xsession ; then
+-    AC_MSG_WARN([** no $xsession file on this system **])
+-    AC_MSG_WARN([** Perhaps you need to specify --with-xsession **])
+-    xsession="You should reconfigure --with-xsession"
+-fi
++#if test ! -x $xsession ; then
++#    AC_MSG_WARN([** no $xsession file on this system **])
++#    AC_MSG_WARN([** Perhaps you need to specify --with-xsession **])
++#    xsession="You should reconfigure --with-xsession"
++#fi
+ 
+ AC_DEFINE_UNQUOTED(ENTRANCE_XSESSION, "$xsession", [Xsession script])
+ AC_SUBST(xsession)
diff --git a/packages/e17/entrance/config-db.patch b/packages/e17/entrance/config-db.patch
new file mode 100644
index 0000000000..5e965057ba
--- /dev/null
+++ b/packages/e17/entrance/config-db.patch
@@ -0,0 +1,56 @@
+--- 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
+@@ -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
+ 
+ # uncomment the below to enable experimental OpenGL hardware acceleration
+ #edb_ed $DB add /entrance/engine int 1
+@@ -25,25 +25,25 @@
+ 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"
+-edb_ed $DB add /entrance/session/1/session str "Enlightenment"
+-edb_ed $DB add /entrance/session/2/session str "kde"
+-edb_ed $DB add /entrance/session/2/title str "KDE"
+-edb_ed $DB add /entrance/session/2/icon str "kde.png"
+-edb_ed $DB add /entrance/session/3/session str "gnome"
+-edb_ed $DB add /entrance/session/3/title str "Gnome"
+-edb_ed $DB add /entrance/session/3/icon str "gnome.png"
+-edb_ed $DB add /entrance/session/4/session str "blackbox"
+-edb_ed $DB add /entrance/session/4/title str "Blackbox"
+-edb_ed $DB add /entrance/session/4/icon str "blackbox.png"
+-edb_ed $DB add /entrance/session/5/session str "sawfish"
+-edb_ed $DB add /entrance/session/5/title str "Sawfish"
+-edb_ed $DB add /entrance/session/5/icon str "default.png"
+-edb_ed $DB add /entrance/session/6/session str "xfce"
+-edb_ed $DB add /entrance/session/6/title str "XFce"
+-edb_ed $DB add /entrance/session/6/icon str "xfce.png"
+-edb_ed $DB add /entrance/session/7/session str "failsafe"
+-edb_ed $DB add /entrance/session/7/title str "Failsafe"
+-edb_ed $DB add /entrance/session/7/icon str "failsafe.png"
++edb_ed $DB add /entrance/session/1/session str "/etc/X11/Session/Enlightenment"
++#edb_ed $DB add /entrance/session/2/session str "kde"
++#edb_ed $DB add /entrance/session/2/title str "KDE"
++#edb_ed $DB add /entrance/session/2/icon str "kde.png"
++edb_ed $DB add /entrance/session/2/session str "/etc/X11/Session/GPE"
++edb_ed $DB add /entrance/session/2/title str "GPE"
++edb_ed $DB add /entrance/session/2/icon str "gnome.png"
++#edb_ed $DB add /entrance/session/4/session str "blackbox"
++#edb_ed $DB add /entrance/session/4/title str "Blackbox"
++#edb_ed $DB add /entrance/session/4/icon str "blackbox.png"
++#edb_ed $DB add /entrance/session/5/session str "sawfish"
++#edb_ed $DB add /entrance/session/5/title str "Sawfish"
++#edb_ed $DB add /entrance/session/5/icon str "default.png"
++#edb_ed $DB add /entrance/session/6/session str "xfce"
++#edb_ed $DB add /entrance/session/6/title str "XFce"
++#edb_ed $DB add /entrance/session/6/icon str "xfce.png"
++edb_ed $DB add /entrance/session/3/session str "/etc/X11/Session/Failsafe"
++edb_ed $DB add /entrance/session/3/title str "Failsafe"
++edb_ed $DB add /entrance/session/3/icon str "failsafe.png"
+ edb_ed $DB add /entrance/system/reboot int 1
+ edb_ed $DB add /entrance/system/halt int 1
+ edb_ed $DB add /entrance/user/remember int 1
diff --git a/packages/e17/entrance_20050810.bb b/packages/e17/entrance_20050810.bb
index 4a7bc20361..251698c233 100644
--- a/packages/e17/entrance_20050810.bb
+++ b/packages/e17/entrance_20050810.bb
@@ -3,15 +3,22 @@ SECTION = "e/apps"
 LICENSE = "MIT"
 # can also use pam and crypt
 DEPENDS = "edb evas-x11 ecore-x11 edje esmart"
+RDEPENDS += "bash"
 HOMEPAGE = "http://www.enlightenment.org"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 CVSDATE = "${PV}"
+PR = "r0"
 
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/entrance \
-           file://longer-sleep.patch;patch=1"
+           file://longer-sleep.patch;patch=1 \
+           file://Xserver.patch;patch=1 \
+           file://config-db.patch;patch=1 \
+           file://allow-missing-xsession.patch;patch=1"
 S = "${WORKDIR}/entrance"
 
 inherit autotools
 
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc \
+                --with-xsession=/etc/X11/Xsession"
 
+FILES += "${datadir}"
\ No newline at end of file
-- 
cgit v1.2.3


From 06a3c35f46151227b356c78257aadc682f546bdb Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Sat, 13 Aug 2005 10:31:03 +0000
Subject: Add binaries to dev package Fix runtime deps for ncurses binary
 Remove gtk+ deps as it doesn't work

---
 packages/efl/edb_1.0.5.004.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/efl/edb_1.0.5.004.bb b/packages/efl/edb_1.0.5.004.bb
index 0a04a42844..a783a4d807 100644
--- a/packages/efl/edb_1.0.5.004.bb
+++ b/packages/efl/edb_1.0.5.004.bb
@@ -1,10 +1,14 @@
 DESCRIPTION = "EDB is a database convenience library wrapped around the \
 Berkeley DB 2.7.7 by Sleepycat Software."
-DEPENDS = "zlib ncurses gtk+"
+DEPENDS = "zlib ncurses"
 LICENSE = "BSD"
 PR = "r0"
 
 inherit efl
 
+EXTRA_OECONF += "--disable-gtk"
+
 libdirectory = "src"
 
+FILES_${PN}-dev += "${bindir}/edb_ed ${bindir}/edb_vt_ed ${bindir}/edb_gtk_ed"
+RDEPENDS_${PN}-dev += "ncurses"
\ No newline at end of file
-- 
cgit v1.2.3


From ef2ca3dff35f40addd7ff579a7fffe6649bc0bc6 Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Sat, 13 Aug 2005 10:32:41 +0000
Subject: Add engage and examine bb files

---
 packages/e17/engage_20050810.bb  | 26 ++++++++++++++++++++++++++
 packages/e17/examine_20050810.bb | 27 +++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 packages/e17/engage_20050810.bb
 create mode 100644 packages/e17/examine_20050810.bb

diff --git a/packages/e17/engage_20050810.bb b/packages/e17/engage_20050810.bb
new file mode 100644
index 0000000000..b74d21f028
--- /dev/null
+++ b/packages/e17/engage_20050810.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "engage, e17 icon dock"
+DEPENDS = "esmart virtual/imlib2 edje virtual/ecore virtual/evas ewl e-wm"
+LICENSE = "MIT"
+SECTION = "e"
+MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
+PR = "r0"
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=misc/engage"
+S = "${WORKDIR}/engage"
+
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
+
+do_prepsources () {
+  make clean distclean || true
+}
+addtask prepsources after do_fetch before do_unpack
+
+export EET_CONFIG = "${STAGING_BINDIR}/eet-config"
+export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config"
+export ECORE_CONFIG = "${STAGING_BINDIR}/ecore-config"
+export EMBRYO_CONFIG = "${STAGING_BINDIR}/embryo-config"
+export EDJE_CONFIG = "${STAGING_BINDIR}/edje-config"
+
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} /etc/* /usr/sbin/*"
+
+inherit autotools pkgconfig binconfig
diff --git a/packages/e17/examine_20050810.bb b/packages/e17/examine_20050810.bb
new file mode 100644
index 0000000000..07ed88c0f5
--- /dev/null
+++ b/packages/e17/examine_20050810.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "examine, the program configurator"
+DEPENDS = "virtual/ecore ewl"
+LICENSE = "MIT"
+SECTION = "e"
+MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
+PR = "r0"
+CVSDATE = "${PV}"
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/examine"
+S = "${WORKDIR}/examine"
+
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
+
+do_prepsources () {
+  make clean distclean || true
+}
+addtask prepsources after do_fetch before do_unpack
+
+export EET_CONFIG = "${STAGING_BINDIR}/eet-config"
+export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config"
+export ECORE_CONFIG = "${STAGING_BINDIR}/ecore-config"
+export EMBRYO_CONFIG = "${STAGING_BINDIR}/embryo-config"
+export EDJE_CONFIG = "${STAGING_BINDIR}/edje-config"
+
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} /etc/* /usr/sbin/*"
+
+inherit autotools pkgconfig binconfig
-- 
cgit v1.2.3


From 2d68f48ddd27b13f73c64447ab46aa380222f010 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Sat, 13 Aug 2005 12:53:58 +0000
Subject: oe/packages/qpe-gaim/qpe-libgaim:     -Update qpe-libgaim from
 version 1.4.0 to 1.5.0      This release contained no security updates

---
 packages/qpe-gaim/qpe-libgaim_1.4.0.bb | 53 ----------------------------------
 packages/qpe-gaim/qpe-libgaim_1.5.0.bb | 53 ++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 53 deletions(-)
 delete mode 100644 packages/qpe-gaim/qpe-libgaim_1.4.0.bb
 create mode 100644 packages/qpe-gaim/qpe-libgaim_1.5.0.bb

diff --git a/packages/qpe-gaim/qpe-libgaim_1.4.0.bb b/packages/qpe-gaim/qpe-libgaim_1.4.0.bb
deleted file mode 100644
index 824dee5c39..0000000000
--- a/packages/qpe-gaim/qpe-libgaim_1.4.0.bb
+++ /dev/null
@@ -1,53 +0,0 @@
-DESCRIPTION = "A multi protocol instant messager library, Qt/Embedded based Palmtop Environments Edition"
-SECTION = "opie/applications"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-DEPENDS = "glib-2.0 gnutls"
-RDEPENDS = "libgaim-plugins"
-LICENSE = "GPL"
-HOMEPAGE = "http://gaim.sourceforge.net/"
-PR = "r3"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/gaim/gaim-${PV}.tar.bz2 \
-	   file://dont-look-for-gtk.patch;patch=1        \
-	   file://libgaim.patch;patch=1 "
-
-S = "${WORKDIR}/gaim-${PV}"
-
-inherit autotools
-
-EXTRA_OE_CONF = "--disable-audio --disable-gtkspell --disable-perl \
-		 --disable-screensaver --disable-sm --disable-glibtest \
-		 --disable-gtktest --disable-startup-notification \
-		 --disable-gevolution --disable-aotest --disable-audiofiletest \
-		 --disable-x --without-x --without-gtk --disable-gtk \
-		 --enable-gnutls=y"
-
-CFLAGS_append = " -I${STAGING_INCDIR}/glib-2.0"
-
-do_stage() {
-	oe_libinstall -so -C src libgaim ${QTDIR}/lib
-
-	# install headers
-	GAIM_DIR=${STAGING_INCDIR}/gaim
-	install -d $GAIM_DIR
-
-	for header in account.h accountopt.h away.h blist.h buddyicon.h cmds.h config.h connection.h conversation.h core.h debug.h eventloop.h ft.h gaim.h imgstore.h log.h md5.h network.h notify.h plugin.h pluginpref.h pounce.h prefix.h prefs.h privacy.h proxy.h prpl.h request.h roomlist.h server.h sha.h signals.h sound.h sslconn.h status.h stringref.h util.h value.h version.h xmlnode.h
-	do
-		if [ -e ${S}/src/$header ]; then
-			install -m 0644 ${S}/src/$header $GAIM_DIR	
-		fi
-		if [ -e ${S}/$header ]; then
-			install -m 0644 ${S}/$header $GAIM_DIR
-		fi
-	done
-}
-
-#FIXME: use do_packages to create individual packages for each of the plugins
-python populate_packages_prepend () {
-	plugindir = bb.data.expand('${libdir}/gaim', d)
-	do_split_packages(d, plugindir, '^lib(.*)\.so$', 'libgaim-protocol-%s', 'GAIM plugin for %s protocol', extra_depends='' )
-}
-
-PACKAGES += "libgaim-plugins"
-FILES_libgaim-plugins = "${libdir}/gaim/autorecon.so ${libdir}/gaim/s*.so"
-
diff --git a/packages/qpe-gaim/qpe-libgaim_1.5.0.bb b/packages/qpe-gaim/qpe-libgaim_1.5.0.bb
new file mode 100644
index 0000000000..824dee5c39
--- /dev/null
+++ b/packages/qpe-gaim/qpe-libgaim_1.5.0.bb
@@ -0,0 +1,53 @@
+DESCRIPTION = "A multi protocol instant messager library, Qt/Embedded based Palmtop Environments Edition"
+SECTION = "opie/applications"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+DEPENDS = "glib-2.0 gnutls"
+RDEPENDS = "libgaim-plugins"
+LICENSE = "GPL"
+HOMEPAGE = "http://gaim.sourceforge.net/"
+PR = "r3"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gaim/gaim-${PV}.tar.bz2 \
+	   file://dont-look-for-gtk.patch;patch=1        \
+	   file://libgaim.patch;patch=1 "
+
+S = "${WORKDIR}/gaim-${PV}"
+
+inherit autotools
+
+EXTRA_OE_CONF = "--disable-audio --disable-gtkspell --disable-perl \
+		 --disable-screensaver --disable-sm --disable-glibtest \
+		 --disable-gtktest --disable-startup-notification \
+		 --disable-gevolution --disable-aotest --disable-audiofiletest \
+		 --disable-x --without-x --without-gtk --disable-gtk \
+		 --enable-gnutls=y"
+
+CFLAGS_append = " -I${STAGING_INCDIR}/glib-2.0"
+
+do_stage() {
+	oe_libinstall -so -C src libgaim ${QTDIR}/lib
+
+	# install headers
+	GAIM_DIR=${STAGING_INCDIR}/gaim
+	install -d $GAIM_DIR
+
+	for header in account.h accountopt.h away.h blist.h buddyicon.h cmds.h config.h connection.h conversation.h core.h debug.h eventloop.h ft.h gaim.h imgstore.h log.h md5.h network.h notify.h plugin.h pluginpref.h pounce.h prefix.h prefs.h privacy.h proxy.h prpl.h request.h roomlist.h server.h sha.h signals.h sound.h sslconn.h status.h stringref.h util.h value.h version.h xmlnode.h
+	do
+		if [ -e ${S}/src/$header ]; then
+			install -m 0644 ${S}/src/$header $GAIM_DIR	
+		fi
+		if [ -e ${S}/$header ]; then
+			install -m 0644 ${S}/$header $GAIM_DIR
+		fi
+	done
+}
+
+#FIXME: use do_packages to create individual packages for each of the plugins
+python populate_packages_prepend () {
+	plugindir = bb.data.expand('${libdir}/gaim', d)
+	do_split_packages(d, plugindir, '^lib(.*)\.so$', 'libgaim-protocol-%s', 'GAIM plugin for %s protocol', extra_depends='' )
+}
+
+PACKAGES += "libgaim-plugins"
+FILES_libgaim-plugins = "${libdir}/gaim/autorecon.so ${libdir}/gaim/s*.so"
+
-- 
cgit v1.2.3


From 735f1b90445f1a173a165a0fe2c4099cda48e71d Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 13 Aug 2005 14:33:30 +0000
Subject: add taglib, a library for reading and editing the meta-data of
 several popular audio formats don't be surprised, I had to ditch the original
 buildsystem and use qmake - it may sound a bit perverted, but that way I
 could get it to work :)

---
 packages/taglib/.mtn2git_empty |  0
 packages/taglib/taglib_1.4.bb  | 38 ++++++++++++++++++++++++++++++++++++++
 packages/taglib/taglibc_1.4.bb | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 71 insertions(+)
 create mode 100644 packages/taglib/.mtn2git_empty
 create mode 100644 packages/taglib/taglib_1.4.bb
 create mode 100644 packages/taglib/taglibc_1.4.bb

diff --git a/packages/taglib/.mtn2git_empty b/packages/taglib/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/taglib/taglib_1.4.bb b/packages/taglib/taglib_1.4.bb
new file mode 100644
index 0000000000..2fbd4dc334
--- /dev/null
+++ b/packages/taglib/taglib_1.4.bb
@@ -0,0 +1,38 @@
+DESCRIPTION = "TagLib is a library for reading and editing the meta-data of several popular audio formats"
+SECTION = "libs"
+HOMEPAGE = "http://developer.kde.org/~wheeler/taglib.html"
+LICENSE = "LGPL"
+
+SRC_URI = "http://developer.kde.org/~wheeler/files/src/taglib-${PV}.tar.gz"
+S = "${WORKDIR}/taglib-${PV}"
+
+inherit autotools qmake-base pkgconfig binconfig
+
+do_configure() {
+	# calling oe_runconf to generate pkgconfig and binconfig files
+	oe_runconf
+	cd ${S}/taglib && rm -f Makefile* && qmake -project -t lib && \
+	qmake -spec ${QMAKESPEC} -after CONFIG=console INCLUDEPATH+=${S}
+}
+
+do_compile() {
+	oe_runmake -C taglib
+}
+
+do_stage_append() {
+	install -d ${STAGING_INCDIR}/taglib
+	for i in `find taglib -name "*.h"`
+	do
+		install $i ${STAGING_INCDIR}/taglib/
+	done
+    for i in `find taglib -name "*.tcc"`
+    do
+        install $i ${STAGING_INCDIR}/taglib/
+    done
+    oe_libinstall -so -C taglib libtaglib ${STAGING_LIBDIR}
+}
+
+do_install() {
+	install -d ${D}${libdir}
+	oe_libinstall -so -C taglib libtaglib ${D}${libdir}
+}
diff --git a/packages/taglib/taglibc_1.4.bb b/packages/taglib/taglibc_1.4.bb
new file mode 100644
index 0000000000..87f85da430
--- /dev/null
+++ b/packages/taglib/taglibc_1.4.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "TagLib is a library for reading and editing the meta-data \
+of several popular audio formats. Currently it supports both ID3v1 and ID3v2 \
+for MP3 files, Ogg Vorbis comments and ID3 tags and Vorbis comments in FLAC files"
+SECTION = "libs"
+HOMEPAGE = "http://developer.kde.org/~wheeler/taglib.html"
+DEPENDS = "taglib"
+LICENSE = "LGPL"
+
+SRC_URI = "http://developer.kde.org/~wheeler/files/src/taglib-${PV}.tar.gz"
+S = "${WORKDIR}/taglib-${PV}"
+
+inherit autotools qmake-base pkgconfig binconfig
+
+do_configure() {
+	echo running oe_runconf to get pkgconfig and binconfig files created          
+	oe_runconf
+	cd ${S}/bindings/c && rm -f Makefile* && qmake -project -o tag_c.pro -t lib && \
+	qmake -spec ${QMAKESPEC} -after CONFIG=console INCLUDEPATH+=${STAGING_INCDIR}/taglib LIBS+=-ltag
+}
+
+do_compile() {
+	oe_runmake -C bindings/c
+}
+
+do_stage_append() {
+	install -d ${STAGING_INCDIR}/taglib
+	install -m 0644 bindings/c/tag_c.h ${STAGING_INCDIR}
+	oe_libinstall -so -C bindings/c libtag_c ${STAGING_LIBDIR}
+}
+
+do_install() {
+    oe_libinstall -so -C bindings/c libtag_c ${D}${libdir}
+}
-- 
cgit v1.2.3


From c0f99abb4c2c1000a699f7a815cef0fd87c48a2a Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 13 Aug 2005 14:34:28 +0000
Subject: libpng also uses the binconfig scheme drop some older libpng versions

---
 packages/libpng/libpng-native_1.2.5+1.2.6rc5.bb |  5 ---
 packages/libpng/libpng-native_1.2.7.bb          |  5 ---
 packages/libpng/libpng-native_1.2.8.bb          |  4 +-
 packages/libpng/libpng_1.2.5+1.2.6rc5.bb        | 54 -----------------------
 packages/libpng/libpng_1.2.7.bb                 | 57 -------------------------
 packages/libpng/libpng_1.2.8.bb                 |  2 +-
 6 files changed, 4 insertions(+), 123 deletions(-)
 delete mode 100644 packages/libpng/libpng-native_1.2.5+1.2.6rc5.bb
 delete mode 100644 packages/libpng/libpng-native_1.2.7.bb
 delete mode 100644 packages/libpng/libpng_1.2.5+1.2.6rc5.bb
 delete mode 100644 packages/libpng/libpng_1.2.7.bb

diff --git a/packages/libpng/libpng-native_1.2.5+1.2.6rc5.bb b/packages/libpng/libpng-native_1.2.5+1.2.6rc5.bb
deleted file mode 100644
index 5415774737..0000000000
--- a/packages/libpng/libpng-native_1.2.5+1.2.6rc5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-SECTION = "libs"
-include libpng_${PV}.bb
-inherit native
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}"
-DEPENDS = "zlib-native"
diff --git a/packages/libpng/libpng-native_1.2.7.bb b/packages/libpng/libpng-native_1.2.7.bb
deleted file mode 100644
index 5415774737..0000000000
--- a/packages/libpng/libpng-native_1.2.7.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-SECTION = "libs"
-include libpng_${PV}.bb
-inherit native
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}"
-DEPENDS = "zlib-native"
diff --git a/packages/libpng/libpng-native_1.2.8.bb b/packages/libpng/libpng-native_1.2.8.bb
index 7e611bf4a5..b03056f08d 100644
--- a/packages/libpng/libpng-native_1.2.8.bb
+++ b/packages/libpng/libpng-native_1.2.8.bb
@@ -3,7 +3,9 @@ inherit native
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}"
 DEPENDS = "zlib-native"
 
-do_stage() {
+INHIBIT_NATIVE_STAGE_INSTALL = "1"
+
+do_stage_append() {
         cp libpng.pc libpng12.pc
         install -m 644 png.h ${STAGING_INCDIR}/png.h
         install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h
diff --git a/packages/libpng/libpng_1.2.5+1.2.6rc5.bb b/packages/libpng/libpng_1.2.5+1.2.6rc5.bb
deleted file mode 100644
index 216657cb8f..0000000000
--- a/packages/libpng/libpng_1.2.5+1.2.6rc5.bb
+++ /dev/null
@@ -1,54 +0,0 @@
-DESCRIPTION = "PNG Library"
-SECTION = "libs"
-PRIORITY = "required"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-DEPENDS = "zlib"
-LICENSE = "PNG"
-PACKAGES =+ "${PN}12 ${PN}12-dev"
-
-FILES_${PN}12 = ${libdir}/libpng12.so.*
-FILES_${PN}12-dev = ${libdir}/libpng12.* ${includedir}/libpng12 ${libdir}/pkgconfig/libpng12.pc
-FILES_${PN} = ${libdir}/lib*.so.*
-FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
-		${libdir}/*.a ${libdir}/pkgconfig \
-		${datadir}/aclocal ${bindir} ${sbindir}
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-1.2.6rc5.tar.bz2"
-S = "${WORKDIR}/libpng-1.2.6rc5"
-
-inherit pkgconfig
-
-EXTRA_OEMAKE_append = " ZLIBINC=${STAGING_INCDIR} ZLIBLIB=${STAGING_LIBDIR}"
-
-do_compile() {
-	sed < scripts/makefile.linux > makefile -e 's/^ZLIBINC.*//' -e 's/^ZLIBLIB.*//'
-	unset LDFLAGS
-	oe_runmake 'CC=${CC}' 'LD=${LD}' 'CFLAGS=${CFLAGS}' \
-		   'ZLIBINC=${STAGING_INCDIR}' \
-		   'ZLIBLIB=${STAGING_LIBDIR}'
-}
-
-do_stage() {
-	cp libpng.pc libpng12.pc
-	install -m 644 png.h ${STAGING_INCDIR}/png.h
-	install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h
-	oe_libinstall -so libpng12 ${STAGING_LIBDIR}
-	ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so
-}
-
-do_install() {
-	install -d ${D}${bindir} ${D}${mandir} \
-		   ${D}${libdir} ${D}${includedir}
-	unset LDFLAGS
-	oe_runmake 'prefix=${prefix}' 'DESTDIR=${D}' \
-		   'DB=${D}${bindir}' 'DI=${D}${includedir}' \
-		   'DL=${D}${libdir}' 'DM=${D}${mandir}' \
-		   install
-}
-
-python do_package() {
-        if bb.data.getVar('DEBIAN_NAMES', d, 1):
-            bb.data.setVar('PKG_${PN}', 'libpng12', d)
-        bb.build.exec_func('package_do_package', d)
-}
-
diff --git a/packages/libpng/libpng_1.2.7.bb b/packages/libpng/libpng_1.2.7.bb
deleted file mode 100644
index a93587c3a0..0000000000
--- a/packages/libpng/libpng_1.2.7.bb
+++ /dev/null
@@ -1,57 +0,0 @@
-DESCRIPTION = "PNG Library"
-HOMEPAGE = "http://www.libpng.org/"
-LICENSE = "libpng"
-SECTION = "libs"
-PRIORITY = "required"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-
-DEPENDS = "zlib"
-
-PACKAGES =+ "${PN}12 ${PN}12-dev"
-
-FILES_${PN}12 = ${libdir}/libpng12.so.*
-FILES_${PN}12-dev = ${libdir}/libpng12.* ${includedir}/libpng12 ${libdir}/pkgconfig/libpng12.pc
-FILES_${PN} = ${libdir}/lib*.so.*
-FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
-		${libdir}/*.a ${libdir}/pkgconfig \
-		${datadir}/aclocal ${bindir} ${sbindir}
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2"
-S = "${WORKDIR}/libpng-${PV}"
-
-inherit pkgconfig
-
-EXTRA_OEMAKE_append = " ZLIBINC=${STAGING_INCDIR} ZLIBLIB=${STAGING_LIBDIR}"
-
-do_compile() {
-	sed < scripts/makefile.linux > makefile -e 's/^ZLIBINC.*//' -e 's/^ZLIBLIB.*//'
-	unset LDFLAGS
-	oe_runmake 'CC=${CC}' 'LD=${LD}' 'CFLAGS=${CFLAGS}' \
-		   'ZLIBINC=${STAGING_INCDIR}' \
-		   'ZLIBLIB=${STAGING_LIBDIR}'
-}
-
-do_stage() {
-	cp libpng.pc libpng12.pc
-	install -m 644 png.h ${STAGING_INCDIR}/png.h
-	install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h
-	oe_libinstall -so libpng12 ${STAGING_LIBDIR}
-	ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so
-}
-
-do_install() {
-	install -d ${D}${bindir} ${D}${mandir} \
-		   ${D}${libdir} ${D}${includedir}
-	unset LDFLAGS
-	oe_runmake 'prefix=${prefix}' 'DESTDIR=${D}' \
-		   'DB=${D}${bindir}' 'DI=${D}${includedir}' \
-		   'DL=${D}${libdir}' 'DM=${D}${mandir}' \
-		   install
-}
-
-python do_package() {
-        if bb.data.getVar('DEBIAN_NAMES', d, 1):
-            bb.data.setVar('PKG_${PN}', 'libpng12', d)
-        bb.build.exec_func('package_do_package', d)
-}
-
diff --git a/packages/libpng/libpng_1.2.8.bb b/packages/libpng/libpng_1.2.8.bb
index 05f681527c..81274dc762 100644
--- a/packages/libpng/libpng_1.2.8.bb
+++ b/packages/libpng/libpng_1.2.8.bb
@@ -19,7 +19,7 @@ FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
 SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2"
 S = "${WORKDIR}/libpng-${PV}"
 
-inherit pkgconfig
+inherit pkgconfig binconfig
 
 EXTRA_OEMAKE_append = " ZLIBINC=${STAGING_INCDIR} ZLIBLIB=${STAGING_LIBDIR}"
 
-- 
cgit v1.2.3


From c43bdb630a5cb6a6cce9a9fb49abcf679c625d58 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 13 Aug 2005 14:42:02 +0000
Subject: add eclair, the E17 multi media player based on the emotion engine
 (based on libxine)

---
 packages/e17/eclair_20050810.bb | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 packages/e17/eclair_20050810.bb

diff --git a/packages/e17/eclair_20050810.bb b/packages/e17/eclair_20050810.bb
new file mode 100644
index 0000000000..ba1e8fb10d
--- /dev/null
+++ b/packages/e17/eclair_20050810.bb
@@ -0,0 +1,20 @@
+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"
+LICENSE = "MIT"
+HOMEPAGE = "http://www.enlightenment.org"
+MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
+CVSDATE = "${PV}"
+PR = "r0"
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/eclair"
+S = "${WORKDIR}/eclair"
+
+inherit autotools
+
+BROKEN = "1"
+
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
+
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
+
-- 
cgit v1.2.3


From b87cac1cf23eab6ad1e8a7498702f408263c2ae4 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 13 Aug 2005 14:44:45 +0000
Subject: E17 files - remove unnecessary explicit binconfig settings - use
 ${sysconfdir} and ${sbindir} instead of hardcoding paths

---
 packages/e17/e-iconbar_20050810.bb |  2 +-
 packages/e17/engage_20050810.bb    | 13 ++++---------
 packages/e17/entice_20050810.bb    |  4 ++--
 packages/e17/examine_20050810.bb   | 12 +++---------
 4 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/packages/e17/e-iconbar_20050810.bb b/packages/e17/e-iconbar_20050810.bb
index 0d3c14cc06..9eae8a37b2 100644
--- a/packages/e17/e-iconbar_20050810.bb
+++ b/packages/e17/e-iconbar_20050810.bb
@@ -13,4 +13,4 @@ inherit autotools
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
 
-FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} /etc/* /usr/sbin/*"
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
diff --git a/packages/e17/engage_20050810.bb b/packages/e17/engage_20050810.bb
index b74d21f028..e8f9467239 100644
--- a/packages/e17/engage_20050810.bb
+++ b/packages/e17/engage_20050810.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "engage, e17 icon dock"
+DESCRIPTION = "Engage is the E17 icon dock"
 DEPENDS = "esmart virtual/imlib2 edje virtual/ecore virtual/evas ewl e-wm"
 LICENSE = "MIT"
 SECTION = "e"
@@ -8,6 +8,8 @@ PR = "r0"
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=misc/engage"
 S = "${WORKDIR}/engage"
 
+inherit autotools pkgconfig binconfig
+
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
 
 do_prepsources () {
@@ -15,12 +17,5 @@ do_prepsources () {
 }
 addtask prepsources after do_fetch before do_unpack
 
-export EET_CONFIG = "${STAGING_BINDIR}/eet-config"
-export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config"
-export ECORE_CONFIG = "${STAGING_BINDIR}/ecore-config"
-export EMBRYO_CONFIG = "${STAGING_BINDIR}/embryo-config"
-export EDJE_CONFIG = "${STAGING_BINDIR}/edje-config"
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
 
-FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} /etc/* /usr/sbin/*"
-
-inherit autotools pkgconfig binconfig
diff --git a/packages/e17/entice_20050810.bb b/packages/e17/entice_20050810.bb
index ac454e7189..667d3f4da8 100644
--- a/packages/e17/entice_20050810.bb
+++ b/packages/e17/entice_20050810.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Entice is a picture viewer"
+DESCRIPTION = "Entice is the E17 picture viewer"
 SECTION = "e/apps"
 # can also depend on GIMP for editing
 DEPENDS = "virtual/evas edb virtual/ecore edje"
@@ -15,5 +15,5 @@ inherit autotools
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
 
-FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} /etc/* /usr/sbin/*"
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
 
diff --git a/packages/e17/examine_20050810.bb b/packages/e17/examine_20050810.bb
index 07ed88c0f5..6e79fd946f 100644
--- a/packages/e17/examine_20050810.bb
+++ b/packages/e17/examine_20050810.bb
@@ -11,17 +11,11 @@ S = "${WORKDIR}/examine"
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
 
+inherit autotools pkgconfig binconfig
+
 do_prepsources () {
   make clean distclean || true
 }
 addtask prepsources after do_fetch before do_unpack
 
-export EET_CONFIG = "${STAGING_BINDIR}/eet-config"
-export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config"
-export ECORE_CONFIG = "${STAGING_BINDIR}/ecore-config"
-export EMBRYO_CONFIG = "${STAGING_BINDIR}/embryo-config"
-export EDJE_CONFIG = "${STAGING_BINDIR}/edje-config"
-
-FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} /etc/* /usr/sbin/*"
-
-inherit autotools pkgconfig binconfig
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
-- 
cgit v1.2.3


From d2f11bf46d4b6929b75b786171105561f91a525c Mon Sep 17 00:00:00 2001
From: Rene Wagner <rw@handhelds.org>
Date: Sat, 13 Aug 2005 21:09:42 +0000
Subject: gstreamer: bump to gstreamer-0.8.10. apply patch submitted in gnome
 bug #313322. move patches around a bit.

---
 packages/gstreamer/files/.mtn2git_empty            |  0
 packages/gstreamer/files/lame-autoconf.patch       | 21 ------
 packages/gstreamer/files/no-libxml2.patch          | 75 ----------------------
 packages/gstreamer/files/try-esdsink.patch         | 22 -------
 packages/gstreamer/gst-plugins/lame-autoconf.patch | 21 ++++++
 packages/gstreamer/gst-plugins/try-esdsink.patch   | 22 +++++++
 packages/gstreamer/gstreamer-0.8.10/.mtn2git_empty |  0
 .../gstreamer/gstreamer-0.8.10/filesrc-uri.patch   | 22 +++++++
 .../gstreamer/gstreamer-0.8.9/no-libxml2.patch     | 75 ++++++++++++++++++++++
 packages/gstreamer/gstreamer_0.8.10.bb             | 34 ++++++++++
 10 files changed, 174 insertions(+), 118 deletions(-)
 delete mode 100644 packages/gstreamer/files/.mtn2git_empty
 delete mode 100644 packages/gstreamer/files/lame-autoconf.patch
 delete mode 100644 packages/gstreamer/files/no-libxml2.patch
 delete mode 100644 packages/gstreamer/files/try-esdsink.patch
 create mode 100644 packages/gstreamer/gst-plugins/lame-autoconf.patch
 create mode 100644 packages/gstreamer/gst-plugins/try-esdsink.patch
 create mode 100644 packages/gstreamer/gstreamer-0.8.10/.mtn2git_empty
 create mode 100644 packages/gstreamer/gstreamer-0.8.10/filesrc-uri.patch
 create mode 100644 packages/gstreamer/gstreamer-0.8.9/no-libxml2.patch
 create mode 100644 packages/gstreamer/gstreamer_0.8.10.bb

diff --git a/packages/gstreamer/files/.mtn2git_empty b/packages/gstreamer/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/gstreamer/files/lame-autoconf.patch b/packages/gstreamer/files/lame-autoconf.patch
deleted file mode 100644
index 3fb85e7d88..0000000000
--- a/packages/gstreamer/files/lame-autoconf.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- gst-plugins-0.8.6.orig/configure.ac	2004-11-25 16:41:47.000000000 +0100
-+++ gst-plugins-0.8.6/configure.ac	2005-02-22 19:02:58.000000000 +0100
-@@ -1135,8 +1135,9 @@
-   GST_CHECK_LIBHEADER(LAME, mp3lame, lame_init, -lm, lame/lame.h, HAVE_LAME="yes" LAME_LIBS="-lmp3lame -lm")
- ])
- dnl is lame presets available
-+if test "x$HAVE_LAME" = "xyes"; then
- LAME_CFLAGS=""
--AC_TRY_RUN([
-+AC_TRY_COMPILE([
- #include <lame/lame.h>
- int main (int argc, char *argv[])
- {
-@@ -1144,6 +1145,7 @@
-   return 0;
- }
- ],[LAME_CFLAGS="-DGSTLAME_PRESET"],[LAME_CFLAGS=""])
-+fi
- AC_SUBST(LAME_CFLAGS)
- AC_SUBST(LAME_LIBS)
- 
diff --git a/packages/gstreamer/files/no-libxml2.patch b/packages/gstreamer/files/no-libxml2.patch
deleted file mode 100644
index c676c2387f..0000000000
--- a/packages/gstreamer/files/no-libxml2.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -ur gstreamer-0.8.9/configure gstreamer-0.8.9-jeh3/configure
---- gstreamer-0.8.9/configure	2005-02-08 04:45:25.000000000 -0500
-+++ gstreamer-0.8.9-jeh3/configure	2005-03-03 22:34:09.213409312 -0500
-@@ -25655,10 +25655,10 @@
- 
- 
- 
--if test "x$GST_DISABLE_LOADSAVE" = "xyes" && test "x$GST_DISABLE_REGISTRY" = "xyes"
-+if test "x$GST_DISABLE_LOADSAVE" = "xyes"
- then
--  { echo "$as_me:$LINENO: Registry and load/save are disabled, not checking for libxml2" >&5
--echo "$as_me: Registry and load/save are disabled, not checking for libxml2" >&6;}
-+  { echo "$as_me:$LINENO: Load/save are disabled, not checking for libxml2" >&5
-+echo "$as_me: Load/save are disabled, not checking for libxml2" >&6;}
- else
- 
-       LIBXML2_REQ=2.4.9
-diff -ur gstreamer-0.8.9/configure.ac gstreamer-0.8.9-jeh3/configure.ac
---- gstreamer-0.8.9/configure.ac	2005-02-08 04:44:47.000000000 -0500
-+++ gstreamer-0.8.9-jeh3/configure.ac	2005-03-03 22:34:09.215409008 -0500
-@@ -275,9 +275,9 @@
- AC_SUBST(GLIB_ONLY_LIBS)
-   
- dnl === libxml 2 ===
--if test "x$GST_DISABLE_LOADSAVE" = "xyes" && test "x$GST_DISABLE_REGISTRY" = "xyes"
-+if test "x$GST_DISABLE_LOADSAVE" = "xyes"
- then
--  AC_MSG_NOTICE([Registry and load/save are disabled, not checking for libxml2])
-+  AC_MSG_NOTICE([Load/save is disabled, not checking for libxml2])
- else
-   dnl check for libxml2 with minimum req version
-   GST_LIBXML2_CHECK(2.4.9)
-diff -ur gstreamer-0.8.9/gst/gstconfig.h.in gstreamer-0.8.9-jeh3/gst/gstconfig.h.in
---- gstreamer-0.8.9/gst/gstconfig.h.in	2004-07-26 06:09:02.000000000 -0400
-+++ gstreamer-0.8.9-jeh3/gst/gstconfig.h.in	2005-03-03 22:36:13.860460080 -0500
-@@ -61,10 +61,11 @@
- 
- /***** Deal with XML stuff, we have to handle both loadsave and registry *****/
- 
--#if (! (defined(GST_DISABLE_LOADSAVE) && defined(GST_DISABLE_REGISTRY)) )
-+#if (! defined(GST_DISABLE_LOADSAVE) )
- # include <libxml/parser.h>
- #else
--# define GST_DISABLE_LOADSAVE_REGISTRY
-+/* misnomer but we cannot rename symbols */
-+# define GST_DISABLE_LOADSAVE_REGISTRY 
- #endif
- 
- #ifdef WIN32
-Only in gstreamer-0.8.9-jeh3/gst: gstconfig.h.in.orig
-diff -ur gstreamer-0.8.9/gst/indexers/gstindexers.c gstreamer-0.8.9-jeh3/gst/indexers/gstindexers.c
---- gstreamer-0.8.9/gst/indexers/gstindexers.c	2004-03-15 14:20:30.000000000 -0500
-+++ gstreamer-0.8.9-jeh3/gst/indexers/gstindexers.c	2005-03-03 22:34:09.228407032 -0500
-@@ -30,7 +30,9 @@
-   gboolean res = TRUE;
- 
-   res &= gst_mem_index_plugin_init (plugin);
-+#ifndef GST_DISABLE_LOADSAVE_REGISTRY
-   res &= gst_file_index_plugin_init (plugin);
-+#endif
- 
-   return res;
- }
-diff -ur gstreamer-0.8.9/gst/registries/gstxmlregistry.h gstreamer-0.8.9-jeh3/gst/registries/gstxmlregistry.h
---- gstreamer-0.8.9/gst/registries/gstxmlregistry.h	2004-03-15 10:08:32.000000000 -0500
-+++ gstreamer-0.8.9-jeh3/gst/registries/gstxmlregistry.h	2005-03-03 22:34:09.229406880 -0500
-@@ -25,6 +25,7 @@
- #define __GST_XML_REGISTRY_H__
- 
- #include <gst/gstregistry.h>
-+#include <stdio.h>
- 
- G_BEGIN_DECLS
- 
-Only in gstreamer-0.8.9-jeh3/win32: gstconfig.h.orig
diff --git a/packages/gstreamer/files/try-esdsink.patch b/packages/gstreamer/files/try-esdsink.patch
deleted file mode 100644
index 9c6242663c..0000000000
--- a/packages/gstreamer/files/try-esdsink.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- gst-plugins-0.8.1/gst-libs/gst/gconf/gconf.c~	2004-08-17 17:55:46.000000000 +0100
-+++ gst-plugins-0.8.1/gst-libs/gst/gconf/gconf.c	2004-08-17 18:04:00.000000000 +0100
-@@ -204,10 +204,16 @@
-   if (!ret) {
-     ret = gst_element_factory_make ("osssink", NULL);
- 
--    if (!ret)
--      g_warning ("No GConf default audio sink key and osssink doesn't work");
--    else
-+    if (!ret) {
-+      ret = gst_element_factory_make ("esdsink", NULL);
-+
-+      if (!ret)
-+        g_warning ("No GConf default audio sink key and osssink & esdsink don't work");
-+      else
-+        g_print ("GConf audio sink and osssink not found, using esdsink\n");
-+    } else {
-       g_print ("GConf audio sink not found, using osssink\n");
-+    }
-   }
- 
-   return ret;
diff --git a/packages/gstreamer/gst-plugins/lame-autoconf.patch b/packages/gstreamer/gst-plugins/lame-autoconf.patch
new file mode 100644
index 0000000000..3fb85e7d88
--- /dev/null
+++ b/packages/gstreamer/gst-plugins/lame-autoconf.patch
@@ -0,0 +1,21 @@
+--- gst-plugins-0.8.6.orig/configure.ac	2004-11-25 16:41:47.000000000 +0100
++++ gst-plugins-0.8.6/configure.ac	2005-02-22 19:02:58.000000000 +0100
+@@ -1135,8 +1135,9 @@
+   GST_CHECK_LIBHEADER(LAME, mp3lame, lame_init, -lm, lame/lame.h, HAVE_LAME="yes" LAME_LIBS="-lmp3lame -lm")
+ ])
+ dnl is lame presets available
++if test "x$HAVE_LAME" = "xyes"; then
+ LAME_CFLAGS=""
+-AC_TRY_RUN([
++AC_TRY_COMPILE([
+ #include <lame/lame.h>
+ int main (int argc, char *argv[])
+ {
+@@ -1144,6 +1145,7 @@
+   return 0;
+ }
+ ],[LAME_CFLAGS="-DGSTLAME_PRESET"],[LAME_CFLAGS=""])
++fi
+ AC_SUBST(LAME_CFLAGS)
+ AC_SUBST(LAME_LIBS)
+ 
diff --git a/packages/gstreamer/gst-plugins/try-esdsink.patch b/packages/gstreamer/gst-plugins/try-esdsink.patch
new file mode 100644
index 0000000000..9c6242663c
--- /dev/null
+++ b/packages/gstreamer/gst-plugins/try-esdsink.patch
@@ -0,0 +1,22 @@
+--- gst-plugins-0.8.1/gst-libs/gst/gconf/gconf.c~	2004-08-17 17:55:46.000000000 +0100
++++ gst-plugins-0.8.1/gst-libs/gst/gconf/gconf.c	2004-08-17 18:04:00.000000000 +0100
+@@ -204,10 +204,16 @@
+   if (!ret) {
+     ret = gst_element_factory_make ("osssink", NULL);
+ 
+-    if (!ret)
+-      g_warning ("No GConf default audio sink key and osssink doesn't work");
+-    else
++    if (!ret) {
++      ret = gst_element_factory_make ("esdsink", NULL);
++
++      if (!ret)
++        g_warning ("No GConf default audio sink key and osssink & esdsink don't work");
++      else
++        g_print ("GConf audio sink and osssink not found, using esdsink\n");
++    } else {
+       g_print ("GConf audio sink not found, using osssink\n");
++    }
+   }
+ 
+   return ret;
diff --git a/packages/gstreamer/gstreamer-0.8.10/.mtn2git_empty b/packages/gstreamer/gstreamer-0.8.10/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/gstreamer/gstreamer-0.8.10/filesrc-uri.patch b/packages/gstreamer/gstreamer-0.8.10/filesrc-uri.patch
new file mode 100644
index 0000000000..0bde73d970
--- /dev/null
+++ b/packages/gstreamer/gstreamer-0.8.10/filesrc-uri.patch
@@ -0,0 +1,22 @@
+Index: gst/elements/gstfilesrc.c
+===================================================================
+RCS file: /cvs/gstreamer/gstreamer/gst/elements/gstfilesrc.c,v
+retrieving revision 1.108.4.3
+diff -u -r1.108.4.3 gstfilesrc.c
+--- gstreamer.orig/gst/elements/gstfilesrc.c	3 Jun 2005 09:29:31 -0000	1.108.4.3
++++ gstreamer/gst/elements/gstfilesrc.c	12 Aug 2005 11:54:38 -0000
+@@ -306,7 +306,13 @@
+     src->filename = NULL;
+     src->uri = NULL;
+   } else {
+-    src->filename = g_strdup (location);
++    const gchar *file_prefix = "file://";
++
++    if (g_str_has_prefix (location, file_prefix)) {
++      src->filename = g_strdup (location + strlen (file_prefix));
++    } else {
++      src->filename = g_strdup (location);
++    }
+     src->uri = gst_uri_construct ("file", src->filename);
+   }
+   g_object_notify (G_OBJECT (src), "location");
diff --git a/packages/gstreamer/gstreamer-0.8.9/no-libxml2.patch b/packages/gstreamer/gstreamer-0.8.9/no-libxml2.patch
new file mode 100644
index 0000000000..c676c2387f
--- /dev/null
+++ b/packages/gstreamer/gstreamer-0.8.9/no-libxml2.patch
@@ -0,0 +1,75 @@
+diff -ur gstreamer-0.8.9/configure gstreamer-0.8.9-jeh3/configure
+--- gstreamer-0.8.9/configure	2005-02-08 04:45:25.000000000 -0500
++++ gstreamer-0.8.9-jeh3/configure	2005-03-03 22:34:09.213409312 -0500
+@@ -25655,10 +25655,10 @@
+ 
+ 
+ 
+-if test "x$GST_DISABLE_LOADSAVE" = "xyes" && test "x$GST_DISABLE_REGISTRY" = "xyes"
++if test "x$GST_DISABLE_LOADSAVE" = "xyes"
+ then
+-  { echo "$as_me:$LINENO: Registry and load/save are disabled, not checking for libxml2" >&5
+-echo "$as_me: Registry and load/save are disabled, not checking for libxml2" >&6;}
++  { echo "$as_me:$LINENO: Load/save are disabled, not checking for libxml2" >&5
++echo "$as_me: Load/save are disabled, not checking for libxml2" >&6;}
+ else
+ 
+       LIBXML2_REQ=2.4.9
+diff -ur gstreamer-0.8.9/configure.ac gstreamer-0.8.9-jeh3/configure.ac
+--- gstreamer-0.8.9/configure.ac	2005-02-08 04:44:47.000000000 -0500
++++ gstreamer-0.8.9-jeh3/configure.ac	2005-03-03 22:34:09.215409008 -0500
+@@ -275,9 +275,9 @@
+ AC_SUBST(GLIB_ONLY_LIBS)
+   
+ dnl === libxml 2 ===
+-if test "x$GST_DISABLE_LOADSAVE" = "xyes" && test "x$GST_DISABLE_REGISTRY" = "xyes"
++if test "x$GST_DISABLE_LOADSAVE" = "xyes"
+ then
+-  AC_MSG_NOTICE([Registry and load/save are disabled, not checking for libxml2])
++  AC_MSG_NOTICE([Load/save is disabled, not checking for libxml2])
+ else
+   dnl check for libxml2 with minimum req version
+   GST_LIBXML2_CHECK(2.4.9)
+diff -ur gstreamer-0.8.9/gst/gstconfig.h.in gstreamer-0.8.9-jeh3/gst/gstconfig.h.in
+--- gstreamer-0.8.9/gst/gstconfig.h.in	2004-07-26 06:09:02.000000000 -0400
++++ gstreamer-0.8.9-jeh3/gst/gstconfig.h.in	2005-03-03 22:36:13.860460080 -0500
+@@ -61,10 +61,11 @@
+ 
+ /***** Deal with XML stuff, we have to handle both loadsave and registry *****/
+ 
+-#if (! (defined(GST_DISABLE_LOADSAVE) && defined(GST_DISABLE_REGISTRY)) )
++#if (! defined(GST_DISABLE_LOADSAVE) )
+ # include <libxml/parser.h>
+ #else
+-# define GST_DISABLE_LOADSAVE_REGISTRY
++/* misnomer but we cannot rename symbols */
++# define GST_DISABLE_LOADSAVE_REGISTRY 
+ #endif
+ 
+ #ifdef WIN32
+Only in gstreamer-0.8.9-jeh3/gst: gstconfig.h.in.orig
+diff -ur gstreamer-0.8.9/gst/indexers/gstindexers.c gstreamer-0.8.9-jeh3/gst/indexers/gstindexers.c
+--- gstreamer-0.8.9/gst/indexers/gstindexers.c	2004-03-15 14:20:30.000000000 -0500
++++ gstreamer-0.8.9-jeh3/gst/indexers/gstindexers.c	2005-03-03 22:34:09.228407032 -0500
+@@ -30,7 +30,9 @@
+   gboolean res = TRUE;
+ 
+   res &= gst_mem_index_plugin_init (plugin);
++#ifndef GST_DISABLE_LOADSAVE_REGISTRY
+   res &= gst_file_index_plugin_init (plugin);
++#endif
+ 
+   return res;
+ }
+diff -ur gstreamer-0.8.9/gst/registries/gstxmlregistry.h gstreamer-0.8.9-jeh3/gst/registries/gstxmlregistry.h
+--- gstreamer-0.8.9/gst/registries/gstxmlregistry.h	2004-03-15 10:08:32.000000000 -0500
++++ gstreamer-0.8.9-jeh3/gst/registries/gstxmlregistry.h	2005-03-03 22:34:09.229406880 -0500
+@@ -25,6 +25,7 @@
+ #define __GST_XML_REGISTRY_H__
+ 
+ #include <gst/gstregistry.h>
++#include <stdio.h>
+ 
+ G_BEGIN_DECLS
+ 
+Only in gstreamer-0.8.9-jeh3/win32: gstconfig.h.orig
diff --git a/packages/gstreamer/gstreamer_0.8.10.bb b/packages/gstreamer/gstreamer_0.8.10.bb
new file mode 100644
index 0000000000..7247bd831a
--- /dev/null
+++ b/packages/gstreamer/gstreamer_0.8.10.bb
@@ -0,0 +1,34 @@
+LICENSE = "LGPL"
+PR = "r0"
+
+DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \
+It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime."
+DEPENDS = "glib-2.0 gettext-native popt"
+SECTION = "base"
+PRIORITY = "optional"
+
+FILES_${PN} += " ${libdir}/gstreamer-0.8/*.so"
+FILES_${PN}-dev += " ${libdir}/gstreamer-0.8/*.la ${libdir}/gstreamer-0.8/*.a"
+
+SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \
+	file://filesrc-uri.patch;patch=1 \
+	file://gstreamer.xsession"
+
+EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --disable-loadsave"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR} \
+	       mandir=${STAGING_DIR}/share/man
+}
+
+do_install_append() {
+	install -d ${D}${sysconfdir}/X11/Xsession.d
+	install ${WORKDIR}/gstreamer.xsession ${D}${sysconfdir}/X11/Xsession.d/90gst-register
+}
+
-- 
cgit v1.2.3


From 066ad20236b7e9291f771e51499124762fbd510c Mon Sep 17 00:00:00 2001
From: Rene Wagner <rw@handhelds.org>
Date: Sat, 13 Aug 2005 21:49:24 +0000
Subject: gst-plugins: bump to gst-plugins-0.8.8. update try-esd.patch to work
 with current code.

---
 .../gstreamer/gst-plugins-0.8.8/.mtn2git_empty     |  0
 .../gst-plugins-0.8.8-try-esdsink.patch            | 19 ++++++++
 .../gst-plugins-0.8.8/lame-autoconf.patch          | 11 +++++
 packages/gstreamer/gst-plugins_0.8.8.bb            | 57 ++++++++++++++++++++++
 4 files changed, 87 insertions(+)
 create mode 100644 packages/gstreamer/gst-plugins-0.8.8/.mtn2git_empty
 create mode 100644 packages/gstreamer/gst-plugins-0.8.8/gst-plugins-0.8.8-try-esdsink.patch
 create mode 100644 packages/gstreamer/gst-plugins-0.8.8/lame-autoconf.patch
 create mode 100644 packages/gstreamer/gst-plugins_0.8.8.bb

diff --git a/packages/gstreamer/gst-plugins-0.8.8/.mtn2git_empty b/packages/gstreamer/gst-plugins-0.8.8/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/gstreamer/gst-plugins-0.8.8/gst-plugins-0.8.8-try-esdsink.patch b/packages/gstreamer/gst-plugins-0.8.8/gst-plugins-0.8.8-try-esdsink.patch
new file mode 100644
index 0000000000..553c7b4270
--- /dev/null
+++ b/packages/gstreamer/gst-plugins-0.8.8/gst-plugins-0.8.8-try-esdsink.patch
@@ -0,0 +1,19 @@
+--- gst-plugins-0.8.8.orig/gst-libs/gst/gconf/gconf.c	2005-02-02 09:14:01.000000000 +0100
++++ gst-plugins-0.8.8/gst-libs/gst/gconf/gconf.c	2005-08-13 23:28:36.000000000 +0200
+@@ -205,9 +205,13 @@
+   if (!ret) {
+     ret = gst_element_factory_make (DEFAULT_AUDIOSINK, NULL);
+ 
+-    if (!ret)
+-      g_warning ("No GConf default audio sink key and %s doesn't work",
+-          DEFAULT_AUDIOSINK);
++    if (!ret) {
++      ret = gst_element_factory_make ("esdsink", NULL);
++
++      if (!ret)
++        g_warning ("No GConf default audio sink key and neither %s nor esdsink work",
++            DEFAULT_AUDIOSINK);
++    }
+   }
+ 
+   return ret;
diff --git a/packages/gstreamer/gst-plugins-0.8.8/lame-autoconf.patch b/packages/gstreamer/gst-plugins-0.8.8/lame-autoconf.patch
new file mode 100644
index 0000000000..6f2a300254
--- /dev/null
+++ b/packages/gstreamer/gst-plugins-0.8.8/lame-autoconf.patch
@@ -0,0 +1,11 @@
+--- gst-plugins-0.8.7/configure.ac.orig	2005-03-03 16:40:45.000000000 +0100
++++ gst-plugins-0.8.7/configure.ac	2005-03-03 16:41:55.000000000 +0100
+@@ -1197,7 +1197,7 @@
+     LAME_LIBS="-lmp3lame -lm"
+     dnl is lame presets available
+     LAME_CFLAGS=""
+-    AC_TRY_RUN([
++    AC_TRY_COMPILE([
+ #include <lame/lame.h>
+ int main (int argc, char *argv[])
+ {
diff --git a/packages/gstreamer/gst-plugins_0.8.8.bb b/packages/gstreamer/gst-plugins_0.8.8.bb
new file mode 100644
index 0000000000..6b28922f27
--- /dev/null
+++ b/packages/gstreamer/gst-plugins_0.8.8.bb
@@ -0,0 +1,57 @@
+LICENSE = "GPL"
+DESCRIPTION = "Plugins for GStreamer"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+PR = "r0"
+
+DEPENDS = "gstreamer libmikmod libmad libogg tremor libvorbis libid3tag gpe-soundserver gconf"
+
+SRC_URI = "http://gstreamer.freedesktop.org/src/gst-plugins/gst-plugins-${PV}.tar.bz2 \
+	   file://gst-plugins-0.8.7-httpsrc1.patch;patch=1 \
+	   file://lame-autoconf.patch;patch=1 \
+	   file://gst-plugins-0.8.8-try-esdsink.patch;patch=1"
+
+EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --disable-aalib --disable-arts \
+                --disable-artsc --disable-jack  --disable-libfame --disable-sdl --disable-shout2 \
+		--disable-gnome_vfs --disable-gconf --disable-libcaca  --disable-directfb \
+		--disable-cairo"
+
+inherit autotools pkgconfig gconf
+
+acpaths = "-I ${S}/common/m4 -I ${S}/m4"
+
+LIBV = "0.8"
+
+plugin_postinst() {
+	if [ x"$D" = "x" ]; then
+		gst-register --gst-registry=/var/cache/gstreamer-0.8/registry.xml
+	fi
+}
+
+python populate_packages_prepend () {
+	gst_libdir = bb.data.expand('${libdir}/gstreamer-${LIBV}', d)
+	postinst = bb.data.getVar('plugin_postinst', d, 1)
+
+	do_split_packages(d, gst_libdir, '^libgst(.*)\.so$', 'gst-plugin-%s', 'GStreamer plugin for %s', postinst=postinst)
+	do_split_packages(d, gst_libdir, '^libgst(.*)\.l?a$', 'gst-plugin-%s-dev', 'GStreamer plugin for %s (development files)')
+}
+
+do_stage() {
+	autotools_stage_includes
+	while read a b; do
+		oe_libinstall -C gst-libs/gst/$a -so libgst$b ${STAGING_LIBDIR}
+	done <<EOF
+. interfaces-0.8
+audio audio
+audio audiofilter
+gconf gconf-0.8
+idct idct
+media-info media-info-0.8
+play play-0.8
+resample resample
+riff riff
+video video
+xwindowlistener xwindowlistener
+EOF
+}
-- 
cgit v1.2.3


From 1acc9a0b4bbdc4eb9f7f2b7e9ab456eab3f9adcb Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Sat, 13 Aug 2005 23:44:30 +0000
Subject: linux-oz-2.6: Cleanup spitz patches - implement touchscreen nicely,
 merge code back into corgi_lcd, add backlight. Backlight needs investigation
 as only partially operational.

---
 packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
index fd6dd9ee37..bcc2c13c28 100644
--- a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
+++ b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
 KV = "${@bb.data.getVar('PV',d,True)}"
 
-PR = "r3"
+PR = "r4"
 
 DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches"
 RPSRC = "http://www.rpsys.net/openzaurus/patches"
@@ -79,10 +79,10 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
            ${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \
            ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \
            ${RPSRC}/pxa27x_extraregs-r0.patch;patch=1 \
-           ${RPSRC}/spitzbase-r0.patch;patch=1 \
+           ${RPSRC}/spitzbase-r1.patch;patch=1 \
            ${RPSRC}/spitzkbd-r0.patch;patch=1 \
-           ${RPSRC}/spitzssp-r0.patch;patch=1 \
-           ${RPSRC}/spitzlcd-r0.patch;patch=1 \
+           ${RPSRC}/spitzssp-r1.patch;patch=1 \
+           ${RPSRC}/spitzbl-r0.patch;patch=1 \
            file://add-oz-release-string.patch;patch=1 \
            file://add-elpp-stuff.patch;patch=1 \
            file://pxa-serial-hack.patch;patch=1 \
@@ -110,7 +110,7 @@ SRC_URI_append_tosa = "${DOSRC}/nand-readid-r1.patch;patch=1 \
                        ${DOSRC}/tosa-pxaac97-r1.patch;patch=1 \
         	       ${DOSRC}/tosa-bluetooth-r0.patch;patch=1 "
 SRC_URI_append_spitz = "${RPSRC}/spitzcf-r0.patch;patch=1 \
-                        ${RPSRC}/spitzts-r0.patch;patch=1 "
+                        ${RPSRC}/spitzts-r1.patch;patch=1 "
 
 S = "${WORKDIR}/linux-2.6.12"
 
-- 
cgit v1.2.3