Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 749357 | Differences between
and this patch

Collapse All | Expand All

(-)a/meson.build (-3 / +3 lines)
Lines 613-620 if x11_dep.found() Link Here
613
endif
613
endif
614
614
615
# Module dependencies
615
# Module dependencies
616
616
if get_option('oss-output')
617
if cc.has_header('sys/soundcard.h')
617
  assert(cc.has_header('sys/soundcard.h'), 'Need header file for OSS support')
618
  cdata.set('HAVE_OSS_OUTPUT', 1)
618
  cdata.set('HAVE_OSS_OUTPUT', 1)
619
  cdata.set('HAVE_OSS_WRAPPER', 1)
619
  cdata.set('HAVE_OSS_WRAPPER', 1)
620
  cdata.set('PULSEDSP_LOCATION', pulsedsp_location)
620
  cdata.set('PULSEDSP_LOCATION', pulsedsp_location)
Lines 808-814 summary = [ Link Here
808
  '',
808
  '',
809
  'Enable memfd shared memory:    @0@'.format(cdata.has('HAVE_MEMFD')),
809
  'Enable memfd shared memory:    @0@'.format(cdata.has('HAVE_MEMFD')),
810
  'Enable X11:                    @0@'.format(x11_dep.found()),
810
  'Enable X11:                    @0@'.format(x11_dep.found()),
811
#  'Enable OSS Output:             @0@'.format(${ENABLE_OSS_OUTPUT}),
811
  'Enable OSS Output:             @0@'.format(get_option('oss-output')),
812
#  'Enable OSS Wrapper:            @0@'.format(${ENABLE_OSS_WRAPPER}),
812
#  'Enable OSS Wrapper:            @0@'.format(${ENABLE_OSS_WRAPPER}),
813
#  'Enable EsounD:                 @0@'.format(${ENABLE_ESOUND}),
813
#  'Enable EsounD:                 @0@'.format(${ENABLE_ESOUND}),
814
  'Enable Alsa:                   @0@'.format(alsa_dep.found()),
814
  'Enable Alsa:                   @0@'.format(alsa_dep.found()),
(-)a/meson_options.txt (+3 lines)
Lines 123-128 option('openssl', Link Here
123
option('orc',
123
option('orc',
124
       type : 'feature', value : 'auto',
124
       type : 'feature', value : 'auto',
125
       description : 'Optimized Inner Loop Runtime Compiler')
125
       description : 'Optimized Inner Loop Runtime Compiler')
126
option('oss-output',
127
       type : 'boolean',
128
       description : 'Optional OSS output support')
126
option('samplerate',
129
option('samplerate',
127
       type : 'feature', value : 'disabled',
130
       type : 'feature', value : 'disabled',
128
       description : 'Optional libsamplerate support (DEPRECATED)')
131
       description : 'Optional libsamplerate support (DEPRECATED)')
(-)a/src/modules/meson.build (-1 / +1 lines)
Lines 73-79 if cc.has_header('linux/input.h') Link Here
73
  ]
73
  ]
74
endif
74
endif
75
75
76
if cc.has_header('sys/soundcard.h')
76
if get_option('oss-output')
77
  subdir('oss')
77
  subdir('oss')
78
  all_modules += [
78
  all_modules += [
79
    [ 'module-oss', 'oss/module-oss.c', [], [], [], liboss_util ],
79
    [ 'module-oss', 'oss/module-oss.c', [], [], [], liboss_util ],
(-)a/src/utils/meson.build (-1 / +1 lines)
Lines 84-90 if x11_dep.found() Link Here
84
  )
84
  )
85
endif
85
endif
86
86
87
if cc.has_header('sys/soundcard.h')
87
if get_option('oss-output')
88
  libpulsecommon_sources = [
88
  libpulsecommon_sources = [
89
    'padsp.c',
89
    'padsp.c',
90
  ]
90
  ]

Return to bug 749357