From 073426d4c10338bc20121702ed0fe61bf2f9d5f0 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Fri, 6 Sep 2024 09:41:06 +0200 Subject: [PATCH 1/5] [cmake,ffmpeg] update CMake detection script --- cmake/FindFFmpeg.cmake | 243 +++++++++++++++++++++++++++++------------ 1 file changed, 172 insertions(+), 71 deletions(-) diff --git a/cmake/FindFFmpeg.cmake b/cmake/FindFFmpeg.cmake index ef65af423..85091b505 100644 --- a/cmake/FindFFmpeg.cmake +++ b/cmake/FindFFmpeg.cmake @@ -1,78 +1,179 @@ -# - Try to find FFmpeg -# Using Pkg-config if available for path +# vim: ts=2 sw=2 +# - Try to find the required ffmpeg components(default: AVFORMAT, AVUTIL, AVCODEC) # -# FFMPEG_FOUND - all required ffmpeg components found on system -# FFMPEG_INCLUDE_DIRS - combined include directories -# FFMPEG_LIBRARIES - combined libraries to link - -set(REQUIRED_AVCODEC_VERSION 0.8) -set(REQUIRED_AVCODEC_API_VERSION 53.25.0) - -find_package(PkgConfig) - -if (PKG_CONFIG_FOUND) - pkg_check_modules(AVCODEC libavcodec) - pkg_check_modules(AVUTIL libavutil) - pkg_check_modules(AVRESAMPLE libavresample) - pkg_check_modules(SWRESAMPLE libswresample) -endif(PKG_CONFIG_FOUND) - -# avcodec -find_path(AVCODEC_INCLUDE_DIR libavcodec/avcodec.h PATHS ${AVCODEC_INCLUDE_DIRS}) -find_library(AVCODEC_LIBRARY avcodec PATHS ${AVCODEC_LIBRARY_DIRS}) - -# avutil -find_path(AVUTIL_INCLUDE_DIR libavutil/avutil.h PATHS ${AVUTIL_INCLUDE_DIRS}) -find_library(AVUTIL_LIBRARY avutil PATHS ${AVUTIL_LIBRARY_DIRS}) - -# swresample -find_path(SWRESAMPLE_INCLUDE_DIR libswresample/swresample.h PATHS ${SWRESAMPLE_INCLUDE_DIRS}) -find_library(SWRESAMPLE_LIBRARY NAMES swresample swresample-3 PATHS ${SWRESAMPLE_LIBRARY_DIRS}) - -if (SWRESAMPLE_INCLUDE_DIR AND SWRESAMPLE_LIBRARY) - set(SWRESAMPLE_FOUND ON) -endif() - -# avresample -find_path(AVRESAMPLE_INCLUDE_DIR libavresample/avresample.h PATHS ${AVRESAMPLE_INCLUDE_DIRS}) -find_library(AVRESAMPLE_LIBRARY avresample PATHS ${AVRESAMPLE_LIBRARY_DIRS}) - -if (AVRESAMPLE_INCLUDE_DIR AND AVRESAMPLE_LIBRARY) - set(AVRESAMPLE_FOUND ON) -endif() - -if (AVCODEC_INCLUDE_DIR AND AVCODEC_LIBRARY) - set(AVCODEC_FOUND TRUE) -endif(AVCODEC_INCLUDE_DIR AND AVCODEC_LIBRARY) - -if (AVUTIL_INCLUDE_DIR AND AVUTIL_LIBRARY) - set(AVUTIL_FOUND TRUE) -endif(AVUTIL_INCLUDE_DIR AND AVUTIL_LIBRARY) +# Once done this will define +# FFMPEG_FOUND - System has the all required components. +# FFMPEG_INCLUDE_DIRS - Include directory necessary for using the required components headers. +# FFMPEG_LIBRARIES - Link these to use the required ffmpeg components. +# FFMPEG_DEFINITIONS - Compiler switches required for using the required ffmpeg components. +# +# For each of the components +# - AVCODEC +# - AVDEVICE +# - AVFORMAT +# - AVFILTER +# - AVUTIL +# - POSTPROCESS +# - SWSCALE +# - SWRESAMPLE +# the following variables will be defined: +# _FOUND - System has +# _INCLUDE_DIRS - Include directory necessary for using the headers +# _LIBRARIES - Link these to use +# _DEFINITIONS - Compiler switches required for using +# _VERSION - The components version +# +# As the versions of the various FFmpeg components differ for a given release, +# and CMake supports only one common version for all components, use the +# following to specify required versions for multiple components: +# +# find_package(FFmpeg 57.48 COMPONENTS AVCODEC) +# find_package(FFmpeg 57.40 COMPONENTS AVFORMAT) +# find_package(FFmpeg 55.27 COMPONENTS AVUTIL) +# +# SPDX-FileCopyrightText: 2006 Matthias Kretz +# SPDX-FileCopyrightText: 2008 Alexander Neundorf +# SPDX-FileCopyrightText: 2011 Michael Jansen +# SPDX-FileCopyrightText: 2021 Stefan Brüns +# SPDX-License-Identifier: BSD-3-Clause include(FindPackageHandleStandardArgs) -if (SWRESAMPLE_FOUND) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(FFmpeg DEFAULT_MSG AVUTIL_FOUND AVCODEC_FOUND SWRESAMPLE_FOUND) -else() - FIND_PACKAGE_HANDLE_STANDARD_ARGS(FFmpeg DEFAULT_MSG AVUTIL_FOUND AVCODEC_FOUND AVRESAMPLE_FOUND) + +if(NOT FFmpeg_FIND_COMPONENTS) + # The default components were taken from a survey over other FindFFMPEG.cmake files + set(FFmpeg_FIND_COMPONENTS AVCODEC AVFORMAT AVUTIL) endif() -if (AVCODEC_VERSION) - if (${AVCODEC_VERSION} VERSION_LESS ${REQUIRED_AVCODEC_API_VERSION}) - message(FATAL_ERROR - "libavcodec version >= ${REQUIRED_AVCODEC_VERSION} (API >= ${REQUIRED_AVCODEC_API_VERSION}) is required") - endif() -else(AVCODEC_VERSION) - message("Note: To build libavcodec version >= ${REQUIRED_AVCODEC_VERSION} (API >= ${REQUIRED_AVCODEC_API_VERSION}) is required") -endif(AVCODEC_VERSION) +list(LENGTH FFmpeg_FIND_COMPONENTS _numComponents) -if (FFMPEG_FOUND) - if (SWRESAMPLE_FOUND) - set(FFMPEG_INCLUDE_DIRS ${AVCODEC_INCLUDE_DIR} ${AVUTIL_INCLUDE_DIR} ${SWRESAMPLE_INCLUDE_DIR}) - set(FFMPEG_LIBRARIES ${AVCODEC_LIBRARY} ${AVUTIL_LIBRARY} ${SWRESAMPLE_LIBRARY}) - elseif (AVRESAMPLE_FOUND) - set(FFMPEG_INCLUDE_DIRS ${AVCODEC_INCLUDE_DIR} ${AVUTIL_INCLUDE_DIR} ${AVRESAMPLE_INCLUDE_DIR}) - set(FFMPEG_LIBRARIES ${AVCODEC_LIBRARY} ${AVUTIL_LIBRARY} ${AVRESAMPLE_LIBRARY}) - endif() -endif(FFMPEG_FOUND) +if((${_numComponents} GREATER 1) AND DEFINED ${FFmpeg_FIND_VERSION}) + message(WARNING "Using a required version in combination with multiple COMPONENTS is not supported") + set(_FFmpeg_REQUIRED_VERSION 0) +elseif(DEFINED FFmpeg_FIND_VERSION) + set(_FFmpeg_REQUIRED_VERSION ${FFmpeg_FIND_VERSION}) +else() + set(_FFmpeg_REQUIRED_VERSION 0) +endif() -mark_as_advanced(FFMPEG_INCLUDE_DIRS FFMPEG_LIBRARIES) +set(_FFmpeg_ALL_COMPONENTS AVCODEC AVDEVICE AVFORMAT AVFILTER AVUTIL POSTPROCESS SWSCALE SWRESAMPLE) + +# +# ## Macro: set_component_found +# +# Marks the given component as found if both *_LIBRARIES AND *_INCLUDE_DIRS is present. +# +macro(set_component_found _component) + if(${_component}_LIBRARIES AND ${_component}_INCLUDE_DIRS) + set(${_component}_FOUND TRUE) + set(FFmpeg_${_component}_FOUND TRUE) + endif() +endmacro() + +# +# ## Macro: find_component +# +# Checks for the given component by invoking pkgconfig and then looking up the libraries and +# include directories. +# +macro(find_component _component _pkgconfig _library _header) + if(NOT WIN32) + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls + find_package(PkgConfig) + + if(PKG_CONFIG_FOUND) + pkg_check_modules(PC_${_component} QUIET ${_pkgconfig}) + endif() + endif(NOT WIN32) + + find_path(${_component}_INCLUDE_DIRS ${_header} + HINTS + ${PC_LIB${_component}_INCLUDEDIR} + ${PC_LIB${_component}_INCLUDE_DIRS} + PATH_SUFFIXES + ffmpeg + ) + + find_library(${_component}_LIBRARIES NAMES ${_library} + HINTS + ${PC_LIB${_component}_LIBDIR} + ${PC_LIB${_component}_LIBRARY_DIRS} + ) + + set(${_component}_DEFINITIONS ${PC_${_component}_CFLAGS_OTHER} CACHE STRING "The ${_component} CFLAGS.") + set(${_component}_VERSION ${PC_${_component}_VERSION} CACHE STRING "The ${_component} version number.") + + set_component_found(${_component}) + + mark_as_advanced( + ${_component}_INCLUDE_DIRS + ${_component}_LIBRARIES + ${_component}_DEFINITIONS + ${_component}_VERSION) +endmacro() + +# Check for cached results. If there are skip the costly part. +if(NOT FFMPEG_LIBRARIES) + # Check for all possible component. + find_component(AVCODEC libavcodec avcodec libavcodec/avcodec.h) + find_component(AVFORMAT libavformat avformat libavformat/avformat.h) + find_component(AVFILTER libavfilter avfilter libavfilter/avfilter.h) + find_component(AVDEVICE libavdevice avdevice libavdevice/avdevice.h) + find_component(AVUTIL libavutil avutil libavutil/avutil.h) + find_component(SWSCALE libswscale swscale libswscale/swscale.h) + find_component(SWRESAMPLE libswresample swresample libswresample/swresample.h) + find_component(POSTPROCESS libpostproc postproc libpostproc/postprocess.h) + + # Check if the required components were found and add their stuff to the FFMPEG_* vars. + foreach(_component ${_FFmpeg_ALL_COMPONENTS}) + if(${_component}_FOUND) + set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${${_component}_LIBRARIES}) + set(FFMPEG_DEFINITIONS ${FFMPEG_DEFINITIONS} ${${_component}_DEFINITIONS}) + list(APPEND FFMPEG_INCLUDE_DIRS ${${_component}_INCLUDE_DIRS}) + endif() + endforeach() + + # Build the include path with duplicates removed. + if(FFMPEG_INCLUDE_DIRS) + list(REMOVE_DUPLICATES FFMPEG_INCLUDE_DIRS) + endif() + + # cache the vars. + set(FFMPEG_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIRS} CACHE STRING "The FFmpeg include directories." FORCE) + set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} CACHE STRING "The FFmpeg libraries." FORCE) + set(FFMPEG_DEFINITIONS ${FFMPEG_DEFINITIONS} CACHE STRING "The FFmpeg cflags." FORCE) + + mark_as_advanced(FFMPEG_INCLUDE_DIRS + FFMPEG_LIBRARIES + FFMPEG_DEFINITIONS) + +else() + # Set the noncached _FOUND vars for the components. + foreach(_component ${_FFmpeg_ALL_COMPONENTS}) + set_component_found(${_component}) + endforeach() +endif() + +# Compile the list of required vars +unset(_FFmpeg_REQUIRED_VARS) +set(_FFmpeg_FOUND_LIBRARIES "") + +foreach(_component ${FFmpeg_FIND_COMPONENTS}) + if(${_component}_FOUND) + if(${_component}_VERSION VERSION_LESS _FFmpeg_REQUIRED_VERSION) + message(STATUS "${_component}: ${${_component}_VERSION} < ${_FFmpeg_REQUIRED_VERSION}") + unset(${_component}_FOUND) + endif() + + list(APPEND _FFmpeg_FOUND_LIBRARIES ${${_component}_LIBRARIES}) + endif() + + list(APPEND _FFmpeg_REQUIRED_VARS ${_component}_LIBRARIES ${_component}_INCLUDE_DIRS ${_component}_FOUND) +endforeach() + +list(INSERT _FFmpeg_REQUIRED_VARS 0 _FFmpeg_FOUND_LIBRARIES) + +# Give a nice error message if some of the required vars are missing. +find_package_handle_standard_args(FFmpeg + REQUIRED_VARS ${_FFmpeg_REQUIRED_VARS} + HANDLE_COMPONENTS) From d1490e3c124d235f7129312245047e71396c2f18 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Mon, 9 Sep 2024 09:37:46 +0200 Subject: [PATCH 2/5] [packaging,nightly] add avformat to dependencies --- packaging/deb/freerdp-nightly/control | 1 + packaging/rpm/freerdp-nightly.spec | 1 + 2 files changed, 2 insertions(+) diff --git a/packaging/deb/freerdp-nightly/control b/packaging/deb/freerdp-nightly/control index 11eb0a2c4..586e7ff34 100644 --- a/packaging/deb/freerdp-nightly/control +++ b/packaging/deb/freerdp-nightly/control @@ -34,6 +34,7 @@ Build-Depends: libasound2-dev, libswscale-dev, libpulse-dev, + libavformat-dev, libavcodec-dev, libavutil-dev, libfuse3-dev, diff --git a/packaging/rpm/freerdp-nightly.spec b/packaging/rpm/freerdp-nightly.spec index 7c3dcb856..2040e7e47 100644 --- a/packaging/rpm/freerdp-nightly.spec +++ b/packaging/rpm/freerdp-nightly.spec @@ -73,6 +73,7 @@ BuildRequires: dbus-1-glib-devel BuildRequires: wayland-devel BuildRequires: libavutil-devel BuildRequires: libavcodec-devel +BuildRequires: libavformat-devel BuildRequires: libswresample-devel BuildRequires: libopus-devel BuildRequires: libjpeg62-devel From e23115c54f37fa9cf30d20ffe4a3ddcb5adc116f Mon Sep 17 00:00:00 2001 From: akallabeth Date: Mon, 9 Sep 2024 11:22:56 +0200 Subject: [PATCH 3/5] [codec,dsp] fix and simplify avcodec version check --- CMakeLists.txt | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a577fcd52..2e8bc3704 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -588,29 +588,6 @@ endif (WITH_OPENH264 AND NOT WITH_OPENH264_LOADING) # Version check, if we have detected FFMPEG but the version is too old # deactivate it as sound backend. if (WITH_DSP_FFMPEG) - # Deactivate FFmpeg backend for sound, if the version is too old. - # See libfreerdp/codec/dsp_ffmpeg.h - file(STRINGS "${AVCODEC_INCLUDE_DIR}/libavcodec/version.h" AV_VERSION_FILE REGEX "LIBAVCODEC_VERSION_M[A-Z]+[\t ]*[0-9]+") - if (EXISTS "${AVCODEC_INCLUDE_DIR}/libavcodec/version_major.h") - file(STRINGS "${AVCODEC_INCLUDE_DIR}/libavcodec/version_major.h" AV_VERSION_FILE2 REGEX "LIBAVCODEC_VERSION_M[A-Z]+[\t ]*[0-9]+") - list(APPEND AV_VERSION_FILE ${AV_VERSION_FILE2}) - endif() - - FOREACH(item ${AV_VERSION_FILE}) - STRING(REGEX MATCH "LIBAVCODEC_VERSION_M[A-Z]+[\t ]*[0-9]+" litem ${item}) - IF(litem) - string(REGEX REPLACE "[ \t]+" ";" VSPLIT_LINE ${litem}) - list(LENGTH VSPLIT_LINE VSPLIT_LINE_LEN) - if (NOT "${VSPLIT_LINE_LEN}" EQUAL "2") - message(ERROR "invalid entry in libavcodec version header ${item}") - endif(NOT "${VSPLIT_LINE_LEN}" EQUAL "2") - list(GET VSPLIT_LINE 0 VNAME) - list(GET VSPLIT_LINE 1 VVALUE) - set(${VNAME} ${VVALUE}) - ENDIF(litem) - ENDFOREACH(item ${AV_VERSION_FILE}) - - set(AVCODEC_VERSION "${LIBAVCODEC_VERSION_MAJOR}.${LIBAVCODEC_VERSION_MINOR}.${LIBAVCODEC_VERSION_MICRO}") if (AVCODEC_VERSION VERSION_LESS "57.48.101") message(WARNING "FFmpeg version detected (${AVCODEC_VERSION}) is too old. (Require at least 57.48.101 for sound). Deactivating") set(WITH_DSP_FFMPEG OFF) From 0bbf0b6e80f3d30a189e1103ca6ed4163bde5a85 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Mon, 9 Sep 2024 11:59:33 +0200 Subject: [PATCH 4/5] [ci] add avformat to dependencies --- .github/workflows/abi-checker.yml | 1 + .github/workflows/clang-tidy.yml | 2 +- .github/workflows/codeql-analysis.yml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/abi-checker.yml b/.github/workflows/abi-checker.yml index fa8dc16e4..28f206701 100644 --- a/.github/workflows/abi-checker.yml +++ b/.github/workflows/abi-checker.yml @@ -38,6 +38,7 @@ jobs: xserver-xorg-dev \ libswscale-dev \ libswresample-dev \ + libavformat-dev \ libavutil-dev \ libavcodec-dev \ libcups2-dev \ diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml index a603f7bcd..10608a3a4 100644 --- a/.github/workflows/clang-tidy.yml +++ b/.github/workflows/clang-tidy.yml @@ -16,7 +16,7 @@ jobs: split_workflow: true clang_tidy_checks: '' # List of packages to install - apt_packages: libkrb5-dev,libxkbcommon-dev,libxkbfile-dev,libx11-dev,libwayland-dev,libxrandr-dev,libxi-dev,libxrender-dev,libxext-dev,libxinerama-dev,libxfixes-dev,libxcursor-dev,libxv-dev,libxdamage-dev,libxtst-dev,libcups2-dev,libcairo2-dev,libpcsclite-dev,libasound2-dev,libswscale-dev,libpulse-dev,libavcodec-dev,libavutil-dev,libfuse3-dev,libswresample-dev,libusb-1.0-0-dev,libudev-dev,libdbus-glib-1-dev,libpam0g-dev,uuid-dev,libxml2-dev,libcjson-dev,libsdl2-2.0-0,libsdl2-dev,libsdl2-ttf-dev,libsdl2-image-dev,libsystemd-dev,liburiparser-dev,libopus-dev,libwebp-dev,libjpeg-dev,libpng-dev,xsltproc,docbook-xsl,libgsm1-dev,libfaac-dev,libfaad-dev,libsoxr-dev,opencl-c-headers,opencl-headers,ocl-icd-opencl-dev,libssl-dev,libv4l-dev + apt_packages: libkrb5-dev,libxkbcommon-dev,libxkbfile-dev,libx11-dev,libwayland-dev,libxrandr-dev,libxi-dev,libxrender-dev,libxext-dev,libxinerama-dev,libxfixes-dev,libxcursor-dev,libxv-dev,libxdamage-dev,libxtst-dev,libcups2-dev,libcairo2-dev,libpcsclite-dev,libasound2-dev,libswscale-dev,libpulse-dev,libavformat-dev,libavcodec-dev,libavutil-dev,libfuse3-dev,libswresample-dev,libusb-1.0-0-dev,libudev-dev,libdbus-glib-1-dev,libpam0g-dev,uuid-dev,libxml2-dev,libcjson-dev,libsdl2-2.0-0,libsdl2-dev,libsdl2-ttf-dev,libsdl2-image-dev,libsystemd-dev,liburiparser-dev,libopus-dev,libwebp-dev,libjpeg-dev,libpng-dev,xsltproc,docbook-xsl,libgsm1-dev,libfaac-dev,libfaad-dev,libsoxr-dev,opencl-c-headers,opencl-headers,ocl-icd-opencl-dev,libssl-dev,libv4l-dev # CMake command to run in order to generate compile_commands.json build_dir: tidy diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index df4c2a228..e9897066c 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -86,6 +86,7 @@ jobs: xserver-xorg-dev \ libswscale-dev \ libswresample-dev \ + libavformat-dev \ libavutil-dev \ libavcodec-dev \ libcups2-dev \ From 52ee2e4668d58e264ef202a9ff769291051f978b Mon Sep 17 00:00:00 2001 From: akallabeth Date: Mon, 9 Sep 2024 12:20:06 +0200 Subject: [PATCH 5/5] [cmake] unify ffmpeg and swscale detection --- CMakeLists.txt | 10 +--------- channels/rdpecam/client/CMakeLists.txt | 6 +++--- cmake/FindSWScale.cmake | 14 -------------- libfreerdp/CMakeLists.txt | 6 +++--- 4 files changed, 7 insertions(+), 29 deletions(-) delete mode 100644 cmake/FindSWScale.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 2e8bc3704..06dfad244 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -496,10 +496,6 @@ set(PCSC_FEATURE_TYPE "RECOMMENDED") set(PCSC_FEATURE_PURPOSE "smart card") set(PCSC_FEATURE_DESCRIPTION "smart card device redirection") -set(FFMPEG_FEATURE_TYPE "RECOMMENDED") -set(FFMPEG_FEATURE_PURPOSE "multimedia") -set(FFMPEG_FEATURE_DESCRIPTION "multimedia redirection, audio and video playback") - set(OPENH264_FEATURE_TYPE "OPTIONAL") set(OPENH264_FEATURE_PURPOSE "codec") set(OPENH264_FEATURE_DESCRIPTION "use OpenH264 library") @@ -531,11 +527,9 @@ set(SOXR_FEATURE_DESCRIPTION "SOX audio resample library") if(WIN32) set(WAYLAND_FEATURE_TYPE "DISABLED") set(PCSC_FEATURE_TYPE "DISABLED") - set(FFMPEG_FEATURE_TYPE "OPTIONAL") endif() if(APPLE) - set(FFMPEG_FEATURE_TYPE "OPTIONAL") set(WAYLAND_FEATURE_TYPE "DISABLED") if(IOS) set(PCSC_FEATURE_TYPE "DISABLED") @@ -568,11 +562,9 @@ endif() find_feature(PCSC ${PCSC_FEATURE_TYPE} ${PCSC_FEATURE_PURPOSE} ${PCSC_FEATURE_DESCRIPTION}) if (WITH_DSP_FFMPEG OR WITH_VIDEO_FFMPEG OR WITH_FFMPEG) - set(FFMPEG_FEATURE_TYPE "REQUIRED" ) + find_package(FFmpeg REQUIRED COMPONENTS AVUTIL AVCODEC) endif() -find_feature(FFmpeg ${FFMPEG_FEATURE_TYPE} ${FFMPEG_FEATURE_PURPOSE} ${FFMPEG_FEATURE_DESCRIPTION}) - find_feature(OpenH264 ${OPENH264_FEATURE_TYPE} ${OPENH264_FEATURE_PURPOSE} ${OPENH264_FEATURE_DESCRIPTION}) find_feature(OpenCL ${OPENCL_FEATURE_TYPE} ${OPENCL_FEATURE_PURPOSE} ${OPENCL_FEATURE_DESCRIPTION}) find_feature(GSM ${GSM_FEATURE_TYPE} ${GSM_FEATURE_PURPOSE} ${GSM_FEATURE_DESCRIPTION}) diff --git a/channels/rdpecam/client/CMakeLists.txt b/channels/rdpecam/client/CMakeLists.txt index b083b6559..61b211567 100644 --- a/channels/rdpecam/client/CMakeLists.txt +++ b/channels/rdpecam/client/CMakeLists.txt @@ -22,7 +22,7 @@ if(NOT WITH_SWSCALE OR NOT WITH_FFMPEG) endif() # currently camera redirect client supported for platforms with Video4Linux only -find_package(SWScale REQUIRED) +find_package(FFmpeg REQUIRED COMPONENTS SWSCALE) find_package(V4L) if(V4L_FOUND) set(WITH_V4L ON) @@ -31,7 +31,7 @@ else() message(FATAL_ERROR "libv4l-dev required for CHANNEL_RDPECAM_CLIENT") endif() -include_directories(SYSTEM ${SWScale_INCLUDE_DIR}) +include_directories(SYSTEM ${SWSCALE_INCLUDE_DIRS}) set(${MODULE_PREFIX}_SRCS camera_device_enum_main.c @@ -42,7 +42,7 @@ set(${MODULE_PREFIX}_SRCS set(${MODULE_PREFIX}_LIBS freerdp winpr - ${SWScale_LIBRARY} + ${SWSCALE_LIBRARY} ${FFMPEG_LIBRARIES} ) diff --git a/cmake/FindSWScale.cmake b/cmake/FindSWScale.cmake deleted file mode 100644 index 8ee9cc68b..000000000 --- a/cmake/FindSWScale.cmake +++ /dev/null @@ -1,14 +0,0 @@ - -find_package(PkgConfig) - -if (PKG_CONFIG_FOUND) - pkg_check_modules(SWScale libswscale) -endif() - -find_path(SWScale_INCLUDE_DIR libswscale/swscale.h PATHS ${SWScale_INCLUDE_DIRS}) -find_library(SWScale_LIBRARY swscale PATHS ${SWScale_LIBRARY_DIRS}) - -FIND_PACKAGE_HANDLE_STANDARD_ARGS(SWScale DEFAULT_MSG SWScale_INCLUDE_DIR SWScale_LIBRARY) - -mark_as_advanced(SWScale_INCLUDE_DIR SWScale_LIBRARY) - diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt index 161a2edc6..c8afe4b05 100644 --- a/libfreerdp/CMakeLists.txt +++ b/libfreerdp/CMakeLists.txt @@ -139,7 +139,7 @@ if (WITH_OPUS) endif() if (WITH_SWSCALE) - find_package(SWScale REQUIRED) + find_package(FFmpeg REQUIRED COMPONENTS SWSCALE) endif(WITH_SWSCALE) if (WITH_CAIRO) find_package(Cairo REQUIRED) @@ -147,8 +147,8 @@ endif(WITH_CAIRO) # Prefer SWScale over Cairo, both at the same time are not possible. if (WITH_SWSCALE) - include_directories(SYSTEM ${SWScale_INCLUDE_DIR}) - freerdp_library_add(${SWScale_LIBRARY}) + include_directories(SYSTEM ${SWSCALE_INCLUDE_DIRS}) + freerdp_library_add(${SWSCALE_LIBRARY}) endif() if (WITH_CAIRO) include_directories(SYSTEM ${CAIRO_INCLUDE_DIR})