diff options
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 | ||||
| -rw-r--r-- | packages/gstreamer/gst-plugin-pulse_0.9.7.bb | 2 | ||||
| -rw-r--r-- | packages/openmoko2/openmoko-sound-system2/session | 2 | ||||
| -rw-r--r-- | packages/openmoko2/openmoko-sound-system2_0.1.0.bb | 2 | ||||
| -rw-r--r-- | packages/pulseaudio/pulse.inc | 7 | ||||
| -rw-r--r-- | packages/pulseaudio/pulseaudio_0.9.9.bb | 6 |
6 files changed, 9 insertions, 12 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 4d92f48928..755b874083 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -26,7 +26,7 @@ SRCREV_pn-fstests ?= "204" SRCREV_pn-gconf-dbus ?= "641" SRCREV_pn-gnuradio ?= "6377" SRCREV_pn-gpe-contacts ?= "9312" -SRCREV_pn-gsm0710muxd ?= "73" +SRCREV_pn-gsm0710muxd ?= "77" SRCREV_pn-gtkhtml2 ?= "1158" SRCREV_pn-gypsy ?= "56" SRCREV_pn-hildon-1 ?= "14429" diff --git a/packages/gstreamer/gst-plugin-pulse_0.9.7.bb b/packages/gstreamer/gst-plugin-pulse_0.9.7.bb index 5a83f3915b..8351856143 100644 --- a/packages/gstreamer/gst-plugin-pulse_0.9.7.bb +++ b/packages/gstreamer/gst-plugin-pulse_0.9.7.bb @@ -4,8 +4,6 @@ LICENSE = "GPL" DEPENDS = "gstreamer pulseaudio" PR = "r1" -DEFAULT_PREFERENCE = "-1" - SRC_URI = "http://0pointer.de/lennart/projects/gst-pulse/gst-pulse-${PV}.tar.gz \ file://dont-overload-pulseaudio.patch;patch=1" S = "${WORKDIR}/gst-pulse-${PV}" diff --git a/packages/openmoko2/openmoko-sound-system2/session b/packages/openmoko2/openmoko-sound-system2/session index ed2346d55f..7ba07e9784 100644 --- a/packages/openmoko2/openmoko-sound-system2/session +++ b/packages/openmoko2/openmoko-sound-system2/session @@ -1,7 +1,7 @@ #!/usr/bin/pulseaudio -nF # Create autoload entries for the device drivers -add-autoload-sink output module-alsa-sink fragment_size=2048 sink_name=output +add-autoload-sink output module-alsa-sink sink_name=output add-autoload-source input module-alsa-source source_name=input # Load several protocols diff --git a/packages/openmoko2/openmoko-sound-system2_0.1.0.bb b/packages/openmoko2/openmoko-sound-system2_0.1.0.bb index 29d0cba1fe..ac281dad76 100644 --- a/packages/openmoko2/openmoko-sound-system2_0.1.0.bb +++ b/packages/openmoko2/openmoko-sound-system2_0.1.0.bb @@ -13,7 +13,7 @@ RDEPENDS = "\ " RREPLACES = "openmoko-sound-system" RPROVIDES = "openmoko-sound-system" -PR = "r4" +PR = "r5" inherit openmoko-base update-rc.d diff --git a/packages/pulseaudio/pulse.inc b/packages/pulseaudio/pulse.inc index b6b622d9c6..7f7f205613 100644 --- a/packages/pulseaudio/pulse.inc +++ b/packages/pulseaudio/pulse.inc @@ -20,8 +20,8 @@ EXTRA_OECONF = "\ --with-glib \ --with-alsa \ --with-oss \ - --with-hal \ - " + --with-hal \ +" PARALLEL_MAKE = "" @@ -83,7 +83,8 @@ pkg_postinst_${PN}-server() { grep -q pulse: /etc/group || addgroup pulse grep -q pulse: /etc/passwd || \ adduser --disabled-password --home=/var/run/pulse --system \ - --ingroup pulse --no-create-home -g "Pulse audio daemon" pulse + --ingroup pulse --no-create-home -g "Pulse audio daemon" pulse + adduser pulse audio /etc/init.d/populate-volatile.sh update } diff --git a/packages/pulseaudio/pulseaudio_0.9.9.bb b/packages/pulseaudio/pulseaudio_0.9.9.bb index d1e5706809..b884c27dd6 100644 --- a/packages/pulseaudio/pulseaudio_0.9.9.bb +++ b/packages/pulseaudio/pulseaudio_0.9.9.bb @@ -8,11 +8,9 @@ SRC_URI += "\ file://fix-dbus-without-hal.patch;patch=1 \ " -PR = "r1" +PR = "r2" # problems w/ pulseaudio 0.9.9 atm: # 1.) needs libltdl >= 1.5.24 (yes, any older version will NOT work at runtime) # 2.) doesn't build w/ glibc TLS support (hence patched out) -# 3.) hangs, if used with gst-pulse 0.9.7, fails with hierarchical pthread stuff -DEFAULT_PREFERENCE = "-1" - +# 3.) fails with hierarchical pthread stuff w/ gst-pulse (hence patched out) |