merge of '12edb579fffee6ffcbbed6a66d80c97b7705d000'

     and '48ac4b4de7e34d9fabc14d0f69415e4c1168e98b'

8 files changed, 47 insertions, 15 deletions

diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb
index e72691f345..ad2b0f79f8 100644
--- a/packages/angstrom/task-angstrom-x11.bb
+++ b/packages/angstrom/task-angstrom-x11.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r24"
+PR = "r25"
 ALLOW_EMPTY = "1"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -40,7 +40,8 @@ RDEPENDS_angstrom-gpe-task-base := "\
     gpe-icons \
     gpe-confd \
     gpe-autostarter \
-    libgtkstylus \
+    ${@base_contains("MACHINE_FEATURES", "touchscreen", "libgtkstylus", "",d)} \
+    ${@base_contains("MACHINE_FEATURES", "keyboard", "", "libgtkinput",d)} \
     suspend-desktop \
     teleport \
     xauth \
@@ -48,7 +49,9 @@ RDEPENDS_angstrom-gpe-task-base := "\
     gdk-pixbuf-loader-xpm \
     gdk-pixbuf-loader-jpeg \
     pango-module-basic-x \
-    pango-module-basic-fc"
+    pango-module-basic-fc \
+    ${@base_contains("COMBINED_FEATURES", "bluetooth", "gpe-bluetooth", "",d)} \
+    "
 
 RDEPENDS_angstrom-gpe-task-pim := "\
     gpe-timesheet \
@@ -78,9 +81,9 @@ RDEPENDS_angstrom-gpe-task-apps := "\
     gpe-watch \
     gpe-what \
     matchbox-panel-hacks \
-    gpe-aerial \
+    ${@base_contains("COMBINED_FEATURES", "wifi", "gpe-aerial", "",d)} \
     gpe-soundbite \
-    rosetta \
+    ${@base_contains("MACHINE_FEATURES", "touchscreen", "rosetta", "",d)} \
     gpe-scap \
     gpe-windowlist"
 
diff --git a/packages/mplayer/files/Makefile.patch b/packages/mplayer/files/Makefile.patch
index da316ad129..b9b68491c5 100644
--- a/packages/mplayer/files/Makefile.patch
+++ b/packages/mplayer/files/Makefile.patch
@@ -1,11 +1,15 @@
---- mplayer_20060519/Makefile.orig	2006-05-30 09:32:23.000000000 +0100
-+++ mplayer_20060519/Makefile	2006-05-30 09:34:07.000000000 +0100
-@@ -438,7 +438,7 @@
+Index: MPlayer-1.0pre8/Makefile
+===================================================================
+--- MPlayer-1.0pre8.orig/Makefile
++++ MPlayer-1.0pre8/Makefile
+@@ -438,8 +438,8 @@ codecs2html: mp_msg.o
  	$(CC) -DCODECS2HTML codec-cfg.c mp_msg.o -o $@
  
  $(PRG_CFG): codec-cfg.c codec-cfg.h help_mp.h
 -	$(HOST_CC) $(HOST_CFLAGS) -I. codec-cfg.c -o $(PRG_CFG) \
+-	-DCODECS2HTML $(EXTRA_LIB) $(EXTRA_INC)
 +	$(BUILD_CC) -Ilibmpdemux -Iloader -Ilibvo -I. codec-cfg.c -o $(PRG_CFG) \
- 	-DCODECS2HTML $(EXTRA_LIB) $(EXTRA_INC)
++	-DCODECS2HTML 
  
  install: $(ALL_PRG)
+ ifeq ($(VIDIX),yes)
diff --git a/packages/mplayer/mplayer_1.0pre8.bb b/packages/mplayer/mplayer_1.0pre8.bb
index c59c30e316..de5fa874fc 100644
--- a/packages/mplayer/mplayer_1.0pre8.bb
+++ b/packages/mplayer/mplayer_1.0pre8.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Open Source multimedia player."
-SECTION = "opie/multimedia"
+SECTION = "multimedia"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.mplayerhq.hu/"
 DEPENDS = "virtual/libsdl libmad zlib libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses lame"
@@ -22,7 +22,7 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \
 
 RCONFLICTS_${PN} = "mplayer-atty"
 RREPLACES_${PN} = "mplayer-atty"
