From f1eaa01de2b4c2a430908a599317238c9c993548 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Tue, 10 Oct 2023 19:52:00 +0200 Subject: [PATCH] [oss] moved detection to module --- CMakeLists.txt | 10 ---------- channels/audin/client/oss/CMakeLists.txt | 2 ++ channels/rdpsnd/client/oss/CMakeLists.txt | 2 ++ channels/tsmf/client/oss/CMakeLists.txt | 3 +++ 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c135ec3e8..29445d4d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -509,7 +509,6 @@ endif(APPLE) # OpenBSD if(OPENBSD) set(WITH_MANPAGES "ON") - set(WITH_OSS "OFF") set(WITH_SNDIO "ON") set(WITH_WAYLAND "OFF") endif() @@ -590,10 +589,6 @@ set(MBEDTLS_FEATURE_TYPE "OPTIONAL") set(MBEDTLS_FEATURE_PURPOSE "cryptography") set(MBEDTLS_FEATURE_DESCRIPTION "encryption, certificate validation, hashing functions") -set(OSS_FEATURE_TYPE "RECOMMENDED") -set(OSS_FEATURE_PURPOSE "sound") -set(OSS_FEATURE_DESCRIPTION "audio input, audio output and multimedia redirection") - set(SNDIO_FEATURE_TYPE "OPTIONAL") set(SNDIO_FEATURE_PURPOSE "sound") set(SNDIO_FEATURE_DESCRIPTION "OpenBSD audio input/output") @@ -648,7 +643,6 @@ set(SOXR_FEATURE_DESCRIPTION "SOX audio resample library") if(WIN32) set(WAYLAND_FEATURE_TYPE "DISABLED") - set(OSS_FEATURE_TYPE "DISABLED") set(SNDIO_FEATURE_TYPE "DISABLED") set(PCSC_FEATURE_TYPE "DISABLED") set(FFMPEG_FEATURE_TYPE "OPTIONAL") @@ -659,7 +653,6 @@ if(APPLE) set(FFMPEG_FEATURE_TYPE "OPTIONAL") set(VAAPI_FEATURE_TYPE "DISABLED") set(WAYLAND_FEATURE_TYPE "DISABLED") - set(OSS_FEATURE_TYPE "DISABLED") set(SNDIO_FEATURE_TYPE "DISABLED") if(IOS) set(PCSC_FEATURE_TYPE "DISABLED") @@ -683,7 +676,6 @@ endif(UNIX AND NOT ANDROID) if(ANDROID) set(WAYLAND_FEATURE_TYPE "DISABLED") - set(OSS_FEATURE_TYPE "DISABLED") set(SNDIO_FEATURE_TYPE "DISABLED") set(PCSC_FEATURE_TYPE "DISABLED") set(VAAPI_FEATURE_TYPE "DISABLED") @@ -694,8 +686,6 @@ find_feature(Wayland ${WAYLAND_FEATURE_TYPE} ${WAYLAND_FEATURE_PURPOSE} ${WAYLAN find_feature(OpenSSL ${OPENSSL_FEATURE_TYPE} ${OPENSSL_FEATURE_PURPOSE} ${OPENSSL_FEATURE_DESCRIPTION}) find_feature(MbedTLS ${MBEDTLS_FEATURE_TYPE} ${MBEDTLS_FEATURE_PURPOSE} ${MBEDTLS_FEATURE_DESCRIPTION}) -find_feature(OSS ${OSS_FEATURE_TYPE} ${OSS_FEATURE_PURPOSE} ${OSS_FEATURE_DESCRIPTION}) - find_feature(PCSC ${PCSC_FEATURE_TYPE} ${PCSC_FEATURE_PURPOSE} ${PCSC_FEATURE_DESCRIPTION}) option(WITH_AAD "Compile with support for Azure AD authentication" ON) diff --git a/channels/audin/client/oss/CMakeLists.txt b/channels/audin/client/oss/CMakeLists.txt index fb200952d..6b747e457 100644 --- a/channels/audin/client/oss/CMakeLists.txt +++ b/channels/audin/client/oss/CMakeLists.txt @@ -17,6 +17,8 @@ define_channel_client_subsystem("audin" "oss" "") +find_package(OSS REQUIRED) + set(${MODULE_PREFIX}_SRCS audin_oss.c ) diff --git a/channels/rdpsnd/client/oss/CMakeLists.txt b/channels/rdpsnd/client/oss/CMakeLists.txt index 5f839748e..83bd59f0a 100644 --- a/channels/rdpsnd/client/oss/CMakeLists.txt +++ b/channels/rdpsnd/client/oss/CMakeLists.txt @@ -17,6 +17,8 @@ define_channel_client_subsystem("rdpsnd" "oss" "") +find_package(OSS REQUIRED) + set(${MODULE_PREFIX}_SRCS rdpsnd_oss.c ) diff --git a/channels/tsmf/client/oss/CMakeLists.txt b/channels/tsmf/client/oss/CMakeLists.txt index 0217fc002..9ff9e81cf 100644 --- a/channels/tsmf/client/oss/CMakeLists.txt +++ b/channels/tsmf/client/oss/CMakeLists.txt @@ -17,12 +17,15 @@ define_channel_client_subsystem("tsmf" "oss" "audio") +find_package(OSS REQUIRED) + set(${MODULE_PREFIX}_SRCS tsmf_oss.c ) set(${MODULE_PREFIX}_LIBS winpr + ${OSS_LIBRARIES} ) include_directories(..)