diff options
| author | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2018-08-18 14:21:02 +0000 |
|---|---|---|
| committer | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2018-08-18 14:21:02 +0000 |
| commit | 13ee5b072d4e3ee1e06f308014d7f298da681f62 (patch) | |
| tree | 2c29f123993acaded9899f4ff728f288f25bdbc3 /www/iridium/files/patch-media_audio_BUILD.gn | |
| parent | security/n2n: Cleanup Makefile (diff) | |
www/iridium: Update to 2018.5.67
Diffstat (limited to 'www/iridium/files/patch-media_audio_BUILD.gn')
| -rw-r--r-- | www/iridium/files/patch-media_audio_BUILD.gn | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/www/iridium/files/patch-media_audio_BUILD.gn b/www/iridium/files/patch-media_audio_BUILD.gn index 93a30a4e7abd..4e0db7c6409d 100644 --- a/www/iridium/files/patch-media_audio_BUILD.gn +++ b/www/iridium/files/patch-media_audio_BUILD.gn @@ -1,11 +1,11 @@ ---- media/audio/BUILD.gn.orig 2017-04-19 19:06:35 UTC -+++ media/audio/BUILD.gn -@@ -212,9 +212,19 @@ source_set("audio") { +--- media/audio/BUILD.gn.orig 2018-01-04 21:05:54.000000000 +0100 ++++ media/audio/BUILD.gn 2018-01-27 12:34:55.048961000 +0100 +@@ -237,9 +237,19 @@ deps += [ "//media/base/android:media_jni_headers" ] } - if (is_linux) { -+ if (is_linux || (is_bsd && !use_sndio)) { ++ if (is_linux && !use_sndio) { sources += [ "linux/audio_manager_linux.cc" ] } + if (use_sndio) { @@ -21,17 +21,11 @@ if (use_alsa) { libs += [ "asound" ] -@@ -261,10 +261,12 @@ source_set("audio") { +@@ -285,7 +295,6 @@ + if (link_pulseaudio) { configs += [ ":libpulse" ] } else { - # TODO(ajwong): Technically, this dl should go in the action. - libs += [ "dl" ] deps += [ ":pulse_generate_stubs" ] sources += get_target_outputs(":pulse_generate_stubs") } -+ if (is_linux) { -+ libs += [ "dl" ] -+ } - } - - configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |