jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1759 from cg2121/enable-linux-browser 

obs-browser: Enable Linux support
master
Jim 2020-02-26 04:46:38 -08:00 committed by GitHub
parent 389032baa3 0ca8424c66
commit 535e94dc0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CI/before-script-linux.sh
View File

@ -8,4 +8,4 @@ fi
set -ex set -ex
ccache -s || echo "CCache is not available." ccache -s || echo "CCache is not available."
mkdir build && cd build mkdir build && cd build
cmake -DBUILD_CAPTIONS=ON .. cmake -DBUILD_CAPTIONS=ON -DBUILD_BROWSER=ON -DCEF_ROOT_DIR="../cef_binary_${CEF_BUILD_VERSION}_linux64" ..

4
CI/install-dependencies-linux.sh
View File

@ -54,3 +54,7 @@ sudo apt-get install -y \
libqt5svg5-dev \ libqt5svg5-dev \
swig \ swig \
clang-format-8 clang-format-8
# build cef
wget --quiet --retry-connrefused --waitretry=1 https://cdn-fastly.obsproject.com/downloads/cef_binary_${CEF_BUILD_VERSION}_linux64.tar.bz2
tar -xjf ./cef_binary_${CEF_BUILD_VERSION}_linux64.tar.bz2

4
UI/obs-app.cpp
View File

@ -1763,6 +1763,10 @@ static int run_program(fstream &logFile, int argc, char *argv[])
QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
#endif #endif
#if !defined(_WIN32) && !defined(__APPLE__) && BROWSER_AVAILABLE
setenv("QT_NO_GLIB", "1", true);
#endif
QCoreApplication::addLibraryPath("."); QCoreApplication::addLibraryPath(".");
#if __APPLE__ #if __APPLE__

3
UI/window-basic-main.cpp
View File

@ -1724,7 +1724,8 @@ void OBSBasic::OBSInit()
if (cef) { if (cef) {
QAction *action = new QAction(QTStr("Basic.MainMenu." QAction *action = new QAction(QTStr("Basic.MainMenu."
"View.Docks." "View.Docks."
"CustomBrowserDocks")); "CustomBrowserDocks"),
this);
ui->viewMenuDocks->insertAction(ui->toggleScenes, action); ui->viewMenuDocks->insertAction(ui->toggleScenes, action);
connect(action, &QAction::triggered, this, connect(action, &QAction::triggered, this,
&OBSBasic::ManageExtraBrowserDocks); &OBSBasic::ManageExtraBrowserDocks);

20
plugins/CMakeLists.txt
View File

@ -48,20 +48,20 @@ elseif("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
add_subdirectory(linux-jack) add_subdirectory(linux-jack)
endif() endif()
if(WIN32 OR APPLE) option(BUILD_BROWSER "Build browser plugin" OFF)
option(BUILD_BROWSER "Build browser plugin" OFF) if (BUILD_BROWSER)
if (BUILD_BROWSER) if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/obs-browser/CMakeLists.txt")
if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/obs-browser/CMakeLists.txt") add_subdirectory(obs-browser)
add_subdirectory(obs-browser) set(BROWSER_AVAILABLE_INTERNAL ON CACHE BOOL "Internal global cmake variable" FORCE)
set(BROWSER_AVAILABLE_INTERNAL ON CACHE BOOL "Internal global cmake variable" FORCE)
else()
message(STATUS "obs-browser submodule not found! Please fetch submodules. obs-browser plugin disabled.")
set(BROWSER_AVAILABLE_INTERNAL OFF CACHE BOOL "Internal global cmake variable" FORCE)
endif()
else() else()
message(STATUS "obs-browser submodule not found! Please fetch submodules. obs-browser plugin disabled.")
set(BROWSER_AVAILABLE_INTERNAL OFF CACHE BOOL "Internal global cmake variable" FORCE) set(BROWSER_AVAILABLE_INTERNAL OFF CACHE BOOL "Internal global cmake variable" FORCE)
endif() endif()
else()
set(BROWSER_AVAILABLE_INTERNAL OFF CACHE BOOL "Internal global cmake variable" FORCE)
endif()
if(WIN32 OR APPLE)
if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/obs-vst/CMakeLists.txt") if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/obs-vst/CMakeLists.txt")
add_subdirectory(obs-vst) add_subdirectory(obs-vst)
else() else()