94 lines
3.0 KiB
Plaintext
94 lines
3.0 KiB
Plaintext
$OpenBSD: patch-media_media_gyp,v 1.30 2014/09/11 19:04:52 robert Exp $
|
|
--- media/media.gyp.orig.port Wed Sep 10 01:47:13 2014
|
|
+++ media/media.gyp Wed Sep 10 22:05:41 2014
|
|
@@ -22,7 +22,7 @@
|
|
'media_use_libvpx%': 1,
|
|
}],
|
|
# Enable ALSA and Pulse for runtime selection.
|
|
- ['(OS=="linux" or OS=="freebsd" or OS=="solaris") and embedded!=1', {
|
|
+ ['(OS=="linux" or OS=="freebsd" or OS=="solaris") and embedded!=1 and os_bsd != 1', {
|
|
# ALSA is always needed for Web MIDI even if the cras is enabled.
|
|
'use_alsa%': 1,
|
|
'conditions': [
|
|
@@ -31,6 +31,10 @@
|
|
}, {
|
|
'use_pulseaudio%': 1,
|
|
}],
|
|
+ # Override to dynamically link the sndio library.
|
|
+ ['OS=="openbsd"', {
|
|
+ 'use_sndioaudio%': 0,
|
|
+ }],
|
|
],
|
|
}, {
|
|
'use_alsa%': 0,
|
|
@@ -164,6 +168,8 @@
|
|
'audio/pulse/pulse_input.h',
|
|
'audio/pulse/pulse_output.cc',
|
|
'audio/pulse/pulse_output.h',
|
|
+ 'audio/sndio/sndio_output.cc',
|
|
+ 'audio/sndio/sndio_output.h',
|
|
'audio/pulse/pulse_util.cc',
|
|
'audio/pulse/pulse_util.h',
|
|
'audio/sample_rates.cc',
|
|
@@ -662,6 +668,24 @@
|
|
'../third_party/libyuv/libyuv.gyp:libyuv',
|
|
],
|
|
}],
|
|
+ ['use_sndio == 1', {
|
|
+ 'link_settings': {
|
|
+ 'libraries': [
|
|
+ '-lsndio',
|
|
+ ],
|
|
+ },
|
|
+ 'defines': [
|
|
+ 'USE_SNDIO',
|
|
+ ],
|
|
+ 'sources!': [
|
|
+ 'audio/linux/audio_manager_linux.cc',
|
|
+ ],
|
|
+ }, { # else: use_sndio == 0
|
|
+ 'sources!': [
|
|
+ 'audio/sndio/sndio_output.cc',
|
|
+ 'audio/sndio/sndio_output.h',
|
|
+ ],
|
|
+ }],
|
|
['use_alsa==1', {
|
|
'link_settings': {
|
|
'libraries': [
|
|
@@ -683,7 +707,7 @@
|
|
'audio/openbsd/audio_manager_openbsd.h',
|
|
],
|
|
}],
|
|
- ['OS=="linux"', {
|
|
+ ['OS=="linux" or OS=="openbsd"', {
|
|
'conditions': [
|
|
['use_x11==1', {
|
|
'dependencies': [
|
|
@@ -984,7 +1008,7 @@
|
|
'base/simd/convert_yuv_to_rgb_x86.cc',
|
|
],
|
|
}],
|
|
- ['OS!="linux" and OS!="win"', {
|
|
+ ['OS!="linux" and OS!="win" and OS!="openbsd"', {
|
|
'sources!': [
|
|
'base/keyboard_event_counter.cc',
|
|
'base/keyboard_event_counter.h',
|
|
@@ -1179,7 +1203,7 @@
|
|
'USE_PULSEAUDIO',
|
|
],
|
|
}],
|
|
- ['os_posix==1 and OS!="mac"', {
|
|
+ ['os_posix==1 and OS!="mac" and OS!="openbsd"', {
|
|
'conditions': [
|
|
['use_allocator!="none"', {
|
|
'dependencies': [
|
|
@@ -1731,7 +1755,7 @@
|
|
'filters/pipeline_integration_test_base.cc',
|
|
],
|
|
'conditions': [
|
|
- ['os_posix==1 and OS!="mac"', {
|
|
+ ['os_posix==1 and OS!="mac" and OS!="openbsd"', {
|
|
'conditions': [
|
|
['use_allocator!="none"', {
|
|
'dependencies': [
|