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
This commit is contained in:
parent
d4740e0ebc
commit
f4db03f644
|
@ -1,7 +1,11 @@
|
||||||
DESCRIPTION = "A library for atomic integer operations"
|
DESCRIPTION = "A library for atomic integer operations"
|
||||||
LICENSE = "MIT"
|
LICENSE = "MIT"
|
||||||
|
|
||||||
SRC_URI = "http://www.hpl.hp.com/research/linux/atomic_ops/download/libatomic_ops-1.2.tar.gz"
|
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}"
|
S = "${WORKDIR}/libatomic_ops-${PV}"
|
||||||
|
|
||||||
inherit autotools pkgconfig
|
inherit autotools pkgconfig
|
||||||
|
|
|
@ -3,8 +3,7 @@ HOMEPAGE = "http://www.pulseaudio.org"
|
||||||
AUTHOR = "Lennart Poettering"
|
AUTHOR = "Lennart Poettering"
|
||||||
SECTION = "libs/multimedia"
|
SECTION = "libs/multimedia"
|
||||||
LICENSE = "LGPL"
|
LICENSE = "LGPL"
|
||||||
|
DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool hal"
|
||||||
DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool"
|
|
||||||
# optional
|
# optional
|
||||||
DEPENDS += "alsa-lib glib-2.0"
|
DEPENDS += "alsa-lib glib-2.0"
|
||||||
|
|
||||||
|
@ -21,7 +20,8 @@ EXTRA_OECONF = "\
|
||||||
--with-glib \
|
--with-glib \
|
||||||
--with-alsa \
|
--with-alsa \
|
||||||
--with-oss \
|
--with-oss \
|
||||||
"
|
--with-hal \
|
||||||
|
"
|
||||||
|
|
||||||
PARALLEL_MAKE = ""
|
PARALLEL_MAKE = ""
|
||||||
|
|
||||||
|
@ -83,7 +83,8 @@ pkg_postinst_${PN}-server() {
|
||||||
grep -q pulse: /etc/group || addgroup pulse
|
grep -q pulse: /etc/group || addgroup pulse
|
||||||
grep -q pulse: /etc/passwd || \
|
grep -q pulse: /etc/passwd || \
|
||||||
adduser --disabled-password --home=/var/run/pulse --system \
|
adduser --disabled-password --home=/var/run/pulse --system \
|
||||||
--ingroup pulse --no-create-home -g "Pulse audio daemon" pulse
|
--ingroup pulse --no-create-home -g "Pulse audio daemon" pulse
|
||||||
|
addgroup pulse audio
|
||||||
/etc/init.d/populate-volatile.sh update
|
/etc/init.d/populate-volatile.sh update
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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([[
|
||||||
|
|
|
@ -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([[
|
24
meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/libpulsedsp-references-libpulsecore.patch
vendored
Normal file
24
meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/libpulsedsp-references-libpulsecore.patch
vendored
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
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
|
|
@ -0,0 +1,48 @@
|
||||||
|
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
Normal file
17
meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/pa-drop-caps-returns-void.patch
vendored
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
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
|
|
@ -0,0 +1,21 @@
|
||||||
|
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)
|
|
@ -1,4 +0,0 @@
|
||||||
require pulse.inc
|
|
||||||
|
|
||||||
PR = "r5"
|
|
||||||
|
|
Loading…
Reference in New Issue