From eebb8f65972613c4d723da4969086fc7499dc76d Mon Sep 17 00:00:00 2001
From: Rat <37424386+ratwithashotgun@users.noreply.github.com>
Date: Thu, 21 Mar 2019 07:44:44 +0100
Subject: [PATCH 1/2] deps/obs-scripting: Expose
 obs_output_output_caption_text1 to scripts

Make obs_output_output_caption_text1 usable via scripting if captions
are enabled to make adding additional caption sources easier.
---
 deps/obs-scripting/CMakeLists.txt            | 4 ++++
 deps/obs-scripting/obs-scripting-config.h.in | 1 +
 deps/obs-scripting/obslua/obslua.i           | 2 +-
 deps/obs-scripting/obspython/obspython.i     | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/deps/obs-scripting/CMakeLists.txt b/deps/obs-scripting/CMakeLists.txt
index 31087398e..92fb1b9e1 100644
--- a/deps/obs-scripting/CMakeLists.txt
+++ b/deps/obs-scripting/CMakeLists.txt
@@ -77,6 +77,10 @@ if(UI_ENABLED)
 	include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/UI/obs-frontend-api")
 endif()
 
+IF(BUILD_CAPTIONS)
+	string(TOUPPER "${BUILD_CAPTIONS}" BUILD_CAPTIONS)
+endif()
+
 configure_file(
 	"${CMAKE_CURRENT_SOURCE_DIR}/obs-scripting-config.h.in"
 	"${CMAKE_CURRENT_BINARY_DIR}/obs-scripting-config.h")
diff --git a/deps/obs-scripting/obs-scripting-config.h.in b/deps/obs-scripting/obs-scripting-config.h.in
index 420512637..6fab8d85b 100644
--- a/deps/obs-scripting/obs-scripting-config.h.in
+++ b/deps/obs-scripting/obs-scripting-config.h.in
@@ -21,3 +21,4 @@
 #define COMPILE_LUA    @LUAJIT_FOUND@
 #define COMPILE_PYTHON @PYTHON_FOUND@
 #define UI_ENABLED     @UI_ENABLED@
+#define BUILD_CAPTIONS @BUILD_CAPTIONS@
diff --git a/deps/obs-scripting/obslua/obslua.i b/deps/obs-scripting/obslua/obslua.i
index 98058b8a3..6a97f2bed 100644
--- a/deps/obs-scripting/obslua/obslua.i
+++ b/deps/obs-scripting/obslua/obslua.i
@@ -84,6 +84,7 @@ static inline void wrap_blog(int log_level, const char *message)
 %include "graphics/vec2.h"
 %include "graphics/quat.h"
 %include "graphics/image-file.h"
+%include "obs-scripting-config.h"
 %include "obs-data.h"
 %include "obs-source.h"
 %include "obs-properties.h"
@@ -95,7 +96,6 @@ static inline void wrap_blog(int log_level, const char *message)
 %include "callback/signal.h"
 %include "util/bmem.h"
 %include "util/base.h"
-%include "obs-scripting-config.h"
 
 #if UI_ENABLED
 %include "obs-frontend-api.h"
diff --git a/deps/obs-scripting/obspython/obspython.i b/deps/obs-scripting/obspython/obspython.i
index 3c71413da..b8a75bbe4 100644
--- a/deps/obs-scripting/obspython/obspython.i
+++ b/deps/obs-scripting/obspython/obspython.i
@@ -82,6 +82,7 @@ static inline void wrap_blog(int log_level, const char *message)
 %include "graphics/vec3.h"
 %include "graphics/vec2.h"
 %include "graphics/quat.h"
+%include "obs-scripting-config.h"
 %include "obs-data.h"
 %include "obs-source.h"
 %include "obs-properties.h"
@@ -93,7 +94,6 @@ static inline void wrap_blog(int log_level, const char *message)
 %include "callback/signal.h"
 %include "util/bmem.h"
 %include "util/base.h"
-%include "obs-scripting-config.h"
 
 #if UI_ENABLED
 %include "obs-frontend-api.h"

From cb3054ae6ed45a9ae1cc255c7672490fed41d675 Mon Sep 17 00:00:00 2001
From: Rat <37424386+ratwithashotgun@users.noreply.github.com>
Date: Thu, 21 Mar 2019 07:46:12 +0100
Subject: [PATCH 2/2] CI: Build caption output support on OSX by default

Enable caption building by default on OSX to make captions usable
on OSX via scripting API.
---
 CI/before-script-osx.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CI/before-script-osx.sh b/CI/before-script-osx.sh
index adc6f48d2..50a9a1916 100755
--- a/CI/before-script-osx.sh
+++ b/CI/before-script-osx.sh
@@ -12,4 +12,5 @@ cmake -DENABLE_SPARKLE_UPDATER=ON \
 -DVLCPath=$PWD/../../vlc-3.0.4 \
 -DBUILD_BROWSER=ON \
 -DBROWSER_DEPLOY=ON \
+-DBUILD_CAPTIONS=ON \
 -DCEF_ROOT_DIR=$PWD/../../cef_binary_${CEF_BUILD_VERSION}_macosx64 ..