Merge bk://oe-devel@oe-devel.bkbits.net/openembedded

into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/04/12 12:43:07+02:00 utwente.nl!koen
abiword_2.2.7.bb:
  add libglade to DEPENDS

2005/04/12 12:41:48+02:00 utwente.nl!koen
abiword_2.2.7.bb:
  use the correct patch to copy cdump to

2005/04/12 12:15:47+02:00 utwente.nl!koen
familiar-0.9.0.conf:  first shot at familiar 0.9.0

2005/04/12 12:08:53+02:00 utwente.nl!koen
preferred-gpe-versions.inc:
  unset almost all preferred versions, except for x

2005/04/11 23:26:07+01:00 (none)!cwiiis
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into cwiiisdesktop.(none):/home/cwiiis/Dev/oe/openembedded

2005/04/11 23:25:43+01:00 (none)!cwiiis
Add enhancement patch for gxine, along with new bb - make it the default.
See the Changelog inside the patch for details.

2005/04/11 23:48:38+02:00 utwente.nl!koen
Add ipkg 0.99.148, courtesy Pierluigi Frullani

2005/04/11 16:54:20+01:00 (none)!cwiiis
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into cwiiisdesktop.(none):/home/cwiiis/Dev/oe/openembedded

2005/04/11 16:53:54+01:00 (none)!cwiiis
New matchbox releases:
-libmatchbox (1.6->1.7)
-matchbox-panel (0.9.1->0.9.2)
-matchbox-wm (0.9.3->0.9.4)

2005/04/11 13:39:04+02:00 mn-solutions.de!schurig
teleport: added missing linefeed between DESCRIPTION and DEPENDS
xpm_cvs: no need for autofoo

2005/04/11 13:37:54+02:00 mn-solutions.de!schurig
MNCI "Rqmses":
one more patch to tslib
support for devfs to kdrive


2005/04/11 13:35:40+02:00 mn-solutions.de!schurig
added Asterisk

2005/04/11 13:35:00+02:00 mn-solutions.de!schurig
keylaunch needs xpm

2005/04/10 18:30:33+01:00 (none)!XorA
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into cimmeria.(none):/home/dp/zaurus/openembedded

2005/04/10 18:29:05+01:00 (none)!XorA
Kismet updated to 2005-04-R1 release

2005/04/10 19:11:39+02:00 dyndns.org!reenoo
copy preferred-gpe-versions.inc to preferred-gpe-versions-2.6.inc as requested by Koen

2005/04/09 05:23:20+01:00 (none)!cwiiis
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into cwiiisdesktop.(none):/home/cwiiis/Dev/oe/openembedded

2005/04/09 05:15:47+01:00 (none)!cwiiis
Remove now unnecessary patch in gxine, add two more required vo/ao plugins ('none' plugins).

2005/04/09 05:14:13+01:00 (none)!cwiiis
Fix up libxine 1.0, make it the default.
    Fixes:
    - Don't disable esd
    - Use tremor instead of libvorbis
    - Apply some patches from libxine-opie
    - Fix finding of libcaca/aalib on host system by manually disabling
    - Make package name 'libxine' instead of 'libxine1' so as not to break package splitting
- Disable tremor 20041119 as it breaks libxine 1.0 (including libxine-opie)

2005/04/09 00:52:25+02:00 utwente.nl!koen
  cleanup roadster

2005/04/09 00:36:03+02:00 utwente.nl!koen
gpsd_2.20.bb:
  add gpsutils.h to staging

2005/04/09 00:20:43+02:00 utwente.nl!koen
Add roadster, which has active cvs at the moment, so don't be surprised when it breaks

2005/04/08 22:42:22+01:00 (none)!cwiiis
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into cwiiisdesktop.(none):/home/cwiiis/Dev/oe/openembedded

2005/04/08 22:41:50+01:00 (none)!cwiiis
- Make libxine 1.0.0-rc5 default until 1.0 is fixed
- Add PROVIDES = "virtual/libxine" to libxine 1.0.0-rc5

2005/04/08 22:13:11+02:00 dyndns.org!reenoo
Merge oe-devel@oe-devel.bkbits.net:openembedded
into sugarcube.dyndns.org:/home2/oe/bakery/openembedded

