Merge pull request #3 from clevertech/upstream-merge

Upstream merge

.gitignore

@@ -16,6 +16,7 @@
 /debug32/
 /debug64/
 /builds/
+.vs/
 *.o.d
 *.ninja
 .ninja*
@@ -27,6 +28,9 @@
 #xcode
 *.xcodeproj/
 
+#clion
+.idea/
+
 #other stuff (windows stuff, qt moc stuff, etc)
 Release_MD/
 Release/
@@ -45,6 +49,14 @@ install-sh
 Makefile.in
 Makefile
 
+#python
+__pycache__
+
+#sphinx
+/docs/sphinx/_build/*
+!/docs/sphinx/_build/.gitignore
+!/docs/sphinx/Makefile
+
 #random useless file stuff
 *.dmg
 *.app
@@ -89,3 +101,5 @@ tags
 */**/.DS_Store
 dependencies2015/
 
+nightly
+.idea/

.gitmodules

@@ -1,19 +1,18 @@
 [submodule "plugins/win-dshow/libdshowcapture"]
 	path = plugins/win-dshow/libdshowcapture
-	url = https://github.com/jp9000/libdshowcapture.git
+	url = https://github.com/obsproject/libdshowcapture.git
 [submodule "plugins/mac-syphon/syphon-framework"]
 	path = plugins/mac-syphon/syphon-framework
 	url = https://github.com/palana/Syphon-Framework.git
 [submodule "plugins/enc-amf"]
 	path = plugins/enc-amf
-	url = https://github.com/Xaymar/obs-studio_amf-encoder-plugin.git
+	url = https://github.com/obsproject/obs-amd-encoder.git
 [submodule "plugins/obs-browser"]
 	path = plugins/obs-browser
-	url = https://github.com/kc5nra/obs-browser.git
+	url = https://github.com/obsproject/obs-browser.git
 [submodule "plugins/obs-vst"]
 	path = plugins/obs-vst
-	url = https://github.com/DDRBoxman/obs-vst.git
+	url = https://github.com/obsproject/obs-vst.git
 [submodule "plugins/websocket-client/third_party"]
 	path = plugins/websocket-client/third_party
-	url = https://github.com/chriskohlhoff/asio.git
-
+	url = https://github.com/chriskohlhoff/asio.git

.travis.yml

@@ -20,6 +20,7 @@ env:
 matrix:
   include:
     - os: osx
+      osx_image: xcode9.4
       env:
        - CMAKE_PREFIX_PATH=/usr/local/opt/qt5/lib/cmake
        - CEF_BUILD_VERSION=3.3282.1726.gc8368c8
@@ -45,7 +46,7 @@ deploy:
   region: us-west-2
   acl: public_read
   on:
-    repo: jp9000/obs-studio
+    repo: obsproject/obs-studio
     condition: "$TRAVIS_OS_NAME = osx"
     all_branches: true
 
@@ -63,6 +64,7 @@ notifications:
   webhooks:
     urls:
       - secure: T5RBY818nO40nr5eC8pdrCfAdQKGkjQdbyYw7mfFrhxWxgt/U5tyKXpX0l9zNGfobS0SnLSqF71OrfW04V97oijXx3q5Y24xV6mSrlLQZOq19+XvGp82LDpkVd4yi2N0kBYpoANB9Pkof4jWT/rKfdQCQttluOLjgr5SM0uWHRg=
+      - secure: EVI2cu5OnNxVTl4jdVppps7O869gGN1PDcSi8fqq/HJVM5kif8iDe4wCrIKv6yWrK3dSNwRgBAwpcPZglRJnKRh23PdFoCdnTjgzBQlmjUR6BYlunQvoKR9mVX6AdT8zrFDgmtC4aOtGD2paptpqt+Equo25KrLwv+qOHJOTrSQ=
     on_success: change
     on_failure: always
 

AUTHORS

@@ -1,3 +1,5 @@
+Original Author: Hugh Bailey ("Jim")
+
 Contributors are sorted by their amount of commits / translated strings.
 
 Contributors:

CI/before-deploy-osx.sh

@@ -15,13 +15,13 @@ export FILENAME=$FILE_DATE-$GIT_HASH-$TRAVIS_BRANCH-osx.pkg
 cd ./build
 
 # Move the CEF plugin out before running build_app so that it doesn't get packaged twice
-hr "Moving CEF out to preserve linking"
-mv ./rundir/RelWithDebInfo/obs-plugins/CEF.app ./
-mv ./rundir/RelWithDebInfo/obs-plugins/obs-browser.so ./
+# hr "Moving CEF out to preserve linking"
+# mv ./rundir/RelWithDebInfo/obs-plugins/CEF.app ./
+# mv ./rundir/RelWithDebInfo/obs-plugins/obs-browser.so ./
 
 # Move obslua
