diff options
author | Dongxiao Xu <dongxiao.xu@intel.com> | 2010-12-27 16:57:29 +0800 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-12-30 12:06:53 +0000 |
commit | ac36c6305a11cf1cf804e08c50773ed7e0052438 (patch) | |
tree | 0b6e0a28f71a496cbe357576dac67cb200c2ea47 /meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/armv4+v5asm.patch | |
parent | 40806b169676f186c02e4a866e43c4baa8faec2a (diff) | |
download | poky-ac36c6305a11cf1cf804e08c50773ed7e0052438.tar.gz |
pulseaudio: upgrade to version 0.9.22
upgrade from 0.9.21 to 0.9.22
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Diffstat (limited to 'meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/armv4+v5asm.patch')
-rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/armv4+v5asm.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/armv4+v5asm.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/armv4+v5asm.patch new file mode 100644 index 0000000000..f07ee672ee --- /dev/null +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/armv4+v5asm.patch | |||
@@ -0,0 +1,59 @@ | |||
1 | Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com> | ||
2 | |||
3 | Index: pulseaudio-0.9.21/src/pulsecore/svolume_arm.c | ||
4 | =================================================================== | ||
5 | --- pulseaudio-0.9.21.orig/src/pulsecore/svolume_arm.c | ||
6 | +++ pulseaudio-0.9.21/src/pulsecore/svolume_arm.c | ||
7 | @@ -37,6 +37,14 @@ | ||
8 | |||
9 | #if defined (__arm__) | ||
10 | |||
11 | +/* | ||
12 | + the code below uses armv6 instructions; we can safely ifdef this away as the code is only | ||
13 | + called if the arm architecture is v6 or higher | ||
14 | +*/ | ||
15 | +#if (!defined (__ARM_ARCH_4__) && !defined (__ARM_ARCH_4T__) \ | ||
16 | + && !defined (__ARM_ARCH_5__)&& !defined (__ARM_ARCH_5E__) && !defined (__ARM_ARCH_5T__) \ | ||
17 | + && !defined (__ARM_ARCH_5TE__) && !defined (__ARM_ARCH_5TEJ__)) | ||
18 | + | ||
19 | #define MOD_INC() \ | ||
20 | " subs r0, r6, %2 \n\t" \ | ||
21 | " addcs r0, %1 \n\t" \ | ||
22 | @@ -179,11 +187,15 @@ static void run_test (void) { | ||
23 | } | ||
24 | #endif | ||
25 | |||
26 | +#endif /* (!defined (__ARM_ARCH_4__) && !defined (__ARM_ARCH_4T__) ... */ | ||
27 | #endif /* defined (__arm__) */ | ||
28 | |||
29 | |||
30 | void pa_volume_func_init_arm (pa_cpu_arm_flag_t flags) { | ||
31 | #if defined (__arm__) | ||
32 | +#if (!defined (__ARM_ARCH_4__) && !defined (__ARM_ARCH_4T__) \ | ||
33 | + && !defined (__ARM_ARCH_5__)&& !defined (__ARM_ARCH_5E__) && !defined (__ARM_ARCH_5T__) \ | ||
34 | + && !defined (__ARM_ARCH_5TE__) && !defined (__ARM_ARCH_5TEJ__)) | ||
35 | pa_log_info("Initialising ARM optimized functions."); | ||
36 | |||
37 | #ifdef RUN_TEST | ||
38 | @@ -191,5 +203,6 @@ void pa_volume_func_init_arm (pa_cpu_arm | ||
39 | #endif | ||
40 | |||
41 | pa_set_volume_func (PA_SAMPLE_S16NE, (pa_do_volume_func_t) pa_volume_s16ne_arm); | ||
42 | +#endif /* (!defined (__ARM_ARCH_4__) && !defined (__ARM_ARCH_4T__) ... */ | ||
43 | #endif /* defined (__arm__) */ | ||
44 | } | ||
45 | Index: pulseaudio-0.9.21/src/modules/bluetooth/sbc_math.h | ||
46 | =================================================================== | ||
47 | --- pulseaudio-0.9.21.orig/src/modules/bluetooth/sbc_math.h | ||
48 | +++ pulseaudio-0.9.21/src/modules/bluetooth/sbc_math.h | ||
49 | @@ -47,7 +47,9 @@ typedef int32_t sbc_fixed_t; | ||
50 | |||
51 | #define SBC_FIXED_0(val) { val = 0; } | ||
52 | #define MUL(a, b) ((a) * (b)) | ||
53 | -#ifdef __arm__ | ||
54 | +#if (defined(__arm__) && !defined (__ARM_ARCH_4__) && !defined (__ARM_ARCH_4T__) \ | ||
55 | + && !defined (__ARM_ARCH_5__)&& !defined (__ARM_ARCH_5E__) && !defined (__ARM_ARCH_5T__) \ | ||
56 | + && !defined (__ARM_ARCH_5TE__) && !defined (__ARM_ARCH_5TEJ__)) | ||
57 | #define MULA(a, b, res) ({ \ | ||
58 | int tmp = res; \ | ||
59 | __asm__( \ | ||