2005/04/08 22:12:57+02:00 dyndns.org!reenoo
lcdproc: fix do_install.

2005/04/08 22:10:06+02:00 utwente.nl!koen
gst-plugins_0.8.7.bb:
  bye bye jack

2005/04/08 22:00:18+02:00 utwente.nl!koen
  disable directfb in gst-plugins

2005/04/08 21:51:59+02:00 dyndns.org!reenoo
Merge oe-devel@oe-devel.bkbits.net:openembedded
into sugarcube.dyndns.org:/home2/oe/bakery/openembedded

2005/04/08 21:51:41+02:00 dyndns.org!reenoo
kaffe: revert dependency change. gmp is listed in DEPENDS for kaffe-gtk and disabled in kaffe-qt.

2005/04/08 21:50:25+02:00 dyndns.org!reenoo
file: fix dependency loop between file and file-native

2005/04/08 20:09:36+01:00 (none)!cwiiis
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into cwiiisdesktop.(none):/home/cwiiis/Dev/oe/openembedded

2005/04/08 20:08:40+01:00 (none)!cwiiis
Add section/license for gxine.
Fix libxine:
- Manually remove libcaca/aalib support
- Use tremor for decoding vorbis
- Fix package naming

2005/04/08 10:12:11-07:00 amd.com!jcrouse
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into forsteri.amd.com:/users/jcrouse/bk/openembedded

2005/04/08 10:11:51-07:00 amd.com!jcrouse
add patch for 2.4.24 to coexist peacefully with gcc 3.4

2005/04/08 19:01:50+02:00 utwente.nl!koen
abiword_2.2.7.bb:  hopefully fix abiword build

2005/04/08 16:36:38+01:00 (none)!cwiiis
Add working gxine 0.4.1, remove gxine 0.3.3 from nonworking.

2005/04/07 20:14:02+02:00 dyndns.org!reenoo
Merge oe-devel@oe-devel.bkbits.net:openembedded
into sugarcube.dyndns.org:/home2/oe/bakery/openembedded

2005/04/06 21:20:45+02:00 dyndns.org!reenoo
Merge oe-devel@oe-devel.bkbits.net:openembedded
into sugarcube.dyndns.org:/home2/oe/bakery/openembedded

2005/04/06 21:20:22+02:00 dyndns.org!reenoo
kaffe: add gmp to DEPENDS.

BKrev: 425bb68eCua4S6ecsEtNJjjHuY5Xhw

45 files changed, 192 insertions, 47 deletions