-hr "Moving OBS LUA"
-mv ./rundir/RelWithDebInfo/data/obs-scripting/obslua.so ./rundir/RelWithDebInfo/bin/
+#hr "Moving OBS LUA"
+#cp ./rundir/RelWithDebInfo/data/obs-scripting/obslua.so ./rundir/RelWithDebInfo/bin/
 
 # Move obspython
 # hr "Moving OBS Python"
@@ -35,33 +35,48 @@ if [ -n "${TRAVIS_TAG}" ]; then
   STABLE=true
 fi
 
-sudo python ../CI/install/osx/build_app.py --public-key ../CI/install/osx/OBSPublicDSAKey.pem --sparkle-framework ../../sparkle/Sparkle.framework --base-url "https://obsproject.com/osx_update" --stable=$STABLE
+sudo python ../CI/install/osx/build_app.py --public-key ../CI/install/osx/OBSPublicDSAKey.pem --sparkle-framework ../../sparkle/Sparkle.framework --stable=$STABLE
 
 # Move the CEF plugin back to where it belongs
-hr "Moving CEF back"
-mv ./CEF.app ./rundir/RelWithDebInfo/obs-plugins/
-mv ./obs-browser.so ./rundir/RelWithDebInfo/obs-plugins/
+# hr "Moving CEF back"
+# mv ./CEF.app ./rundir/RelWithDebInfo/obs-plugins/
+# mv ./obs-browser.so ./rundir/RelWithDebInfo/obs-plugins/
+
+# Copy Chromium embedded framework to app Frameworks directory
+#hr "Copying Chromium Embedded Framework.framework"
+#sudo mkdir -p OBS.app/Contents/Frameworks
+#sudo cp -r ../../cef_binary_${CEF_BUILD_VERSION}_macosx64/Release/Chromium\ Embedded\ Framework.framework OBS.app/Contents/Frameworks/
+#sudo install_name_tool -change \
+#	@rpath/Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \
+#	../../Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \
+#	OBS.app/Contents/Resources/obs-plugins/obs-browser.so
+#sudo install_name_tool -change \
+#	@rpath/Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \
+#	../../Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \
+#	OBS.app/Contents/Resources/obs-plugins/obs-browser-page
 
 # Package app
 hr "Generating .pkg"
 packagesbuild ../CI/install/osx/CMakeLists.pkgproj
 
 # Signing stuff
-hr "Decrypting Cert"
-openssl aes-256-cbc -K $encrypted_dd3c7f5e9db9_key -iv $encrypted_dd3c7f5e9db9_iv -in ../CI/osxcert/Certificates.p12.enc -out Certificates.p12 -d
-hr "Creating Keychain"
-security create-keychain -p mysecretpassword build.keychain
-security default-keychain -s build.keychain
-security unlock-keychain -p mysecretpassword build.keychain
-security set-keychain-settings -t 3600 -u build.keychain
-hr "Importing certs into keychain"
-security import ./Certificates.p12 -k build.keychain -T /usr/bin/productsign -P ""
-# macOS 10.12+
-security set-key-partition-list -S apple-tool:,apple: -s -k mysecretpassword build.keychain
-hr "Signing Package"
-productsign --sign 2MMRE5MTB8 ./OBS.pkg ./$FILENAME
+#hr "Decrypting Cert"
+#openssl aes-256-cbc -K $encrypted_dd3c7f5e9db9_key -iv $encrypted_dd3c7f5e9db9_iv -in ../CI/osxcert/Certificates.p12.enc -out Certificates.p12 -d
+#hr "Creating Keychain"
+#security create-keychain -p mysecretpassword build.keychain
+#security default-keychain -s build.keychain
+#security unlock-keychain -p mysecretpassword build.keychain
+#security set-keychain-settings -t 3600 -u build.keychain
+#hr "Importing certs into keychain"
+#security import ./Certificates.p12 -k build.keychain -T /usr/bin/productsign -P ""
+## macOS 10.12+
+#security set-key-partition-list -S apple-tool:,apple: -s -k mysecretpassword build.keychain
+#hr "Signing Package"
+#productsign --sign 2MMRE5MTB8 ./OBS.pkg ./$FILENAME
+
+mv ./EBS.pkg ./$FILENAME
 
 # Move to the folder that travis uses to upload artifacts from
 hr "Moving package to nightly folder for distribution"
-mkdir ../nightly
+mkdir -p ../nightly
 sudo mv ./$FILENAME ../nightly

