oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

meson: add fixed-point Vorbis (Tremor) decoder support 

Re-add build support for the fixed-point Vorbis (Tremor) decoder, which
was dropped when switching from Autotools to Meson.

Note, that it is not possible to build both, the Vorbis and the Tremor
decoder.

Closes: #405
This commit is contained in:
Jörg Krause 2019-01-21 08:22:04 +01:00
parent c7848da8f2
commit 4f7d52dbf2
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meson_options.txt
View File

@ -128,6 +128,7 @@ option('mpg123', type: 'feature', description: 'MP3 decoder using libmpg123')
option('opus', type: 'feature', description: 'Opus decoder plugin') option('opus', type: 'feature', description: 'Opus decoder plugin')
option('sidplay', type: 'feature', description: 'C64 SID support via libsidplayfp or libsidplay2') option('sidplay', type: 'feature', description: 'C64 SID support via libsidplayfp or libsidplay2')
option('sndfile', type: 'feature', description: 'libsndfile decoder plugin') option('sndfile', type: 'feature', description: 'libsndfile decoder plugin')
option('tremor', type: 'feature', description: 'Fixed-point vorbis decoder plugin')
option('vorbis', type: 'feature', description: 'Vorbis decoder plugin') option('vorbis', type: 'feature', description: 'Vorbis decoder plugin')
option('wavpack', type: 'feature', description: 'WavPack decoder plugin') option('wavpack', type: 'feature', description: 'WavPack decoder plugin')
option('wildmidi', type: 'feature', description: 'WildMidi decoder plugin') option('wildmidi', type: 'feature', description: 'WildMidi decoder plugin')

6
src/decoder/plugins/meson.build
View File

@ -36,8 +36,9 @@ if flac_dep.found()
] ]
endif endif
conf.set('ENABLE_VORBIS_DECODER', libvorbis_dep.found()) conf.set('ENABLE_VORBIS_DECODER', libvorbis_dep.found() or libvorbisidec_dep.found())
if libvorbis_dep.found() conf.set('HAVE_TREMOR', libvorbisidec_dep.found())
if libvorbis_dep.found() or libvorbisidec_dep.found()
decoder_plugins_sources += [ decoder_plugins_sources += [
'VorbisDecoderPlugin.cxx', 'VorbisDecoderPlugin.cxx',
'VorbisDomain.cxx', 'VorbisDomain.cxx',
@ -181,6 +182,7 @@ decoder_plugins = static_library(
libsidplay_dep, libsidplay_dep,
libsndfile_dep, libsndfile_dep,
libvorbis_dep, libvorbis_dep,
libvorbisidec_dep,
ogg_dep, ogg_dep,
wavpack_dep, wavpack_dep,
wildmidi_dep, wildmidi_dep,

7
src/lib/xiph/meson.build
View File

@ -1,6 +1,11 @@
libflac_dep = dependency('flac', version: '>= 1.2', required: get_option('flac')) libflac_dep = dependency('flac', version: '>= 1.2', required: get_option('flac'))
libopus_dep = dependency('opus', required: get_option('opus')) libopus_dep = dependency('opus', required: get_option('opus'))
libvorbis_dep = dependency('vorbis', required: get_option('vorbis')) libvorbis_dep = dependency('vorbis', required: get_option('vorbis'))
libvorbisidec_dep = dependency('vorbisidec', required: get_option('tremor'))
if get_option('vorbis').enabled() and get_option('tremor').enabled()
error('Cannot build both, the Vorbis decoder AND the Tremor (Vorbis fixed-point) decoder')
endif
libvorbisenc_dep = dependency('', required: false) libvorbisenc_dep = dependency('', required: false)
if need_encoder and not get_option('vorbisenc').disabled() if need_encoder and not get_option('vorbisenc').disabled()
@ -13,7 +18,7 @@ if need_encoder and not get_option('vorbisenc').disabled()
endif endif
endif endif
if libopus_dep.found() or libvorbis_dep.found() or libvorbisenc_dep.found() if libopus_dep.found() or libvorbis_dep.found() or libvorbisenc_dep.found() or libvorbisidec_dep.found()
libogg_dep = dependency('ogg') libogg_dep = dependency('ogg')
else else
libogg_dep = dependency('', required: false) libogg_dep = dependency('', required: false)