From 0a1929653f902ec3418f950ad066723101f0bf06 Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Tue, 2 Jan 2024 21:28:33 +0300 Subject: [PATCH] cmake: make flac, speex and vorbis support in xiph optional Signed-off-by: Alexander Golubev --- CMakeLists.txt | 25 ++++++++++++++----------- ConfigureChecks.cmake | 12 ++++++------ 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 715bba0..84be212 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,17 +51,20 @@ tde_setup_paths( ) option( WITH_ALL_OPTIONS "Enable all optional support" OFF ) option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} ) -OPTION( WITH_LIBLTDL "Build with libltdl" OFF ) -OPTION( WITH_ALSA_SINK "Build with alsa sink" ${WITH_ALL_OPTIONS} ) -OPTION( WITH_JACK_SINK "Build with jack sink" ${WITH_ALL_OPTIONS} ) -OPTION( WITH_PULSE_SINK "Build with pulseaudio sink" ${WITH_ALL_OPTIONS} ) -OPTION( WITH_OSS_SINK "Build with oss sink" ${WITH_ALL_OPTIONS} ) -OPTION( WITH_SUN_SINK "Build with sun sink" OFF ) -OPTION( WITH_FFMPEG_DECODER "Build with ffmpeg decoder" OFF ) -option( WITH_MPC_DECODER "Build with mpc decoder" ${WITH_ALL_OPTIONS} ) -option( WITH_MPEG_DECODER "Build with mpeg decoder" ${WITH_ALL_OPTIONS} ) -OPTION( WITH_SRC_RESAMPLER "Build with src resampler" ${WITH_ALL_OPTIONS} ) -option( WITH_XIPH_DECODER "Build with xiph decoder" ${WITH_ALL_OPTIONS} ) +OPTION( WITH_LIBLTDL "Build with libltdl" OFF ) +OPTION( WITH_ALSA_SINK "Build with alsa sink" ${WITH_ALL_OPTIONS} ) +OPTION( WITH_JACK_SINK "Build with jack sink" ${WITH_ALL_OPTIONS} ) +OPTION( WITH_PULSE_SINK "Build with pulseaudio sink" ${WITH_ALL_OPTIONS} ) +OPTION( WITH_OSS_SINK "Build with oss sink" ${WITH_ALL_OPTIONS} ) +OPTION( WITH_SUN_SINK "Build with sun sink" OFF ) +OPTION( WITH_FFMPEG_DECODER "Build with ffmpeg decoder" OFF ) +option( WITH_MPC_DECODER "Build with musepack decoder" ${WITH_ALL_OPTIONS} ) +option( WITH_MPEG_DECODER "Build with mpeg decoder" ${WITH_ALL_OPTIONS} ) +OPTION( WITH_SRC_RESAMPLER "Build with src resampler" ${WITH_ALL_OPTIONS} ) +option( WITH_XIPH_DECODER "Build with xiph decoder" ${WITH_ALL_OPTIONS} ) +option( WITH_XIPH_FLAC "Build xiph decoder with flac support" ON ) +option( WITH_XIPH_SPEEX "Build xiph decoder with speex support" ON ) +option( WITH_XIPH_VORBIS "Build xiph decoder with vorbis support" ON ) ##### configure checks diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 9867c04..980b744 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -210,7 +210,7 @@ endif( WITH_MPEG_DECODER ) ##### check FLAC support ######################## -if( WITH_XIPH_DECODER ) +if( WITH_XIPH_DECODER AND WITH_XIPH_FLAC ) # check for FLAC module pkg_search_module( FLAC flac>=1.1.3 ) @@ -254,12 +254,12 @@ if( WITH_XIPH_DECODER ) tde_message_fatal( "FLAC >= 1.1.1 are required, but not found on your system" ) endif( NOT FLAC_LIBRARIES ) -endif( WITH_XIPH_DECODER ) +endif( WITH_XIPH_DECODER AND WITH_XIPH_FLAC ) ##### check speex support ####################### -if( WITH_XIPH_DECODER ) +if( WITH_XIPH_DECODER AND WITH_XIPH_SPEEX ) # check for speex module pkg_search_module( SPEEX speex>=1.2 ) @@ -291,12 +291,12 @@ if( WITH_XIPH_DECODER ) tde_message_fatal( "speex are required, but not found on your system" ) endif( SPEEX_FOUND ) -endif( WITH_XIPH_DECODER ) +endif( WITH_XIPH_DECODER AND WITH_XIPH_SPEEX ) ##### check ogg/vorbis support ################## -if( WITH_XIPH_DECODER ) +if( WITH_XIPH_DECODER AND WITH_XIPH_VORBIS ) pkg_search_module( OGG ogg ) if( NOT OGG_FOUND ) @@ -315,7 +315,7 @@ if( WITH_XIPH_DECODER ) set( HAVE_OGG_VORBIS 1 ) -endif( WITH_XIPH_DECODER ) +endif( WITH_XIPH_DECODER AND WITH_XIPH_VORBIS ) ##### check samplerate support ##################