diff --git a/packages/abiword/abiword_2.2.7.bb b/packages/abiword/abiword_2.2.7.bb
index e69de29bb2..ff182033ab 100644
--- a/packages/abiword/abiword_2.2.7.bb
+++ b/packages/abiword/abiword_2.2.7.bb
@@ -0,0 +1,50 @@
+DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word""
+HOMEPAGE="http://www.abiword.org""
+MAINTAINER="Koen Kooi <koen@handhelds.org>"
+LICENSE="GPLv2"
+
+DEPENDS     = "cdump-native libglade libfribidi enchant jpeg libpng perl glibc"
+RDEPENDS    = "libglade enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \
+               glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
+
+SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz"
+S = "${WORKDIR}/abiword-${PV}/abi"
+
+FILES_${PN} += " ${datadir}/icons/* \
+${datadir}/AbiSuite-2.0/AbiWord/glade \
+${datadir}/AbiSuite-2.0/AbiWord/scripts \
+${datadir}/AbiSuite-2.0/AbiWord/system.profile-en \
+${datadir}/AbiSuite-2.0/AbiWord/system.profile-en_GB \
+#${datadir}/AbiSuite-2.0/templates/A4.awt \
+#${datadir}/AbiSuite-2.0/templates/US-Letter.awt \
+${datadir}/AbiSuite-2.0/templates/normal.awt \
+${datadir}/AbiSuite-2.0/templates/normal.awt-en_GB \
+${datadir}/AbiSuite-2.0/templates/Employee-Directory.awt \
+${datadir}/AbiSuite-2.0/templates/Business-Report.awt \
+${datadir}/AbiSuite-2.0/templates/Fax-Coversheet.awt \
+${datadir}/AbiSuite-2.0/templates/Resume.awt \
+${datadir}/AbiSuite-2.0/templates/Two-Columns.awt \
+${datadir}/AbiSuite-2.0/templates/Memo.awt \
+${datadir}/AbiSuite-2.0/templates/Press-Release.awt"
+
+inherit autotools
+
+#abiword needs this native tool
+export BUILD_CDUMPTOOL=${STAGING_BINDIR}/cdump
+
+PARALLEL_MAKE=""
+
+do_configure () {
+        cd ${S}
+        ./autogen.sh
+        ./configure --prefix=/usr --host=${TARGET_SYS} --disable-pspell --enable-enchant
+#       --enable-debug
+	cp -f ${STAGING_BINDIR}/cdump src/tools/cdump/xp/
+}
+
+do_install_append() {
+        install -d ${D}${datadir}/pixmaps/
+        mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/
+}
+
+
diff --git a/packages/nonworking/gxine/gxine_0.3.3.bb b/packages/asterisk/asterisk-1.0.7/makefile.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/nonworking/gxine/gxine_0.3.3.bb
+++ b/packages/asterisk/asterisk-1.0.7/makefile.patch
diff --git a/packages/asterisk/asterisk_1.0.7.bb b/packages/asterisk/asterisk_1.0.7.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/asterisk/asterisk_1.0.7.bb
diff --git a/packages/file/file-native_4.13.bb b/packages/file/file-native_4.13.bb
index e69de29bb2..d030f735ae 100644
--- a/packages/file/file-native_4.13.bb
+++ b/packages/file/file-native_4.13.bb
@@ -0,0 +1,11 @@
+include file_${PV}.bb
+inherit native
+
+# avoid dependency loop
+DEPENDS = ""
+
+do_stage() {
+	install -m 0755 src/file ${STAGING_BINDIR}/
+	oe_libinstall -so -C src libmagic ${STAGING_LIBDIR}/
+}
+
diff --git a/packages/gpsd/gpsd_2.20.bb b/packages/gpsd/gpsd_2.20.bb
index 5f509f9f39..6c8114afc0 100644
--- a/packages/gpsd/gpsd_2.20.bb
+++ b/packages/gpsd/gpsd_2.20.bb
@@ -5,7 +5,7 @@ MAINTAINER = "Jose Bernardo Silva <jbs@bandos.homelinux.com> \
 		Robert Anderson <rea@sr.unh.edu> \
 		Stephan Zalewski <stephan.zalewski@uni-dusseldorf.de>"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://download.berlios.de/gpsd/gpsd-${PV}.tar.gz \
 	file://gpsd"