CI/before-deploy-win.cmd

@@ -1,3 +1,3 @@
-robocopy C:\projects\obs-studio\build32\rundir\RelWithDebInfo C:\projects\obs-studio\build\ /E /XF .gitignore
-robocopy C:\projects\obs-studio\build64\rundir\RelWithDebInfo C:\projects\obs-studio\build\ /E /XC /XN /XO /XF .gitignore
-7z a build.zip C:\projects\obs-studio\build\*
+robocopy C:\projects\ebs-studio\build32\rundir\RelWithDebInfo C:\projects\ebs-studio\build\ /E /XF .gitignore
+robocopy C:\projects\ebs-studio\build64\rundir\RelWithDebInfo C:\projects\ebs-studio\build\ /E /XC /XN /XO /XF .gitignore
+7z a build.zip C:\projects\ebs-studio\build\*

CI/before-script-osx.sh

@@ -1,11 +1,15 @@
 # Make sure ccache is found
-export PATH=/usr/local/opt/ccache/libexec:$PATH
+# export PATH=/usr/local/opt/ccache/libexec:$PATH
 
+# set CEF version for use later
+# export CEF_BUILD_VERSION="3.3282.1726.gc8368c8"
+
+sudo rm -rf build
 mkdir build
 cd build
-cmake -DENABLE_SPARKLE_UPDATER=ON \
+cmake \
 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.10 \
--DDepsPath=/tmp/obsdeps \
+-DDepsPath=/tmp/ebsdeps \
 -DVLCPath=$PWD/../../vlc-master \
--DBUILD_BROWSER=ON \
--DCEF_ROOT_DIR=$PWD/../../cef_binary_${CEF_BUILD_VERSION}_macosx64 ..
+-DCMAKE_INSTALL_PREFIX=/opt/ebs \
+-DCMAKE_BUILD_TYPE=RelWithDebInfo ..

CI/install-dependencies-linux-ubuntu16.sh

@@ -0,0 +1,57 @@
+#!/bin/sh
+set -ex
+
+sudo apt-get -qq update
+sudo apt-get install -y \
+        build-essential \
+        checkinstall \
+        cmake \
+        libasound2-dev \
+        libavcodec-dev \
+        libavdevice-dev \
+        libavfilter-dev \
+        libavformat-dev \
+        libavutil-dev \
+        libcurl4-openssl-dev \
+        libfdk-aac-dev \
+        libfontconfig-dev \
+        libfreetype6-dev \
+        libgl1-mesa-dev \
+        libjack-jackd2-dev \
+        libjansson-dev \
+        libluajit-5.1-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 \
+        python3-dev \
+        qtbase5-dev \
+        swig
+
+
+# build mbedTLS
+cd ~/projects
+mkdir mbedtls
+cd mbedtls
+mbedtlsPath=$PWD
+curl -L -O https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.12.0.tar.gz
+tar -xf mbedtls-2.12.0.tar.gz
+mkdir build
+cd ./build
+cmake -DENABLE_TESTING=Off -DUSE_SHARED_MBEDTLS_LIBRARY=On ../mbedtls-mbedtls-2.12.0
+make -j 12
+sudo make install
+
+# return to OBS build dir
+cd $APPVEYOR_BUILD_FOLDER

CI/install-dependencies-linux.sh

@@ -1,18 +1,18 @@
 #!/bin/sh
 set -ex
 
-sudo add-apt-repository ppa:kirillshkrogalev/ffmpeg-next -y
+sudo add-apt-repository ppa:jonathonf/ffmpeg-3 -y
 sudo apt-get -qq update
 sudo apt-get install -y \
         build-essential \
         checkinstall \
         cmake \
         libasound2-dev \
-        libavcodec-ffmpeg-dev \
-        libavdevice-ffmpeg-dev \
-        libavfilter-ffmpeg-dev \
-        libavformat-ffmpeg-dev \
-        libavutil-ffmpeg-dev \
+        libavcodec-dev \
+        libavdevice-dev \
+        libavfilter-dev \
+        libavformat-dev \
+        libavutil-dev \
         libcurl4-openssl-dev \
         libfdk-aac-dev \
         libfontconfig-dev \
@@ -24,10 +24,11 @@ sudo apt-get install -y \
         libpulse-dev \
         libqt5x11extras5-dev \
         libspeexdsp-dev \
-        libswresample-ffmpeg-dev \
-        libswscale-ffmpeg-dev \
+        libswresample-dev \
+        libswscale-dev \
         libudev-dev \
         libv4l-dev \
+        libva-dev \
         libvlc-dev \
         libx11-dev \
         libx264-dev \