third_party/instrumented_libraries/patches/pulseaudio.diff - Issue 689113002: Instrumented libraries: partially fix pulseaudio build on Trusty.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/instrumented_libraries/patches/pulseaudio.diff

Issue 689113002: Instrumented libraries: partially fix pulseaudio build on Trusty. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/instrumented_libraries/instrumented_libraries.gyp ('k') | third_party/instrumented_libraries/patches/pulseaudio.precise.diff » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/instrumented_libraries/patches/pulseaudio.diff

diff --git a/third_party/instrumented_libraries/patches/pulseaudio.diff b/third_party/instrumented_libraries/patches/pulseaudio.diff

deleted file mode 100644

index fc2ca0d297c7832a227138ee7a5d20c986735efc..0000000000000000000000000000000000000000

--- 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