From: Chris Lord <chris@openedhand.com>
Date: Fri, 17 Sep 2004 11:39:53 +0000 (+0000)
Subject: Merge bk://openembedded@openembedded.bkbits.net/packages
X-Git-Tag: Release-2010-05/1~17112
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=090e682fbdaf2fce18f2d4de2c0d2d829b2f3850;p=openembedded.git

Merge bk://openembedded@openembedded.bkbits.net/packages
into chris.(none):/home/cwiiis/oe/packages

2004/09/17 12:39:39+01:00 (none)!cwiiis
Add a compact gst-plugins package for GPE, Make /dev/mixer user-writable on collie.

BKrev: 414acd09HO0WfVBdGQC9dJYM7FHPWg
---

diff --git a/conf/openzaurus-3.5.1.conf b/conf/openzaurus-3.5.1.conf
index df2881fced..d537b3ba10 100644
--- a/conf/openzaurus-3.5.1.conf
+++ b/conf/openzaurus-3.5.1.conf
@@ -4,6 +4,7 @@ CVSDATE = 20040915
 ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
 PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
 PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-qpe"
+PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
diff --git a/gstreamer/gpe-gst-plugins_0.8.4.oe b/gstreamer/gpe-gst-plugins_0.8.4.oe
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/initscripts/initscripts-1.0/collie/devices b/initscripts/initscripts-1.0/collie/devices
index e3e11c22e7..50034b5d6c 100644
--- a/initscripts/initscripts-1.0/collie/devices
+++ b/initscripts/initscripts-1.0/collie/devices
@@ -55,6 +55,7 @@ else
 	# Change some permissions for non-root users
 	chmod 666 /dev/collie-fl
 	chmod 666 /dev/dsp
+	chmod 666 /dev/mixer
 	if test $? -ne 0; then
 		if test "$VERBOSE" != "no"; then echo "failed"; fi
 	else
diff --git a/initscripts/initscripts_1.0.oe b/initscripts/initscripts_1.0.oe
index 22a4687739..74ddcde460 100644
--- a/initscripts/initscripts_1.0.oe
+++ b/initscripts/initscripts_1.0.oe
@@ -4,7 +4,7 @@ SECTION = "base"
 PRIORITY = "required"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "file://halt \
            file://ramdisk \