From 630a9ee3a52c9e4fa972438517905cb815525ad3 Mon Sep 17 00:00:00 2001 From: earthdok Date: Fri, 31 Oct 2014 08:27:07 -0700 Subject: Instrumented libraries: partially fix pulseaudio build on Trusty. BUG=414189 TBR=glider@chromium.org NOTRY=true Review URL: https://codereview.chromium.org/689113002 Cr-Commit-Position: refs/heads/master@{#302268} --- .../instrumented_libraries/patches/pulseaudio.diff | 16 ---------------- .../patches/pulseaudio.precise.diff | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 third_party/instrumented_libraries/patches/pulseaudio.diff create mode 100644 third_party/instrumented_libraries/patches/pulseaudio.precise.diff (limited to 'third_party/instrumented_libraries/patches') diff --git a/third_party/instrumented_libraries/patches/pulseaudio.diff b/third_party/instrumented_libraries/patches/pulseaudio.diff deleted file mode 100644 index fc2ca0d..0000000 --- a/third_party/instrumented_libraries/patches/pulseaudio.diff +++ /dev/null @@ -1,16 +0,0 @@ -diff -rupN ./src/modules/bluetooth/sbc/sbc_primitives_mmx.h ../pulseaudio-1.1-patched/src/modules/bluetooth/sbc/sbc_primitives_mmx.h ---- ./src/modules/bluetooth/sbc/sbc_primitives_mmx.h 2011-10-20 16:54:16.000000000 +0400 -+++ ../pulseaudio-1.1-patched/src/modules/bluetooth/sbc/sbc_primitives_mmx.h 2014-01-30 16:57:43.113946495 +0400 -@@ -29,8 +29,11 @@ - - #include "sbc_primitives.h" - -+// The inline asm causes errors in clang builds. We don't want inline asm in -+// instrumented builds anyway. - #if defined(__GNUC__) && (defined(__i386__) || defined(__amd64__)) && \ -- !defined(SBC_HIGH_PRECISION) && (SCALE_OUT_BITS == 15) -+ !defined(SBC_HIGH_PRECISION) && (SCALE_OUT_BITS == 15) && \ -+ !defined(__clang__) - - #define SBC_BUILD_WITH_MMX_SUPPORT - diff --git a/third_party/instrumented_libraries/patches/pulseaudio.precise.diff b/third_party/instrumented_libraries/patches/pulseaudio.precise.diff new file mode 100644 index 0000000..fc2ca0d --- /dev/null +++ b/third_party/instrumented_libraries/patches/pulseaudio.precise.diff @@ -0,0 +1,16 @@ +diff -rupN ./src/modules/bluetooth/sbc/sbc_primitives_mmx.h ../pulseaudio-1.1-patched/src/modules/bluetooth/sbc/sbc_primitives_mmx.h +--- ./src/modules/bluetooth/sbc/sbc_primitives_mmx.h 2011-10-20 16:54:16.000000000 +0400 ++++ ../pulseaudio-1.1-patched/src/modules/bluetooth/sbc/sbc_primitives_mmx.h 2014-01-30 16:57:43.113946495 +0400 +@@ -29,8 +29,11 @@ + + #include "sbc_primitives.h" + ++// The inline asm causes errors in clang builds. We don't want inline asm in ++// instrumented builds anyway. + #if defined(__GNUC__) && (defined(__i386__) || defined(__amd64__)) && \ +- !defined(SBC_HIGH_PRECISION) && (SCALE_OUT_BITS == 15) ++ !defined(SBC_HIGH_PRECISION) && (SCALE_OUT_BITS == 15) && \ ++ !defined(__clang__) + + #define SBC_BUILD_WITH_MMX_SUPPORT + -- cgit v1.1