-PR = "r3"
+PR = "r4"
 
 PARALLEL_MAKE = ""
 
diff --git a/packages/mplayer/mplayer_svn.bb b/packages/mplayer/mplayer_svn.bb
index 118e71bcea..ee0ba7921c 100644
--- a/packages/mplayer/mplayer_svn.bb
+++ b/packages/mplayer/mplayer_svn.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Open Source multimedia player."
-SECTION = "opie/multimedia"
+SECTION = "multimedia"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.mplayerhq.hu/"
 DEPENDS = "virtual/libsdl libmad zlib libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses lame"
@@ -22,7 +22,7 @@ RCONFLICTS_${PN} = "mplayer-atty"
 RREPLACES_${PN} = "mplayer-atty"
 
 PV = "1.0pre8+svn${SRCDATE}"
-PR = "r0"
+PR = "r1"
 DEFAULT_PREFERENCE = "-1"
 
 PARALLEL_MAKE = ""
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 3f919c7766..1a41f13129 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r14"
+PR = "r15"
 
 PACKAGES = "task-base \
             task-base-minimal \
@@ -49,6 +49,7 @@ DISTRO_CORE_PACKAGE ?= "task-base-core-default"
 RDEPENDS_task-base = "\
     ${DISTRO_CORE_PACKAGE} \
     kernel \
+    ${@base_contains("MACHINE_FEATURES", "kernel24", "${task-base-kernel24-rdepends}", "",d)} \
     ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-rdepends}", "",d)} \
     ${@base_contains("MACHINE_FEATURES", "apm", "${task-base-apm-rdepends}", "",d)} \
     ${@base_contains("MACHINE_FEATURES", "acpi", "${task-base-acpi-rdepends}", "",d)} \
@@ -123,6 +124,8 @@ RDEPENDS_task-base-core-default = '\
 RRECOMMENDS_task-base-core-default = '\
     dropbear '
 
+task-base-kernel24-rdepends = "\
+    linux-hotplug "
 
 task-base-kernel26-rdepends = "\
     udev \
@@ -176,6 +179,13 @@ task-base-pcmcia-rrecommends = "\
     kernel-module-pcnet-cs \
     kernel-module-serial-cs \
     kernel-module-ide-cs \
+    ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-pcmcia26-rrecommends}", "${task-base-pcmcia24-rrecommends}",d)} "
+
+task-base-pcmcia24-rrecommends = "\
+    ${@base_contains("DISTRO_FEATURES", "wifi", "hostap-modules-cs", "",d)} \
+    ${@base_contains("DISTRO_FEATURES", "wifi", "orinoco-modules-cs", "",d)}"
+
+task-base-pcmcia26-rrecommends = "\
     ${@base_contains("DISTRO_FEATURES", "wifi", "kernel-module-hostap-cs", "",d)} \
     ${@base_contains("DISTRO_FEATURES", "wifi", "kernel-module-orinoco-cs", "",d)} \
     ${@base_contains("DISTRO_FEATURES", "wifi", "kernel-module-spectrum-cs", "",d)}"
diff --git a/packages/tasks/task-proper-tools.bb b/packages/tasks/task-proper-tools.bb
index 5520864c82..dccdd13bdf 100644
--- a/packages/tasks/task-proper-tools.bb
+++ b/packages/tasks/task-proper-tools.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "Proper tools for busybox haters"
-PR = "r1"
+PR = "r2"
 
+PACKAGE_ARCH = "all"
 ALLOW_EMPTY_${PN} = "1"
 
 RDEPENDS = "\
diff --git a/packages/valgrind/.mtn2git_empty b/packages/valgrind/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/valgrind/.mtn2git_empty
diff --git a/packages/valgrind/valgrind_3.2.1.bb b/packages/valgrind/valgrind_3.2.1.bb
new file mode 100644
index 0000000000..fedce377a8
--- /dev/null
+++ b/packages/valgrind/valgrind_3.2.1.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Valgrind memory debugger"
+HOMEPAGE = "http://www.valgrind.org/"
+SECTION = "devel"
+LICENSE = "GPL"
+DEPENDS = "virtual/libx11"
+PR = "r0"
+
+SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-tls"
+
+COMPATIBLE_HOST = "^i.86.*-linux"