From c25f6335edff2dd52fd1faabbff1b3347b96df30 Mon Sep 17 00:00:00 2001 From: ludo Date: Tue, 29 Mar 2022 14:38:21 +0800 Subject: [PATCH] #340 linux: path to obs plugins libraries --- CI/before-script-linux-1804.sh | 2 +- CI/before-script-linux-2004.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CI/before-script-linux-1804.sh b/CI/before-script-linux-1804.sh index 099e17124..9bb964fc1 100755 --- a/CI/before-script-linux-1804.sh +++ b/CI/before-script-linux-1804.sh @@ -13,5 +13,5 @@ then else vendor_option="-DOBS_WEBRTC_VENDOR_NAME=$1" fi -cmake ${vendor_option} -DBUILD_NDI=ON -DBUILD_WEBSOCKET=ON -DCMAKE_BUILD_TYPE=${CI_BUILD_TYPE} -DUNIX_STRUCTURE=1 -DENABLE_PIPEWIRE=OFF -DENABLE_VLC=ON -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_BROWSER=ON -DCEF_ROOT_DIR="../cef_binary_${LINUX_CEF_BUILD_VERSION}_linux64" -DUSE_LIBC++=ON -Dlibwebrtc_DIR=${libwebrtc_dir} -DOBS_VERSION_OVERRIDE=${OBS_VERSION} -DCPACK_DEBIAN_PACKAGE_MAINTAINER="CoSMo Software" -DCPACK_DEBIAN_PACKAGE_NAME="obs" -DCPACK_DEBIAN_PACKAGE_VERSION=${OBS_VERSION} -DCPACK_DEBIAN_PACKAGE_ARCHITECTURE="amd64" -DCPACK_DEBIAN_PACKAGE_DEPENDS="ffmpeg, libqt5gui5, libqt5xml5, libqt5x11extras5, libqt5core5a, libx264-dev, vlc, libavcodec57, libmbedtls10, libfdk-aac1, libavfilter6, libavdevice57, libc++1, libcurl4" -DOBS_MULTIARCH_SUFFIX="/usr/lib/x86_64-linux-gnu" .. -DENABLE_WAYLAND=OFF +cmake ${vendor_option} -DBUILD_NDI=ON -DBUILD_WEBSOCKET=ON -DCMAKE_BUILD_TYPE=${CI_BUILD_TYPE} -DUNIX_STRUCTURE=1 -DENABLE_PIPEWIRE=OFF -DENABLE_VLC=ON -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_BROWSER=ON -DCEF_ROOT_DIR="../cef_binary_${LINUX_CEF_BUILD_VERSION}_linux64" -DUSE_LIBC++=ON -Dlibwebrtc_DIR=${libwebrtc_dir} -DOBS_VERSION_OVERRIDE=${OBS_VERSION} -DCPACK_DEBIAN_PACKAGE_MAINTAINER="CoSMo Software" -DCPACK_DEBIAN_PACKAGE_NAME="obs" -DCPACK_DEBIAN_PACKAGE_VERSION=${OBS_VERSION} -DCPACK_DEBIAN_PACKAGE_ARCHITECTURE="amd64" -DCPACK_DEBIAN_PACKAGE_DEPENDS="ffmpeg, libqt5gui5, libqt5xml5, libqt5x11extras5, libqt5core5a, libx264-dev, vlc, libavcodec57, libmbedtls10, libfdk-aac1, libavfilter6, libavdevice57, libc++1, libcurl4" .. -DENABLE_WAYLAND=OFF cd .. diff --git a/CI/before-script-linux-2004.sh b/CI/before-script-linux-2004.sh index de4df4dfd..260712410 100755 --- a/CI/before-script-linux-2004.sh +++ b/CI/before-script-linux-2004.sh @@ -13,5 +13,5 @@ then else vendor_option="-DOBS_WEBRTC_VENDOR_NAME=$1" fi -cmake ${vendor_option} -DBUILD_NDI=ON -DBUILD_WEBSOCKET=ON -DCMAKE_BUILD_TYPE=${CI_BUILD_TYPE} -DUNIX_STRUCTURE=1 -DENABLE_PIPEWIRE=OFF -DENABLE_VLC=ON -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_BROWSER=ON -DCEF_ROOT_DIR="../cef_binary_${LINUX_CEF_BUILD_VERSION}_linux64" -DUSE_LIBC++=ON -Dlibwebrtc_DIR=${libwebrtc_dir} -DOBS_VERSION_OVERRIDE=${OBS_VERSION} -DCPACK_DEBIAN_PACKAGE_MAINTAINER="CoSMo Software" -DCPACK_DEBIAN_PACKAGE_NAME="obs" -DCPACK_DEBIAN_PACKAGE_VERSION=${OBS_VERSION} -DCPACK_DEBIAN_PACKAGE_ARCHITECTURE="amd64" -DCPACK_DEBIAN_PACKAGE_DEPENDS="ffmpeg, libqt5gui5, libqt5xml5, libqt5x11extras5, libqt5core5a, libx264-dev, vlc, libavcodec58, libmbedtls12, libfdk-aac1, libavfilter7, libavdevice58, libc++1, libcurl4" -DOBS_MULTIARCH_SUFFIX="/usr/lib/x86_64-linux-gnu" .. -DENABLE_WAYLAND=OFF +cmake ${vendor_option} -DBUILD_NDI=ON -DBUILD_WEBSOCKET=ON -DCMAKE_BUILD_TYPE=${CI_BUILD_TYPE} -DUNIX_STRUCTURE=1 -DENABLE_PIPEWIRE=OFF -DENABLE_VLC=ON -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_BROWSER=ON -DCEF_ROOT_DIR="../cef_binary_${LINUX_CEF_BUILD_VERSION}_linux64" -DUSE_LIBC++=ON -Dlibwebrtc_DIR=${libwebrtc_dir} -DOBS_VERSION_OVERRIDE=${OBS_VERSION} -DCPACK_DEBIAN_PACKAGE_MAINTAINER="CoSMo Software" -DCPACK_DEBIAN_PACKAGE_NAME="obs" -DCPACK_DEBIAN_PACKAGE_VERSION=${OBS_VERSION} -DCPACK_DEBIAN_PACKAGE_ARCHITECTURE="amd64" -DCPACK_DEBIAN_PACKAGE_DEPENDS="ffmpeg, libqt5gui5, libqt5xml5, libqt5x11extras5, libqt5core5a, libx264-dev, vlc, libavcodec58, libmbedtls12, libfdk-aac1, libavfilter7, libavdevice58, libc++1, libcurl4" .. -DENABLE_WAYLAND=OFF cd ..