@@ -23,6 +23,7 @@ do_stage() {
         install -m 0655 ${S}/libgps.la ${STAGING_LIBDIR}
         install -m 0655 ${S}/gps.h ${STAGING_INCDIR}
         install -m 0655 ${S}/gpsd.h ${STAGING_INCDIR}
+	install -m 0655 ${S}/gpsutils.h ${STAGING_INCDIR}
 }
 
 do_install_append() {
diff --git a/packages/gstreamer/gst-plugins_0.8.7.bb b/packages/gstreamer/gst-plugins_0.8.7.bb
index 20698cdf72..0de72d1129 100644
--- a/packages/gstreamer/gst-plugins_0.8.7.bb
+++ b/packages/gstreamer/gst-plugins_0.8.7.bb
@@ -13,8 +13,8 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/gst-plugins/gst-plugins-${PV}.ta
 	   file://try-esdsink.patch;patch=1"
 
 EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --disable-aalib --disable-arts \
-                --disable-artsc --disable-libfame --disable-sdl --disable-shout2 \
-		--disable-gnome_vfs --disable-gconf --disable-libcaca"
+                --disable-artsc --disable-jack  --disable-libfame --disable-sdl --disable-shout2 \
+		--disable-gnome_vfs --disable-gconf --disable-libcaca  --disable-directfb "
 
 inherit autotools pkgconfig gconf
 
diff --git a/packages/gxine/files/disable-browser-plugin.patch b/packages/gxine/files/disable-browser-plugin.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gxine/files/disable-browser-plugin.patch
diff --git a/packages/gxine/files/enhance.patch b/packages/gxine/files/enhance.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gxine/files/enhance.patch
diff --git a/packages/gxine/files/rhythmbox-volume-max.png b/packages/gxine/files/rhythmbox-volume-max.png
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gxine/files/rhythmbox-volume-max.png
diff --git a/packages/gxine/files/rhythmbox-volume-medium.png b/packages/gxine/files/rhythmbox-volume-medium.png
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gxine/files/rhythmbox-volume-medium.png
diff --git a/packages/gxine/files/rhythmbox-volume-min.png b/packages/gxine/files/rhythmbox-volume-min.png
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gxine/files/rhythmbox-volume-min.png
diff --git a/packages/gxine/files/rhythmbox-volume-zero.png b/packages/gxine/files/rhythmbox-volume-zero.png
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gxine/files/rhythmbox-volume-zero.png
diff --git a/packages/gxine/gxine_0.4.1.bb b/packages/gxine/gxine_0.4.1.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gxine/gxine_0.4.1.bb
diff --git a/packages/gxine/gxine_0.4.1enhanced.bb b/packages/gxine/gxine_0.4.1enhanced.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gxine/gxine_0.4.1enhanced.bb
diff --git a/packages/ipkg/ipkg-0.99.148/libdir.patch b/packages/ipkg/ipkg-0.99.148/libdir.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ipkg/ipkg-0.99.148/libdir.patch
diff --git a/packages/ipkg/ipkg-0.99.148/terse.patch b/packages/ipkg/ipkg-0.99.148/terse.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ipkg/ipkg-0.99.148/terse.patch
diff --git a/packages/ipkg/ipkg-native_0.99.148.bb b/packages/ipkg/ipkg-native_0.99.148.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ipkg/ipkg-native_0.99.148.bb
diff --git a/packages/ipkg/ipkg_0.99.148.bb b/packages/ipkg/ipkg_0.99.148.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ipkg/ipkg_0.99.148.bb
diff --git a/packages/keylaunch/keylaunch_2.0.7.bb b/packages/keylaunch/keylaunch_2.0.7.bb
index 86e0bb6a46..eabc1a164a 100644
--- a/packages/keylaunch/keylaunch_2.0.7.bb
+++ b/packages/keylaunch/keylaunch_2.0.7.bb
@@ -1,6 +1,6 @@
 inherit gpe
 
-DEPENDS = "virtual/xserver xtst xau"
+DEPENDS = "virtual/xserver xtst xau xpm"
 SECTION = "gpe"
 LICENSE = "GPL"
 DESCRIPTION = "A small utility for binding commands to a hot key.\
diff --git a/packages/kismet/kismet_2005-04-R1.bb b/packages/kismet/kismet_2005-04-R1.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/kismet/kismet_2005-04-R1.bb
diff --git a/packages/lcdproc/lcdproc_0.4.5.bb b/packages/lcdproc/lcdproc_0.4.5.bb
index b5c24e9157..4bfc7609c8 100644
--- a/packages/lcdproc/lcdproc_0.4.5.bb
+++ b/packages/lcdproc/lcdproc_0.4.5.bb
@@ -1,11 +1,13 @@
-SECTION = "base"
 DESCRIPTION = "LCDproc is a client/Server suite to drive all kinds of LCD (-like) devices. The client \
 shipped with this package can be used to acquire various kinds of system stats."
 HOMEPAGE = "http://lcdproc.org"
+LICENSE ="GPL"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+SECTION = "utils"
+
 DEPENDS = "${@((bb.data.getVar('LCDPROC_DRIVERS',d) or 'curses,text').find('curses') != -1) and 'ncurses' or ''}"
-LICENSE ="GPL"
+
 SRC_URI = "${SOURCEFORGE_MIRROR}/lcdproc/lcdproc-${PV}.tar.gz"
 
 inherit autotools
@@ -21,9 +23,7 @@ do_install () {
 	install -D -m 0755 scripts/init-LCDd.debian ${D}${sysconfdir}/init.d/lcdd
 	# prevent lcdproc from starting if no SCREENS are set.
 	# will be fixed in next upstream release
-	cat scripts/init-lcdproc.debian | sed -e 's/C X//' | sed -e 's/case/[ -n $SCREENS ] || exit 0
-
-case/' > ${D}${sysconfdir}/init.d/lcdproc
+	cat scripts/init-lcdproc.debian | sed -e 's/C X//' | sed -e 's/case/[ -n $SCREENS ] || exit 0\n\ncase/' > ${D}${sysconfdir}/init.d/lcdproc
 	chmod 0755 ${D}${sysconfdir}/init.d/lcdproc
 
 	# configuration files
diff --git a/packages/libmatchbox/libmatchbox_1.7.bb b/packages/libmatchbox/libmatchbox_1.7.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libmatchbox/libmatchbox_1.7.bb
diff --git a/packages/libxine/libxine-1.0.0-rc5/libxine-libvorbis.patch b/packages/libxine/libxine-1.0.0-rc5/libxine-libvorbis.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libxine/libxine-1.0.0-rc5/libxine-libvorbis.patch
diff --git a/packages/libxine/libxine-1.0.0-rc5/libxine-tremor-autoconf.patch b/packages/libxine/libxine-1.0.0-rc5/libxine-tremor-autoconf.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libxine/libxine-1.0.0-rc5/libxine-tremor-autoconf.patch
diff --git a/packages/libxine/libxine-1.0.0-rc5/no-caca-no-aalib.patch b/packages/libxine/libxine-1.0.0-rc5/no-caca-no-aalib.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libxine/libxine-1.0.0-rc5/no-caca-no-aalib.patch
diff --git a/packages/libxine/libxine-1.0/dont-have-xv.patch b/packages/libxine/libxine-1.0/dont-have-xv.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libxine/libxine-1.0/dont-have-xv.patch
diff --git a/packages/libxine/libxine-1.0/libxine-ffmpeg-enable-arm.patch b/packages/libxine/libxine-1.0/libxine-ffmpeg-enable-arm.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libxine/libxine-1.0/libxine-ffmpeg-enable-arm.patch
diff --git a/packages/libxine/libxine-1.0/libxine-libvorbis.patch b/packages/libxine/libxine-1.0/libxine-libvorbis.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libxine/libxine-1.0/libxine-libvorbis.patch
diff --git a/packages/libxine/libxine-1.0/libxine-tremor-autoconf.patch b/packages/libxine/libxine-1.0/libxine-tremor-autoconf.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libxine/libxine-1.0/libxine-tremor-autoconf.patch
diff --git a/packages/libxine/libxine-1.0/no-caca-no-aalib.patch b/packages/libxine/libxine-1.0/no-caca-no-aalib.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libxine/libxine-1.0/no-caca-no-aalib.patch
diff --git a/packages/libxine/libxine-1.0/restore-esd.patch b/packages/libxine/libxine-1.0/restore-esd.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libxine/libxine-1.0/restore-esd.patch
diff --git a/packages/libxine/libxine_1.0.0-rc5.bb b/packages/libxine/libxine_1.0.0-rc5.bb
index ee85eb12a3..f4666c72e6 100644
--- a/packages/libxine/libxine_1.0.0-rc5.bb
+++ b/packages/libxine/libxine_1.0.0-rc5.bb
@@ -1,12 +1,13 @@
 LICENSE = GPL
-# libxine OE build file
-# Modified by Advanced Micro Devices, Inc.
-
 DESCRIPTION = "libxine"
 SECTION = "libs"
 PRIORITY = "optional"
 MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>"
-DEPENDS = "zlib libogg libvorbis libmad"
+DEPENDS = "zlib libogg tremor libmad esound-gpe"
+PROVIDES = "virtual/libxine"
+PR = "r1"
+
+DEFAULT_PREFERENCE = "-1"
 
 inherit autotools pkgconfig gettext
 
@@ -14,7 +15,10 @@ S = "${WORKDIR}/xine-lib-1-rc5"
 
 SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-1-rc5.tar.gz \
 	file://cpu.patch;patch=1 \
-	file://configure.patch;patch=1"
+	file://configure.patch;patch=1 \
+	file://no-caca-no-aalib.patch;patch=1 \
+	file://libxine-tremor-autoconf.patch;patch=1 \
+	file://libxine-libvorbis.patch;patch=1"
 
 SOV = "1.0.6"
 
@@ -31,7 +35,6 @@ EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \
 	--disable-altivec --disable-vis --disable-mlib \
 	--disable-fb --disable-alsa --disable-vcd \
 	--disable-asf --disable-faad --disable-iconv \
-	--disable-aalib \
 	--without-v4l --without-arts --without-sdl"
 			      
 do_compile() {
@@ -55,10 +58,14 @@ do_stage() {
 		cp ${S}/$file ${STAGING_INCDIR}/xine/`basename $file`
 	done
 
+	install -m 0644 ${S}/m4/xine.m4 ${STAGING_DATADIR}/aclocal/
+
 	oe_libinstall -so -C src/xine-engine libxine ${STAGING_LIBDIR}
 }
 
 python populate_packages_prepend () {
+	bb.data.setVar('PKG_libxine', 'libxine', d)
+
 	plugindir = bb.data.expand('${libdir}/xine/plugins/1.0.0', d)
 	do_split_packages(d, plugindir, '^xineplug_(.*)\.so$', 'libxine-plugin-%s', 'Xine plugin for %s')
 
diff --git a/packages/libxine/libxine_1.0.bb b/packages/libxine/libxine_1.0.bb
index 0d77d48b38..c8fa4aedbe 100644
--- a/packages/libxine/libxine_1.0.bb
+++ b/packages/libxine/libxine_1.0.bb
@@ -1,36 +1,12 @@
 LICENSE = GPL
-# libxine OE build file
-# Modified by Advanced Micro Devices, Inc.
-
-#FIXME: libxine doesn't build when X11 has been built before:
-#| In file included from video_out_dxr3.c:55:
-#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:16: error: parse error before "Bool"
-#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:17: error: parse error before '*' token
-#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:20: warning: type defaults to `int' in declaration of 
-#`XineramaQueryExtension'
-#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:20: warning: data definition has no type or storage class
-#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:22: error: parse error before "XineramaQueryVersion"
-#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:23: error: parse error before '*' token
-#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:26: warning: type defaults to `int' in declaration of 
-#`XineramaQueryVersion'
-#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:26: warning: data definition has no type or storage class
-#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:28: error: parse error before "XineramaIsActive"
-#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:28: error: parse error before '*' token
-#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:28: warning: type defaults to `int' in declaration of 
-#`XineramaIsActive'
-#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:28: warning: data definition has no type or storage class
-#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:41: error: parse error before '*' token
-#| In file included from /local/pkg/oe/collie/tmp/staging/arm-linux/include/inttypes.h:28,
-#|                  from ../../src/xine-engine/xine_internal.h:31,
-#|                  from video_out_dxr3.c:65:
-#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/stdint.h:49: error: syntax error before "typedef"
 
 DESCRIPTION = "libxine"
 SECTION = "libs"
 PRIORITY = "optional"
 MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>"
-DEPENDS = "zlib libogg libvorbis libmad"
+DEPENDS = "zlib libogg tremor libmad esound-gpe"
 PROVIDES = "virtual/libxine"
+PR = "r1"
 
 inherit autotools pkgconfig gettext
 
@@ -38,7 +14,13 @@ S = "${WORKDIR}/xine-lib-${PV}"
 
 SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-${PV}.tar.gz \
 	file://cpu-${PV}.patch;patch=1 \
-	file://configure-${PV}.patch;patch=1"
+	file://configure-${PV}.patch;patch=1 \
+	file://libxine-tremor-autoconf.patch;patch=1 \
+	file://libxine-libvorbis.patch;patch=1 \
+	file://libxine-ffmpeg-enable-arm.patch;patch=1 \
+	file://no-caca-no-aalib.patch;patch=1 \
+	file://dont-have-xv.patch;patch=1 \
+	file://restore-esd.patch;patch=1"
 
 SOV = "1.0.7"
 
@@ -53,10 +35,8 @@ EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \
 	--disable-oggtest \
 	--with-ogg-prefix=${STAGING_DIR}/${HOST_SYS} \
 	--disable-altivec --disable-vis --disable-mlib \
-	--enable-shared --disable-static \
 	--disable-fb --disable-alsa --disable-vcd \
 	--disable-asf --disable-faad --disable-iconv \
-	--disable-aalib --with-xv-path=${STAGING_LIBDIR} \
 	--without-v4l --without-arts --without-sdl"
 			      
 do_compile() {
@@ -97,6 +77,8 @@ do_stage() {
 }
 
 python populate_packages_prepend () {
+	bb.data.setVar('PKG_libxine', 'libxine', d)
+
 	plugindir = bb.data.expand('${libdir}/xine/plugins/1.0.0', d)
 	do_split_packages(d, plugindir, '^xineplug_(.*)\.so$', 'libxine-plugin-%s', 'Xine plugin for %s', extra_depends='' )
 
diff --git a/packages/linux/linux-geodegx-2.4.24/linux-2.4.24-gcc340-fixes.patch b/packages/linux/linux-geodegx-2.4.24/linux-2.4.24-gcc340-fixes.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-geodegx-2.4.24/linux-2.4.24-gcc340-fixes.patch
diff --git a/packages/linux/linux-geodegx_2.4.24.bb b/packages/linux/linux-geodegx_2.4.24.bb
index e69de29bb2..0cc97f4842 100644
--- a/packages/linux/linux-geodegx_2.4.24.bb
+++ b/packages/linux/linux-geodegx_2.4.24.bb
@@ -0,0 +1,25 @@
+# Linux kernel OE build file for the AMD Geode GX processor
+# Copyright (C) 2005, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+KV = "2.4.24"
+DESCRIPTION = "Linux kernel for the AMD Geode GX processor"
+LICENSE = "GPL"
+
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/2.4/linux-${KV}.tar.bz2 \
+	http://www.amd.com/files/connectivitysolutions/geode/Patches_Linux_${KV}_1.00.tar.gz \
+	file://${WORKDIR}/Patches_Linux_${KV}_1.00/linux-${KV}-geode.patch;patch=1 \
+	file://linux-2.4.24-gcc340-fixes.patch;patch=1 \
+	file://defconfig"
+
+S = "${WORKDIR}/linux-${KV}"
+
+inherit kernel 
+
+ARCH = "i386"
+KERNEL_IMAGETYPE = "bzImage"
+
+do_configure_prepend() {
+	install -m 0644 ${WORKDIR}/defconfig ${S}/.config 
+        oe_runmake oldconfig
+}
diff --git a/packages/matchbox-panel/matchbox-panel_0.9.2.bb b/packages/matchbox-panel/matchbox-panel_0.9.2.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/matchbox-panel/matchbox-panel_0.9.2.bb
diff --git a/packages/matchbox-wm/matchbox-wm_0.9.4.bb b/packages/matchbox-wm/matchbox-wm_0.9.4.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/matchbox-wm/matchbox-wm_0.9.4.bb
diff --git a/packages/roadster/roadster_cvs.bb b/packages/roadster/roadster_cvs.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/roadster/roadster_cvs.bb
diff --git a/packages/teleport/teleport_0.34.bb b/packages/teleport/teleport_0.34.bb
index e69de29bb2..3b89a5be51 100644
--- a/packages/teleport/teleport_0.34.bb
+++ b/packages/teleport/teleport_0.34.bb
@@ -0,0 +1,6 @@
+inherit gpe
+LICENSE = "GPL"
+DESCRIPTION = "Teleport app"
+DEPENDS = "gtk+ libgpewidget libdisplaymigration libgcrypt sqlite"
+MAINTAINER = "Koen Kooi  <koen@handhelds.org>"SECTION = "gpe"
+PRIORITY = "optional"
diff --git a/packages/tremor/tremor_20041119.bb b/packages/tremor/tremor_20041119.bb
index 00145120e0..bc257e5a61 100644
--- a/packages/tremor/tremor_20041119.bb
+++ b/packages/tremor/tremor_20041119.bb
@@ -7,6 +7,8 @@ LICENSE = "BSD"
 CVSDATE = "${PV}"
 PR = "r1"
 
+DEFAULT_PREFERENCE = "-1"
+
 SRC_URI = "svn://svn.xiph.org/trunk;module=Tremor;rev=4573;proto=http"
 
 S = "${WORKDIR}/Tremor"
diff --git a/packages/tslib/tslib/ramses/tslib.sh b/packages/tslib/tslib/ramses/tslib.sh
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tslib/tslib/ramses/tslib.sh
diff --git a/packages/xpm/files/autofoo.patch b/packages/xpm/files/autofoo.patch
index e69de29bb2..6b2174bf02 100644
--- a/packages/xpm/files/autofoo.patch
+++ b/packages/xpm/files/autofoo.patch
@@ -0,0 +1,18 @@
+Index: libXpm-3.5.1/configure.ac
+===================================================================
+--- libXpm-3.5.1.orig/configure.ac	2004-05-11 02:00:35.000000000 -0400
++++ libXpm-3.5.1/configure.ac	2005-01-19 18:35:57.187402008 -0500
+@@ -1,12 +1,12 @@
+ AC_PREREQ(2.57)
+ AC_INIT([libXpm], 3.5.1, [daniel@freedesktop.org], libXpm)
+ AC_CONFIG_SRCDIR([Makefile.am])
++AC_CONFIG_AUX_DIR(.)
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ 
+ AM_MAINTAINER_MODE
+ 
+ AM_CONFIG_HEADER([lib/config.h])
+-AC_CONFIG_AUX_DIR(.)
+ 
+ # Checks for programs.
+ AC_PROG_LIBTOOL
diff --git a/packages/xpm/xpm_cvs.bb b/packages/xpm/xpm_cvs.bb
index 72e39d0fc9..342fdfaa92 100644
--- a/packages/xpm/xpm_cvs.bb
+++ b/packages/xpm/xpm_cvs.bb
@@ -7,8 +7,7 @@ DEPENDS = "xproto x11"
 DESCRIPTION = "X Pixmap library."
 PR = "r1"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xpm \
-	   file://autofoo.patch;patch=1"
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xpm"
 S = "${WORKDIR}/Xpm"
 
 inherit autotools pkgconfig 
diff --git a/packages/xserver/xserver-kdrive/devfs.patch b/packages/xserver/xserver-kdrive/devfs.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xserver/xserver-kdrive/devfs.patch
diff --git a/packages/xserver/xserver-kdrive_20050207.bb b/packages/xserver/xserver-kdrive_20050207.bb
index e69de29bb2..0cbdf2f4f5 100644
--- a/packages/xserver/xserver-kdrive_20050207.bb
+++ b/packages/xserver/xserver-kdrive_20050207.bb
@@ -0,0 +1,44 @@
+LICENSE = "MIT"
+DEPENDS = "tslib xproto xdmcp xextensions xtrans xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext recordext"
+PROVIDES = "virtual/xserver"
+PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale"
+SECTION = "x11/base"
+DESCRIPTION = "X server from freedesktop.org"
+DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting i810 devices"
+DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices"
+DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting MGA devices"
+DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting generic VESA devices"
+DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting Mach64 devices"
+DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA CLE266 devices"
+DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices"
+DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices"
+DESCRIPTION_xserver-kdrive-fake = "Fake X server"
+DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
+
+PR = "r0"
+
+FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
+FILES_xserver-kdrive-ati = "${bindir}/Xati"
+FILES_xserver-kdrive-vesa = "${bindir}/Xvesa"
+FILES_xserver-kdrive-via = "${bindir}/Xvia"
+FILES_xserver-kdrive-mga = "${bindir}/Xmga"
+FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64"
+FILES_xserver-kdrive-fake = "${bindir}/Xfake"
+FILES_xserver-kdrive-i810 = "${bindir}/Xi810"
+FILES_xserver-kdrive-epson = "${bindir}/Xepson"
+FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
+
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${PV} \
+	file://kmode.patch;patch=1 \
+	file://fbdev-not-fix.patch;patch=1"
+
+SRC_URI_append_ramses = " file://onlyfb.patch;patch=1"
+SRC_URI_append_ramses = " file://devfs.patch;patch=1"
+SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
+PACKAGE_ARCH_poodle = "poodle"
+
+S = "${WORKDIR}/xserver"
+
+inherit autotools pkgconfig 
+
+EXTRA_OECONF = "--enable-composite --disable-xinerama"