From 090e682fbdaf2fce18f2d4de2c0d2d829b2f3850 Mon Sep 17 00:00:00 2001 From: Chris Lord Date: Fri, 17 Sep 2004 11:39:53 +0000 Subject: [PATCH] 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 --- conf/openzaurus-3.5.1.conf | 1 + gstreamer/gpe-gst-plugins_0.8.4.oe | 0 initscripts/initscripts-1.0/collie/devices | 1 + initscripts/initscripts_1.0.oe | 2 +- 4 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 gstreamer/gpe-gst-plugins_0.8.4.oe diff --git a/conf/openzaurus-3.5.1.conf b/conf/openzaurus-3.5.1.conf index df2881f..d537b3b 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 0000000..e69de29 diff --git a/initscripts/initscripts-1.0/collie/devices b/initscripts/initscripts-1.0/collie/devices index e3e11c2..50034b5 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 22a4687..74ddcde 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 \ -- 2.7.4