summaryrefslogtreecommitdiffstats
path: root/meta-moblin
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-04-21 17:40:55 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-04-21 17:40:55 +0100
commit5df6deaa32e4f6d0a8985403970a137270491991 (patch)
treebfc61fc292038a9cf5c35e0dccc8d7c101e96085 /meta-moblin
parent12856d95a7e729914f8d0dbe55d9c28df65bc718 (diff)
downloadpoky-5df6deaa32e4f6d0a8985403970a137270491991.tar.gz
puslseaudio: Upgrade to 0.9.10
Upgrade to 0.9.10, moving pulseaudio to meta-moblin cleaning up and merging in some changes from OE.dev. Also add libcanberra 0.10. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta-moblin')
-rw-r--r--meta-moblin/packages/pulseaudio/libatomics-ops/fedora/libatomic_ops-1.2-ppclwzfix.patch15
-rw-r--r--meta-moblin/packages/pulseaudio/libatomics-ops_1.2.bb15
-rw-r--r--meta-moblin/packages/pulseaudio/libcanberra/autoconf_version.patch38
-rw-r--r--meta-moblin/packages/pulseaudio/libcanberra_0.10.bb28
-rw-r--r--meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2113.diff19
-rw-r--r--meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2114.diff15
-rw-r--r--meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/autoconf_version.patch13
-rw-r--r--meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/buildfix.patch13
-rw-r--r--meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/gcc4-compile-fix.patch18
-rw-r--r--meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/volatiles.04_pulse2
-rw-r--r--meta-moblin/packages/pulseaudio/pulseaudio.inc101
-rw-r--r--meta-moblin/packages/pulseaudio/pulseaudio_0.9.12.bb17
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 0000000000..51161dbe0f
--- /dev/null
+++ b/meta-moblin/packages/pulseaudio/libatomics-ops/fedora/libatomic_ops-1.2-ppclwzfix.patch
@@ -0,0 +1,15 @@
1http://cvs.fedoraproject.org/viewcvs/devel/libatomic_ops/libatomic_ops-1.2-ppclwzfix.patch
2
3* add fix for bad variable handling on PPC
4
5--- libatomic_ops-1.2.orig/src/atomic_ops/sysdeps/gcc/powerpc.h 2007-05-29 19:29:52.000000000 +0200
6+++ libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/powerpc.h 2007-05-29 19:30:48.000000000 +0200
7@@ -72,7 +72,7 @@
8 /* registers. I always got "impossible constraint" when I */
9 /* tried the "y" constraint. */
10 __asm__ __volatile__ (
11- "lwz %0,%1\n"
12+ "lwz%U1%X1 %0,%1\n"
13 "cmpw cr7,%0,%0\n"
14 "bne- cr7,1f\n"
15 "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 0000000000..0563eb6382
--- /dev/null
+++ b/meta-moblin/packages/pulseaudio/libatomics-ops_1.2.bb
@@ -0,0 +1,15 @@
1DESCRIPTION = "A library for atomic integer operations"
2LICENSE = "MIT"
3
4PR = "r1"
5
6SRC_URI = "http://www.hpl.hp.com/research/linux/atomic_ops/download/libatomic_ops-1.2.tar.gz \
7 file://fedora/libatomic_ops-1.2-ppclwzfix.patch;patch=1"
8
9S = "${WORKDIR}/libatomic_ops-${PV}"
10
11inherit autotools pkgconfig
12
13do_stage() {
14 autotools_stage_all
15}
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 0000000000..73a2ea6e49
--- /dev/null
+++ b/meta-moblin/packages/pulseaudio/libcanberra/autoconf_version.patch
@@ -0,0 +1,38 @@
1Allow a slightly older autoconf and disable the inbuild libltdl
2
3RP - 16/4/09
4
5Index: libcanberra-0.10/Makefile.am
6===================================================================
7--- libcanberra-0.10.orig/Makefile.am 2009-04-16 14:38:53.000000000 +0100
8+++ libcanberra-0.10/Makefile.am 2009-04-16 14:39:04.000000000 +0100
9@@ -19,7 +19,7 @@
10 dist_doc_DATA = README
11
12 EXTRA_DIST = bootstrap.sh autogen.sh LGPL libcanberra.schemas
13-SUBDIRS = src gtkdoc libltdl doc
14+SUBDIRS = src gtkdoc doc
15
16 MAINTAINERCLEANFILES = README
17 noinst_DATA = README
18Index: libcanberra-0.10/configure.ac
19===================================================================
20--- libcanberra-0.10.orig/configure.ac 2009-04-16 14:32:33.000000000 +0100
21+++ libcanberra-0.10/configure.ac 2009-04-16 14:37:50.000000000 +0100
22@@ -19,7 +19,7 @@
23 # License along with libcanberra. If not, see
24 # <http://www.gnu.org/licenses/>.
25
26-AC_PREREQ(2.62)
27+AC_PREREQ(2.61)
28
29 AC_INIT([libcanberra], 0.10, [mzyvopnaoreen (at) 0pointer (dot) de])
30 AC_CONFIG_SRCDIR([src/common.c])
31@@ -70,7 +70,6 @@
32 AC_PROG_LIBTOOL
33 AC_SUBST(LTDLINCL)
34 AC_SUBST(LIBLTDL)
35-AC_CONFIG_SUBDIRS(libltdl)
36
37 #### Determine build environment ####
38
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 0000000000..ad44b0f1ab
--- /dev/null
+++ b/meta-moblin/packages/pulseaudio/libcanberra_0.10.bb
@@ -0,0 +1,28 @@
1DESCRIPTION = "Libcanberra is an implementation of the XDG Sound Theme and Name Specifications, for generating event sounds on free desktops."
2LICENSE = "LGPL"
3DEPENDS = "gtk+ pulseaudio alsa-lib"
4PR = "r1"
5
6inherit gconf autotools
7
8SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz \
9 file://autoconf_version.patch;patch=1"
10
11EXTRA_OECONF = " --disable-oss "
12
13do_configure_prepend () {
14 rm -f ${S}/libltdl/configure*
15}
16
17FILES_${PN} += "${libdir}/gtk-2.0/modules/ ${datadir}/gnome"
18FILES_${PN}-dbg += "${libdir}/gtk-2.0/modules/.debug"
19
20AUTOTOOLS_STAGE_PKGCONFIG = "1"
21
22do_stage() {
23 autotools_stage_all
24}
25
26
27
28
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 0000000000..666ed34ad3
--- /dev/null
+++ b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2113.diff
@@ -0,0 +1,19 @@
1from upstream svn r2113
2
3Index: configure.ac
4===================================================================
5--- configure.ac (wersja 2112)
6+++ configure.ac (wersja 2113)
7@@ -172,6 +172,12 @@
8 AC_SUBST(LIBLTDL)
9 AC_CONFIG_SUBDIRS(libltdl)
10
11+old_LIBS=$LIBS
12+LIBS="$LIBS $LIBLTDL"
13+AC_CHECK_FUNCS([lt_dlmutex_register])
14+LIBS=$old_LIBS
15+AC_CHECK_TYPES([lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>])
16+
17 if test "x$enable_ltdl_install" = "xno" && test "x$ac_cv_lib_ltdl_lt_dlinit" = "xno" ; then
18 AC_MSG_ERROR([[
19
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 0000000000..cbd82eeb84
--- /dev/null
+++ b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2114.diff
@@ -0,0 +1,15 @@
1from upstream svn r2114
2
3Index: configure.ac
4===================================================================
5--- configure.ac (wersja 2113)
6+++ configure.ac (wersja 2114)
7@@ -176,7 +176,7 @@
8 LIBS="$LIBS $LIBLTDL"
9 AC_CHECK_FUNCS([lt_dlmutex_register])
10 LIBS=$old_LIBS
11-AC_CHECK_TYPES([lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>])
12+AC_CHECK_TYPES([struct lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>])
13
14 if test "x$enable_ltdl_install" = "xno" && test "x$ac_cv_lib_ltdl_lt_dlinit" = "xno" ; then
15 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 0000000000..a3bc3c43c5
--- /dev/null
+++ b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/autoconf_version.patch
@@ -0,0 +1,13 @@
1Index: pulseaudio-0.9.12/configure.ac
2===================================================================
3--- pulseaudio-0.9.12.orig/configure.ac 2009-04-16 14:52:38.000000000 +0100
4+++ pulseaudio-0.9.12/configure.ac 2009-04-16 14:52:46.000000000 +0100
5@@ -20,7 +20,7 @@
6 # along with PulseAudio; if not, write to the Free Software Foundation,
7 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
8
9-AC_PREREQ(2.62)
10+AC_PREREQ(2.61)
11
12 m4_define(PA_MAJOR, [0])
13 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 0000000000..ca01e0d80f
--- /dev/null
+++ b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/buildfix.patch
@@ -0,0 +1,13 @@
1Index: pulseaudio-0.9.11/src/pulsecore/atomic.h
2===================================================================
3--- pulseaudio-0.9.11.orig/src/pulsecore/atomic.h
4+++ pulseaudio-0.9.11/src/pulsecore/atomic.h
5@@ -40,6 +40,8 @@
6 #error "Please include config.h before including this file!"
7 #endif
8
9+#include "macro.h"
10+
11 #ifdef HAVE_ATOMIC_BUILTINS
12
13 /* __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 0000000000..34ad026e4d
--- /dev/null
+++ b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/gcc4-compile-fix.patch
@@ -0,0 +1,18 @@
1| fix for more strict syntax compliance in gcc4.x
2| pulsecore/core-util.c: In function 'pa_raise_priority':
3| pulsecore/core-util.c:547: error: label at end of compound statement
4| Signed off: mickey@openmoko.org
5|
6Index: pulseaudio-0.9.6/src/pulsecore/core-util.c
7===================================================================
8--- pulseaudio-0.9.6.orig/src/pulsecore/core-util.c
9+++ pulseaudio-0.9.6/src/pulsecore/core-util.c
10@@ -535,7 +535,7 @@ void pa_raise_priority(void) {
11 pa_log_info("Successfully gained high priority class.");
12 #endif
13
14-fail:
15+fail:;
16
17 #if defined(HAVE_SYS_CAPABILITY_H)
18 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 0000000000..5b1998032b
--- /dev/null
+++ b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/volatiles.04_pulse
@@ -0,0 +1,2 @@
1# <type> <owner> <group> <mode> <path> <linksource>
2d 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 0000000000..4b13980cc4
--- /dev/null
+++ b/meta-moblin/packages/pulseaudio/pulseaudio.inc
@@ -0,0 +1,101 @@
1DESCRIPTION = "Pulseaudio is a sound server for Linux and Unix-like operating systems."
2HOMEPAGE = "http://www.pulseaudio.org"
3AUTHOR = "Lennart Poettering"
4SECTION = "libs/multimedia"
5LICENSE = "LGPL"
6DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool hal"
7# optional
8DEPENDS += "alsa-lib glib-2.0"
9
10SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \
11 file://gcc4-compile-fix.patch;patch=1 \
12 file://volatiles.04_pulse"
13
14inherit autotools pkgconfig
15
16EXTRA_OECONF = "\
17 --disable-lynx \
18 --without-x \
19 --without-jack \
20 --with-glib \
21 --with-alsa \
22 --with-oss \
23 --with-hal \
24"
25
26PARALLEL_MAKE = ""
27
28export TARGET_PFPU = "${TARGET_FPU}"
29
30# TODO: Use more fine granular version
31#OE_LT_RPATH_ALLOW=":${libdir}/pulse-0.9:"
32OE_LT_RPATH_ALLOW = "any"
33OE_LT_RPATH_ALLOW[export]="1"
34
35do_stage() {
36 autotools_stage_all
37}
38
39do_install_append() {
40 install -d ${D}${sysconfdir}/default/volatiles
41 install -m 0644 ${WORKDIR}/volatiles.04_pulse ${D}${sysconfdir}/default/volatiles/volatiles.04_pulse
42
43 if [ "x${TARGET_PFPU}" == "xsoft" ] ; then
44 sed -i -e s:\;\ resample-method\ =\ sinc-fastest:resample-method\ =\ trivial: ${D}${sysconfdir}/pulse/daemon.conf
45 fi
46}
47
48PACKAGES =+ "libpulsecore libpulse libpulse-simple libpulse-browse libpulse-mainloop-glib \
49 pulseaudio-server pulseaudio-misc pulseaudio-gconf-helper"
50
51#upgrade path:
52RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf"
53
54PACKAGES_DYNAMIC = "pulseaudio-lib* pulseaudio-module* libpulse-lib* libpulse-module* "
55
56FILES_libpulsecore = "${libdir}/libpulsecore.so.*"
57FILES_libpulse = "${libdir}/libpulse.so.*"
58FILES_libpulse-simple = "${libdir}/libpulse-simple.so.*"
59FILES_libpulse-browse = "${libdir}/libpulse-browse.so.*"
60FILES_libpulse-mainloop-glib = "${libdir}/libpulse-mainloop-glib.so.*"
61
62FILES_${PN}-dbg += "${libexecdir}/pulse/.debug \
63 ${libdir}/pulse-0.9/modules/.debug"
64FILES_${PN}-dev += "${libdir}/pulse-0.9/modules/*.la"
65FILES_${PN}-conf = "${sysconfdir}"
66FILES_${PN}-bin = "${bindir}/* \
67 ${sysconfdir}/default/volatiles/volatiles.04_pulse"
68FILES_${PN}-server = "${bindir}/pulseaudio ${sysconfdir}"
69FILES_${PN}-gconf-helper = "${libexecdir}/pulse/gconf-helper"
70FILES_${PN}-misc = "${bindir}/*"
71
72CONFFILES_pulseaudio-server = "\
73 ${sysconfdir}/pulse/default.pa \
74 ${sysconfdir}/pulse/daemon.conf \
75 ${sysconfdir}/pulse/client.conf \
76 "
77
78pkg_postinst_${PN}-server() {
79 # can't do this offline
80 if [ "x$D" != "x" ]; then
81 exit 1
82 fi
83 grep -q pulse: /etc/group || addgroup pulse
84 grep -q pulse: /etc/passwd || \
85 adduser --disabled-password --home=/var/run/pulse --system \
86 --ingroup pulse --no-create-home -g "Pulse audio daemon" pulse
87 addgroup pulse audio
88 /etc/init.d/populate-volatile.sh update
89}
90
91pkg_postrm_${PN}-server() {
92 deluser pulse || true
93}
94
95python populate_packages_prepend() {
96 #bb.data.setVar('PKG_pulseaudio', 'pulseaudio', d)
97
98 plugindir = bb.data.expand('${libdir}/pulse-0.9/modules/', d)
99 do_split_packages(d, plugindir, '^module-(.*)\.so$', 'pulseaudio-module-%s', 'PulseAudio module for %s', extra_depends='' )
100 do_split_packages(d, plugindir, '^lib(.*)\.so$', 'pulseaudio-lib-%s', 'PulseAudio library for %s', extra_depends='' )
101}
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 0000000000..6ef6669955
--- /dev/null
+++ b/meta-moblin/packages/pulseaudio/pulseaudio_0.9.12.bb
@@ -0,0 +1,17 @@
1require pulseaudio.inc
2
3DEPENDS += "dbus gdbm speex"
4PR = "r0"
5
6SRC_URI += "\
7 file://buildfix.patch;patch=1 \
8 file://autoconf_version.patch;patch=1 \
9 file://2113.diff;patch=1;pnum=0 \
10 file://2114.diff;patch=1;pnum=0 \
11"
12
13do_compile_prepend() {
14 cd ${S}
15 mkdir -p ${S}/libltdl
16 cp ${STAGING_LIBDIR}/libltdl* ${S}/libltdl
17}