From d9a4c588ef24e7e4019fbe5a2314addbcd3a6bb8 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 28 Aug 2007 10:38:05 +0000 Subject: pulseaudio: added 0.9.6 needed for openmoko-dialer2 git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2568 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../pulseaudio/files/gcc4-compile-fix.patch | 18 ++++ .../packages/pulseaudio/files/volatiles.04_pulse | 2 + .../packages/pulseaudio/libatomics-ops_1.2.bb | 11 +++ meta-openmoko/packages/pulseaudio/pulse.inc | 100 +++++++++++++++++++++ .../packages/pulseaudio/pulseaudio_0.9.6.bb | 4 + 5 files changed, 135 insertions(+) create mode 100644 meta-openmoko/packages/pulseaudio/files/gcc4-compile-fix.patch create mode 100644 meta-openmoko/packages/pulseaudio/files/volatiles.04_pulse create mode 100644 meta-openmoko/packages/pulseaudio/libatomics-ops_1.2.bb create mode 100644 meta-openmoko/packages/pulseaudio/pulse.inc create mode 100644 meta-openmoko/packages/pulseaudio/pulseaudio_0.9.6.bb diff --git a/meta-openmoko/packages/pulseaudio/files/gcc4-compile-fix.patch b/meta-openmoko/packages/pulseaudio/files/gcc4-compile-fix.patch new file mode 100644 index 0000000000..34ad026e4d --- /dev/null +++ b/meta-openmoko/packages/pulseaudio/files/gcc4-compile-fix.patch @@ -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) { diff --git a/meta-openmoko/packages/pulseaudio/files/volatiles.04_pulse b/meta-openmoko/packages/pulseaudio/files/volatiles.04_pulse new file mode 100644 index 0000000000..5b1998032b --- /dev/null +++ b/meta-openmoko/packages/pulseaudio/files/volatiles.04_pulse @@ -0,0 +1,2 @@ +# +d pulse pulse 0755 /var/run/pulse none diff --git a/meta-openmoko/packages/pulseaudio/libatomics-ops_1.2.bb b/meta-openmoko/packages/pulseaudio/libatomics-ops_1.2.bb new file mode 100644 index 0000000000..c4e838eb78 --- /dev/null +++ b/meta-openmoko/packages/pulseaudio/libatomics-ops_1.2.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "A library for atomic integer operations" +LICENSE = "MIT" + +SRC_URI = "http://www.hpl.hp.com/research/linux/atomic_ops/download/libatomic_ops-1.2.tar.gz" +S = "${WORKDIR}/libatomic_ops-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/meta-openmoko/packages/pulseaudio/pulse.inc b/meta-openmoko/packages/pulseaudio/pulse.inc new file mode 100644 index 0000000000..f765bec1a1 --- /dev/null +++ b/meta-openmoko/packages/pulseaudio/pulse.inc @@ -0,0 +1,100 @@ +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" +# optional +DEPENDS += "alsa-lib glib-2.0" + +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 \ + --without-x \ + --without-jack \ + --with-glib \ + --with-alsa \ + --with-oss \ + " + +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_stage() { + autotools_stage_all +} + +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 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_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-0.9/modules/.debug" +FILES_${PN}-dev += "${libdir}/pulse-0.9/modules/*.la" +FILES_${PN}-conf = "${sysconfdir}" +FILES_${PN}-bin = "${bindir}/* \ + ${sysconfdir}/default/volatiles/volatiles.04_pulse" +FILES_${PN}-server = "${bindir}/pulseaudio ${sysconfdir}" +FILES_${PN}-gconf-helper = "${libexecdir}/pulse/gconf-helper" +FILES_${PN}-misc = "${bindir}/*" + +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 + /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-0.9/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='' ) +} diff --git a/meta-openmoko/packages/pulseaudio/pulseaudio_0.9.6.bb b/meta-openmoko/packages/pulseaudio/pulseaudio_0.9.6.bb new file mode 100644 index 0000000000..a93c8ee251 --- /dev/null +++ b/meta-openmoko/packages/pulseaudio/pulseaudio_0.9.6.bb @@ -0,0 +1,4 @@ +require pulse.inc + +PR = "r5" + -- cgit v1.2.3