sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Richard Purdie 2009-04-21 17:40:55 +01:00
parent 12856d95a7
commit 5df6deaa32
19 changed files with 109 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
meta-openmoko/packages/pulseaudio/libatomics-ops/fedora/libatomic_ops-1.2-ppclwzfix.patch → meta-moblin/packages/pulseaudio/libatomics-ops/fedora/libatomic_ops-1.2-ppclwzfix.patch
View File

0
meta-openmoko/packages/pulseaudio/libatomics-ops_1.2.bb → meta-moblin/packages/pulseaudio/libatomics-ops_1.2.bb
View File

38
meta-moblin/packages/pulseaudio/libcanberra/autoconf_version.patch Normal file
View File

@ -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 ####

28
meta-moblin/packages/pulseaudio/libcanberra_0.10.bb Normal file
View File

@ -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
}

0
meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/2113.diff → meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2113.diff vendored
View File

0
meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/2114.diff → meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2114.diff vendored
View File

13
meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/autoconf_version.patch vendored Normal file
View File

@ -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])

13
meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/buildfix.patch vendored Normal file
View 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 */

0
meta-openmoko/packages/pulseaudio/files/gcc4-compile-fix.patch → meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/gcc4-compile-fix.patch vendored
View File

0
meta-openmoko/packages/pulseaudio/files/volatiles.04_pulse → meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/volatiles.04_pulse vendored
View File

0
meta-openmoko/packages/pulseaudio/pulse.inc → meta-moblin/packages/pulseaudio/pulseaudio.inc
View File

17
meta-moblin/packages/pulseaudio/pulseaudio_0.9.12.bb Normal file
View File

@ -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
}

25
meta-openmoko/packages/pulseaudio/files/disable-using-glibc-tls.patch
View File

@ -1,25 +0,0 @@
Index: pulseaudio-0.9.9/configure.ac
===================================================================
--- pulseaudio-0.9.9.orig/configure.ac 2008-01-24 01:06:06.000000000 +0000
+++ pulseaudio-0.9.9/configure.ac 2008-02-05 17:45:59.000000000 +0000
@@ -139,8 +139,8 @@
ret=$?
rm -f conftest.o conftest
if test $ret -eq 0 ; then
- AC_DEFINE([HAVE_TLS_BUILTIN], 1, [Have __thread().])
- AC_MSG_RESULT([yes])
+dnl AC_DEFINE([HAVE_TLS_BUILTIN], 1, [Have __thread().])
+ AC_MSG_RESULT([no])
else
AC_MSG_RESULT([no])
fi
@@ -325,8 +325,7 @@
rm -f conftest.o conftest
if test $ret -eq 0 ; then
- AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], 1, [Have PTHREAD_PRIO_INHERIT.])
- AC_MSG_RESULT([yes])
+ AC_MSG_RESULT([no])
else
AC_MSG_RESULT([no])
fi

15
meta-openmoko/packages/pulseaudio/files/fix-dbus-without-hal.patch
View File

@ -1,15 +0,0 @@
Index: pulseaudio-0.9.8/src/Makefile.am
===================================================================
--- pulseaudio-0.9.8.orig/src/Makefile.am
+++ pulseaudio-0.9.8/src/Makefile.am
@@ -1424,8 +1424,8 @@
# HAL
libdbus_util_la_SOURCES = modules/dbus-util.c modules/dbus-util.h
libdbus_util_la_LDFLAGS = -avoid-version
-libdbus_util_la_LIBADD = $(AM_LIBADD) $(HAL_LIBS) libpulsecore.la
-libdbus_util_la_CFLAGS = $(AM_CFLAGS) $(HAL_CFLAGS)
+libdbus_util_la_LIBADD = $(AM_LIBADD) $(HAL_LIBS) $(DBUS_LIBS) libpulsecore.la
+libdbus_util_la_CFLAGS = $(AM_CFLAGS) $(HAL_CFLAGS) $(DBUS_CFLAGS)
module_hal_detect_la_SOURCES = modules/module-hal-detect.c
module_hal_detect_la_LDFLAGS = -module -avoid-version

20
meta-openmoko/packages/pulseaudio/files/fix-shm.patch
View File

