summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/pulseaudio/files/gcc4-compile-fix.patch18
-rw-r--r--packages/pulseaudio/pulse.inc38
-rw-r--r--packages/pulseaudio/pulseaudio_0.9.5.bb2
-rw-r--r--packages/pulseaudio/pulseaudio_0.9.6.bb3
4 files changed, 35 insertions, 26 deletions
diff --git a/packages/pulseaudio/files/gcc4-compile-fix.patch b/packages/pulseaudio/files/gcc4-compile-fix.patch
new file mode 100644
index 0000000000..34ad026e4d
--- /dev/null
+++ b/packages/pulseaudio/files/gcc4-compile-fix.patch
@@ -0,0 +1,18 @@
+| fix for more strict syntax compliance in gcc4.x
+| pulsecore/core-util.c: In function 'pa_raise_priority':
+| pulsecore/core-util.c:547: error: label at end of compound statement
+| Signed off: mickey@openmoko.org
+|
+Index: pulseaudio-0.9.6/src/pulsecore/core-util.c
+===================================================================
+--- pulseaudio-0.9.6.orig/src/pulsecore/core-util.c
++++ pulseaudio-0.9.6/src/pulsecore/core-util.c
+@@ -535,7 +535,7 @@ void pa_raise_priority(void) {
+ pa_log_info("Successfully gained high priority class.");
+ #endif
+
+-fail:
++fail:;
+
+ #if defined(HAVE_SYS_CAPABILITY_H)
+ if (caps) {
diff --git a/packages/pulseaudio/pulse.inc b/packages/pulseaudio/pulse.inc
index d4a9c5ef54..0158a8a9cc 100644
--- a/packages/pulseaudio/pulse.inc
+++ b/packages/pulseaudio/pulse.inc
@@ -6,29 +6,30 @@ LICENSE = "LGPL"
DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool"
# optional
-DEPENDS += "alsa-lib"
-
-PR = "r2"
-
-SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz"
-
-SRC_URI += "file://volatiles.04_pulse"
+DEPENDS += "alsa-lib glib-2.0"
+SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \
+ file://gcc4-compile-fix.patch;patch=1 \
+ file://volatiles.04_pulse"
inherit autotools pkgconfig
EXTRA_OECONF = "\
- --disable-lynx \
+ --disable-lynx \
--without-x \
- --without-glib \
--without-jack \
+ --with-glib \
--with-alsa \
--with-oss \
"
PARALLEL_MAKE = ""
-export TARGET_PFPU="${TARGET_FPU}"
+export TARGET_PFPU = "${TARGET_FPU}"
+
+do_stage() {
+ autotools_stage_all
+}
do_install_append() {
install -d ${D}${sysconfdir}/default/volatiles
@@ -39,17 +40,14 @@ do_install_append() {
fi
}
-
-PACKAGES =+ "libpulsecore libpulse libpulse-simple libpulse-browse libpulse-mainloop-glib pulseaudio-server \
- pulseaudio-misc pulseaudio-gconf-helper"
+PACKAGES =+ "libpulsecore libpulse libpulse-simple libpulse-browse libpulse-mainloop-glib \
+ pulseaudio-server pulseaudio-misc pulseaudio-gconf-helper"
#upgrade path:
RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf"
-
PACKAGES_DYNAMIC = "pulseaudio-lib* pulseaudio-module* libpulse-lib* libpulse-module* "
-
FILES_libpulsecore = "${libdir}/libpulsecore.so.*"
FILES_libpulse = "${libdir}/libpulse.so.*"
FILES_libpulse-simple = "${libdir}/libpulse-simple.so.*"
@@ -91,18 +89,10 @@ else
fi
}
-
-
-
-do_stage() {
- autotools_stage_all
-}
-
-
python populate_packages_prepend() {
#bb.data.setVar('PKG_pulseaudio', 'pulseaudio', d)
plugindir = bb.data.expand('${libdir}/pulse-0.9/modules/', d)
do_split_packages(d, plugindir, '^module-(.*)\.so$', 'pulseaudio-module-%s', 'PulseAudio module for %s', extra_depends='' )
- do_split_packages(d, plugindir, '^lib(.*)\.so$', 'pulseaudio-lib-%s', 'PulseAudio library for %s', extra_depends='' )
+ do_split_packages(d, plugindir, '^lib(.*)\.so$', 'pulseaudio-lib-%s', 'PulseAudio library for %s', extra_depends='' )
}
diff --git a/packages/pulseaudio/pulseaudio_0.9.5.bb b/packages/pulseaudio/pulseaudio_0.9.5.bb
index 3a4ab46cae..63c33c4725 100644
--- a/packages/pulseaudio/pulseaudio_0.9.5.bb
+++ b/packages/pulseaudio/pulseaudio_0.9.5.bb
@@ -1,3 +1,3 @@
require pulse.inc
-PR = "r10"
+PR = "r11"
diff --git a/packages/pulseaudio/pulseaudio_0.9.6.bb b/packages/pulseaudio/pulseaudio_0.9.6.bb
index cd088c9843..fd64673cc7 100644
--- a/packages/pulseaudio/pulseaudio_0.9.6.bb
+++ b/packages/pulseaudio/pulseaudio_0.9.6.bb
@@ -1,3 +1,4 @@
require pulse.inc
-DEFAULT_PREFERENCE = "-1"
+PR = "r3"
+