summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-moblin/packages/pulseaudio/libatomics-ops/fedora/libatomic_ops-1.2-ppclwzfix.patch (renamed from meta-openmoko/packages/pulseaudio/libatomics-ops/fedora/libatomic_ops-1.2-ppclwzfix.patch)0
-rw-r--r--meta-moblin/packages/pulseaudio/libatomics-ops_1.2.bb (renamed from meta-openmoko/packages/pulseaudio/libatomics-ops_1.2.bb)0
-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.diff (renamed from meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/2113.diff)0
-rw-r--r--meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2114.diff (renamed from meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/2114.diff)0
-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.patch (renamed from meta-openmoko/packages/pulseaudio/files/gcc4-compile-fix.patch)0
-rw-r--r--meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/volatiles.04_pulse (renamed from meta-openmoko/packages/pulseaudio/files/volatiles.04_pulse)0
-rw-r--r--meta-moblin/packages/pulseaudio/pulseaudio.inc (renamed from meta-openmoko/packages/pulseaudio/pulse.inc)0
-rw-r--r--meta-moblin/packages/pulseaudio/pulseaudio_0.9.12.bb17
-rw-r--r--meta-openmoko/packages/pulseaudio/files/disable-using-glibc-tls.patch25
-rw-r--r--meta-openmoko/packages/pulseaudio/files/fix-dbus-without-hal.patch15
-rw-r--r--meta-openmoko/packages/pulseaudio/files/fix-shm.patch20
-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
19 files changed, 109 insertions, 170 deletions
diff --git a/meta-openmoko/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
index 51161dbe0f..51161dbe0f 100644
--- a/meta-openmoko/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
diff --git a/meta-openmoko/packages/pulseaudio/libatomics-ops_1.2.bb b/meta-moblin/packages/pulseaudio/libatomics-ops_1.2.bb
index 0563eb6382..0563eb6382 100644
--- a/meta-openmoko/packages/pulseaudio/libatomics-ops_1.2.bb
+++ b/meta-moblin/packages/pulseaudio/libatomics-ops_1.2.bb
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-openmoko/packages/pulseaudio/pulseaudio-0.9.10/2113.diff b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2113.diff
index 666ed34ad3..666ed34ad3 100644
--- a/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/2113.diff
+++ b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2113.diff
diff --git a/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/2114.diff b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2114.diff
index cbd82eeb84..cbd82eeb84 100644
--- a/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/2114.diff
+++ b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/2114.diff
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-openmoko/packages/pulseaudio/files/gcc4-compile-fix.patch b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/gcc4-compile-fix.patch
index 34ad026e4d..34ad026e4d 100644
--- a/meta-openmoko/packages/pulseaudio/files/gcc4-compile-fix.patch
+++ b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/gcc4-compile-fix.patch
diff --git a/meta-openmoko/packages/pulseaudio/files/volatiles.04_pulse b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/volatiles.04_pulse
index 5b1998032b..5b1998032b 100644
--- a/meta-openmoko/packages/pulseaudio/files/volatiles.04_pulse
+++ b/meta-moblin/packages/pulseaudio/pulseaudio-0.9.12/volatiles.04_pulse
diff --git a/meta-openmoko/packages/pulseaudio/pulse.inc b/meta-moblin/packages/pulseaudio/pulseaudio.inc
index 4b13980cc4..4b13980cc4 100644
--- a/meta-openmoko/packages/pulseaudio/pulse.inc
+++ b/meta-moblin/packages/pulseaudio/pulseaudio.inc
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}
diff --git a/meta-openmoko/packages/pulseaudio/files/disable-using-glibc-tls.patch b/meta-openmoko/packages/pulseaudio/files/disable-using-glibc-tls.patch
deleted file mode 100644
index 31d147be7d..0000000000
--- a/meta-openmoko/packages/pulseaudio/files/disable-using-glibc-tls.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1Index: pulseaudio-0.9.9/configure.ac
2===================================================================
3--- pulseaudio-0.9.9.orig/configure.ac 2008-01-24 01:06:06.000000000 +0000
4+++ pulseaudio-0.9.9/configure.ac 2008-02-05 17:45:59.000000000 +0000
5@@ -139,8 +139,8 @@
6 ret=$?
7 rm -f conftest.o conftest
8 if test $ret -eq 0 ; then
9- AC_DEFINE([HAVE_TLS_BUILTIN], 1, [Have __thread().])
10- AC_MSG_RESULT([yes])
11+dnl AC_DEFINE([HAVE_TLS_BUILTIN], 1, [Have __thread().])
12+ AC_MSG_RESULT([no])
13 else
14 AC_MSG_RESULT([no])
15 fi
16@@ -325,8 +325,7 @@
17 rm -f conftest.o conftest
18
19 if test $ret -eq 0 ; then
20- AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], 1, [Have PTHREAD_PRIO_INHERIT.])
21- AC_MSG_RESULT([yes])
22+ AC_MSG_RESULT([no])
23 else
24 AC_MSG_RESULT([no])
25 fi
diff --git a/meta-openmoko/packages/pulseaudio/files/fix-dbus-without-hal.patch b/meta-openmoko/packages/pulseaudio/files/fix-dbus-without-hal.patch
deleted file mode 100644
index f8ac5674a6..0000000000
--- a/meta-openmoko/packages/pulseaudio/files/fix-dbus-without-hal.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Index: pulseaudio-0.9.8/src/Makefile.am
2===================================================================
3--- pulseaudio-0.9.8.orig/src/Makefile.am
4+++ pulseaudio-0.9.8/src/Makefile.am
5@@ -1424,8 +1424,8 @@
6 # HAL
7 libdbus_util_la_SOURCES = modules/dbus-util.c modules/dbus-util.h
8 libdbus_util_la_LDFLAGS = -avoid-version
9-libdbus_util_la_LIBADD = $(AM_LIBADD) $(HAL_LIBS) libpulsecore.la
10-libdbus_util_la_CFLAGS = $(AM_CFLAGS) $(HAL_CFLAGS)
11+libdbus_util_la_LIBADD = $(AM_LIBADD) $(HAL_LIBS) $(DBUS_LIBS) libpulsecore.la
12+libdbus_util_la_CFLAGS = $(AM_CFLAGS) $(HAL_CFLAGS) $(DBUS_CFLAGS)
13
14 module_hal_detect_la_SOURCES = modules/module-hal-detect.c
15 module_hal_detect_la_LDFLAGS = -module -avoid-version
diff --git a/meta-openmoko/packages/pulseaudio/files/fix-shm.patch b/meta-openmoko/packages/pulseaudio/files/fix-shm.patch
deleted file mode 100644
index 3bf61d0d34..0000000000
--- a/meta-openmoko/packages/pulseaudio/files/fix-shm.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1# fixes building against uclibc
2# fixed upstream, see http://www.pulseaudio.org/ticket/200
3Index: pulseaudio-0.9.9/src/pulsecore/shm.c
4===================================================================
5--- pulseaudio-0.9.9/src/pulsecore/shm.c (revision 1971)
6+++ pulseaudio-0.9.9/src/pulsecore/shm.c (revision 2110)
7@@ -319,4 +319,5 @@
8 int pa_shm_cleanup(void) {
9
10+#ifdef HAVE_SHM_OPEN
11 #ifdef SHM_PATH
12 DIR *d;
13@@ -376,5 +377,6 @@
14
15 closedir(d);
16-#endif
17+#endif /* SHM_PATH */
18+#endif /* HAVE_SHM_OPEN */
19
20 return 0;
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
deleted file mode 100644
index 4234af5f53..0000000000
--- a/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/libpulsedsp-references-libpulsecore.patch
+++ /dev/null
@@ -1,24 +0,0 @@
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
deleted file mode 100644
index 9e9e5f55d3..0000000000
--- a/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/libtool2.patch
+++ /dev/null
@@ -1,48 +0,0 @@
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
deleted file mode 100644
index 74ea6ac060..0000000000
--- a/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/pa-drop-caps-returns-void.patch
+++ /dev/null
@@ -1,17 +0,0 @@
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
deleted file mode 100644
index 671fb66a96..0000000000
--- a/meta-openmoko/packages/pulseaudio/pulseaudio_0.9.10.bb
+++ /dev/null
@@ -1,21 +0,0 @@
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)
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-14 19:46:42 +0000