@ -1,20 +0,0 @@
# fixes building against uclibc
# fixed upstream, see http://www.pulseaudio.org/ticket/200
Index: pulseaudio-0.9.9/src/pulsecore/shm.c
===================================================================
--- pulseaudio-0.9.9/src/pulsecore/shm.c (revision 1971)
+++ pulseaudio-0.9.9/src/pulsecore/shm.c (revision 2110)
@@ -319,4 +319,5 @@
int pa_shm_cleanup(void) {
+#ifdef HAVE_SHM_OPEN
#ifdef SHM_PATH
DIR *d;
@@ -376,5 +377,6 @@
closedir(d);
-#endif
+#endif /* SHM_PATH */
+#endif /* HAVE_SHM_OPEN */
return 0;

24
meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/libpulsedsp-references-libpulsecore.patch vendored
View File

@ -1,24 +0,0 @@
upstream: http://pulseaudio.org/ticket/287
Index: pulseaudio-0.9.10/src/Makefile.am
===================================================================
--- pulseaudio-0.9.10.orig/src/Makefile.am 2008-03-30 03:43:05.000000000 +0200
+++ pulseaudio-0.9.10/src/Makefile.am 2008-05-03 11:55:46.000000000 +0200
@@ -605,7 +605,7 @@
libpulsedsp_la_SOURCES = utils/padsp.c
libpulsedsp_la_CFLAGS = $(AM_CFLAGS)
-libpulsedsp_la_LIBADD = $(AM_LIBADD) libpulse.la
+libpulsedsp_la_LIBADD = $(AM_LIBADD) libpulse.la libpulsecore.la
libpulsedsp_la_LDFLAGS = -avoid-version
###################################
@@ -888,7 +888,7 @@
libpstream_util_la_SOURCES = pulsecore/pstream-util.c pulsecore/pstream-util.h
libpstream_util_la_LDFLAGS = -avoid-version
-libpstream_util_la_LIBADD = $(AM_LIBADD) libpacket.la libpstream.la libtagstruct.la
+libpstream_util_la_LIBADD = $(AM_LIBADD) libpacket.la libpstream.la libtagstruct.la libpulsecore.la
libpdispatch_la_SOURCES = pulsecore/pdispatch.c pulsecore/pdispatch.h
libpdispatch_la_LDFLAGS = -avoid-version

48
meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/libtool2.patch vendored
View File

@ -1,48 +0,0 @@
Tell where is libltdl from libtool - was needed to get it built with libtool 2.2.4
---
configure.ac | 26 +++++++++++++++++++-------
1 file changed, 19 insertions(+), 7 deletions(-)
--- pulseaudio-0.9.10.orig/configure.ac
+++ pulseaudio-0.9.10/configure.ac
@@ -242,20 +242,32 @@ if test $ret -eq 0 ; then
else
AC_MSG_RESULT([no])
fi
#### libtool stuff ####
-
-AC_LTDL_ENABLE_INSTALL
-AC_LIBLTDL_INSTALLABLE
-AC_LIBTOOL_DLOPEN
-AC_LIBTOOL_WIN32_DLL
+LT_PREREQ([2.2])
+LT_INIT([dlopen win32-dll])
AC_PROG_LIBTOOL
-AC_SUBST(LTDLINCL)
-AC_SUBST(LIBLTDL)
+#AC_SUBST(LTDLINCL)
+#AC_SUBST(LIBLTDL)
AC_CONFIG_SUBDIRS(libltdl)
+AC_ARG_WITH(libltdl-libs,
+ [ --with-libltdl-libs=DIR path to libltdl libs], libltdl_libs_prefix=$withval)
+if test x$libltdl_libs_prefix != x; then
+ LIBLTDL="-L${libltdl_libs_prefix}/libltdl.so -lltdl"
+fi
+AC_SUBST(LIBLTDL)
+
+AC_ARG_WITH(libltdl-includes,
+ [ --with-libltdl-includes=DIR path to libltdl includes], libltdl_prefix=$withval)
+if test x$libltdl_prefix != x; then
+ LTDLINCL="-I${libltdl_prefix} ${libltdl_libs_prefix}/libltdl.so"
+fi
+AC_SUBST(LTDLINCL)
+
+
old_LIBS=$LIBS
LIBS="$LIBS $LIBLTDL"
AC_CHECK_FUNCS([lt_dlmutex_register])
LIBS=$old_LIBS
AC_CHECK_TYPES([struct lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>])

17
meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/pa-drop-caps-returns-void.patch vendored
View File

@ -1,17 +0,0 @@
upstream: http://pulseaudio.org/changeset/2213
Index: pulseaudio-0.9.10/src/daemon/caps.c
===================================================================
--- pulseaudio-0.9.10.orig/src/daemon/caps.c 2008-05-03 12:10:26.000000000 +0200
+++ pulseaudio-0.9.10/src/daemon/caps.c 2008-05-03 12:10:30.000000000 +0200
@@ -131,9 +131,8 @@
return 0;
}
-int pa_drop_caps(void) {
+void pa_drop_caps(void) {
pa_drop_root();
- return 0;
}
#endif

21
meta-openmoko/packages/pulseaudio/pulseaudio_0.9.10.bb
View File

@ -1,21 +0,0 @@
require pulse.inc
DEPENDS += "dbus"
PR = "r2"
# this is not correct (see below)
SRC_URI += "\
file://disable-using-glibc-tls.patch;patch=1 \
file://libpulsedsp-references-libpulsecore.patch;patch=1 \
file://pa-drop-caps-returns-void.patch;patch=1 \
file://2113.diff;patch=1;pnum=0 \
file://2114.diff;patch=1;pnum=0 \
file://libtool2.patch;patch=1 \
"
EXTRA_OECONF += "--with-libltdl-includes=${STAGING_INCDIR}/libltdl/ --with-libltdl-libs=${STAGING_LIBDIR}"
# problems w/ pulseaudio 0.9.10 atm:
# 1.) needs libltdl >= 1.5.24 (yes, any older version will NOT work at runtime)
# 2.) doesn't build w/ glibc TLS support (hence patched out)
# 3.) fails with hierarchical pthread stuff w/ gst-pulse (hence patched out)