Changes of Revision 54

View file
obs-studio.changes Changed
​x
 
1
@@ -1,4 +1,12 @@
2
 -------------------------------------------------------------------
3
+Thu Jan 25 19:16:58 UTC 2018 - jimmy@boombatower.com
4
+
5
+- Update to version 21.0.2:
6
+  * libobs: Update version to 21.0.2 (mac tag)
7
+  * CI: Point to newer brew python
8
+  * deps/obs-scripting: Make ENABLE_SCRIPTING a user variable
9
+
10
+-------------------------------------------------------------------
11
 Tue Jan 23 07:18:25 UTC 2018 - jimmy@boombatower.com
12
13
 - Update to version 21.0.1:
14
​
View file
obs-studio.spec Changed
8
 
1
@@ -1,5 +1,5 @@
2
 Name:           obs-studio
3
-Version:        21.0.1
4
+Version:        21.0.2
5
 Release:        0
6
 Summary:        A recording/broadcasting program
7
 Group:          Productivity/Multimedia/Video/Editors and Convertors
8
​
View file
_service Changed
10
 
1
@@ -1,7 +1,7 @@
2
 <services>
3
   <service name="tar_scm" mode="disabled">
4
     <param name="versionformat">@PARENT_TAG@</param>
5
-    <param name="revision">refs/tags/21.0.1</param>
6
+    <param name="revision">refs/tags/21.0.2</param>
7
     <param name="url">git://github.com/jp9000/obs-studio.git</param>
8
     <param name="scm">git</param>
9
     <param name="changesgenerate">enable</param>
10
​
View file
_servicedata Changed
9
 
1
@@ -1,6 +1,6 @@
2
 <servicedata>
3
   <service name="tar_scm">
4
     <param name="url">git://github.com/jp9000/obs-studio.git</param>
5
-    <param name="changesrevision">4eb5be4903008c7f1b0bb1e67bbb84bbee6aa7ae</param>
6
+    <param name="changesrevision">6ed55995048951cd36be8b1253de3f251ccb9d80</param>
7
   </service>
8
 </servicedata>
9
​
View file
obs-studio-21.0.1.tar.xz/CI/before-script-osx.sh -> obs-studio-21.0.2.tar.xz/CI/before-script-osx.sh Changed
8
 
1
@@ -3,4 +3,4 @@
2
3
 mkdir build
4
 cd build
5
-cmake -DPYTHON_LIBRARY=/usr/local/Cellar/python3/3.6.4/Frameworks/Python.framework/Versions/3.6/lib/libpython3.6.dylib -DPYTHON_INCLUDE_DIR=/usr/local/Cellar/python3/3.6.4/Frameworks/Python.framework/Versions/3.6/include/python3.6m -DENABLE_SPARKLE_UPDATER=ON -DCMAKE_OSX_DEPLOYMENT_TARGET=10.10 -DDepsPath=/tmp/obsdeps -DVLCPath=$PWD/../../vlc-master -DBUILD_BROWSER=ON -DCEF_ROOT_DIR=$PWD/../../cef_binary_${CEF_BUILD_VERSION}_macosx64 ..
6
+cmake -DPYTHON_LIBRARY=/usr/local/Cellar/python3/3.6.4_2/Frameworks/Python.framework/Versions/3.6/lib/libpython3.6.dylib -DPYTHON_INCLUDE_DIR=/usr/local/Cellar/python3/3.6.4_2/Frameworks/Python.framework/Versions/3.6/include/python3.6m -DENABLE_SPARKLE_UPDATER=ON -DCMAKE_OSX_DEPLOYMENT_TARGET=10.10 -DDepsPath=/tmp/obsdeps -DVLCPath=$PWD/../../vlc-master -DBUILD_BROWSER=ON -DCEF_ROOT_DIR=$PWD/../../cef_binary_${CEF_BUILD_VERSION}_macosx64 ..
7
\ No newline at end of file
8
​
View file
obs-studio-21.0.1.tar.xz/CMakeLists.txt -> obs-studio-21.0.2.tar.xz/CMakeLists.txt Changed
11
 
1
@@ -20,7 +20,8 @@
2
 endif()
3
4
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
5
-set(ENABLE_SCRIPTING OFF CACHE BOOL "" FORCE)
6
+set(ENABLE_SCRIPTING TRUE CACHE BOOL "Enables scripting")
7
+set(SCRIPTING_ENABLED OFF CACHE BOOL "Interal global cmake variable" FORCE)
8
9
 include(ObsHelpers)
10
 include(ObsCpack)
11
​
View file
obs-studio-21.0.1.tar.xz/UI/frontend-plugins/frontend-tools/CMakeLists.txt -> obs-studio-21.0.2.tar.xz/UI/frontend-plugins/frontend-tools/CMakeLists.txt Changed
10
 
1
@@ -43,7 +43,7 @@
2
    forms/output-timer.ui
3
    )
4
5
-if(ENABLE_SCRIPTING)
6
+if(SCRIPTING_ENABLED)
7
    set(frontend-tools_HEADERS
8
        ${frontend-tools_HEADERS}
9
        scripts.hpp
10
​
View file
obs-studio-21.0.1.tar.xz/UI/frontend-plugins/frontend-tools/frontend-tools-config.h.in -> obs-studio-21.0.2.tar.xz/UI/frontend-plugins/frontend-tools/frontend-tools-config.h.in Changed
9
 
1
@@ -17,6 +17,6 @@
2
 #endif
3
4
 #define BUILD_CAPTIONS @BUILD_CAPTIONS@
5
-#define ENABLE_SCRIPTING @ENABLE_SCRIPTING@
6
+#define ENABLE_SCRIPTING @SCRIPTING_ENABLED@
7
 #define COMPILE_LUA @COMPILE_LUA@
8
 #define COMPILE_PYTHON @COMPILE_PYTHON@
9
​
View file
obs-studio-21.0.1.tar.xz/deps/obs-scripting/CMakeLists.txt -> obs-studio-21.0.2.tar.xz/deps/obs-scripting/CMakeLists.txt Changed
20
 
1
@@ -1,4 +1,9 @@
2
 cmake_minimum_required(VERSION 2.8)
3
+
4
+if(NOT ENABLE_SCRIPTING)
5
+   return()
6
+endif()
7
+
8
 project(obs-scripting)
9
10
 if(MSVC)
11
@@ -46,7 +51,7 @@
12
    endif()
13
 endif()
14
15
-set(ENABLE_SCRIPTING ON CACHE BOOL "" FORCE)
16
+set(SCRIPTING_ENABLED ON CACHE BOOL "Interal global cmake variable" FORCE)
17
18
 if(UI_ENABLED)
19
    set(EXTRA_LIBS obs-frontend-api)
20
​
View file
obs-studio-21.0.1.tar.xz/libobs/obs-config.h -> obs-studio-21.0.2.tar.xz/libobs/obs-config.h Changed
10
 
1
@@ -41,7 +41,7 @@
2
  *
3
  * Reset to zero each major or minor version
4
  */
5
-#define LIBOBS_API_PATCH_VER  1
6
+#define LIBOBS_API_PATCH_VER  2
7
8
 #define MAKE_SEMANTIC_VERSION(major, minor, patch) \
9
                              ((major << 24) | \
10
​
Locations
Help
Contact