8 files changed, 67 insertions, 15 deletions
diff --git a/packages/directfb/directfb_1.0.0.bb b/packages/directfb/directfb_1.0.0.bb
index cbeede90ab..caa8dbee8f 100644
--- a/packages/directfb/directfb_1.0.0.bb
+++ b/packages/directfb/directfb_1.0.0.bb
@@ -7,21 +7,22 @@ SECTION = "libs"
 LICENSE = "LGPL"
 HOMEPAGE = "http://directfb.org"
 DEPENDS = "jpeg libpng freetype zlib tslib"
-PR = "r3"
+PR = "r4"
 RV = "1.0-0"
 
 SRC_URI = "http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \
            file://fix-pkgconfig-specs.patch;patch=1 \
-	   file://mkdfiff.patch;patch=1 \
-	   file://getpagesize.patch;patch=1"
-
+           file://mkdfiff.patch;patch=1 \
+           file://getpagesize.patch;patch=1 \
+           file://fix-includes.patch;patch=1"
 S = "${WORKDIR}/DirectFB-1.0.0"
 
 LDFLAGS_append =" -lts -lm"
 
 inherit autotools pkgconfig
 
-EXTRA_OECONF = "--with-gfxdrivers=none \
+EXTRA_OECONF = "\
+		--with-gfxdrivers=none \
 		--enable-libmpeg3=no \
 		--enable-freetype=yes \
 		--enable-sdl=no \
diff --git a/packages/directfb/files/fix-includes.patch b/packages/directfb/files/fix-includes.patch
new file mode 100644
index 0000000000..0c40cdb3a6
--- /dev/null
+++ b/packages/directfb/files/fix-includes.patch
@@ -0,0 +1,24 @@
+#
+# pkgconfig points to STAGING_INCDIR, hence
+# we need to append a directfb/ to make it
+# find its header files
+#
+# Signed-Off: mickey@openmoko.org
+#
+Index: DirectFB-1.0.0/include/directfb.h
+===================================================================
+--- DirectFB-1.0.0.orig/include/directfb.h
++++ DirectFB-1.0.0/include/directfb.h
+@@ -29,10 +29,10 @@
+ #ifndef __DIRECTFB_H__
+ #define __DIRECTFB_H__
+ 
+-#include <dfb_types.h>
++#include <directfb/dfb_types.h>
+ #include <sys/time.h> /* struct timeval */
+ 
+-#include <directfb_keyboard.h>
++#include <directfb/directfb_keyboard.h>
+ 
+ #ifdef __cplusplus
+ extern "C"
diff --git a/packages/efl/etk_0.1.0.003.bb b/packages/efl/etk_0.1.0.003.bb
index 86e1ce9f8e..e283adef23 100644
--- a/packages/efl/etk_0.1.0.003.bb
+++ b/packages/efl/etk_0.1.0.003.bb
@@ -1,16 +1,17 @@
 DESCRIPTION = "Etk is an advanced widget toolkit based on the Enlightenment Foundation Libraries."
 DEPENDS = "evas-x11 ecore-x11 edje"
 LICENSE = "MIT"
-PR = "r0"
+PR = "r1"
 
 inherit efl
 
-SRC_URI = "${E_CVS};module=e17/proto/etk;date=${PV}"
-S = "${WORKDIR}/etk"
+SRC_URI = "http://enlightenment.freedesktop.org/files/etk-${PV}.tar.gz"
 
-do_stage_append() {
-        for i in src/lib/etk_*.h
-        do
-                install -m 0644 $i ${STAGING_INCDIR}
-        done
+do_stage() {
+	autotools_stage_all
 }
+
+FILES_${PN} += "${libdir}/etk/engines/*.so"
+FILES_${PN}-dev += "${libdir}/etk/engines/*.a ${libdir}/etk/engines/*.la"
+FILES_${PN}-dbg += "${libdir}/etk/engines/*/.debug/"
+
diff --git a/packages/mpg123/.mtn2git_empty b/packages/mpg123/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mpg123/.mtn2git_empty
diff --git a/packages/mpg123/mpg123_0.66.bb b/packages/mpg123/mpg123_0.66.bb
new file mode 100644
index 0000000000..a92cf877a9
--- /dev/null
+++ b/packages/mpg123/mpg123_0.66.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "mpg123 is a fast and free console based real time MPEG Audio Player \
+for Layer 1, 2 and 3. It uses floating point math (unlike libmad)."
+LICENSE = "LGPL"
+DESCRIPTION = "multimedia"
+HOMEPAGE = "http://www.mpg123.de"
+RCONFLICTS = "mpg321"
+RREPLACES = "mpg321"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/mpg123/mpg123-${PV}.tar.bz2"
+
+inherit autotools
diff --git a/packages/mpg321/mpg321_0.2.10.bb b/packages/mpg321/mpg321_0.2.10.bb
index ccd8ecd48e..018fb17b7b 100644
--- a/packages/mpg321/mpg321_0.2.10.bb
+++ b/packages/mpg321/mpg321_0.2.10.bb
@@ -1,12 +1,14 @@
-DESCRIPTION = "mpg321 is a Free replacement for mpg123, a very popular command-line mp3 player."
+DESCRIPTION = "mpg321 is a replacement for mpg123, a very popular command-line mp3 player."
 SECTION = "console/multimedia"
 DEPENDS = "libmad libao"
 LICENSE = "GPL"
 AUTHOR = "Joe Drew <hoserhead@woot.net>"
 HOMEPAGE = "http://mpg321.sourceforge.net/"
+RCONFLICTS = "mpg123"
+RREPLACES = "mpg123"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/mpg321/mpg321-0.2.10.tar.gz \
-file://libao.m4.patch;patch=1"
+           file://libao.m4.patch;patch=1"
 
 inherit autotools
 
diff --git a/packages/synaesthesia/.mtn2git_empty b/packages/synaesthesia/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/synaesthesia/.mtn2git_empty
diff --git a/packages/synaesthesia/synaesthesia_2.4.bb b/packages/synaesthesia/synaesthesia_2.4.bb
new file mode 100644
index 0000000000..14b96ea860
--- /dev/null
+++ b/packages/synaesthesia/synaesthesia_2.4.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Synaesthesia is a program that gives a graphical accompanyment to music."
+SECTION = "x11/multimedia"
+HOMEPAGE = "http://www.logarithmic.net/pfh/synaesthesia"
+LICENSE = "GPL"
+DEPENDS = "libx11"
+# optional
+# DEPENDS += "libsdl-x11 directfb"
+
+SRC_URI = "http://www.logarithmic.net/pfh-files/synaesthesia/synaesthesia-${PV}.tar.gz"
+
+inherit autotools
+
+