From ceafd94aeff57f7336e4851c8511a45940374513 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Thu, 30 Jan 2025 11:21:06 +0100 Subject: [PATCH] [ci,rpm] enable dynamic openh264 support --- packaging/rpm/freerdp-nightly.spec | 88 ++++++++++++++++-------------- 1 file changed, 46 insertions(+), 42 deletions(-) diff --git a/packaging/rpm/freerdp-nightly.spec b/packaging/rpm/freerdp-nightly.spec index 030bc77c2..3c22be4f0 100644 --- a/packaging/rpm/freerdp-nightly.spec +++ b/packaging/rpm/freerdp-nightly.spec @@ -123,6 +123,7 @@ BuildRequires: wayland-devel %if 0%{?fedora} || 0%{?rhel} > 8 BuildRequires: (fdk-aac-devel or fdk-aac-free-devel) +BuildRequires: (noopenh264-devel or openh264-devel) %endif %if 0%{?fedora} >= 36 || 0%{?rhel} >= 8 @@ -155,56 +156,59 @@ cp %{_topdir}/SOURCES/source_version freerdp-nightly-%{version}/.source_version %build -%cmake -DCMAKE_SKIP_RPATH=FALSE \ - -DCMAKE_SKIP_INSTALL_RPATH=FALSE \ - -DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON \ - -DWITH_PULSE=ON \ - -DWITH_CHANNELS=ON \ - -DWITH_CUPS=ON \ - -DWITH_PCSC=ON \ - -DWITH_JPEG=ON \ - -DWITH_OPUS=ON \ - -DWITH_INTERNAL_RC4=ON \ - -DWITH_INTERNAL_MD4=ON \ - -DWITH_INTERNAL_MD5=ON \ - -DWITH_KEYBOARD_LAYOUT_FROM_FILE=ON \ - -DWITH_TIMEZONE_FROM_FILE=ON \ - -DSDL_USE_COMPILED_RESOURCES=OFF \ - -DWITH_SDL_IMAGE_DIALOGS=ON \ - -DWITH_BINARY_VERSIONING=ON \ - -DWITH_RESOURCE_VERSIONING=ON \ - -DWINPR_USE_VENDOR_PRODUCT_CONFIG_DIR=ON \ - -DFREERDP_USE_VENDOR_PRODUCT_CONFIG_DIR=ON \ - -DSAMPLE_USE_VENDOR_PRODUCT_CONFIG_DIR=ON \ - -DSDL_USE_VENDOR_PRODUCT_CONFIG_DIR=ON \ - -DWINPR_USE_LEGACY_RESOURCE_DIR=OFF \ - -DRDTK_FORCE_STATIC_BUILD=ON \ - -DUWAC_FORCE_STATIC_BUILD=ON \ +%cmake \ + -DCMAKE_SKIP_RPATH=FALSE \ + -DCMAKE_SKIP_INSTALL_RPATH=FALSE \ + -DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON \ + -DWITH_PULSE=ON \ + -DWITH_CHANNELS=ON \ + -DWITH_CUPS=ON \ + -DWITH_PCSC=ON \ + -DWITH_JPEG=ON \ + -DWITH_OPUS=ON \ + -DWITH_OPENH264=ON \ + -DWITH_OPENH264_LOADING=ON \ + -DWITH_INTERNAL_RC4=ON \ + -DWITH_INTERNAL_MD4=ON \ + -DWITH_INTERNAL_MD5=ON \ + -DWITH_KEYBOARD_LAYOUT_FROM_FILE=ON \ + -DWITH_TIMEZONE_FROM_FILE=ON \ + -DSDL_USE_COMPILED_RESOURCES=OFF \ + -DWITH_SDL_IMAGE_DIALOGS=ON \ + -DWITH_BINARY_VERSIONING=ON \ + -DWITH_RESOURCE_VERSIONING=ON \ + -DWINPR_USE_VENDOR_PRODUCT_CONFIG_DIR=ON \ + -DFREERDP_USE_VENDOR_PRODUCT_CONFIG_DIR=ON \ + -DSAMPLE_USE_VENDOR_PRODUCT_CONFIG_DIR=ON \ + -DSDL_USE_VENDOR_PRODUCT_CONFIG_DIR=ON \ + -DWINPR_USE_LEGACY_RESOURCE_DIR=OFF \ + -DRDTK_FORCE_STATIC_BUILD=ON \ + -DUWAC_FORCE_STATIC_BUILD=ON \ %if 0%{?fedora} || 0%{?rhel} > 8 - -DWITH_FDK_AAC=ON \ + -DWITH_FDK_AAC=ON \ %endif %if 0%{?fedora} >= 36 || 0%{?rhel} >= 9 || 0%{?suse_version} - -DWITH_FFMPEG=ON \ - -DWITH_DSP_FFMPEG=ON \ + -DWITH_FFMPEG=ON \ + -DWITH_DSP_FFMPEG=ON \ %endif %if 0%{?rhel} <= 8 - -DALLOW_IN_SOURCE_BUILD=ON \ + -DALLOW_IN_SOURCE_BUILD=ON \ %endif %if 0%{?rhel} >= 8 || 0%{defined suse_version} - -DWITH_WEBVIEW=OFF \ + -DWITH_WEBVIEW=OFF \ %endif - -DCMAKE_C_COMPILER=clang \ - -DCMAKE_CXX_COMPILER=clang++ \ - -DWITH_SANITIZE_ADDRESS=OFF \ - -DWITH_KRB5=ON \ - -DCHANNEL_URBDRC=ON \ - -DCHANNEL_URBDRC_CLIENT=ON \ - -DWITH_SERVER=ON \ - -DWITH_CAIRO=ON \ - -DBUILD_TESTING=ON \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_INSTALL_PREFIX=%{INSTALL_PREFIX} \ - -DCMAKE_INSTALL_LIBDIR=%{_lib} + -DCMAKE_C_COMPILER=clang \ + -DCMAKE_CXX_COMPILER=clang++ \ + -DWITH_SANITIZE_ADDRESS=OFF \ + -DWITH_KRB5=ON \ + -DCHANNEL_URBDRC=ON \ + -DCHANNEL_URBDRC_CLIENT=ON \ + -DWITH_SERVER=ON \ + -DWITH_CAIRO=ON \ + -DBUILD_TESTING=ON \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_PREFIX=%{INSTALL_PREFIX} \ + -DCMAKE_INSTALL_LIBDIR=%{_lib} %cmake_build