mirror of
https://git.yoctoproject.org/poky
synced 2026-02-21 00:49:41 +01:00
pulseaudio: Add back after it was lost in meta-moblin removal (and dependencies)
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie
15
meta/recipes-tbd/consolekit/consolekit_0.3.0.bb
Normal file
15
meta/recipes-tbd/consolekit/consolekit_0.3.0.bb
Normal file
@@ -0,0 +1,15 @@
|
||||
DESCRIPTION = "ConsoleKit is a framework for defining and tracking users, login sessions, and seats."
|
||||
LICENSE = "GPLv2"
|
||||
DEPENDS = "dbus"
|
||||
|
||||
inherit gnome
|
||||
|
||||
SRC_URI = "http://people.freedesktop.org/~mccann/dist/ConsoleKit-${PV}.tar.bz2 \
|
||||
file://nopolkit.patch;patch=1"
|
||||
S = "${WORKDIR}/ConsoleKit-${PV}"
|
||||
|
||||
FILES_${PN} += "${libdir}/ConsoleKit ${datadir}/dbus-1 ${datadir}/PolicyKit"
|
||||
|
||||
|
||||
|
||||
|
||||
16
meta/recipes-tbd/consolekit/files/nopolkit.patch
Normal file
16
meta/recipes-tbd/consolekit/files/nopolkit.patch
Normal file
@@ -0,0 +1,16 @@
|
||||
Index: ConsoleKit-0.3.0/configure.ac
|
||||
===================================================================
|
||||
--- ConsoleKit-0.3.0.orig/configure.ac 2009-05-22 12:53:27.000000000 +0100
|
||||
+++ ConsoleKit-0.3.0/configure.ac 2009-05-22 12:53:56.000000000 +0100
|
||||
@@ -55,10 +55,7 @@
|
||||
gthread-2.0 >= $GLIB_REQUIRED_VERSION
|
||||
)
|
||||
|
||||
-PKG_CHECK_MODULES(POLKIT,
|
||||
- polkit >= $POLKIT_REQUIRED_VERSION,
|
||||
- have_polkit=yes,
|
||||
- have_polkit=no)
|
||||
+have_polkit=no
|
||||
if test "x$have_polkit" = "xyes" ; then
|
||||
AC_DEFINE(HAVE_POLKIT, [], [Define if we have polkit])
|
||||
fi
|
||||
10
meta/recipes-tbd/libsamplerate/libsamplerate0_0.1.2.bb
Normal file
10
meta/recipes-tbd/libsamplerate/libsamplerate0_0.1.2.bb
Normal file
@@ -0,0 +1,10 @@
|
||||
DESCRIPTION = "An audio Sample Rate Conversion library"
|
||||
SECTION = "libs"
|
||||
LICENSE = "GPL libsamplerate"
|
||||
DEPENDS = "flac"
|
||||
PR = "r3"
|
||||
|
||||
SRC_URI = "http://www.mega-nerd.com/SRC/libsamplerate-${PV}.tar.gz"
|
||||
S = "${WORKDIR}/libsamplerate-${PV}"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
26
meta/recipes-tbd/libsndfile/libsndfile1/acincludefix.patch
Normal file
26
meta/recipes-tbd/libsndfile/libsndfile1/acincludefix.patch
Normal file
@@ -0,0 +1,26 @@
|
||||
Fix m4 quoting to avoid an infinite loop in m4 with recent autoconf/automake
|
||||
|
||||
RP 1/2/10
|
||||
|
||||
Index: libsndfile-1.0.17/acinclude.m4
|
||||
===================================================================
|
||||
--- libsndfile-1.0.17.orig/acinclude.m4 2010-02-01 14:53:35.517826746 +0000
|
||||
+++ libsndfile-1.0.17/acinclude.m4 2010-02-01 14:53:51.409122706 +0000
|
||||
@@ -255,7 +255,7 @@
|
||||
|
||||
)
|
||||
]
|
||||
-
|
||||
+[
|
||||
if test $ac_cv_c_byte_order = big ; then
|
||||
ac_cv_c_big_endian=1
|
||||
ac_cv_c_little_endian=0
|
||||
@@ -272,7 +272,7 @@
|
||||
AC_MSG_WARN([[*** src/config.h may need to be hand editied. ]])
|
||||
AC_MSG_WARN([[*****************************************************************]])
|
||||
fi
|
||||
-
|
||||
+]
|
||||
)# AC_C_FIND_ENDIAN
|
||||
|
||||
|
||||
18
meta/recipes-tbd/libsndfile/libsndfile1/add-cxx.patch
Normal file
18
meta/recipes-tbd/libsndfile/libsndfile1/add-cxx.patch
Normal file
@@ -0,0 +1,18 @@
|
||||
---
|
||||
configure.ac | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
--- libsndfile-1.0.17.orig/configure.ac
|
||||
+++ libsndfile-1.0.17/configure.ac
|
||||
@@ -29,10 +29,11 @@ AC_LANG([C])
|
||||
# to 0.
|
||||
|
||||
SHARED_VERSION_INFO="1:17:0"
|
||||
|
||||
AC_PROG_CC
|
||||
+AC_PROG_CXX
|
||||
AM_PROG_LIBTOOL
|
||||
|
||||
AC_CHECK_PROG(autogen, autogen, yes, no)
|
||||
|
||||
AC_PROG_INSTALL
|
||||
22
meta/recipes-tbd/libsndfile/libsndfile1_1.0.17.bb
Normal file
22
meta/recipes-tbd/libsndfile/libsndfile1_1.0.17.bb
Normal file
@@ -0,0 +1,22 @@
|
||||
DESCRIPTION = "An audio format Conversion library"
|
||||
HOMEPAGE = "http://www.mega-nerd.com/libsndfile"
|
||||
AUTHOR = "Erik de Castro Lopo"
|
||||
DEPENDS = "sqlite3"
|
||||
SECTION = "libs/multimedia"
|
||||
LICENSE = "LGPL"
|
||||
PR = "r4"
|
||||
|
||||
SRC_URI = "http://www.mega-nerd.com/libsndfile/libsndfile-${PV}.tar.gz \
|
||||
file://acincludefix.patch;patch=1 \
|
||||
file://add-cxx.patch;patch=1"
|
||||
|
||||
S = "${WORKDIR}/libsndfile-${PV}"
|
||||
|
||||
inherit autotools lib_package pkgconfig
|
||||
|
||||
do_configure_prepend_arm() {
|
||||
export ac_cv_sys_largefile_source=1
|
||||
export ac_cv_sys_file_offset_bits=64
|
||||
ac_cv_sizeof_off_t=8
|
||||
}
|
||||
|
||||
25
meta/recipes-tbd/pulseaudio/libatomics-ops/doublefix.patch
Normal file
25
meta/recipes-tbd/pulseaudio/libatomics-ops/doublefix.patch
Normal file
@@ -0,0 +1,25 @@
|
||||
Double path references breaks recent autoconf+automake
|
||||
|
||||
RP 2/1/10
|
||||
|
||||
Index: libatomic_ops-1.2/src/atomic_ops/sysdeps/Makefile.am
|
||||
===================================================================
|
||||
--- libatomic_ops-1.2.orig/src/atomic_ops/sysdeps/Makefile.am 2005-09-28 00:53:16.000000000 +0100
|
||||
+++ libatomic_ops-1.2/src/atomic_ops/sysdeps/Makefile.am 2010-02-01 14:28:46.397820574 +0000
|
||||
@@ -25,7 +25,6 @@
|
||||
README \
|
||||
\
|
||||
gcc/alpha.h gcc/arm.h gcc/x86.h \
|
||||
- gcc/hppa.h gcc/ia64.h \
|
||||
gcc/powerpc.h gcc/sparc.h \
|
||||
gcc/hppa.h gcc/m68k.h gcc/s390.h \
|
||||
gcc/ia64.h gcc/x86_64.h gcc/cris.h \
|
||||
Index: libatomic_ops-1.2/doc/Makefile.am
|
||||
===================================================================
|
||||
--- libatomic_ops-1.2.orig/doc/Makefile.am 2010-02-01 15:20:09.207788884 +0000
|
||||
+++ libatomic_ops-1.2/doc/Makefile.am 2010-02-01 15:20:20.909049794 +0000
|
||||
@@ -1,3 +1,3 @@
|
||||
# installed documentation
|
||||
#
|
||||
-dist_pkgdata_DATA=COPYING LICENSING.txt README.txt COPYING README_stack.txt README_malloc.txt README_win32.txt
|
||||
+dist_pkgdata_DATA=LICENSING.txt README.txt COPYING README_stack.txt README_malloc.txt README_win32.txt
|
||||
@@ -0,0 +1,15 @@
|
||||
http://cvs.fedoraproject.org/viewcvs/devel/libatomic_ops/libatomic_ops-1.2-ppclwzfix.patch
|
||||
|
||||
* add fix for bad variable handling on PPC
|
||||
|
||||
--- libatomic_ops-1.2.orig/src/atomic_ops/sysdeps/gcc/powerpc.h 2007-05-29 19:29:52.000000000 +0200
|
||||
+++ libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/powerpc.h 2007-05-29 19:30:48.000000000 +0200
|
||||
@@ -72,7 +72,7 @@
|
||||
/* registers. I always got "impossible constraint" when I */
|
||||
/* tried the "y" constraint. */
|
||||
__asm__ __volatile__ (
|
||||
- "lwz %0,%1\n"
|
||||
+ "lwz%U1%X1 %0,%1\n"
|
||||
"cmpw cr7,%0,%0\n"
|
||||
"bne- cr7,1f\n"
|
||||
"1: isync\n"
|
||||
14
meta/recipes-tbd/pulseaudio/libatomics-ops_1.2.bb
Normal file
14
meta/recipes-tbd/pulseaudio/libatomics-ops_1.2.bb
Normal file
@@ -0,0 +1,14 @@
|
||||
DESCRIPTION = "A library for atomic integer operations"
|
||||
LICENSE = "MIT"
|
||||
|
||||
PR = "r4"
|
||||
|
||||
SRC_URI = "http://www.hpl.hp.com/research/linux/atomic_ops/download/libatomic_ops-1.2.tar.gz \
|
||||
file://fedora/libatomic_ops-1.2-ppclwzfix.patch;patch=1 \
|
||||
file://doublefix.patch;patch=1"
|
||||
|
||||
S = "${WORKDIR}/libatomic_ops-${PV}"
|
||||
|
||||
ALLOW_EMPTY_${PN} = "1"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
@@ -0,0 +1,38 @@
|
||||
Allow a slightly older autoconf and disable the inbuild libltdl
|
||||
|
||||
RP - 16/4/09
|
||||
|
||||
Index: libcanberra-0.10/Makefile.am
|
||||
===================================================================
|
||||
--- libcanberra-0.10.orig/Makefile.am 2009-04-16 14:38:53.000000000 +0100
|
||||
+++ libcanberra-0.10/Makefile.am 2009-04-16 14:39:04.000000000 +0100
|
||||
@@ -19,7 +19,7 @@
|
||||
dist_doc_DATA = README
|
||||
|
||||
EXTRA_DIST = bootstrap.sh autogen.sh LGPL libcanberra.schemas
|
||||
-SUBDIRS = src gtkdoc libltdl doc
|
||||
+SUBDIRS = src gtkdoc doc
|
||||
|
||||
MAINTAINERCLEANFILES = README
|
||||
noinst_DATA = README
|
||||
Index: libcanberra-0.10/configure.ac
|
||||
===================================================================
|
||||
--- libcanberra-0.10.orig/configure.ac 2009-04-16 14:32:33.000000000 +0100
|
||||
+++ libcanberra-0.10/configure.ac 2009-04-16 14:37:50.000000000 +0100
|
||||
@@ -19,7 +19,7 @@
|
||||
# License along with libcanberra. If not, see
|
||||
# <http://www.gnu.org/licenses/>.
|
||||
|
||||
-AC_PREREQ(2.62)
|
||||
+AC_PREREQ(2.61)
|
||||
|
||||
AC_INIT([libcanberra], 0.10, [mzyvopnaoreen (at) 0pointer (dot) de])
|
||||
AC_CONFIG_SRCDIR([src/common.c])
|
||||
@@ -70,7 +70,6 @@
|
||||
AC_PROG_LIBTOOL
|
||||
AC_SUBST(LTDLINCL)
|
||||
AC_SUBST(LIBLTDL)
|
||||
-AC_CONFIG_SUBDIRS(libltdl)
|
||||
|
||||
#### Determine build environment ####
|
||||
|
||||
16
meta/recipes-tbd/pulseaudio/libcanberra/nofallbackfix.patch
Normal file
16
meta/recipes-tbd/pulseaudio/libcanberra/nofallbackfix.patch
Normal file
@@ -0,0 +1,16 @@
|
||||
Index: libcanberra-0.10/src/sound-theme-spec.c
|
||||
===================================================================
|
||||
--- libcanberra-0.10.orig/src/sound-theme-spec.c 2009-05-22 17:08:23.000000000 +0100
|
||||
+++ libcanberra-0.10/src/sound-theme-spec.c 2009-05-22 17:12:50.000000000 +0100
|
||||
@@ -398,9 +398,9 @@
|
||||
if ((ret = load_theme_dir(t, name)) < 0)
|
||||
goto fail;
|
||||
|
||||
+ /* The fallback theme may intentionally not exist so ignore failure */
|
||||
if (!t->loaded_fallback_theme)
|
||||
- if ((ret = load_theme_dir(t, FALLBACK_THEME)) < 0)
|
||||
- goto fail;
|
||||
+ load_theme_dir(t, FALLBACK_THEME);
|
||||
|
||||
if (*_t)
|
||||
ca_theme_data_free(*_t);
|
||||
22
meta/recipes-tbd/pulseaudio/libcanberra_0.10.bb
Normal file
22
meta/recipes-tbd/pulseaudio/libcanberra_0.10.bb
Normal file
@@ -0,0 +1,22 @@
|
||||
DESCRIPTION = "Libcanberra is an implementation of the XDG Sound Theme and Name Specifications, for generating event sounds on free desktops."
|
||||
LICENSE = "LGPL"
|
||||
DEPENDS = "gtk+ pulseaudio alsa-lib libtool"
|
||||
PR = "r3"
|
||||
|
||||
inherit gconf autotools
|
||||
|
||||
SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz \
|
||||
file://nofallbackfix.patch;patch=1 \
|
||||
file://autoconf_version.patch;patch=1"
|
||||
|
||||
EXTRA_OECONF = " --disable-oss --disable-ltdl-install"
|
||||
|
||||
do_configure_prepend () {
|
||||
rm -f ${S}/libltdl/configure*
|
||||
}
|
||||
|
||||
FILES_${PN} += "${libdir}/gtk-2.0/modules/ ${datadir}/gnome"
|
||||
FILES_${PN}-dbg += "${libdir}/gtk-2.0/modules/.debug"
|
||||
|
||||
AUTOTOOLS_STAGE_PKGCONFIG = "1"
|
||||
|
||||
525
meta/recipes-tbd/pulseaudio/pulseaudio-0.9.15/alsaerror.patch
Normal file
525
meta/recipes-tbd/pulseaudio/pulseaudio-0.9.15/alsaerror.patch
Normal file
@@ -0,0 +1,525 @@
|
||||
From: Lennart Poettering <lennart@poettering.net>
|
||||
Date: Sun, 19 Apr 2009 17:22:51 +0000 (+0200)
|
||||
Subject: alsa: properly convert return values of snd_strerror() to utf8
|
||||
X-Git-Url: http://git.0pointer.de/?p=pulseaudio.git;a=commitdiff_plain;h=98a25c506e692ab091b4af7e1b37e8432fc08e8f
|
||||
|
||||
alsa: properly convert return values of snd_strerror() to utf8
|
||||
---
|
||||
|
||||
diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
|
||||
index 2fbcd7b..41e8b47 100644
|
||||
--- a/src/modules/alsa/alsa-sink.c
|
||||
+++ b/src/modules/alsa/alsa-sink.c
|
||||
@@ -281,7 +281,7 @@ static int try_recover(struct userdata *u, const char *call, int err) {
|
||||
pa_assert(call);
|
||||
pa_assert(err < 0);
|
||||
|
||||
- pa_log_debug("%s: %s", call, snd_strerror(err));
|
||||
+ pa_log_debug("%s: %s", call, pa_alsa_strerror(err));
|
||||
|
||||
pa_assert(err != -EAGAIN);
|
||||
|
||||
@@ -289,7 +289,7 @@ static int try_recover(struct userdata *u, const char *call, int err) {
|
||||
pa_log_debug("%s: Buffer underrun!", call);
|
||||
|
||||
if ((err = snd_pcm_recover(u->pcm_handle, err, 1)) < 0) {
|
||||
- pa_log("%s: %s", call, snd_strerror(err));
|
||||
+ pa_log("%s: %s", call, pa_alsa_strerror(err));
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -636,12 +636,12 @@ static void update_smoother(struct userdata *u) {
|
||||
/* Let's update the time smoother */
|
||||
|
||||
if (PA_UNLIKELY((err = pa_alsa_safe_delay(u->pcm_handle, &delay, u->hwbuf_size, &u->sink->sample_spec)) < 0)) {
|
||||
- pa_log_warn("Failed to query DSP status data: %s", snd_strerror(err));
|
||||
+ pa_log_warn("Failed to query DSP status data: %s", pa_alsa_strerror(err));
|
||||
return;
|
||||
}
|
||||
|
||||
if (PA_UNLIKELY((err = snd_pcm_status(u->pcm_handle, status)) < 0))
|
||||
- pa_log_warn("Failed to get timestamp: %s", snd_strerror(err));
|
||||
+ pa_log_warn("Failed to get timestamp: %s", pa_alsa_strerror(err));
|
||||
else {
|
||||
snd_htimestamp_t htstamp = { 0, 0 };
|
||||
snd_pcm_status_get_htstamp(status, &htstamp);
|
||||
@@ -764,7 +764,7 @@ static int update_sw_params(struct userdata *u) {
|
||||
pa_log_debug("setting avail_min=%lu", (unsigned long) avail_min);
|
||||
|
||||
if ((err = pa_alsa_set_sw_params(u->pcm_handle, avail_min)) < 0) {
|
||||
- pa_log("Failed to set software parameters: %s", snd_strerror(err));
|
||||
+ pa_log("Failed to set software parameters: %s", pa_alsa_strerror(err));
|
||||
return err;
|
||||
}
|
||||
|
||||
@@ -792,7 +792,7 @@ static int unsuspend(struct userdata *u) {
|
||||
SND_PCM_NO_AUTO_RESAMPLE|
|
||||
SND_PCM_NO_AUTO_CHANNELS|
|
||||
SND_PCM_NO_AUTO_FORMAT)) < 0) {
|
||||
- pa_log("Error opening PCM device %s: %s", u->device_name, snd_strerror(err));
|
||||
+ pa_log("Error opening PCM device %s: %s", u->device_name, pa_alsa_strerror(err));
|
||||
goto fail;
|
||||
}
|
||||
|
||||
@@ -803,7 +803,7 @@ static int unsuspend(struct userdata *u) {
|
||||
d = u->use_tsched;
|
||||
|
||||
if ((err = pa_alsa_set_hw_params(u->pcm_handle, &ss, &nfrags, &period_size, u->hwbuf_size / u->frame_size, &b, &d, TRUE)) < 0) {
|
||||
- pa_log("Failed to set hardware parameters: %s", snd_strerror(err));
|
||||
+ pa_log("Failed to set hardware parameters: %s", pa_alsa_strerror(err));
|
||||
goto fail;
|
||||
}
|
||||
|
||||
@@ -1030,7 +1030,7 @@ static void sink_get_volume_cb(pa_sink *s) {
|
||||
return;
|
||||
|
||||
fail:
|
||||
- pa_log_error("Unable to read volume: %s", snd_strerror(err));
|
||||
+ pa_log_error("Unable to read volume: %s", pa_alsa_strerror(err));
|
||||
}
|
||||
|
||||
static void sink_set_volume_cb(pa_sink *s) {
|
||||
@@ -1141,7 +1141,7 @@ static void sink_set_volume_cb(pa_sink *s) {
|
||||
return;
|
||||
|
||||
fail:
|
||||
- pa_log_error("Unable to set volume: %s", snd_strerror(err));
|
||||
+ pa_log_error("Unable to set volume: %s", pa_alsa_strerror(err));
|
||||
}
|
||||
|
||||
static void sink_get_mute_cb(pa_sink *s) {
|
||||
@@ -1152,7 +1152,7 @@ static void sink_get_mute_cb(pa_sink *s) {
|
||||
pa_assert(u->mixer_elem);
|
||||
|
||||
if ((err = snd_mixer_selem_get_playback_switch(u->mixer_elem, 0, &sw)) < 0) {
|
||||
- pa_log_error("Unable to get switch: %s", snd_strerror(err));
|
||||
+ pa_log_error("Unable to get switch: %s", pa_alsa_strerror(err));
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1167,7 +1167,7 @@ static void sink_set_mute_cb(pa_sink *s) {
|
||||
pa_assert(u->mixer_elem);
|
||||
|
||||
if ((err = snd_mixer_selem_set_playback_switch_all(u->mixer_elem, !s->muted)) < 0) {
|
||||
- pa_log_error("Unable to set switch: %s", snd_strerror(err));
|
||||
+ pa_log_error("Unable to set switch: %s", pa_alsa_strerror(err));
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -1206,7 +1206,7 @@ static int process_rewind(struct userdata *u) {
|
||||
pa_log_debug("Requested to rewind %lu bytes.", (unsigned long) rewind_nbytes);
|
||||
|
||||
if (PA_UNLIKELY((unused = pa_alsa_safe_avail(u->pcm_handle, u->hwbuf_size, &u->sink->sample_spec)) < 0)) {
|
||||
- pa_log("snd_pcm_avail() failed: %s", snd_strerror((int) unused));
|
||||
+ pa_log("snd_pcm_avail() failed: %s", pa_alsa_strerror((int) unused));
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -1228,7 +1228,7 @@ static int process_rewind(struct userdata *u) {
|
||||
in_frames = (snd_pcm_sframes_t) (rewind_nbytes / u->frame_size);
|
||||
pa_log_debug("before: %lu", (unsigned long) in_frames);
|
||||
if ((out_frames = snd_pcm_rewind(u->pcm_handle, (snd_pcm_uframes_t) in_frames)) < 0) {
|
||||
- pa_log("snd_pcm_rewind() failed: %s", snd_strerror((int) out_frames));
|
||||
+ pa_log("snd_pcm_rewind() failed: %s", pa_alsa_strerror((int) out_frames));
|
||||
return -1;
|
||||
}
|
||||
pa_log_debug("after: %lu", (unsigned long) out_frames);
|
||||
@@ -1359,7 +1359,7 @@ static void thread_func(void *userdata) {
|
||||
pollfd = pa_rtpoll_item_get_pollfd(u->alsa_rtpoll_item, &n);
|
||||
|
||||
if ((err = snd_pcm_poll_descriptors_revents(u->pcm_handle, pollfd, n, &revents)) < 0) {
|
||||
- pa_log("snd_pcm_poll_descriptors_revents() failed: %s", snd_strerror(err));
|
||||
+ pa_log("snd_pcm_poll_descriptors_revents() failed: %s", pa_alsa_strerror(err));
|
||||
goto fail;
|
||||
}
|
||||
|
||||
diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
|
||||
index c59fc75..843f70b 100644
|
||||
--- a/src/modules/alsa/alsa-source.c
|
||||
+++ b/src/modules/alsa/alsa-source.c
|
||||
@@ -278,7 +278,7 @@ static int try_recover(struct userdata *u, const char *call, int err) {
|
||||
pa_assert(call);
|
||||
pa_assert(err < 0);
|
||||
|
||||
- pa_log_debug("%s: %s", call, snd_strerror(err));
|
||||
+ pa_log_debug("%s: %s", call, pa_alsa_strerror(err));
|
||||
|
||||
pa_assert(err != -EAGAIN);
|
||||
|
||||
@@ -286,7 +286,7 @@ static int try_recover(struct userdata *u, const char *call, int err) {
|
||||
pa_log_debug("%s: Buffer overrun!", call);
|
||||
|
||||
if ((err = snd_pcm_recover(u->pcm_handle, err, 1)) < 0) {
|
||||
- pa_log("%s: %s", call, snd_strerror(err));
|
||||
+ pa_log("%s: %s", call, pa_alsa_strerror(err));
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -606,12 +606,12 @@ static void update_smoother(struct userdata *u) {
|
||||
/* Let's update the time smoother */
|
||||
|
||||
if (PA_UNLIKELY((err = pa_alsa_safe_delay(u->pcm_handle, &delay, u->hwbuf_size, &u->source->sample_spec)) < 0)) {
|
||||
- pa_log_warn("Failed to get delay: %s", snd_strerror(err));
|
||||
+ pa_log_warn("Failed to get delay: %s", pa_alsa_strerror(err));
|
||||
return;
|
||||
}
|
||||
|
||||
if (PA_UNLIKELY((err = snd_pcm_status(u->pcm_handle, status)) < 0))
|
||||
- pa_log_warn("Failed to get timestamp: %s", snd_strerror(err));
|
||||
+ pa_log_warn("Failed to get timestamp: %s", pa_alsa_strerror(err));
|
||||
else {
|
||||
snd_htimestamp_t htstamp = { 0, 0 };
|
||||
snd_pcm_status_get_htstamp(status, &htstamp);
|
||||
@@ -721,7 +721,7 @@ static int update_sw_params(struct userdata *u) {
|
||||
pa_log_debug("setting avail_min=%lu", (unsigned long) avail_min);
|
||||
|
||||
if ((err = pa_alsa_set_sw_params(u->pcm_handle, avail_min)) < 0) {
|
||||
- pa_log("Failed to set software parameters: %s", snd_strerror(err));
|
||||
+ pa_log("Failed to set software parameters: %s", pa_alsa_strerror(err));
|
||||
return err;
|
||||
}
|
||||
|
||||
@@ -747,7 +747,7 @@ static int unsuspend(struct userdata *u) {
|
||||
SND_PCM_NO_AUTO_RESAMPLE|
|
||||
SND_PCM_NO_AUTO_CHANNELS|
|
||||
SND_PCM_NO_AUTO_FORMAT)) < 0) {
|
||||
- pa_log("Error opening PCM device %s: %s", u->device_name, snd_strerror(err));
|
||||
+ pa_log("Error opening PCM device %s: %s", u->device_name, pa_alsa_strerror(err));
|
||||
goto fail;
|
||||
}
|
||||
|
||||
@@ -758,7 +758,7 @@ static int unsuspend(struct userdata *u) {
|
||||
d = u->use_tsched;
|
||||
|
||||
if ((err = pa_alsa_set_hw_params(u->pcm_handle, &ss, &nfrags, &period_size, u->hwbuf_size / u->frame_size, &b, &d, TRUE)) < 0) {
|
||||
- pa_log("Failed to set hardware parameters: %s", snd_strerror(err));
|
||||
+ pa_log("Failed to set hardware parameters: %s", pa_alsa_strerror(err));
|
||||
goto fail;
|
||||
}
|
||||
|
||||
@@ -988,7 +988,7 @@ static void source_get_volume_cb(pa_source *s) {
|
||||
return;
|
||||
|
||||
fail:
|
||||
- pa_log_error("Unable to read volume: %s", snd_strerror(err));
|
||||
+ pa_log_error("Unable to read volume: %s", pa_alsa_strerror(err));
|
||||
}
|
||||
|
||||
static void source_set_volume_cb(pa_source *s) {
|
||||
@@ -1100,7 +1100,7 @@ static void source_set_volume_cb(pa_source *s) {
|
||||
return;
|
||||
|
||||
fail:
|
||||
- pa_log_error("Unable to set volume: %s", snd_strerror(err));
|
||||
+ pa_log_error("Unable to set volume: %s", pa_alsa_strerror(err));
|
||||
}
|
||||
|
||||
static void source_get_mute_cb(pa_source *s) {
|
||||
@@ -1111,7 +1111,7 @@ static void source_get_mute_cb(pa_source *s) {
|
||||
pa_assert(u->mixer_elem);
|
||||
|
||||
if ((err = snd_mixer_selem_get_capture_switch(u->mixer_elem, 0, &sw)) < 0) {
|
||||
- pa_log_error("Unable to get switch: %s", snd_strerror(err));
|
||||
+ pa_log_error("Unable to get switch: %s", pa_alsa_strerror(err));
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1126,7 +1126,7 @@ static void source_set_mute_cb(pa_source *s) {
|
||||
pa_assert(u->mixer_elem);
|
||||
|
||||
if ((err = snd_mixer_selem_set_capture_switch_all(u->mixer_elem, !s->muted)) < 0) {
|
||||
- pa_log_error("Unable to set switch: %s", snd_strerror(err));
|
||||
+ pa_log_error("Unable to set switch: %s", pa_alsa_strerror(err));
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -1218,7 +1218,7 @@ static void thread_func(void *userdata) {
|
||||
pollfd = pa_rtpoll_item_get_pollfd(u->alsa_rtpoll_item, &n);
|
||||
|
||||
if ((err = snd_pcm_poll_descriptors_revents(u->pcm_handle, pollfd, n, &revents)) < 0) {
|
||||
- pa_log("snd_pcm_poll_descriptors_revents() failed: %s", snd_strerror(err));
|
||||
+ pa_log("snd_pcm_poll_descriptors_revents() failed: %s", pa_alsa_strerror(err));
|
||||
goto fail;
|
||||
}
|
||||
|
||||
diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c
|
||||
index d2dc6e8..ddc3c77 100644
|
||||
--- a/src/modules/alsa/alsa-util.c
|
||||
+++ b/src/modules/alsa/alsa-util.c
|
||||
@@ -33,6 +33,7 @@
|
||||
#include <pulse/timeval.h>
|
||||
#include <pulse/util.h>
|
||||
#include <pulse/i18n.h>
|
||||
+#include <pulse/utf8.h>
|
||||
|
||||
#include <pulsecore/log.h>
|
||||
#include <pulsecore/macro.h>
|
||||
@@ -40,6 +41,7 @@
|
||||
#include <pulsecore/atomic.h>
|
||||
#include <pulsecore/core-error.h>
|
||||
#include <pulsecore/once.h>
|
||||
+#include <pulsecore/thread.h>
|
||||
|
||||
#include "alsa-util.h"
|
||||
|
||||
@@ -106,7 +108,7 @@ static void io_cb(pa_mainloop_api*a, pa_io_event* e, int fd, pa_io_event_flags_t
|
||||
pa_assert(i != fdl->num_fds);
|
||||
|
||||
if ((err = snd_mixer_poll_descriptors_revents(fdl->mixer, fdl->work_fds, fdl->num_fds, &revents)) < 0) {
|
||||
- pa_log_error("Unable to get poll revent: %s", snd_strerror(err));
|
||||
+ pa_log_error("Unable to get poll revent: %s", pa_alsa_strerror(err));
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -129,7 +131,7 @@ static void defer_cb(pa_mainloop_api*a, pa_defer_event* e, void *userdata) {
|
||||
a->defer_enable(fdl->defer, 0);
|
||||
|
||||
if ((n = snd_mixer_poll_descriptors_count(fdl->mixer)) < 0) {
|
||||
- pa_log("snd_mixer_poll_descriptors_count() failed: %s", snd_strerror(n));
|
||||
+ pa_log("snd_mixer_poll_descriptors_count() failed: %s", pa_alsa_strerror(n));
|
||||
return;
|
||||
}
|
||||
num_fds = (unsigned) n;
|
||||
@@ -146,7 +148,7 @@ static void defer_cb(pa_mainloop_api*a, pa_defer_event* e, void *userdata) {
|
||||
memset(fdl->work_fds, 0, sizeof(struct pollfd) * num_fds);
|
||||
|
||||
if ((err = snd_mixer_poll_descriptors(fdl->mixer, fdl->work_fds, num_fds)) < 0) {
|
||||
- pa_log_error("Unable to get poll descriptors: %s", snd_strerror(err));
|
||||
+ pa_log_error("Unable to get poll descriptors: %s", pa_alsa_strerror(err));
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -482,42 +484,42 @@ int pa_alsa_set_sw_params(snd_pcm_t *pcm, snd_pcm_uframes_t avail_min) {
|
||||
snd_pcm_sw_params_alloca(&swparams);
|
||||
|
||||
if ((err = snd_pcm_sw_params_current(pcm, swparams) < 0)) {
|
||||
- pa_log_warn("Unable to determine current swparams: %s\n", snd_strerror(err));
|
||||
+ pa_log_warn("Unable to determine current swparams: %s\n", pa_alsa_strerror(err));
|
||||
return err;
|
||||
}
|
||||
|
||||
if ((err = snd_pcm_sw_params_set_period_event(pcm, swparams, 0)) < 0) {
|
||||
- pa_log_warn("Unable to disable period event: %s\n", snd_strerror(err));
|
||||
+ pa_log_warn("Unable to disable period event: %s\n", pa_alsa_strerror(err));
|
||||
return err;
|
||||
}
|
||||
|
||||
if ((err = snd_pcm_sw_params_set_tstamp_mode(pcm, swparams, SND_PCM_TSTAMP_ENABLE)) < 0) {
|
||||
- pa_log_warn("Unable to enable time stamping: %s\n", snd_strerror(err));
|
||||
+ pa_log_warn("Unable to enable time stamping: %s\n", pa_alsa_strerror(err));
|
||||
return err;
|
||||
}
|
||||
|
||||
if ((err = snd_pcm_sw_params_get_boundary(swparams, &boundary)) < 0) {
|
||||
- pa_log_warn("Unable to get boundary: %s\n", snd_strerror(err));
|
||||
+ pa_log_warn("Unable to get boundary: %s\n", pa_alsa_strerror(err));
|
||||
return err;
|
||||
}
|
||||
|
||||
if ((err = snd_pcm_sw_params_set_stop_threshold(pcm, swparams, boundary)) < 0) {
|
||||
- pa_log_warn("Unable to set stop threshold: %s\n", snd_strerror(err));
|
||||
+ pa_log_warn("Unable to set stop threshold: %s\n", pa_alsa_strerror(err));
|
||||
return err;
|
||||
}
|
||||
|
||||
if ((err = snd_pcm_sw_params_set_start_threshold(pcm, swparams, (snd_pcm_uframes_t) -1)) < 0) {
|
||||
- pa_log_warn("Unable to set start threshold: %s\n", snd_strerror(err));
|
||||
+ pa_log_warn("Unable to set start threshold: %s\n", pa_alsa_strerror(err));
|
||||
return err;
|
||||
}
|
||||
|
||||
if ((err = snd_pcm_sw_params_set_avail_min(pcm, swparams, avail_min)) < 0) {
|
||||
- pa_log_error("snd_pcm_sw_params_set_avail_min() failed: %s", snd_strerror(err));
|
||||
+ pa_log_error("snd_pcm_sw_params_set_avail_min() failed: %s", pa_alsa_strerror(err));
|
||||
return err;
|
||||
}
|
||||
|
||||
if ((err = snd_pcm_sw_params(pcm, swparams)) < 0) {
|
||||
- pa_log_warn("Unable to set sw params: %s\n", snd_strerror(err));
|
||||
+ pa_log_warn("Unable to set sw params: %s\n", pa_alsa_strerror(err));
|
||||
return err;
|
||||
}
|
||||
|
||||
@@ -854,7 +856,7 @@ snd_pcm_t *pa_alsa_open_by_device_string(
|
||||
SND_PCM_NO_AUTO_RESAMPLE|
|
||||
SND_PCM_NO_AUTO_CHANNELS|
|
||||
(reformat ? 0 : SND_PCM_NO_AUTO_FORMAT))) < 0) {
|
||||
- pa_log_info("Error opening PCM device %s: %s", d, snd_strerror(err));
|
||||
+ pa_log_info("Error opening PCM device %s: %s", d, pa_alsa_strerror(err));
|
||||
goto fail;
|
||||
}
|
||||
|
||||
@@ -882,7 +884,7 @@ snd_pcm_t *pa_alsa_open_by_device_string(
|
||||
continue;
|
||||
}
|
||||
|
||||
- pa_log_info("Failed to set hardware parameters on %s: %s", d, snd_strerror(err));
|
||||
+ pa_log_info("Failed to set hardware parameters on %s: %s", d, pa_alsa_strerror(err));
|
||||
snd_pcm_close(pcm_handle);
|
||||
|
||||
goto fail;
|
||||
@@ -1000,17 +1002,17 @@ int pa_alsa_prepare_mixer(snd_mixer_t *mixer, const char *dev) {
|
||||
pa_assert(dev);
|
||||
|
||||
if ((err = snd_mixer_attach(mixer, dev)) < 0) {
|
||||
- pa_log_info("Unable to attach to mixer %s: %s", dev, snd_strerror(err));
|
||||
+ pa_log_info("Unable to attach to mixer %s: %s", dev, pa_alsa_strerror(err));
|
||||
return -1;
|
||||
}
|
||||
|
||||
if ((err = snd_mixer_selem_register(mixer, NULL, NULL)) < 0) {
|
||||
- pa_log_warn("Unable to register mixer: %s", snd_strerror(err));
|
||||
+ pa_log_warn("Unable to register mixer: %s", pa_alsa_strerror(err));
|
||||
return -1;
|
||||
}
|
||||
|
||||
if ((err = snd_mixer_load(mixer)) < 0) {
|
||||
- pa_log_warn("Unable to load mixer: %s", snd_strerror(err));
|
||||
+ pa_log_warn("Unable to load mixer: %s", pa_alsa_strerror(err));
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -1136,7 +1138,7 @@ int pa_alsa_find_mixer_and_elem(
|
||||
}
|
||||
|
||||
if ((err = snd_mixer_open(&m, 0)) < 0) {
|
||||
- pa_log("Error opening mixer: %s", snd_strerror(err));
|
||||
+ pa_log("Error opening mixer: %s", pa_alsa_strerror(err));
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -1338,7 +1340,7 @@ void pa_alsa_dump(pa_log_level_t level, snd_pcm_t *pcm) {
|
||||
pa_assert_se(snd_output_buffer_open(&out) == 0);
|
||||
|
||||
if ((err = snd_pcm_dump(pcm, out)) < 0)
|
||||
- pa_logl(level, "snd_pcm_dump(): %s", snd_strerror(err));
|
||||
+ pa_logl(level, "snd_pcm_dump(): %s", pa_alsa_strerror(err));
|
||||
else {
|
||||
char *s = NULL;
|
||||
snd_output_buffer_string(out, &s);
|
||||
@@ -1362,7 +1364,7 @@ void pa_alsa_dump_status(snd_pcm_t *pcm) {
|
||||
pa_assert_se(snd_pcm_status(pcm, status) == 0);
|
||||
|
||||
if ((err = snd_pcm_status_dump(status, out)) < 0)
|
||||
- pa_log_debug("snd_pcm_dump(): %s", snd_strerror(err));
|
||||
+ pa_log_debug("snd_pcm_dump(): %s", pa_alsa_strerror(err));
|
||||
else {
|
||||
char *s = NULL;
|
||||
snd_output_buffer_string(out, &s);
|
||||
@@ -1524,7 +1526,7 @@ void pa_alsa_init_proplist_pcm(pa_core *c, pa_proplist *p, snd_pcm_t *pcm, snd_m
|
||||
snd_pcm_info_alloca(&info);
|
||||
|
||||
if ((err = snd_pcm_hw_params_current(pcm, hwparams)) < 0)
|
||||
- pa_log_warn("Error fetching hardware parameter info: %s", snd_strerror(err));
|
||||
+ pa_log_warn("Error fetching hardware parameter info: %s", pa_alsa_strerror(err));
|
||||
else {
|
||||
|
||||
if ((bits = snd_pcm_hw_params_get_sbits(hwparams)) >= 0)
|
||||
@@ -1535,7 +1537,7 @@ void pa_alsa_init_proplist_pcm(pa_core *c, pa_proplist *p, snd_pcm_t *pcm, snd_m
|
||||
pa_proplist_sets(p, "alsa.mixer_element", snd_mixer_selem_get_name(elem));
|
||||
|
||||
if ((err = snd_pcm_info(pcm, info)) < 0)
|
||||
- pa_log_warn("Error fetching PCM info: %s", snd_strerror(err));
|
||||
+ pa_log_warn("Error fetching PCM info: %s", pa_alsa_strerror(err));
|
||||
else
|
||||
pa_alsa_init_proplist_pcm_info(c, p, info);
|
||||
}
|
||||
@@ -1568,14 +1570,14 @@ int pa_alsa_recover_from_poll(snd_pcm_t *pcm, int revents) {
|
||||
|
||||
case SND_PCM_STATE_XRUN:
|
||||
if ((err = snd_pcm_recover(pcm, -EPIPE, 1)) != 0) {
|
||||
- pa_log_warn("Could not recover from POLLERR|POLLNVAL|POLLHUP and XRUN: %s", snd_strerror(err));
|
||||
+ pa_log_warn("Could not recover from POLLERR|POLLNVAL|POLLHUP and XRUN: %s", pa_alsa_strerror(err));
|
||||
return -1;
|
||||
}
|
||||
break;
|
||||
|
||||
case SND_PCM_STATE_SUSPENDED:
|
||||
if ((err = snd_pcm_recover(pcm, -ESTRPIPE, 1)) != 0) {
|
||||
- pa_log_warn("Could not recover from POLLERR|POLLNVAL|POLLHUP and SUSPENDED: %s", snd_strerror(err));
|
||||
+ pa_log_warn("Could not recover from POLLERR|POLLNVAL|POLLHUP and SUSPENDED: %s", pa_alsa_strerror(err));
|
||||
return -1;
|
||||
}
|
||||
break;
|
||||
@@ -1585,7 +1587,7 @@ int pa_alsa_recover_from_poll(snd_pcm_t *pcm, int revents) {
|
||||
snd_pcm_drop(pcm);
|
||||
|
||||
if ((err = snd_pcm_prepare(pcm)) < 0) {
|
||||
- pa_log_warn("Could not recover from POLLERR|POLLNVAL|POLLHUP with snd_pcm_prepare(): %s", snd_strerror(err));
|
||||
+ pa_log_warn("Could not recover from POLLERR|POLLNVAL|POLLHUP with snd_pcm_prepare(): %s", pa_alsa_strerror(err));
|
||||
return -1;
|
||||
}
|
||||
break;
|
||||
@@ -1602,7 +1604,7 @@ pa_rtpoll_item* pa_alsa_build_pollfd(snd_pcm_t *pcm, pa_rtpoll *rtpoll) {
|
||||
pa_assert(pcm);
|
||||
|
||||
if ((n = snd_pcm_poll_descriptors_count(pcm)) < 0) {
|
||||
- pa_log("snd_pcm_poll_descriptors_count() failed: %s", snd_strerror(n));
|
||||
+ pa_log("snd_pcm_poll_descriptors_count() failed: %s", pa_alsa_strerror(n));
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -1610,7 +1612,7 @@ pa_rtpoll_item* pa_alsa_build_pollfd(snd_pcm_t *pcm, pa_rtpoll *rtpoll) {
|
||||
pollfd = pa_rtpoll_item_get_pollfd(item, NULL);
|
||||
|
||||
if ((err = snd_pcm_poll_descriptors(pcm, pollfd, (unsigned) n)) < 0) {
|
||||
- pa_log("snd_pcm_poll_descriptors() failed: %s", snd_strerror(err));
|
||||
+ pa_log("snd_pcm_poll_descriptors() failed: %s", pa_alsa_strerror(err));
|
||||
pa_rtpoll_item_free(item);
|
||||
return NULL;
|
||||
}
|
||||
@@ -1819,3 +1821,30 @@ pa_bool_t pa_alsa_pcm_is_modem(snd_pcm_t *pcm) {
|
||||
|
||||
return snd_pcm_info_get_class(info) == SND_PCM_CLASS_MODEM;
|
||||
}
|
||||
+
|
||||
+PA_STATIC_TLS_DECLARE(cstrerror, pa_xfree);
|
||||
+
|
||||
+const char* pa_alsa_strerror(int errnum) {
|
||||
+ const char *original = NULL;
|
||||
+ char *translated, *t;
|
||||
+ char errbuf[128];
|
||||
+
|
||||
+ if ((t = PA_STATIC_TLS_GET(cstrerror)))
|
||||
+ pa_xfree(t);
|
||||
+
|
||||
+ original = snd_strerror(errnum);
|
||||
+
|
||||
+ if (!original) {
|
||||
+ pa_snprintf(errbuf, sizeof(errbuf), "Unknown error %i", errnum);
|
||||
+ original = errbuf;
|
||||
+ }
|
||||
+
|
||||
+ if (!(translated = pa_locale_to_utf8(original))) {
|
||||
+ pa_log_warn("Unable to convert error string to locale, filtering.");
|
||||
+ translated = pa_utf8_filter(original);
|
||||
+ }
|
||||
+
|
||||
+ PA_STATIC_TLS_SET(cstrerror, translated);
|
||||
+
|
||||
+ return translated;
|
||||
+}
|
||||
diff --git a/src/modules/alsa/alsa-util.h b/src/modules/alsa/alsa-util.h
|
||||
index c8acc7c..77ac8a7 100644
|
||||
--- a/src/modules/alsa/alsa-util.h
|
||||
+++ b/src/modules/alsa/alsa-util.h
|
||||
@@ -146,4 +146,6 @@ pa_bool_t pa_alsa_pcm_is_hw(snd_pcm_t *pcm);
|
||||
|
||||
pa_bool_t pa_alsa_pcm_is_modem(snd_pcm_t *pcm);
|
||||
|
||||
+const char* pa_alsa_strerror(int errnum);
|
||||
+
|
||||
#endif
|
||||
diff --git a/src/modules/alsa/module-alsa-card.c b/src/modules/alsa/module-alsa-card.c
|
||||
index fdc952d..51d466e 100644
|
||||
--- a/src/modules/alsa/module-alsa-card.c
|
||||
+++ b/src/modules/alsa/module-alsa-card.c
|
||||
@@ -304,7 +304,7 @@ int pa__init(pa_module *m) {
|
||||
u->modargs = ma;
|
||||
|
||||
if ((alsa_card_index = snd_card_get_index(u->device_id)) < 0) {
|
||||
- pa_log("Card '%s' doesn't exist: %s", u->device_id, snd_strerror(alsa_card_index));
|
||||
+ pa_log("Card '%s' doesn't exist: %s", u->device_id, pa_alsa_strerror(alsa_card_index));
|
||||
goto fail;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
Index: pulseaudio-0.9.15/configure.ac
|
||||
===================================================================
|
||||
--- pulseaudio-0.9.15.orig/configure.ac 2009-04-14 00:09:53.000000000 +0100
|
||||
+++ pulseaudio-0.9.15/configure.ac 2009-05-22 11:32:50.000000000 +0100
|
||||
@@ -20,7 +20,7 @@
|
||||
# along with PulseAudio; if not, write to the Free Software Foundation,
|
||||
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
|
||||
|
||||
-AC_PREREQ(2.63)
|
||||
+AC_PREREQ(2.61)
|
||||
|
||||
m4_define(pa_major, [0])
|
||||
m4_define(pa_minor, [9])
|
||||
13
meta/recipes-tbd/pulseaudio/pulseaudio-0.9.15/buildfix.patch
Normal file
13
meta/recipes-tbd/pulseaudio/pulseaudio-0.9.15/buildfix.patch
Normal file
@@ -0,0 +1,13 @@
|
||||
Index: pulseaudio-0.9.11/src/pulsecore/atomic.h
|
||||
===================================================================
|
||||
--- pulseaudio-0.9.11.orig/src/pulsecore/atomic.h
|
||||
+++ pulseaudio-0.9.11/src/pulsecore/atomic.h
|
||||
@@ -40,6 +40,8 @@
|
||||
#error "Please include config.h before including this file!"
|
||||
#endif
|
||||
|
||||
+#include "macro.h"
|
||||
+
|
||||
#ifdef HAVE_ATOMIC_BUILTINS
|
||||
|
||||
/* __sync based implementation */
|
||||
338
meta/recipes-tbd/pulseaudio/pulseaudio-0.9.15/fallback.patch
Normal file
338
meta/recipes-tbd/pulseaudio/pulseaudio-0.9.15/fallback.patch
Normal file
@@ -0,0 +1,338 @@
|
||||
From: Lennart Poettering <lennart@poettering.net>
|
||||
Date: Tue, 28 Apr 2009 23:58:18 +0000 (+0200)
|
||||
Subject: alsa: allow configuration of fallback device strings in profiles
|
||||
X-Git-Url: http://git.0pointer.de/?p=pulseaudio.git;a=commitdiff_plain;h=d8710711fb0c74b4ad83ac99c2501218155b502b
|
||||
|
||||
alsa: allow configuration of fallback device strings in profiles
|
||||
|
||||
This has the benefit that we can properly support ALSA devices where
|
||||
only the raw 'hw' device exists but no 'front' although it's a proper
|
||||
2ch stereo device.
|
||||
---
|
||||
|
||||
diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c
|
||||
index 18d6880..a3a0450 100644
|
||||
--- a/src/modules/alsa/alsa-util.c
|
||||
+++ b/src/modules/alsa/alsa-util.c
|
||||
@@ -528,7 +528,7 @@ int pa_alsa_set_sw_params(snd_pcm_t *pcm, snd_pcm_uframes_t avail_min) {
|
||||
|
||||
static const struct pa_alsa_profile_info device_table[] = {
|
||||
{{ 1, { PA_CHANNEL_POSITION_MONO }},
|
||||
- "hw",
|
||||
+ "hw", NULL,
|
||||
N_("Analog Mono"),
|
||||
"analog-mono",
|
||||
1,
|
||||
@@ -536,7 +536,7 @@ static const struct pa_alsa_profile_info device_table[] = {
|
||||
"Capture", "Mic" },
|
||||
|
||||
{{ 2, { PA_CHANNEL_POSITION_LEFT, PA_CHANNEL_POSITION_RIGHT }},
|
||||
- "front",
|
||||
+ "front", "hw",
|
||||
N_("Analog Stereo"),
|
||||
"analog-stereo",
|
||||
10,
|
||||
@@ -544,7 +544,7 @@ static const struct pa_alsa_profile_info device_table[] = {
|
||||
"Capture", "Mic" },
|
||||
|
||||
{{ 2, { PA_CHANNEL_POSITION_LEFT, PA_CHANNEL_POSITION_RIGHT }},
|
||||
- "iec958",
|
||||
+ "iec958", NULL,
|
||||
N_("Digital Stereo (IEC958)"),
|
||||
"iec958-stereo",
|
||||
5,
|
||||
@@ -552,7 +552,7 @@ static const struct pa_alsa_profile_info device_table[] = {
|
||||
"IEC958 In", NULL },
|
||||
|
||||
{{ 2, { PA_CHANNEL_POSITION_LEFT, PA_CHANNEL_POSITION_RIGHT }},
|
||||
- "hdmi",
|
||||
+ "hdmi", NULL,
|
||||
N_("Digital Stereo (HDMI)"),
|
||||
"hdmi-stereo",
|
||||
4,
|
||||
@@ -561,7 +561,7 @@ static const struct pa_alsa_profile_info device_table[] = {
|
||||
|
||||
{{ 4, { PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT,
|
||||
PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT }},
|
||||
- "surround40",
|
||||
+ "surround40", NULL,
|
||||
N_("Analog Surround 4.0"),
|
||||
"analog-surround-40",
|
||||
7,
|
||||
@@ -570,7 +570,7 @@ static const struct pa_alsa_profile_info device_table[] = {
|
||||
|
||||
{{ 4, { PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT,
|
||||
PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT }},
|
||||
- "a52",
|
||||
+ "a52", NULL,
|
||||
N_("Digital Surround 4.0 (IEC958/AC3)"),
|
||||
"iec958-ac3-surround-40",
|
||||
2,
|
||||
@@ -580,7 +580,7 @@ static const struct pa_alsa_profile_info device_table[] = {
|
||||
{{ 5, { PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT,
|
||||
PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT,
|
||||
PA_CHANNEL_POSITION_LFE }},
|
||||
- "surround41",
|
||||
+ "surround41", NULL,
|
||||
N_("Analog Surround 4.1"),
|
||||
"analog-surround-41",
|
||||
7,
|
||||
@@ -590,7 +590,7 @@ static const struct pa_alsa_profile_info device_table[] = {
|
||||
{{ 5, { PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT,
|
||||
PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT,
|
||||
PA_CHANNEL_POSITION_CENTER }},
|
||||
- "surround50",
|
||||
+ "surround50", NULL,
|
||||
N_("Analog Surround 5.0"),
|
||||
"analog-surround-50",
|
||||
7,
|
||||
@@ -600,7 +600,7 @@ static const struct pa_alsa_profile_info device_table[] = {
|
||||
{{ 6, { PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT,
|
||||
PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT,
|
||||
PA_CHANNEL_POSITION_CENTER, PA_CHANNEL_POSITION_LFE }},
|
||||
- "surround51",
|
||||
+ "surround51", NULL,
|
||||
N_("Analog Surround 5.1"),
|
||||
"analog-surround-51",
|
||||
8,
|
||||
@@ -610,7 +610,7 @@ static const struct pa_alsa_profile_info device_table[] = {
|
||||
{{ 6, { PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT,
|
||||
PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT,
|
||||
PA_CHANNEL_POSITION_FRONT_CENTER, PA_CHANNEL_POSITION_LFE}},
|
||||
- "a52",
|
||||
+ "a52", NULL,
|
||||
N_("Digital Surround 5.1 (IEC958/AC3)"),
|
||||
"iec958-ac3-surround-51",
|
||||
3,
|
||||
@@ -621,16 +621,72 @@ static const struct pa_alsa_profile_info device_table[] = {
|
||||
PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT,
|
||||
PA_CHANNEL_POSITION_CENTER, PA_CHANNEL_POSITION_LFE,
|
||||
PA_CHANNEL_POSITION_SIDE_LEFT, PA_CHANNEL_POSITION_SIDE_RIGHT }},
|
||||
- "surround71",
|
||||
+ "surround71", NULL,
|
||||
N_("Analog Surround 7.1"),
|
||||
"analog-surround-71",
|
||||
7,
|
||||
"Master", "PCM",
|
||||
"Capture", "Mic" },
|
||||
|
||||
- {{ 0, { 0 }}, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL }
|
||||
+ {{ 0, { 0 }}, NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL }
|
||||
};
|
||||
|
||||
+static snd_pcm_t *open_by_device_string_with_fallback(
|
||||
+ const char *prefix,
|
||||
+ const char *prefix_fallback,
|
||||
+ const char *dev_id,
|
||||
+ char **dev,
|
||||
+ pa_sample_spec *ss,
|
||||
+ pa_channel_map* map,
|
||||
+ int mode,
|
||||
+ uint32_t *nfrags,
|
||||
+ snd_pcm_uframes_t *period_size,
|
||||
+ snd_pcm_uframes_t tsched_size,
|
||||
+ pa_bool_t *use_mmap,
|
||||
+ pa_bool_t *use_tsched,
|
||||
+ pa_bool_t require_exact_channel_number) {
|
||||
+
|
||||
+ snd_pcm_t *pcm_handle;
|
||||
+ char *d;
|
||||
+
|
||||
+ d = pa_sprintf_malloc("%s:%s", prefix, dev_id);
|
||||
+
|
||||
+ pcm_handle = pa_alsa_open_by_device_string(
|
||||
+ d,
|
||||
+ dev,
|
||||
+ ss,
|
||||
+ map,
|
||||
+ mode,
|
||||
+ nfrags,
|
||||
+ period_size,
|
||||
+ tsched_size,
|
||||
+ use_mmap,
|
||||
+ use_tsched,
|
||||
+ require_exact_channel_number);
|
||||
+ pa_xfree(d);
|
||||
+
|
||||
+ if (!pcm_handle && prefix_fallback) {
|
||||
+
|
||||
+ d = pa_sprintf_malloc("%s:%s", prefix_fallback, dev_id);
|
||||
+
|
||||
+ pcm_handle = pa_alsa_open_by_device_string(
|
||||
+ d,
|
||||
+ dev,
|
||||
+ ss,
|
||||
+ map,
|
||||
+ mode,
|
||||
+ nfrags,
|
||||
+ period_size,
|
||||
+ tsched_size,
|
||||
+ use_mmap,
|
||||
+ use_tsched,
|
||||
+ require_exact_channel_number);
|
||||
+ pa_xfree(d);
|
||||
+ }
|
||||
+
|
||||
+ return pcm_handle;
|
||||
+}
|
||||
+
|
||||
snd_pcm_t *pa_alsa_open_by_device_id_auto(
|
||||
const char *dev_id,
|
||||
char **dev,
|
||||
@@ -671,14 +727,14 @@ snd_pcm_t *pa_alsa_open_by_device_id_auto(
|
||||
|
||||
pa_log_debug("Checking for %s (%s)", device_table[i].name, device_table[i].alsa_name);
|
||||
|
||||
- d = pa_sprintf_malloc("%s:%s", device_table[i].alsa_name, dev_id);
|
||||
-
|
||||
try_ss.channels = device_table[i].map.channels;
|
||||
try_ss.rate = ss->rate;
|
||||
try_ss.format = ss->format;
|
||||
|
||||
- pcm_handle = pa_alsa_open_by_device_string(
|
||||
- d,
|
||||
+ pcm_handle = open_by_device_string_with_fallback(
|
||||
+ device_table[i].alsa_name,
|
||||
+ device_table[i].alsa_name_fallback,
|
||||
+ dev_id,
|
||||
dev,
|
||||
&try_ss,
|
||||
map,
|
||||
@@ -690,8 +746,6 @@ snd_pcm_t *pa_alsa_open_by_device_id_auto(
|
||||
use_tsched,
|
||||
TRUE);
|
||||
|
||||
- pa_xfree(d);
|
||||
-
|
||||
if (pcm_handle) {
|
||||
|
||||
*ss = try_ss;
|
||||
@@ -703,6 +757,7 @@ snd_pcm_t *pa_alsa_open_by_device_id_auto(
|
||||
|
||||
return pcm_handle;
|
||||
}
|
||||
+
|
||||
}
|
||||
|
||||
if (direction > 0) {
|
||||
@@ -775,7 +830,6 @@ snd_pcm_t *pa_alsa_open_by_device_id_profile(
|
||||
pa_bool_t *use_tsched,
|
||||
const pa_alsa_profile_info *profile) {
|
||||
|
||||
- char *d;
|
||||
snd_pcm_t *pcm_handle;
|
||||
pa_sample_spec try_ss;
|
||||
|
||||
@@ -787,14 +841,14 @@ snd_pcm_t *pa_alsa_open_by_device_id_profile(
|
||||
pa_assert(period_size);
|
||||
pa_assert(profile);
|
||||
|
||||
- d = pa_sprintf_malloc("%s:%s", profile->alsa_name, dev_id);
|
||||
-
|
||||
try_ss.channels = profile->map.channels;
|
||||
try_ss.rate = ss->rate;
|
||||
try_ss.format = ss->format;
|
||||
|
||||
- pcm_handle = pa_alsa_open_by_device_string(
|
||||
- d,
|
||||
+ pcm_handle = open_by_device_string_with_fallback(
|
||||
+ profile->alsa_name,
|
||||
+ profile->alsa_name_fallback,
|
||||
+ dev_id,
|
||||
dev,
|
||||
&try_ss,
|
||||
map,
|
||||
@@ -806,8 +860,6 @@ snd_pcm_t *pa_alsa_open_by_device_id_profile(
|
||||
use_tsched,
|
||||
TRUE);
|
||||
|
||||
- pa_xfree(d);
|
||||
-
|
||||
if (!pcm_handle)
|
||||
return NULL;
|
||||
|
||||
@@ -860,6 +912,8 @@ snd_pcm_t *pa_alsa_open_by_device_string(
|
||||
goto fail;
|
||||
}
|
||||
|
||||
+ pa_log_debug("Managed to open %s", d);
|
||||
+
|
||||
if ((err = pa_alsa_set_hw_params(pcm_handle, ss, nfrags, period_size, tsched_size, use_mmap, use_tsched, require_exact_channel_number)) < 0) {
|
||||
|
||||
if (!reformat) {
|
||||
@@ -928,26 +982,25 @@ int pa_alsa_probe_profiles(
|
||||
snd_pcm_t *pcm_i = NULL;
|
||||
|
||||
if (i->alsa_name) {
|
||||
- char *id;
|
||||
pa_sample_spec try_ss;
|
||||
pa_channel_map try_map;
|
||||
|
||||
pa_log_debug("Checking for playback on %s (%s)", i->name, i->alsa_name);
|
||||
- id = pa_sprintf_malloc("%s:%s", i->alsa_name, dev_id);
|
||||
|
||||
try_ss = *ss;
|
||||
try_ss.channels = i->map.channels;
|
||||
try_map = i->map;
|
||||
|
||||
- pcm_i = pa_alsa_open_by_device_string(
|
||||
- id, NULL,
|
||||
+ pcm_i = open_by_device_string_with_fallback(
|
||||
+ i->alsa_name,
|
||||
+ i->alsa_name_fallback,
|
||||
+ dev_id,
|
||||
+ NULL,
|
||||
&try_ss, &try_map,
|
||||
SND_PCM_STREAM_PLAYBACK,
|
||||
NULL, NULL, 0, NULL, NULL,
|
||||
TRUE);
|
||||
|
||||
- pa_xfree(id);
|
||||
-
|
||||
if (!pcm_i)
|
||||
continue;
|
||||
}
|
||||
@@ -956,26 +1009,25 @@ int pa_alsa_probe_profiles(
|
||||
snd_pcm_t *pcm_j = NULL;
|
||||
|
||||
if (j->alsa_name) {
|
||||
- char *jd;
|
||||
pa_sample_spec try_ss;
|
||||
pa_channel_map try_map;
|
||||
|
||||
pa_log_debug("Checking for capture on %s (%s)", j->name, j->alsa_name);
|
||||
- jd = pa_sprintf_malloc("%s:%s", j->alsa_name, dev_id);
|
||||
|
||||
try_ss = *ss;
|
||||
try_ss.channels = j->map.channels;
|
||||
try_map = j->map;
|
||||
|
||||
- pcm_j = pa_alsa_open_by_device_string(
|
||||
- jd, NULL,
|
||||
+ pcm_j = open_by_device_string_with_fallback(
|
||||
+ j->alsa_name,
|
||||
+ j->alsa_name_fallback,
|
||||
+ dev_id,
|
||||
+ NULL,
|
||||
&try_ss, &try_map,
|
||||
SND_PCM_STREAM_CAPTURE,
|
||||
NULL, NULL, 0, NULL, NULL,
|
||||
TRUE);
|
||||
|
||||
- pa_xfree(jd);
|
||||
-
|
||||
if (!pcm_j)
|
||||
continue;
|
||||
}
|
||||
diff --git a/src/modules/alsa/alsa-util.h b/src/modules/alsa/alsa-util.h
|
||||
index 77ac8a7..4c5d336 100644
|
||||
--- a/src/modules/alsa/alsa-util.h
|
||||
+++ b/src/modules/alsa/alsa-util.h
|
||||
@@ -56,6 +56,7 @@ int pa_alsa_set_sw_params(snd_pcm_t *pcm, snd_pcm_uframes_t avail_min);
|
||||
typedef struct pa_alsa_profile_info {
|
||||
pa_channel_map map;
|
||||
const char *alsa_name;
|
||||
+ const char *alsa_name_fallback;
|
||||
const char *description; /* internationalized */
|
||||
const char *name;
|
||||
unsigned priority;
|
||||
@@ -0,0 +1,18 @@
|
||||
| fix for more strict syntax compliance in gcc4.x
|
||||
| pulsecore/core-util.c: In function 'pa_raise_priority':
|
||||
| pulsecore/core-util.c:547: error: label at end of compound statement
|
||||
| Signed off: mickey@openmoko.org
|
||||
|
|
||||
Index: pulseaudio-0.9.6/src/pulsecore/core-util.c
|
||||
===================================================================
|
||||
--- pulseaudio-0.9.6.orig/src/pulsecore/core-util.c
|
||||
+++ pulseaudio-0.9.6/src/pulsecore/core-util.c
|
||||
@@ -535,7 +535,7 @@ void pa_raise_priority(void) {
|
||||
pa_log_info("Successfully gained high priority class.");
|
||||
#endif
|
||||
|
||||
-fail:
|
||||
+fail:;
|
||||
|
||||
#if defined(HAVE_SYS_CAPABILITY_H)
|
||||
if (caps) {
|
||||
@@ -0,0 +1,73 @@
|
||||
X-Git-Url: http://git.0pointer.de/?p=pulseaudio.git;a=blobdiff_plain;f=src%2Fmodules%2Falsa%2Falsa-util.c;h=107bec357c7889f0197853f5e5f1951a5a2f5be0;hp=a3a045080dac0e1b30e8671443ce73a03337cf14;hb=4bffc7849f7898fa85dd6ac8e735db86b57814b3;hpb=d2b5ae5525e9036c4f91b1615879a5a07aac5bf2
|
||||
|
||||
diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c
|
||||
index a3a0450..107bec3 100644
|
||||
--- a/src/modules/alsa/alsa-util.c
|
||||
+++ b/src/modules/alsa/alsa-util.c
|
||||
@@ -334,7 +334,6 @@ int pa_alsa_set_hw_params(
|
||||
int ret = -1;
|
||||
snd_pcm_uframes_t _period_size = period_size ? *period_size : 0;
|
||||
unsigned int _periods = periods ? *periods : 0;
|
||||
- snd_pcm_uframes_t buffer_size;
|
||||
unsigned int r = ss->rate;
|
||||
unsigned int c = ss->channels;
|
||||
pa_sample_format_t f = ss->format;
|
||||
@@ -390,39 +389,47 @@ int pa_alsa_set_hw_params(
|
||||
goto finish;
|
||||
|
||||
if (_period_size && tsched_size && _periods) {
|
||||
+
|
||||
/* Adjust the buffer sizes, if we didn't get the rate we were asking for */
|
||||
_period_size = (snd_pcm_uframes_t) (((uint64_t) _period_size * r) / ss->rate);
|
||||
tsched_size = (snd_pcm_uframes_t) (((uint64_t) tsched_size * r) / ss->rate);
|
||||
|
||||
if (_use_tsched) {
|
||||
- _period_size = tsched_size;
|
||||
- _periods = 1;
|
||||
+ snd_pcm_uframes_t buffer_size;
|
||||
|
||||
pa_assert_se(snd_pcm_hw_params_get_buffer_size_max(hwparams, &buffer_size) == 0);
|
||||
pa_log_debug("Maximum hw buffer size is %u ms", (unsigned) buffer_size * 1000 / r);
|
||||
+
|
||||
+ _period_size = tsched_size;
|
||||
+ _periods = 1;
|
||||
}
|
||||
|
||||
+ if (_period_size > 0 && _periods > 0) {
|
||||
+ snd_pcm_uframes_t buffer_size;
|
||||
+
|
||||
buffer_size = _periods * _period_size;
|
||||
|
||||
+ if ((ret = snd_pcm_hw_params_set_buffer_size_near(pcm_handle, hwparams, &buffer_size)) < 0)
|
||||
+ pa_log_info("snd_pcm_hw_params_set_buffer_size_near() failed: %s", pa_alsa_strerror(ret));
|
||||
+ }
|
||||
+
|
||||
if (_periods > 0) {
|
||||
|
||||
- /* First we pass 0 as direction to get exactly what we asked
|
||||
- * for. That this is necessary is presumably a bug in ALSA */
|
||||
+ /* First we pass 0 as direction to get exactly what we
|
||||
+ * asked for. That this is necessary is presumably a bug
|
||||
+ * in ALSA. All in all this is mostly a hint to ALSA, so
|
||||
+ * we don't care if this fails. */
|
||||
|
||||
dir = 0;
|
||||
- if ((ret = snd_pcm_hw_params_set_periods_near(pcm_handle, hwparams, &_periods, &dir)) < 0) {
|
||||
+ if (snd_pcm_hw_params_set_periods_near(pcm_handle, hwparams, &_periods, &dir) < 0) {
|
||||
dir = 1;
|
||||
- if ((ret = snd_pcm_hw_params_set_periods_near(pcm_handle, hwparams, &_periods, &dir)) < 0) {
|
||||
+ if (snd_pcm_hw_params_set_periods_near(pcm_handle, hwparams, &_periods, &dir) < 0) {
|
||||
dir = -1;
|
||||
if ((ret = snd_pcm_hw_params_set_periods_near(pcm_handle, hwparams, &_periods, &dir)) < 0)
|
||||
- goto finish;
|
||||
+ pa_log_info("snd_pcm_hw_params_set_periods_near() failed: %s", pa_alsa_strerror(ret));
|
||||
}
|
||||
}
|
||||
}
|
||||
-
|
||||
- if (_period_size > 0)
|
||||
- if ((ret = snd_pcm_hw_params_set_buffer_size_near(pcm_handle, hwparams, &buffer_size)) < 0)
|
||||
- goto finish;
|
||||
}
|
||||
|
||||
if ((ret = snd_pcm_hw_params(pcm_handle, hwparams)) < 0)
|
||||
@@ -0,0 +1,2 @@
|
||||
# <type> <owner> <group> <mode> <path> <linksource>
|
||||
d pulse pulse 0755 /var/run/pulse none
|
||||
126
meta/recipes-tbd/pulseaudio/pulseaudio.inc
Normal file
126
meta/recipes-tbd/pulseaudio/pulseaudio.inc
Normal file
@@ -0,0 +1,126 @@
|
||||
DESCRIPTION = "Pulseaudio is a sound server for Linux and Unix-like operating systems."
|
||||
HOMEPAGE = "http://www.pulseaudio.org"
|
||||
AUTHOR = "Lennart Poettering"
|
||||
SECTION = "libs/multimedia"
|
||||
LICENSE = "LGPL"
|
||||
DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool hal virtual/libx11"
|
||||
# optional
|
||||
DEPENDS += "alsa-lib glib-2.0 dbus consolekit hal"
|
||||
|
||||
SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \
|
||||
file://gcc4-compile-fix.patch;patch=1 \
|
||||
file://volatiles.04_pulse"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
EXTRA_OECONF = "\
|
||||
--disable-lynx \
|
||||
--disable-bluez \
|
||||
--disable-polkit \
|
||||
--with-x \
|
||||
--without-jack \
|
||||
--with-glib \
|
||||
--with-alsa \
|
||||
--with-oss \
|
||||
--with-hal \
|
||||
"
|
||||
|
||||
PARALLEL_MAKE = ""
|
||||
|
||||
export TARGET_PFPU = "${TARGET_FPU}"
|
||||
|
||||
# TODO: Use more fine granular version
|
||||
#OE_LT_RPATH_ALLOW=":${libdir}/pulse-0.9:"
|
||||
OE_LT_RPATH_ALLOW = "any"
|
||||
OE_LT_RPATH_ALLOW[export]="1"
|
||||
|
||||
do_install_append() {
|
||||
install -d ${D}${sysconfdir}/default/volatiles
|
||||
install -m 0644 ${WORKDIR}/volatiles.04_pulse ${D}${sysconfdir}/default/volatiles/volatiles.04_pulse
|
||||
|
||||
if [ "x${TARGET_PFPU}" == "xsoft" ] ; then
|
||||
sed -i -e s:\;\ resample-method\ =\ sinc-fastest:resample-method\ =\ trivial: ${D}${sysconfdir}/pulse/daemon.conf
|
||||
fi
|
||||
}
|
||||
|
||||
PACKAGES =+ "libpulsecore libpulsecommon libpulsedsp libpulse libpulse-simple libpulse-browse libpulse-mainloop-glib \
|
||||
pulseaudio-server pulseaudio-misc pulseaudio-gconf-helper"
|
||||
|
||||
#upgrade path:
|
||||
RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf"
|
||||
|
||||
PACKAGES_DYNAMIC = "pulseaudio-lib* pulseaudio-module* libpulse-lib* libpulse-module* "
|
||||
|
||||
FILES_libpulsecore = "${libdir}/libpulsecore*.so"
|
||||
FILES_libpulsecommon = "${libdir}/libpulsecommon*.so"
|
||||
FILES_libpulsedsp = "${libdir}/libpulsedsp*.so"
|
||||
FILES_libpulse = "${libdir}/libpulse.so.*"
|
||||
FILES_libpulse-simple = "${libdir}/libpulse-simple.so.*"
|
||||
FILES_libpulse-browse = "${libdir}/libpulse-browse.so.*"
|
||||
FILES_libpulse-mainloop-glib = "${libdir}/libpulse-mainloop-glib.so.*"
|
||||
|
||||
FILES_${PN}-dbg += "${libexecdir}/pulse/.debug \
|
||||
${libdir}/pulse-${PV}/modules/.debug"
|
||||
FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la"
|
||||
FILES_${PN}-conf = "${sysconfdir}"
|
||||
FILES_${PN}-bin = "${bindir}/* \
|
||||
${sysconfdir}/default/volatiles/volatiles.04_pulse"
|
||||
FILES_${PN}-server = "${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} ${bindir}/pactl"
|
||||
FILES_${PN}-gconf-helper = "${libexecdir}/pulse/gconf-helper"
|
||||
FILES_${PN}-misc = "${bindir}/*"
|
||||
|
||||
# Allow the pulseaudio package to be created empty as a placeholder (-dbg and -dev depend on it)
|
||||
ALLOW_EMPTY_${PN} = "1"
|
||||
|
||||
CONFFILES_pulseaudio-server = "\
|
||||
${sysconfdir}/pulse/default.pa \
|
||||
${sysconfdir}/pulse/daemon.conf \
|
||||
${sysconfdir}/pulse/client.conf \
|
||||
"
|
||||
|
||||
pkg_postinst_${PN}-server() {
|
||||
# can't do this offline
|
||||
if [ "x$D" != "x" ]; then
|
||||
exit 1
|
||||
fi
|
||||
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
|
||||
addgroup pulse audio
|
||||
/etc/init.d/populate-volatile.sh update
|
||||
}
|
||||
|
||||
pkg_postrm_${PN}-server() {
|
||||
deluser pulse || true
|
||||
}
|
||||
|
||||
python populate_packages_prepend() {
|
||||
#bb.data.setVar('PKG_pulseaudio', 'pulseaudio', d)
|
||||
|
||||
plugindir = bb.data.expand('${libdir}/pulse-${PV}/modules/', d)
|
||||
do_split_packages(d, plugindir, '^module-(.*)\.so$', 'pulseaudio-module-%s', 'PulseAudio module for %s', extra_depends='' )
|
||||
do_split_packages(d, plugindir, '^lib(.*)\.so$', 'pulseaudio-lib-%s', 'PulseAudio library for %s', extra_depends='' )
|
||||
}
|
||||
|
||||
RDEPENDS_pulseaudio-module-console-kit =+ "consolekit"
|
||||
RDEPENDS_pulseaudio-module-hal-detect =+ "hal"
|
||||
RDEPENDS_pulseaudio-server = " \
|
||||
pulseaudio-module-device-restore \
|
||||
pulseaudio-module-stream-restore \
|
||||
pulseaudio-module-card-restore \
|
||||
pulseaudio-module-augment-properties \
|
||||
pulseaudio-module-detect \
|
||||
pulseaudio-module-alsa-sink \
|
||||
pulseaudio-module-alsa-source \
|
||||
pulseaudio-module-alsa-card \
|
||||
pulseaudio-module-native-protocol-unix \
|
||||
pulseaudio-module-hal-detect \
|
||||
pulseaudio-module-default-device-restore \
|
||||
pulseaudio-module-rescue-streams \
|
||||
pulseaudio-module-always-sink \
|
||||
pulseaudio-module-suspend-on-idle \
|
||||
pulseaudio-module-console-kit \
|
||||
pulseaudio-module-position-event-sounds \
|
||||
pulseaudio-module-cork-music-on-phone "
|
||||
|
||||
18
meta/recipes-tbd/pulseaudio/pulseaudio_0.9.15.bb
Normal file
18
meta/recipes-tbd/pulseaudio/pulseaudio_0.9.15.bb
Normal file
@@ -0,0 +1,18 @@
|
||||
require pulseaudio.inc
|
||||
|
||||
DEPENDS += "dbus gdbm speex"
|
||||
PR = "r14"
|
||||
|
||||
SRC_URI += "\
|
||||
file://buildfix.patch;patch=1 \
|
||||
file://alsaerror.patch;patch=1 \
|
||||
file://periodfix.patch;patch=1 \
|
||||
file://fallback.patch;patch=1 \
|
||||
file://autoconf_version.patch;patch=1 \
|
||||
"
|
||||
|
||||
do_compile_prepend() {
|
||||
cd ${S}
|
||||
mkdir -p ${S}/libltdl
|
||||
cp ${STAGING_LIBDIR}/libltdl* ${S}/libltdl
|
||||
}
|
||||
Reference in New Issue
Block a user