summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-sound/pulseaudio')
-rw-r--r--media-sound/pulseaudio/ChangeLog10
-rw-r--r--media-sound/pulseaudio/files/pulseaudio-0.9.21-armv5-build-fix.patch102
-rw-r--r--media-sound/pulseaudio/pulseaudio-0.9.21.1.ebuild10
-rw-r--r--media-sound/pulseaudio/pulseaudio-0.9.21.2-r2.ebuild10
-rw-r--r--media-sound/pulseaudio/pulseaudio-0.9.22.ebuild10
5 files changed, 135 insertions, 7 deletions
diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index 2dbd297dd36a..fe09b38c3785 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for media-sound/pulseaudio
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.198 2010/11/26 06:56:03 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.199 2010/11/27 06:52:54 ford_prefect Exp $
+
+ 27 Nov 2010; Arun Raghavan <ford_prefect@gentoo.org>
+ +files/pulseaudio-0.9.21-armv5-build-fix.patch,
+ pulseaudio-0.9.21.1.ebuild, pulseaudio-0.9.21.2-r2.ebuild,
+ pulseaudio-0.9.22.ebuild:
+ Add a patch to fix compilation on ARMv5. Adding to stable candidate and 2
+ most recent ebuilds. 0.9.21.2 and 0.9.21.2-r1 can be removed after a newer
+ version is keyworded on arm.
26 Nov 2010; Tim Harder <radhermit@gentoo.org> pulseaudio-0.9.22.ebuild:
Fix libX11 xcb USE flag dependency since >=x11-libs/libX11-1.4.0 comes with
diff --git a/media-sound/pulseaudio/files/pulseaudio-0.9.21-armv5-build-fix.patch b/media-sound/pulseaudio/files/pulseaudio-0.9.21-armv5-build-fix.patch
new file mode 100644
index 000000000000..aaaaae6838cf
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio-0.9.21-armv5-build-fix.patch
@@ -0,0 +1,102 @@
+From e5b136fc0fde751df3a94cd64855a74732dd4cc7 Mon Sep 17 00:00:00 2001
+From: Arun Raghavan <arun.raghavan@collabora.co.uk>
+Date: Fri, 26 Nov 2010 11:55:57 +0530
+Subject: [PATCH] volume: Add explicit checks for ARMv6 instructions
+
+This ensures that the build does not fail if the ssat and pkhbt
+instructions are not available (armv5te and below).
+
+Fixes: http://www.pulseaudio.org/ticket/790
+---
+ configure.ac | 33 ++++++++++++++++++++++++++++++++-
+ src/pulsecore/svolume_arm.c | 8 ++++----
+ 2 files changed, 36 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7ab42dc..3df8c6b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -230,7 +230,7 @@ else
+ [pulseaudio_cv_support_arm_atomic_ops=no])
+ ])
+ AS_IF([test "$pulseaudio_cv_support_arm_atomic_ops" = "yes"], [
+- AC_DEFINE([ATOMIC_ARM_INLINE_ASM], 1, [Have ARMv6 instructions.])
++ AC_DEFINE([ATOMIC_ARM_INLINE_ASM], 1, [Have ARM atomic instructions.])
+ need_libatomic_ops=no
+ ])
+ fi
+@@ -249,6 +249,37 @@ else
+ esac
+ fi
+
++# If we're on ARM, check for the ARMV6 instructions we need */
++case $host in
++ arm*)
++ AC_CACHE_CHECK([support for required armv6 instructions],
++ pulseaudio_cv_support_armv6,
++ [AC_COMPILE_IFELSE(
++ AC_LANG_PROGRAM([],
++ [[volatile int a = -60000, b = 0xaaaabbbb, c = 0xccccdddd;
++ asm volatile ("ldr r0, %2 \n"
++ "ldr r2, %3 \n"
++ "ldr r3, %4 \n"
++ "ssat r1, #8, r0 \n"
++ "str r1, %0 \n"
++ "pkhbt r1, r3, r2, LSL #8 \n"
++ "str r1, %1 \n"
++ : "=m" (a), "=m" (b)
++ : "m" (a), "m" (b), "m" (c)
++ : "r0", "r1", "r2", "r3", "cc");
++ return (a == -128 && b == 0xaabbdddd) ? 0 : -1;
++ ]]),
++ [pulseaudio_cv_support_armv6=yes],
++ [pulseaudio_cv_support_armv6=no])
++ ])
++ AS_IF([test "$pulseaudio_cv_support_armv6" = "yes"], [
++ AC_DEFINE([HAVE_ARMV6], 1, [Have ARMv6 instructions.])
++ ])
++ ;;
++ *)
++ ;;
++esac
++
+ CC_CHECK_TLS
+
+ AC_CACHE_CHECK([whether $CC knows _Bool],
+diff --git a/src/pulsecore/svolume_arm.c b/src/pulsecore/svolume_arm.c
+index fdd8f09..3973e51 100644
+--- a/src/pulsecore/svolume_arm.c
++++ b/src/pulsecore/svolume_arm.c
+@@ -35,7 +35,7 @@
+ #include "sample-util.h"
+ #include "endianmacros.h"
+
+-#if defined (__arm__)
++#if defined (__arm__) && defined (HAVE_ARMV6)
+
+ #define MOD_INC() \
+ " subs r0, r6, %2 \n\t" \
+@@ -182,11 +182,11 @@ static void run_test (void) {
+ }
+ #endif
+
+-#endif /* defined (__arm__) */
++#endif /* defined (__arm__) && defined (HAVE_ARMV6) */
+
+
+ void pa_volume_func_init_arm (pa_cpu_arm_flag_t flags) {
+-#if defined (__arm__)
++#if defined (__arm__) && defined (HAVE_ARMV6)
+ pa_log_info("Initialising ARM optimized functions.");
+
+ #ifdef RUN_TEST
+@@ -194,5 +194,5 @@ void pa_volume_func_init_arm (pa_cpu_arm_flag_t flags) {
+ #endif
+
+ pa_set_volume_func (PA_SAMPLE_S16NE, (pa_do_volume_func_t) pa_volume_s16ne_arm);
+-#endif /* defined (__arm__) */
++#endif /* defined (__arm__) && defined (HAVE_ARMV6) */
+ }
+--
+1.7.3.2
+
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.21.1.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.21.1.ebuild
index afcc79c56e8a..62255a2d85c9 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.21.1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.21.1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.21.1.ebuild,v 1.10 2010/09/21 22:36:43 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.21.1.ebuild,v 1.11 2010/11/27 06:52:54 ford_prefect Exp $
EAPI=2
-inherit eutils libtool flag-o-matic versionator
+inherit autotools eutils libtool flag-o-matic versionator
DESCRIPTION="A networked sound server with an advanced plugin system"
HOMEPAGE="http://www.pulseaudio.org/"
@@ -92,6 +92,12 @@ pkg_setup() {
}
src_prepare() {
+ if use arm; then
+ # Fix build on armv5 - bug #294599
+ epatch "${FILESDIR}/${PN}-0.9.21-armv5-build-fix.patch"
+ eautoreconf
+ fi
+
elibtoolize
}
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.21.2-r2.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.21.2-r2.ebuild
index c1fabd58d94b..c1ded9d26d6b 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.21.2-r2.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.21.2-r2.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.21.2-r2.ebuild,v 1.1 2010/09/21 22:36:43 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.21.2-r2.ebuild,v 1.2 2010/11/27 06:52:54 ford_prefect Exp $
EAPI=3
-inherit eutils libtool flag-o-matic versionator
+inherit autotools eutils libtool flag-o-matic versionator
DESCRIPTION="A networked sound server with an advanced plugin system"
HOMEPAGE="http://www.pulseaudio.org/"
@@ -93,6 +93,12 @@ pkg_setup() {
}
src_prepare() {
+ if use arm; then
+ # Fix build on armv5 - bug #294599
+ epatch "${FILESDIR}/${PN}-0.9.21-armv5-build-fix.patch"
+ eautoreconf
+ fi
+
elibtoolize
}
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild
index b8b07eac12f0..9c49c6a87841 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild,v 1.2 2010/11/26 06:56:03 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild,v 1.3 2010/11/27 06:52:54 ford_prefect Exp $
EAPI=3
-inherit eutils libtool flag-o-matic versionator
+inherit autotools eutils libtool flag-o-matic versionator
DESCRIPTION="A networked sound server with an advanced plugin system"
HOMEPAGE="http://www.pulseaudio.org/"
@@ -89,6 +89,12 @@ pkg_setup() {
}
src_prepare() {
+ if use arm; then
+ # Fix build on armv5 - bug #294599
+ epatch "${FILESDIR}/${PN}-0.9.21-armv5-build-fix.patch"
+ eautoreconf
+ fi
+
elibtoolize
}