Differential D16383 Diff 45670 head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_audio_BUILD.gn
Changeset View
Changeset View
Standalone View
Standalone View
head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_audio_BUILD.gn
--- src/3rdparty/chromium/media/audio/BUILD.gn.orig 2017-01-26 00:49:15 UTC | --- src/3rdparty/chromium/media/audio/BUILD.gn.orig 2018-04-10 14:05:55 UTC | ||||
+++ src/3rdparty/chromium/media/audio/BUILD.gn | +++ src/3rdparty/chromium/media/audio/BUILD.gn | ||||
@@ -206,7 +206,7 @@ source_set("audio") { | @@ -206,7 +206,7 @@ source_set("audio") { | ||||
deps += [ "//media/base/android:media_jni_headers" ] | deps += [ "//media/base/android:media_jni_headers" ] | ||||
} | } | ||||
- if (is_linux) { | - if (is_linux) { | ||||
+ if (is_linux || is_bsd) { | + if (is_linux || (is_bsd && !use_sndio)) { | ||||
sources += [ "linux/audio_manager_linux.cc" ] | sources += [ "linux/audio_manager_linux.cc" ] | ||||
} | } | ||||
@@ -255,10 +255,12 @@ source_set("audio") { | @@ -255,10 +255,24 @@ source_set("audio") { | ||||
configs += [ ":libpulse" ] | configs += [ ":libpulse" ] | ||||
} else { | } else { | ||||
# TODO(ajwong): Technically, this dl should go in the action. | # TODO(ajwong): Technically, this dl should go in the action. | ||||
- libs += [ "dl" ] | - libs += [ "dl" ] | ||||
deps += [ ":pulse_generate_stubs" ] | deps += [ ":pulse_generate_stubs" ] | ||||
sources += get_target_outputs(":pulse_generate_stubs") | sources += get_target_outputs(":pulse_generate_stubs") | ||||
} | } | ||||
+ if (is_linux) { | + if (is_linux) { | ||||
+ libs += [ "dl" ] | + libs += [ "dl" ] | ||||
+ } | + } | ||||
+ } | |||||
+ | |||||
+ if (use_sndio) { | |||||
+ libs += [ "sndio" ] | |||||
+ sources += [ | |||||
+ "openbsd/audio_manager_openbsd.cc", | |||||
+ "openbsd/audio_manager_openbsd.h", | |||||
+ "sndio/sndio_input.cc", | |||||
+ "sndio/sndio_input.h", | |||||
+ "sndio/sndio_output.cc", | |||||
+ "sndio/sndio_output.h", | |||||
+ ] | |||||
} | } | ||||
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] | configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |