summaryrefslogtreecommitdiffstats
path: root/meta-openmoko/packages
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-05-23 14:09:11 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-05-23 14:09:11 +0000
commitf4db03f644ea8e36d10273f9bdda74c58730dde5 (patch)
treed7e84b0509c396b39161b352d1ae09fae32f9d23 /meta-openmoko/packages
parentd4740e0ebca2579c69ac6da6703c4d91472b39c1 (diff)
downloadpoky-f4db03f644ea8e36d10273f9bdda74c58730dde5.tar.gz
pulseaudio: merge with OE + patches for libtool 2.2
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4550 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta-openmoko/packages')
-rw-r--r--meta-openmoko/packages/pulseaudio/libatomics-ops_1.2.bb6
-rw-r--r--meta-openmoko/packages/pulseaudio/pulse.inc9
-rw-r--r--meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/2113.diff19
-rw-r--r--meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/2114.diff15
-rw-r--r--meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/libpulsedsp-references-libpulsecore.patch24
-rw-r--r--meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/libtool2.patch48
-rw-r--r--meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/pa-drop-caps-returns-void.patch17
-rw-r--r--meta-openmoko/packages/pulseaudio/pulseaudio_0.9.10.bb21
-rw-r--r--meta-openmoko/packages/pulseaudio/pulseaudio_0.9.6.bb4
9 files changed, 154 insertions, 9 deletions
diff --git a/meta-openmoko/packages/pulseaudio/libatomics-ops_1.2.bb b/meta-openmoko/packages/pulseaudio/libatomics-ops_1.2.bb
index c4e838eb78..0563eb6382 100644
--- a/meta-openmoko/packages/pulseaudio/libatomics-ops_1.2.bb
+++ b/meta-openmoko/packages/pulseaudio/libatomics-ops_1.2.bb
@@ -1,7 +1,11 @@
1DESCRIPTION = "A library for atomic integer operations" 1DESCRIPTION = "A library for atomic integer operations"
2LICENSE = "MIT" 2LICENSE = "MIT"
3 3
4SRC_URI = "http://www.hpl.hp.com/research/linux/atomic_ops/download/libatomic_ops-1.2.tar.gz" 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
5S = "${WORKDIR}/libatomic_ops-${PV}" 9S = "${WORKDIR}/libatomic_ops-${PV}"
6 10
7inherit autotools pkgconfig 11inherit autotools pkgconfig
diff --git a/meta-openmoko/packages/pulseaudio/pulse.inc b/meta-openmoko/packages/pulseaudio/pulse.inc
index f765bec1a1..4b13980cc4 100644
--- a/meta-openmoko/packages/pulseaudio/pulse.inc
+++ b/meta-openmoko/packages/pulseaudio/pulse.inc
@@ -3,8 +3,7 @@ HOMEPAGE = "http://www.pulseaudio.org"
3AUTHOR = "Lennart Poettering" 3AUTHOR = "Lennart Poettering"
4SECTION = "libs/multimedia" 4SECTION = "libs/multimedia"
5LICENSE = "LGPL" 5LICENSE = "LGPL"
6 6DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool hal"
7DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool"
8# optional 7# optional
9DEPENDS += "alsa-lib glib-2.0" 8DEPENDS += "alsa-lib glib-2.0"
10 9
@@ -21,7 +20,8 @@ EXTRA_OECONF = "\
21 --with-glib \ 20 --with-glib \
22 --with-alsa \ 21 --with-alsa \
23 --with-oss \ 22 --with-oss \
24 " 23 --with-hal \
24"
25 25
26PARALLEL_MAKE = "" 26PARALLEL_MAKE = ""
27 27
@@ -83,7 +83,8 @@ pkg_postinst_${PN}-server() {
83 grep -q pulse: /etc/group || addgroup pulse 83 grep -q pulse: /etc/group || addgroup pulse
84 grep -q pulse: /etc/passwd || \ 84 grep -q pulse: /etc/passwd || \
85 adduser --disabled-password --home=/var/run/pulse --system \ 85 adduser --disabled-password --home=/var/run/pulse --system \
86 --ingroup pulse --no-create-home -g "Pulse audio daemon" pulse 86 --ingroup pulse --no-create-home -g "Pulse audio daemon" pulse
87 addgroup pulse audio
87 /etc/init.d/populate-volatile.sh update 88 /etc/init.d/populate-volatile.sh update
88} 89}
89 90
diff --git a/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/2113.diff b/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/2113.diff
new file mode 100644
index 0000000000..666ed34ad3
--- /dev/null
+++ b/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/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-openmoko/packages/pulseaudio/pulseaudio-0.9.10/2114.diff b/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/2114.diff
new file mode 100644
index 0000000000..cbd82eeb84
--- /dev/null
+++ b/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/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-openmoko/packages/pulseaudio/pulseaudio-0.9.10/libpulsedsp-references-libpulsecore.patch b/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/libpulsedsp-references-libpulsecore.patch
new file mode 100644
index 0000000000..4234af5f53
--- /dev/null
+++ b/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/libpulsedsp-references-libpulsecore.patch
@@ -0,0 +1,24 @@
1upstream: http://pulseaudio.org/ticket/287
2
3Index: pulseaudio-0.9.10/src/Makefile.am
4===================================================================
5--- pulseaudio-0.9.10.orig/src/Makefile.am 2008-03-30 03:43:05.000000000 +0200
6+++ pulseaudio-0.9.10/src/Makefile.am 2008-05-03 11:55:46.000000000 +0200
7@@ -605,7 +605,7 @@
8
9 libpulsedsp_la_SOURCES = utils/padsp.c
10 libpulsedsp_la_CFLAGS = $(AM_CFLAGS)
11-libpulsedsp_la_LIBADD = $(AM_LIBADD) libpulse.la
12+libpulsedsp_la_LIBADD = $(AM_LIBADD) libpulse.la libpulsecore.la
13 libpulsedsp_la_LDFLAGS = -avoid-version
14
15 ###################################
16@@ -888,7 +888,7 @@
17
18 libpstream_util_la_SOURCES = pulsecore/pstream-util.c pulsecore/pstream-util.h
19 libpstream_util_la_LDFLAGS = -avoid-version
20-libpstream_util_la_LIBADD = $(AM_LIBADD) libpacket.la libpstream.la libtagstruct.la
21+libpstream_util_la_LIBADD = $(AM_LIBADD) libpacket.la libpstream.la libtagstruct.la libpulsecore.la
22
23 libpdispatch_la_SOURCES = pulsecore/pdispatch.c pulsecore/pdispatch.h
24 libpdispatch_la_LDFLAGS = -avoid-version
diff --git a/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/libtool2.patch b/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/libtool2.patch
new file mode 100644
index 0000000000..9e9e5f55d3
--- /dev/null
+++ b/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/libtool2.patch
@@ -0,0 +1,48 @@
1Tell where is libltdl from libtool - was needed to get it built with libtool 2.2.4
2
3---
4 configure.ac | 26 +++++++++++++++++++-------
5 1 file changed, 19 insertions(+), 7 deletions(-)
6
7--- pulseaudio-0.9.10.orig/configure.ac
8+++ pulseaudio-0.9.10/configure.ac
9@@ -242,20 +242,32 @@ if test $ret -eq 0 ; then
10 else
11 AC_MSG_RESULT([no])
12 fi
13
14 #### libtool stuff ####
15-
16-AC_LTDL_ENABLE_INSTALL
17-AC_LIBLTDL_INSTALLABLE
18-AC_LIBTOOL_DLOPEN
19-AC_LIBTOOL_WIN32_DLL
20+LT_PREREQ([2.2])
21+LT_INIT([dlopen win32-dll])
22 AC_PROG_LIBTOOL
23-AC_SUBST(LTDLINCL)
24-AC_SUBST(LIBLTDL)
25+#AC_SUBST(LTDLINCL)
26+#AC_SUBST(LIBLTDL)
27 AC_CONFIG_SUBDIRS(libltdl)
28
29+AC_ARG_WITH(libltdl-libs,
30+ [ --with-libltdl-libs=DIR path to libltdl libs], libltdl_libs_prefix=$withval)
31+if test x$libltdl_libs_prefix != x; then
32+ LIBLTDL="-L${libltdl_libs_prefix}/libltdl.so -lltdl"
33+fi
34+AC_SUBST(LIBLTDL)
35+
36+AC_ARG_WITH(libltdl-includes,
37+ [ --with-libltdl-includes=DIR path to libltdl includes], libltdl_prefix=$withval)
38+if test x$libltdl_prefix != x; then
39+ LTDLINCL="-I${libltdl_prefix} ${libltdl_libs_prefix}/libltdl.so"
40+fi
41+AC_SUBST(LTDLINCL)
42+
43+
44 old_LIBS=$LIBS
45 LIBS="$LIBS $LIBLTDL"
46 AC_CHECK_FUNCS([lt_dlmutex_register])
47 LIBS=$old_LIBS
48 AC_CHECK_TYPES([struct lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>])
diff --git a/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/pa-drop-caps-returns-void.patch b/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/pa-drop-caps-returns-void.patch
new file mode 100644
index 0000000000..74ea6ac060
--- /dev/null
+++ b/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/pa-drop-caps-returns-void.patch
@@ -0,0 +1,17 @@
1upstream: http://pulseaudio.org/changeset/2213
2
3Index: pulseaudio-0.9.10/src/daemon/caps.c
4===================================================================
5--- pulseaudio-0.9.10.orig/src/daemon/caps.c 2008-05-03 12:10:26.000000000 +0200
6+++ pulseaudio-0.9.10/src/daemon/caps.c 2008-05-03 12:10:30.000000000 +0200
7@@ -131,9 +131,8 @@
8 return 0;
9 }
10
11-int pa_drop_caps(void) {
12+void pa_drop_caps(void) {
13 pa_drop_root();
14- return 0;
15 }
16
17 #endif
diff --git a/meta-openmoko/packages/pulseaudio/pulseaudio_0.9.10.bb b/meta-openmoko/packages/pulseaudio/pulseaudio_0.9.10.bb
new file mode 100644
index 0000000000..671fb66a96
--- /dev/null
+++ b/meta-openmoko/packages/pulseaudio/pulseaudio_0.9.10.bb
@@ -0,0 +1,21 @@
1require pulse.inc
2
3DEPENDS += "dbus"
4PR = "r2"
5
6# this is not correct (see below)
7SRC_URI += "\
8 file://disable-using-glibc-tls.patch;patch=1 \
9 file://libpulsedsp-references-libpulsecore.patch;patch=1 \
10 file://pa-drop-caps-returns-void.patch;patch=1 \
11 file://2113.diff;patch=1;pnum=0 \
12 file://2114.diff;patch=1;pnum=0 \
13 file://libtool2.patch;patch=1 \
14"
15
16EXTRA_OECONF += "--with-libltdl-includes=${STAGING_INCDIR}/libltdl/ --with-libltdl-libs=${STAGING_LIBDIR}"
17
18# problems w/ pulseaudio 0.9.10 atm:
19# 1.) needs libltdl >= 1.5.24 (yes, any older version will NOT work at runtime)
20# 2.) doesn't build w/ glibc TLS support (hence patched out)
21# 3.) fails with hierarchical pthread stuff w/ gst-pulse (hence patched out)
diff --git a/meta-openmoko/packages/pulseaudio/pulseaudio_0.9.6.bb b/meta-openmoko/packages/pulseaudio/pulseaudio_0.9.6.bb
deleted file mode 100644
index a93c8ee251..0000000000
--- a/meta-openmoko/packages/pulseaudio/pulseaudio_0.9.6.bb
+++ /dev/null
@@ -1,4 +0,0 @@
1require pulse.inc
2
3PR = "r5"
4