From 0a50e2a95caf773ea615572229ea6bb57f219e54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lepin?= Date: Tue, 20 Mar 2018 11:49:37 +0100 Subject: [PATCH] ci(linux): use OBS dev deps from PPA release --- CI/build-xenial.sh | 2 +- CI/install-dependencies-xenial.sh | 57 +++++-------------------------- CMakeLists.txt | 12 ++++--- 3 files changed, 17 insertions(+), 54 deletions(-) diff --git a/CI/build-xenial.sh b/CI/build-xenial.sh index 7dad3fcc..cc7e53ef 100755 --- a/CI/build-xenial.sh +++ b/CI/build-xenial.sh @@ -4,5 +4,5 @@ set -ex cd /root/obs-websocket mkdir build && cd build -cmake -DLIBOBS_INCLUDE_DIR="../../obs-studio/libobs" -DCMAKE_INSTALL_PREFIX=/usr .. +cmake -DCMAKE_INSTALL_PREFIX=/usr .. make -j4 diff --git a/CI/install-dependencies-xenial.sh b/CI/install-dependencies-xenial.sh index f29372e1..b79de4af 100755 --- a/CI/install-dependencies-xenial.sh +++ b/CI/install-dependencies-xenial.sh @@ -1,57 +1,18 @@ #!/bin/sh set -ex -# OBS Studio deps +add-apt-repository -y ppa:obsproject/obs-studio apt-get -qq update -apt-get install -y \ - libc-dev-bin libc6-dev \ - git \ - build-essential apt-get install -y \ - build-essential \ - checkinstall \ - cmake \ - libasound2-dev \ - libavcodec-dev \ - libavdevice-dev \ - libavfilter-dev \ - libavformat-dev \ - libavutil-dev \ - libcurl4-openssl-dev \ - libfontconfig-dev \ - libfreetype6-dev \ - libgl1-mesa-dev \ - libjack-jackd2-dev \ - libjansson-dev \ - libpulse-dev \ - libqt5x11extras5-dev \ - libspeexdsp-dev \ - libswresample-dev \ - libswscale-dev \ - libudev-dev \ - libv4l-dev \ - libvlc-dev \ - libx11-dev \ - libx264-dev \ - libxcb-shm0-dev \ - libxcb-xinerama0-dev \ - libxcomposite-dev \ - libxinerama-dev \ - pkg-config \ - qtbase5-dev + libc-dev-bin \ + libc6-dev git \ + build-essential \ + cmake \ + obs-studio \ + libqt5websockets5-dev -# obs-websocket deps -apt-get install -y libqt5websockets5-dev - -# Build obs-studio -cd /root -git clone https://github.com/jp9000/obs-studio ./obs-studio -cd obs-studio -git checkout 21.0.0 -mkdir build && cd build -cmake -DUNIX_STRUCTURE=1 -DCMAKE_INSTALL_PREFIX=/usr .. -make -j4 -make install +# Dirty hack +wget -O /usr/include/obs/obs-frontend-api.h https://raw.githubusercontent.com/obsproject/obs-studio/master/UI/obs-frontend-api/obs-frontend-api.h ldconfig diff --git a/CMakeLists.txt b/CMakeLists.txt index 281331a4..cd012ea9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,9 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOUIC ON) +if (WIN32 OR APPLE) include(external/FindLibObs.cmake) +endif() find_package(LibObs REQUIRED) find_package(Qt5Core REQUIRED) @@ -16,7 +18,7 @@ find_package(Qt5Widgets REQUIRED) add_subdirectory(deps/mbedtls EXCLUDE_FROM_ALL) set(ENABLE_PROGRAMS false) -set(obs-websocket_SOURCES +set(obs-websocket_SOURCES src/obs-websocket.cpp src/WSServer.cpp src/WSRequestHandler.cpp @@ -112,15 +114,15 @@ if(WIN32) "${CMAKE_COMMAND}" -E make_directory "${RELEASE_DIR}/data/obs-plugins/obs-websocket" "${RELEASE_DIR}/obs-plugins/${ARCH_NAME}") - + COMMAND if $==1 ("${CMAKE_COMMAND}" -E copy_directory "${PROJECT_SOURCE_DIR}/data" "${RELEASE_DIR}/data/obs-plugins/obs-websocket") - COMMAND if $==1 ("${CMAKE_COMMAND}" -E copy + COMMAND if $==1 ("${CMAKE_COMMAND}" -E copy "$" - "${QTDIR}/bin/Qt5WebSockets.dll" - "${QTDIR}/bin/Qt5Network.dll" + "${QTDIR}/bin/Qt5WebSockets.dll" + "${QTDIR}/bin/Qt5Network.dll" "${RELEASE_DIR}/obs-plugins/${ARCH_NAME}") # Copy to obs-studio dev environment for immediate testing