diff options
Diffstat (limited to 'meta-moblin/packages/pulseaudio')
12 files changed, 294 insertions, 0 deletions
diff --git a/meta-moblin/packages/pulseaudio/libatomics-ops/fedora/libatomic_ops-1.2-ppclwzfix.patch b/meta-moblin/packages/pulseaudio/libatomics-ops/fedora/libatomic_ops-1.2-ppclwzfix.patch new file mode 100644 index 000000000..51161dbe0 --- /dev/null +++ b/meta-moblin/packages/pulseaudio/libatomics-ops/fedora/libatomic_ops-1.2-ppclwzfix.patch @@ -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" diff --git a/meta-moblin/packages/pulseaudio/libatomics-ops_1.2.bb b/meta-moblin/packages/pulseaudio/libatomics-ops_1.2.bb new file mode 100644 index 000000000..0563eb638 --- /dev/null +++ b/meta-moblin/packages/pulseaudio/libatomics-ops_1.2.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "A library for atomic integer operations" +LICENSE = "MIT" + +PR = "r1" + +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" + +S = "${WORKDIR}/libatomic_ops-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/meta-moblin/packages/pulseaudio/libcanberra/autoconf_version.patch b/meta-moblin/packages/pulseaudio/libcanberra/autoconf_version.patch new file mode 100644 index 000000000..73a2ea6e4 --- /dev/null +++ b/meta-moblin/packages/pulseaudio/libcanberra/autoconf_version.patch @@ -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 #### + diff --git a/meta-moblin/packages/pulseaudio/libcanberra_0.10.bb b/meta-moblin/packages/pulseaudio/libcanberra_0.10.bb new file mode 100644 index 000000000..ad44b0f1a --- /dev/null +++ b/meta-moblin/packages/pulseaudio/libcanberra_0.10.bb @@ -0,0 +1,28 @@ +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" +PR = "r1" + +inherit gconf autotools + +SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz \ + file://autoconf_version.patch;patch=1" + +EXTRA_OECONF = " --disable-oss " + +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" + +do_stage() { + autotools_stage_all +} + + + + diff --git a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2113.diff b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2113.diff new file mode 100644 index 000000000..666ed34ad --- /dev/null +++ b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2113.diff @@ -0,0 +1,19 @@ +from upstream svn r2113 + +Index: configure.ac +=================================================================== +--- configure.ac (wersja 2112) ++++ configure.ac (wersja 2113) +@@ -172,6 +172,12 @@ + AC_SUBST(LIBLTDL) + AC_CONFIG_SUBDIRS(libltdl) + ++old_LIBS=$LIBS ++LIBS="$LIBS $LIBLTDL" ++AC_CHECK_FUNCS([lt_dlmutex_register]) ++LIBS=$old_LIBS ++AC_CHECK_TYPES([lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>]) ++ + if test "x$enable_ltdl_install" = "xno" && test "x$ac_cv_lib_ltdl_lt_dlinit" = "xno" ; then + AC_MSG_ERROR([[ + diff --git a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2114.diff b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2114.diff new file mode 100644 index 000000000..cbd82eeb8 --- /dev/null +++ b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2114.diff @@ -0,0 +1,15 @@ +from upstream svn r2114 + +Index: configure.ac +=================================================================== +--- configure.ac (wersja 2113) ++++ configure.ac (wersja 2114) +@@ -176,7 +176,7 @@ + LIBS="$LIBS $LIBLTDL" + AC_CHECK_FUNCS([lt_dlmutex_register]) + LIBS=$old_LIBS +-AC_CHECK_TYPES([lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>]) ++AC_CHECK_TYPES([struct lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>]) + + if test "x$enable_ltdl_install" = "xno" && test "x$ac_cv_lib_ltdl_lt_dlinit" = "xno" ; then + AC_MSG_ERROR([[ diff --git a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/autoconf_version.patch b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/autoconf_version.patch new file mode 100644 index 000000000..a3bc3c43c --- /dev/null +++ b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/autoconf_version.patch @@ -0,0 +1,13 @@ +Index: pulseaudio-0.9.12/configure.ac +=================================================================== +--- pulseaudio-0.9.12.orig/configure.ac 2009-04-16 14:52:38.000000000 +0100 ++++ pulseaudio-0.9.12/configure.ac 2009-04-16 14:52:46.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.62) ++AC_PREREQ(2.61) + + m4_define(PA_MAJOR, [0]) + m4_define(PA_MINOR, [9]) diff --git a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/buildfix.patch b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/buildfix.patch new file mode 100644 index 000000000..ca01e0d80 --- /dev/null +++ b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/buildfix.patch @@ -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 */ diff --git a/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/gcc4-compile-fix.patch b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/gcc4-compile-fix.patch new file mode 100644 index 000000000..34ad026e4 --- /dev/null +++ b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/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-moblin/packages/pulseaudio/pulseaudio-0.9.12/volatiles.04_pulse b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/volatiles.04_pulse new file mode 100644 index 000000000..5b1998032 --- /dev/null +++ b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/volatiles.04_pulse @@ -0,0 +1,2 @@ +# <type> <owner> <group> <mode> <path> <linksource> +d pulse pulse 0755 /var/run/pulse none diff --git a/meta-moblin/packages/pulseaudio/pulseaudio.inc b/meta-moblin/packages/pulseaudio/pulseaudio.inc new file mode 100644 index 000000000..4b13980cc --- /dev/null +++ b/meta-moblin/packages/pulseaudio/pulseaudio.inc @@ -0,0 +1,101 @@ +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" +# 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 \ + --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_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 + 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-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-moblin/packages/pulseaudio/pulseaudio_0.9.12.bb b/meta-moblin/packages/pulseaudio/pulseaudio_0.9.12.bb new file mode 100644 index 000000000..6ef666995 --- /dev/null +++ b/meta-moblin/packages/pulseaudio/pulseaudio_0.9.12.bb @@ -0,0 +1,17 @@ +require pulseaudio.inc + +DEPENDS += "dbus gdbm speex" +PR = "r0" + +SRC_URI += "\ + file://buildfix.patch;patch=1 \ + file://autoconf_version.patch;patch=1 \ + file://2113.diff;patch=1;pnum=0 \ + file://2114.diff;patch=1;pnum=0 \ +" + +do_compile_prepend() { + cd ${S} + mkdir -p ${S}/libltdl + cp ${STAGING_LIBDIR}/libltdl* ${S}/libltdl +} |