7 files changed, 41 insertions, 40 deletions
diff --git a/packages/libpcre/libpcre_7.6.bb b/packages/libpcre/libpcre_7.6.bb
index a065b56cfc..eb5af03db0 100644
--- a/packages/libpcre/libpcre_7.6.bb
+++ b/packages/libpcre/libpcre_7.6.bb
@@ -5,7 +5,7 @@ provides a POSIX calling interface to PCRE; the regular expressions \
 themselves still follow Perl syntax and semantics. The header file for \
 the POSIX-style functions is called pcreposix.h."
 SECTION = "devel"
-PR = "r2"
+PR = "r3"
 LICENSE = "BSD"
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \
            file://pcre-cross.patch;patch=1"
@@ -25,7 +25,12 @@ EXTRA_OECONF = " --with-link-size=2 --enable-newline-is-lf --with-match-limit=10
 do_compile () {
 	# stop libtool from trying to link with host libraries - fix from #33
 	# this resolve build problem on amd64 - #1015
-	sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${TARGET_SYS}-libtool
+	if [ -e ${S}/${TARGET_SYS}-libtool ] ; then
+		sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${TARGET_SYS}-libtool
+	else
+		ln -sf ${S}/libtool ${S}/${TARGET_SYS}-libtool
+		sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${TARGET_SYS}-libtool	
+	fi
 
 	# The generation of dftables can lead to timestamp problems with ccache
 	# because the generated config.h seems newer.  It is sufficient to ensure that the
diff --git a/packages/linux/linux-omap2-git/beagleboard/defconfig b/packages/linux/linux-omap2-git/beagleboard/defconfig
index 0936becec2..1c3dc2106c 100644
--- a/packages/linux/linux-omap2-git/beagleboard/defconfig
+++ b/packages/linux/linux-omap2-git/beagleboard/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.26-rc5-omap1
-# Tue Jun 10 21:11:56 2008
+# Fri Jun 13 19:50:40 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -581,7 +581,6 @@ CONFIG_MTD_NAND=y
 # CONFIG_MTD_NAND_VERIFY_WRITE is not set
 # CONFIG_MTD_NAND_ECC_SMC is not set
 # CONFIG_MTD_NAND_MUSEUM_IDS is not set
-CONFIG_MTD_NAND_OMAP2=y
 CONFIG_MTD_NAND_IDS=y
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_NANDSIM is not set
@@ -1156,6 +1155,9 @@ CONFIG_SND_SOC=y
 # SoC Audio for the Texas Instruments OMAP
 #
 CONFIG_SND_OMAP_SOC=y
+CONFIG_SND_OMAP_SOC_MCBSP=y
+CONFIG_SND_OMAP_SOC_OMAP3BEAGLE=y
+CONFIG_SND_SOC_TWL4030=y
 
 #
 # Open Sound System
@@ -1681,7 +1683,7 @@ CONFIG_FRAME_POINTER=y
 # CONFIG_DEBUG_USER is not set
 # CONFIG_DEBUG_ERRORS is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
-CONFIG_DEBUG_LL=y
+CONFIG_DEBUG_LL=n
 # CONFIG_DEBUG_ICEDCC is not set
 
 #
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index 7fc6fef26c..2927bc6d7b 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r54"
+PR = "r55"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2|ixp4xx"
@@ -134,7 +134,6 @@ SLUGOS_PACKAGES = "\
 	libvorbis \
 	libxml2 \
 	lighttpd \
-	linphone \
 	litestream \
 	logrotate \
 	lrzsz \
@@ -189,7 +188,6 @@ SLUGOS_PACKAGES = "\
 	pkgconfig \
 	popt \
 	portmap \
-	postfix \
 	ppp \
 	procps \
 	psmisc \
@@ -210,7 +208,6 @@ SLUGOS_PACKAGES = "\
 	sipsak \
 	slugimage \
 	smartmontools \
-	spandsp \
 	sqlite \
 	squid \
 	ssmtp \
@@ -246,7 +243,6 @@ SLUGOS_PACKAGES = "\
 	wview-vpro \
 	wview-wxt510 \
 	xinetd \
-	yeaphone \
 	yp-tools ypbind ypserv \
 	zd1211-firmware \
 	zip \
@@ -260,16 +256,20 @@ SLUGOS_BROKEN_PACKAGES = "\
 	eciadsl \
 	fetchmail \
 	gspcav1 \
+	linphone \
 	lirc-modules lirc \
 	madfu \
 	motion \
 	openldap \
+	postfix \
 	pwc \
 	qc-usb-messenger \
+	spandsp \
 	syslog-ng \
 	task-native-sdk \
 	unionfs-modules unionfs-utils \
 	wview-sim-mysql wview-wxt510-mysql wview-vpro-mysql \
+	yeaphone \
 	zd1211 \
 	"
 
diff --git a/packages/mplayer/files/Makefile-codec-cfg.patch b/packages/mplayer/files/Makefile-codec-cfg.patch
index 78fb6e98ce..84c17a9017 100644
--- a/packages/mplayer/files/Makefile-codec-cfg.patch
+++ b/packages/mplayer/files/Makefile-codec-cfg.patch
@@ -1,11 +1,11 @@
---- /tmp/Makefile	2008-04-17 21:41:29.623907292 +0200
-+++ trunk/Makefile	2008-04-17 21:42:04.164926258 +0200
-@@ -311,7 +311,7 @@
+--- /tmp/Makefile	2008-06-10 20:55:43.100403024 +0200
++++ trunk/Makefile	2008-06-10 20:56:10.881647093 +0200
+@@ -731,7 +731,7 @@
  	$(CC) -o $@ $^ $(LDFLAGS_MENCODER)
  
  codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
--	$(HOST_CC) -O -I. -DCODECS2HTML $< -o $@
-+	$(BUILD_CC) -O -I. -DCODECS2HTML $< -o $@
+-	$(HOST_CC) -O -I. -DCODECS2HTML -o $@ $<
++	$(BUILD_CC) -O -I. -DCODECS2HTML -o $@ $<
  
  codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
  	./codec-cfg$(EXESUF) ./etc/codecs.conf > $@
diff --git a/packages/mplayer/files/makefile-nostrip-svn.patch b/packages/mplayer/files/makefile-nostrip-svn.patch
index b1a60af312..c684001792 100644
--- a/packages/mplayer/files/makefile-nostrip-svn.patch
+++ b/packages/mplayer/files/makefile-nostrip-svn.patch
@@ -1,22 +1,11 @@
-upstream: not applicable, I think (unless somebody claims there is a more portable way to stripping)
-
---- /tmp/Makefile	2008-04-17 21:48:32.987984542 +0200
-+++ trunk/Makefile	2008-04-17 21:48:52.042750779 +0200
-@@ -337,7 +337,7 @@
- 	if test -f $(CONFDIR)/codecs.conf ; then mv -f $(CONFDIR)/codecs.conf $(CONFDIR)/codecs.conf.old ; fi
+--- /tmp/Makefile	2008-06-10 21:05:55.613676241 +0200
++++ trunk/Makefile	2008-06-10 21:06:30.701172833 +0200
+@@ -797,7 +797,7 @@
+ 	$(INSTALL) -d $(BINDIR) $(CONFDIR)
  
- install-mplayer: mplayer$(EXESUF)
--	$(INSTALL) -m 755 $(INSTALLSTRIP) mplayer$(EXESUF) $(BINDIR)
-+	$(INSTALL) -m 755  mplayer$(EXESUF) $(BINDIR)
+ install-%: %$(EXESUF) install-dirs
+-	$(INSTALL) -m 755 $(INSTALLSTRIP) $< $(BINDIR)
++	$(INSTALL) -m 755 $< $(BINDIR)
  
- install-mplayer-man:
- 	for lang in $(MAN_LANG); do \
-@@ -350,7 +350,7 @@
- 	done
- 
- install-mencoder: mencoder$(EXESUF)
--	$(INSTALL) -m 755 $(INSTALLSTRIP) mencoder$(EXESUF) $(BINDIR)
-+	$(INSTALL) -m 755 mencoder$(EXESUF) $(BINDIR)
- 	for lang in $(MAN_LANG); do \
- 		if test "$$lang" = en ; then \
- 			cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1 ; \
+ install-mplayer-man: $(foreach lang,$(MAN_LANG_ALL),install-mplayer-man-$(lang))
+ install-mencoder-man: $(foreach lang,$(MAN_LANG_ALL),install-mencoder-man-$(lang))
diff --git a/packages/packagekit/packagekit_git.bb b/packages/packagekit/packagekit_git.bb
index 5ed193a7cc..8e2adff2cf 100644
--- a/packages/packagekit/packagekit_git.bb
+++ b/packages/packagekit/packagekit_git.bb
@@ -4,13 +4,12 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native (>= 0.37.1)"
 RDEPENDS_${PN} = "opkg"
-PV = "0.2.1+git${SRCREV}"
-PR = "r8"
+PV = "0.2.3+gitr${SRCREV}"
+PR = "r9"
 
 SRC_URI = "git://anongit.freedesktop.org/git/packagekit;protocol=git \
-           file://disable-docbook2man.patch;patch=1 \
-           file://d1e096c3267c1c9492041382b954e9327bc8bbec.patch;patch=1 \
-	   file://pk-nodocs.patch;patch=1"
+           file://disable-docbook2man.patch;patch=1"
+
 
 S = "${WORKDIR}/git"
 
diff --git a/packages/pulseaudio/pulseaudio-alsa-wrapper.bb b/packages/pulseaudio/pulseaudio-alsa-wrapper.bb
index 7a287da773..e555d50075 100644
--- a/packages/pulseaudio/pulseaudio-alsa-wrapper.bb
+++ b/packages/pulseaudio/pulseaudio-alsa-wrapper.bb
@@ -1,6 +1,8 @@
 DESCRIPTION = "Meta package to make alsa transparently use pulseaudio"
 LICENSE = "GPLv2"
 
+PR = "r1"
+
 SRC_URI = "file://asound.conf.pulseaudio"
 
 RDEPENDS = "hal \
@@ -9,6 +11,10 @@ RDEPENDS = "hal \
 	pulseaudio-module-alsa-sink \
 	pulseaudio-module-alsa-source \
 	pulseaudio-module-hal-detect \
+	pulseaudio-module-volume-restore \
+	pulseaudio-module-default-device-restore \
+	pulseaudio-module-rescue-streams \
+	pulseaudio-module-suspend-on-idle \
 	libasound-module-ctl-pulse \
 	libasound-module-pcm-pulse \
 "