@@ -1,4 +1,183 @@

 -------------------------------------------------------------------

+Tue Dec 15 03:46:49 UTC 2020 - jimmy@boombatower.com

+

+- Update to version 26.1.0:

+  * UI: Add deferred function to update context bar

+  * UI: Fix installer/updater check for vs2019 32bit

+  * Update translations from Crowdin

+  * Revert #3856

+  * linux-jack: fix timestamp calculation

+  * linux-jack: fix deadlock when closing the client

+  * linux-jack: mark ports as JackPortIsTerminal

+  * linux-pulseaudio: fix race conditions

+  * obs-browser: Add obsExit event

+  * UI: Determine rate control after creating encoders

+  * UI: Handle (de)select scene items queued

+  * CI: Update macOS to Qt 5.15.2 and deps 2020-12-11

+  * libobs: fix the pending stop trick

+  * UI/updater: Fix dll check

+  * UI: Remove jansson requirement from UI and updater

+  * UI/updater: Update redist checks to VS2019

+  * deps/json11: Update to most recent version

+  * rtmp-services: Update Steam

+  * libobs: Update version to 26.1.0

+  * sndio: remove strerror_l

+  * UI: Fix weird spacing in adv output FFmpeg recording

+  * linux-v4l2: Fix bashism in v4l2loopback module detection

+  * obs-scripting: Fix removing signal handlers in lua

+  * UI: Correctly unregister Virtual Camera & Source Toolbar hotkeys

+  * UI: Scale Interact cursor position based on display DPI

+  * UI: Sync 'Copy Filters' enabled state in the Source context menu

+  * mac-virtualcam: Build a universal x86_64+arm64 binary for M1 Macs

+  * vlc-video: Free media struct

+  * mac-virtualcam: Fix remaining global namespaces

+  * UI: Allow enabling vod track on custom via ini

+  * UI: Fix vod track working with custom server

+  * UI: Fix vod track not working with twitch soundtrack

+  * UI: Fix aac encoder name

+  * libobs: Ignore non-fatal ffmpeg return values during remux

+  * UI: Fix disabled sliders

+  * UI: Remove redundant setting

+  * UI: fix typo

+  * UI/installer: Add additional VS2019 DLL check

+  * UI: Use Qt::MiddleButton instead of deprecated Qt::MidButton

+  * obs-browser: Update to 2.9.0

+  * UI: Don't round non-integer High DPI scale

+  * CI: Add decklink-captions to dylibbundler fixups

+  * enc-amf: Fix inability to set bitrate in latest AMD driver

+  * UI: Fix filter window rendering and accessible names

+  * UI: Log success/failure for scene collection importer

+  * UI: Prevent import failure for collections with slash in name

+  * UI: Prevent name collision during scene collection import

+  * UI: Various screen reader fixes

+  * Update translations from Crowdin

+  * libobs: Allow wrapping D3D11 object with gs_texture_t

+  * UI: Fix Save Replay button staying highlighted

+  * frontend-tools: Don't give every loaded filter focus

+  * UI: Set default source toolbar visibility to true

+  * obs-outputs: Log unhandled status description as debug level

+  * mac-virtualcam: Fix global namespace issues in DAL plugin

+  * cmake: Make sure to copy other mbedtls libraries

+  * obs-browser: Don't inject CSS if the property is empty

+  * UI: Force plugins to use our Qt5Network, not their own

+  * cmake: Add Qt5Network to copied windows libs

+  * CI: Remove explicit LANGUAGE flags for cmake 3.19+

+  * obs-ffmpeg: Treat non-network errors as fatal too

+  * Revert "obs-ffmpeg: Treat errors as fatal for non-network streams in ffmpeg-mux"

+  * mac-virtualcam: Remove old test card

+  * UI: fix build on older FreeBSD versions

+  * win-capture: Update hook version

+  * obs-ffmpeg: Treat errors as fatal for non-network streams in ffmpeg-mux

+  * obs-ffmpeg: Treat EINVAL as non-fatal in ffmpeg-mux

+  * win-capture: Clean up remaining /W4 warnings

+  * obs-ffmpeg: Treat AVERROR_INVALIDDATA as non-fatal

+  * obs-ffmpeg: Add error detection to ffmpeg-mux network streams

+  * deps/media-playback: Fix audio segment duration calc

+  * autotools: Remove config module

+  * Revert "obs-ffmpeg: Add error detection to ffmpeg-mux"

+  * mac-virtualcam: Update locales

+  * UI: Detect other instances of obs on FreeBSD

+  * win-capture: Fix our own Vulkan spec violation

+  * Add sndio support (#3715)

+  * Add OpenBSD support

+  * UI: Add Twitch VOD track to simple output mode

+  * cmake: Put decklink-captions in source folders

+  * win-dshow: Add support for YUY2 in virtualcam

+  * UI: Move "changed" when recreating output res widget

+  * UI: Show service max resolution/framerate values to user

+  * UI: Add service res/fps limitation support to settings

+  * libobs: Change service max res. to res. list

+  * UI: Allow blocking all signals if resetting downscales

+  * UI: Add SetComboItemEnabled

+  * win-capture: Warning fixes

+  * libobs-winrt: Fix misnamed function

+  * UI: Use macOS app icon for Qt app on macOS

+  * UI: Fix tray icon menu handling on macOS

+  * UI: Update macOS app icon

+  * UI: Update tray icons to use masks on macOS

+  * win-capture: Fix unused variables

+  * UI: Fix compiler-specific error

+  * UI: Move "enforce" setting to "ignore" stream section

+  * UI: Refactor to make it easier to get service object

+  * libobs: Implement obs_service func to get max bitrates

+  * rtmp-services: Increase twitch audio bitrate

+  * decklink: Fix compiling on linux

+  * rnnoise: Explicit double to float conversions

+  * rtmp-services: Add missing int cast

+  * obs-ffmpeg: Add missing int cast

+  * libobs-winrt: Fix BOOL/bool mismatch warning

+  * libobs: Fix bad type and size mismatch

+  * UI: Add VOD track support in advanced output

+  * decklink: Clean up warnings introduced by caption code

+  * CI: Remove caching of obs-deps for Github CI

+  * decklink: Upgrade sdk to version 11.6

+  * Remove BUILD_CAPTIONS build flag

+  * decklink: Fix format detection loop

+  * decklink: Add ability to ingest/embed cea 708 captions

+  * linux-v4l2: avoid OOB write

+  * linux-v4l2: Hide modinfo from terminal

+  * UI: Don't update source context bar when hidden

+  * vlc-video: Use case insensitive compare for valid extension check

+  * CONTRIBUTING.rst: Update CONTRIBUTING doc

+  * UI: Disable stream encoder setting in simple output with active output

+  * Add virtualcam plugin to OBS codebase

+  * UI: Detect other instances of obs on Linux

+  * UI/installer: Use random temp directory for security

+  * libobs: Add desktop session type to Linux log

+  * rtmp-services: Add YouTube RTMPS beta service

+  * rmtp-services: Add Viloud service

+  * linux-v4l2: Add virtual camera output

+  * win-dshow: Fix virtualcam crash and reference bug

+  * UI: Add max cx/cy/fps clamp (if service specifies)

+  * rtmp-services: Add max recommended cx/cy/fps for Facebook

+  * rtmp-services: Add specifiable max cx/cy/fps in json

+  * libobs: Add ability to get max cx/cy/fps from service

+  * obs-ffmpeg: Add MX350 to blacklist

+  * UI: Run Autoconfig Wizard on New Profile Creation

+  * CI: Update macOS build script to support alternative build configs

+  * obs-transitions: Expose hardware decoding for Stingers

+  * libobs: Return default obj and array rather than current

+  * UI: Report detailed output errors for Replay Buffer

+  * CI: Fix Windows artifact issues and housekeeping

+  * UI: Fix replay buffer saved event in advanced mode

+  * docs: Fix GitHub Actions doc check warnings

+  * linux-alsa: Support more device formats

+  * UI: Detect other instances of obs on macOS

+  * UI: Add duplicate filter

+  * obs-filter: Fix potential symbol clashing on Linux

+  * UI: Update Twitch Get Stream Key link

+  * UI: Apply minimum width to Stats fields

+  * UI, libobs: Add ability to copy/paste single filter

+  * UI: Keep showing time when paused

+  * obs-ffmpeg/ffmpeg-mux: Fix issue with HLS

+  * obs-ffmpeg: Add ability to debug ffmpeg-mux subprocess

+  * UI: Fix text clipping on non-English locales in certain locations

+  * win-capture: Fix D3D leaks on swap chain release

+  * rtmp-services: Add YouTube HLS service selection

+  * obs-ffmpeg: Add HLS output

+  * obs-ffmpeg: Allow using stream keys with muxer

+  * obs-ffmpeg: Allow specifying mux settings directly

+  * obs-ffmpeg/ffmpeg-mux: Use separate printable URL target

+  * obs-ffmpeg/ffmpeg-mux: Set codec->time_base if avformat < 59

+  * obs-ffmpeg/ffmpeg-mux: Add ability to get FFmpeg logging

+  * UI: Find YouTube via starting string, not full match

+  * UI: Add support for "More Info" link from service

+  * obs-ffmpeg/ffmpeg-mux: Fix variable case

+  * obs-ffmpeg: Move muxer structure/funcs to header

+  * UI: Fix replay buffer frontend event not triggering

+  * UI/obs-frontend-api: Fix replay buffer save event ABI break

+  * UI: Add replay buffer saved event to the frontend api (#3592)

+  * UI: Prevent disabling replay buffer if it's active

+  * CI: Add virtualcam GUID to win builds

+  * CI: Remove deprecated use of `set-env` in Github Actions

+  * Docs: Fix Frontend Finish Loading event

+  * UI: Set focus back to label after source rename

+  * UI: Apply custom_rtmp service settings to srt output

+  * rtmp-services/rtmp-custom: Apply repeat_headers video setting to srt output

+  * obs-ffmpeg: Allow video headers repetition in IDR and bitstream for jim-nvenc

+  * obs-x264: Allow repeat_headers and annexb parameters to be set

+

+-------------------------------------------------------------------

 Mon Oct 19 16:02:28 UTC 2020 - Jimmy Berry <jimmy@boombatower.com>

 - Remove c7f84f8fc4e90ef779a204ac268f5ee1a962e324.patch.

​

@@ -1,5 +1,5 @@

 Name:           obs-studio

-Version:        26.0.2

+Version:        26.1.0

 Release:        0

 Summary:        A recording/broadcasting program

 Group:          Productivity/Multimedia/Video/Editors and Convertors

​

@@ -1,7 +1,7 @@

 <services>

   <service name="tar_scm" mode="disabled">

     <param name="versionformat">@PARENT_TAG@</param>

-    <param name="revision">refs/tags/26.0.2</param>

+    <param name="revision">refs/tags/26.1.0</param>

     <param name="url">git://github.com/jp9000/obs-studio.git</param>

     <param name="scm">git</param>

     <param name="changesgenerate">enable</param>

​

@@ -1,6 +1,6 @@

 <servicedata>

   <service name="tar_scm">

     <param name="url">git://github.com/jp9000/obs-studio.git</param>

-    <param name="changesrevision">3486c0b3633a8ff2b36170d56f37705fe7061349</param>

+    <param name="changesrevision">38ad3ba18fc27846e122bd56f589ccb34c4578e2</param>

   </service>

 </servicedata>

​

@@ -1,78 +0,0 @@

-#!/usr/bin/env bash

-

-# Exit if something fails

-set -e

-

-rm -rf ./OBS.app

-

-mkdir OBS.app

-mkdir OBS.app/Contents

-mkdir OBS.app/Contents/MacOS

-mkdir OBS.app/Contents/PlugIns

-mkdir OBS.app/Contents/Resources

-

-cp -R rundir/RelWithDebInfo/bin/ ./OBS.app/Contents/MacOS

-cp -R rundir/RelWithDebInfo/data ./OBS.app/Contents/Resources

-cp ../CI/scripts/macos/app/obs.icns ./OBS.app/Contents/Resources

-cp -R rundir/RelWithDebInfo/obs-plugins/ ./OBS.app/Contents/PlugIns

-cp ../CI/scripts/macos/app/Info.plist ./OBS.app/Contents

-

-../CI/scripts/macos/package/dylibBundler -b -cd -d ./OBS.app/Contents/Frameworks -p @executable_path/../Frameworks/ \

--s ./OBS.app/Contents/MacOS \

--x ./OBS.app/Contents/PlugIns/coreaudio-encoder.so \

--x ./OBS.app/Contents/PlugIns/decklink-ouput-ui.so \

--x ./OBS.app/Contents/PlugIns/frontend-tools.so \

--x ./OBS.app/Contents/PlugIns/image-source.so \

--x ./OBS.app/Contents/PlugIns/linux-jack.so \

--x ./OBS.app/Contents/PlugIns/mac-avcapture.so \

--x ./OBS.app/Contents/PlugIns/mac-capture.so \

--x ./OBS.app/Contents/PlugIns/mac-decklink.so \

--x ./OBS.app/Contents/PlugIns/mac-syphon.so \

--x ./OBS.app/Contents/PlugIns/mac-vth264.so \

--x ./OBS.app/Contents/PlugIns/obs-browser.so \

--x ./OBS.app/Contents/PlugIns/obs-browser-page \

--x ./OBS.app/Contents/PlugIns/obs-ffmpeg.so \

--x ./OBS.app/Contents/PlugIns/obs-filters.so \

--x ./OBS.app/Contents/PlugIns/obs-transitions.so \

--x ./OBS.app/Contents/PlugIns/obs-vst.so \

--x ./OBS.app/Contents/PlugIns/rtmp-services.so \

--x ./OBS.app/Contents/MacOS/obs \

--x ./OBS.app/Contents/MacOS/obs-ffmpeg-mux \

--x ./OBS.app/Contents/MacOS/obslua.so \

--x ./OBS.app/Contents/PlugIns/obs-x264.so \

--x ./OBS.app/Contents/PlugIns/text-freetype2.so \

--x ./OBS.app/Contents/PlugIns/obs-libfdk.so

-# -x ./OBS.app/Contents/MacOS/_obspython.so \

-# -x ./OBS.app/Contents/PlugIns/obs-outputs.so \

-

-/usr/local/Cellar/qt/${QT_VERSION}/bin/macdeployqt ./OBS.app

-

-mv ./OBS.app/Contents/MacOS/libobs-opengl.so ./OBS.app/Contents/Frameworks

-

-rm -f -r ./OBS.app/Contents/Frameworks/QtNetwork.framework

-

-# put qt network in here becasuse streamdeck uses it

-cp -R /usr/local/opt/qt/lib/QtNetwork.framework ./OBS.app/Contents/Frameworks

-chmod -R +w ./OBS.app/Contents/Frameworks/QtNetwork.framework

-rm -r ./OBS.app/Contents/Frameworks/QtNetwork.framework/Headers

-rm -r ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/Headers/

-chmod 644 ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/Resources/Info.plist

-install_name_tool -id @executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork

-install_name_tool -change /usr/local/Cellar/qt/${QT_VERSION}/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork

-

-

-# decklink ui qt

-install_name_tool -change /usr/local/opt/qt/lib/QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui ./OBS.app/Contents/PlugIns/decklink-ouput-ui.so

-install_name_tool -change /usr/local/opt/qt/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore ./OBS.app/Contents/PlugIns/decklink-ouput-ui.so

-install_name_tool -change /usr/local/opt/qt/lib/QtWidgets.framework/Versions/5/QtWidgets @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtWidgets ./OBS.app/Contents/PlugIns/decklink-ouput-ui.so

-

-# frontend tools qt

-install_name_tool -change /usr/local/opt/qt/lib/QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui ./OBS.app/Contents/PlugIns/frontend-tools.so

-install_name_tool -change /usr/local/opt/qt/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore ./OBS.app/Contents/PlugIns/frontend-tools.so

-install_name_tool -change /usr/local/opt/qt/lib/QtWidgets.framework/Versions/5/QtWidgets @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtWidgets ./OBS.app/Contents/PlugIns/frontend-tools.so

-

-# vst qt

-install_name_tool -change /usr/local/opt/qt/lib/QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui ./OBS.app/Contents/PlugIns/obs-vst.so

-install_name_tool -change /usr/local/opt/qt/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore ./OBS.app/Contents/PlugIns/obs-vst.so

-install_name_tool -change /usr/local/opt/qt/lib/QtWidgets.framework/Versions/5/QtWidgets @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtWidgets ./OBS.app/Contents/PlugIns/obs-vst.so

-install_name_tool -change /usr/local/opt/qt/lib/QtMacExtras.framework/Versions/5/QtMacExtras @executable_path/../Frameworks/QtMacExtras.framework/Versions/5/QtMacExtras ./OBS.app/Contents/PlugIns/obs-vst.so

​

@@ -1,41 +0,0 @@

-#!/usr/bin/env bash

-

-# Exit if something fails

-set -e

-

-cd ./build

-

-mv ./rundir/RelWithDebInfo/data/obs-scripting/obslua.so ./rundir/RelWithDebInfo/bin/

-mv ./rundir/RelWithDebInfo/data/obs-scripting/_obspython.so ./rundir/RelWithDebInfo/bin/

-mv ./rundir/RelWithDebInfo/data/obs-scripting/obspython.py ./rundir/RelWithDebInfo/bin/

-

-../CI/scripts/macos/packageApp.sh

-

-# fix obs outputs plugin it doesn't play nicely with dylibBundler at the moment

-chmod +w ./OBS.app/Contents/Frameworks/*.dylib

-install_name_tool -change libmbedtls.12.dylib @executable_path/../Frameworks/libmbedtls.12.dylib ./OBS.app/Contents/Plugins/obs-outputs.so

-install_name_tool -change libmbedcrypto.3.dylib @executable_path/../Frameworks/libmbedcrypto.3.dylib ./OBS.app/Contents/Plugins/obs-outputs.so

-install_name_tool -change libmbedx509.0.dylib @executable_path/../Frameworks/libmbedx509.0.dylib ./OBS.app/Contents/Plugins/obs-outputs.so

-install_name_tool -change /usr/local/opt/curl/lib/libcurl.4.dylib @executable_path/../Frameworks/libcurl.4.dylib ./OBS.app/Contents/Plugins/obs-outputs.so

-install_name_tool -change @rpath/libobs.0.dylib @executable_path/../Frameworks/libobs.0.dylib ./OBS.app/Contents/Plugins/obs-outputs.so

-install_name_tool -change /tmp/obsdeps/bin/libjansson.4.dylib @executable_path/../Frameworks/libjansson.4.dylib ./OBS.app/Contents/Plugins/obs-outputs.so

-

-cp -R ${GITHUB_WORKSPACE}/cmbuild/sparkle/Sparkle.framework ./OBS.app/Contents/Frameworks/

-install_name_tool -change @rpath/Sparkle.framework/Versions/A/Sparkle @executable_path/../Frameworks/Sparkle.framework/Versions/A/Sparkle ./OBS.app/Contents/MacOS/obs

-

-sudo mkdir -p ./OBS.app/Contents/Frameworks

-sudo cp -R ${GITHUB_WORKSPACE}/cmbuild/cef_binary_${CEF_BUILD_VERSION}_macosx64/Release/Chromium\ Embedded\ Framework.framework ./OBS.app/Contents/Frameworks/

-install_name_tool -change /usr/local/opt/qt/lib/QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui ./OBS.app/Contents/Plugins/obs-browser.so

-install_name_tool -change /usr/local/opt/qt/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore ./OBS.app/Contents/Plugins/obs-browser.so

-install_name_tool -change /usr/local/opt/qt/lib/QtWidgets.framework/Versions/5/QtWidgets @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtWidgets ./OBS.app/Contents/Plugins/obs-browser.so

-

-cp ../CI/scripts/macos/app/OBSPublicDSAKey.pem ./OBS.app/Contents/Resources

-

-plutil -insert CFBundleVersion -string $(basename ${GITHUB_REF}) ./OBS.app/Contents/Info.plist

-plutil -insert CFBundleShortVersionString -string $(basename ${GITHUB_REF}) ./OBS.app/Contents/Info.plist

-plutil -insert OBSFeedsURL -string https://obsproject.com/osx_update/feeds.xml ./OBS.app/Contents/Info.plist

-plutil -insert SUFeedURL -string https://obsproject.com/osx_update/stable/updates.xml ./OBS.app/Contents/Info.plist

-plutil -insert SUPublicDSAKeyFile -string OBSPublicDSAKey.pem ./OBS.app/Contents/Info.plist

-

-mv ./OBS.app ../OBS.app

-cd -

​

@@ -1,105 +0,0 @@

-<?xml version="1.0" encoding="UTF-8"?>

-<ui version="4.0">

- <class>NameDialog</class>

- <widget class="QDialog" name="NameDialog">

-  <property name="windowModality">

-   <enum>Qt::WindowModal</enum>

-  </property>

-  <property name="geometry">

-   <rect>

-    <x>0</x>

-    <y>0</y>

-    <width>555</width>

-    <height>102</height>

-   </rect>

-  </property>

-  <property name="windowTitle">

-   <string notr="true">Dialog</string>

-  </property>

-  <layout class="QVBoxLayout" name="verticalLayout">

-   <item>

-    <widget class="QLabel" name="label">

-     <property name="sizePolicy">

-      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">

-       <horstretch>0</horstretch>

-       <verstretch>0</verstretch>

-      </sizepolicy>

-     </property>

-     <property name="text">

-      <string notr="true">TextLabel</string>

-     </property>

-     <property name="wordWrap">

-      <bool>true</bool>

-     </property>

-    </widget>

-   </item>

-   <item>

-    <widget class="QLineEdit" name="userText">

-     <property name="sizePolicy">

-      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">

-       <horstretch>0</horstretch>

-       <verstretch>0</verstretch>

-      </sizepolicy>

-     </property>

-     <property name="text">

-      <string notr="true"/>

-     </property>

-    </widget>

-   </item>

-   <item>

-    <widget class="QDialogButtonBox" name="buttonBox">

-     <property name="sizePolicy">

-      <sizepolicy hsizetype="Expanding" vsizetype="Maximum">

-       <horstretch>0</horstretch>

-       <verstretch>0</verstretch>

-      </sizepolicy>

-     </property>

-     <property name="orientation">

-      <enum>Qt::Horizontal</enum>

-     </property>

-     <property name="standardButtons">

-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>

-     </property>

-     <property name="centerButtons">

-      <bool>true</bool>

-     </property>

-    </widget>

-   </item>

-  </layout>

- </widget>

- <resources/>

- <connections>

-  <connection>

-   <sender>buttonBox</sender>

-   <signal>accepted()</signal>

-   <receiver>NameDialog</receiver>

-   <slot>accept()</slot>

-   <hints>

-    <hint type="sourcelabel">

-     <x>257</x>

-     <y>94</y>

-    </hint>

-    <hint type="destinationlabel">

-     <x>157</x>

-     <y>274</y>

-    </hint>

-   </hints>

-  </connection>

-  <connection>

-   <sender>buttonBox</sender>

-   <signal>rejected()</signal>

-   <receiver>NameDialog</receiver>

-   <slot>reject()</slot>

-   <hints>

-    <hint type="sourcelabel">

-     <x>325</x>

-     <y>94</y>

-    </hint>

-    <hint type="destinationlabel">

-     <x>286</x>

-     <y>274</y>

-    </hint>

-   </hints>

-  </connection>

- </connections>

-</ui>

​

-(directory)

​

@@ -23,64 +23,57 @@

     name: 'macOS 64-bit'

     runs-on: [macos-latest]

     env:

-      MACOS_DEPS_VERSION: '2020-08-30'

+      MIN_MACOS_VERSION: '10.13'

+      MACOS_DEPS_VERSION: '2020-12-11'

       VLC_VERSION: '3.0.8'

       SPARKLE_VERSION: '1.23.0'

-      QT_VERSION: '5.14.1'

+      QT_VERSION: '5.15.2'

       SIGN_IDENTITY: ''

     steps:

       - name: 'Checkout'

-        uses: actions/checkout@v2

+        uses: actions/checkout@v2.3.3

         with:

           submodules: 'recursive'

       - name: 'Fetch Git Tags'

         run: |

           git fetch --prune --unshallow

-          echo ::set-env name=OBS_GIT_BRANCH::$(git rev-parse --abbrev-ref HEAD)

-          echo ::set-env name=OBS_GIT_HASH::$(git rev-parse --short HEAD)

-          echo ::set-env name=OBS_GIT_TAG::$(git describe --tags --abbrev=0)

+          echo "OBS_GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV

+          echo "OBS_GIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV

+          echo "OBS_GIT_TAG=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV

       - name: 'Check for Github Labels'

         if: github.event_name == 'pull_request'

         run: |

           LABELS_URL="$(echo ${{ github.event.pull_request.url }} | sed s'/pulls/issues/')"

           LABEL_FOUND="$(curl -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" "${LABELS_URL}/labels" | sed -n 's/.*"name": "\(.*\)",/\1/p' | grep 'Seeking Testers' || true)"

           if [ "${LABEL_FOUND}" = "Seeking Testers" ]; then

-            echo ::set-env name=SEEKING_TESTERS::1

+            echo "SEEKING_TESTERS=1" >> $GITHUB_ENV

           else

-            echo ::set-env name=SEEKING_TESTERS::0

+            echo "SEEKING_TESTERS=0" >> $GITHUB_ENV

           fi

       - name: 'Install prerequisites (Homebrew)'

         shell: bash

         run: |

-          brew update --preinstall

+          if [ -d /usr/local/opt/openssl@1.0.2t ]; then

+              brew uninstall openssl@1.0.2t

+              brew untap local/openssl

+          fi

+

+          if [ -d /usr/local/opt/python@2.7.17 ]; then

+              brew uninstall python@2.7.17

+              brew untap local/python2

+          fi

           brew bundle --file ./CI/scripts/macos/Brewfile

       - name: 'Restore Chromium Embedded Framework from cache'

         id: cef-cache

-        uses: actions/cache@v1

+        uses: actions/cache@v2.1.2

         env:

           CACHE_NAME: 'cef-cache'

         with:

           path: ${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_BUILD_VERSION }}_macosx64

           key: ${{ runner.os }}-pr-${{ env.CACHE_NAME }}-${{ env.CEF_BUILD_VERSION }}

-      - name: 'Restore pre-built dependencies from cache'

-        id: deps-cache

-        uses: actions/cache@v1

-        env:

-          CACHE_NAME: 'deps-cache'

-        with:

-          path: /tmp/obsdeps

-          key: ${{ runner.os }}-pr-${{ env.CACHE_NAME }}-${{ env.MACOS_DEPS_VERSION }}

-      - name: 'Restore pre-built Qt dependency from cache'

-        id: deps-qt-cache

-        uses: actions/cache@v1

-        env:

-          CACHE_NAME: 'deps-qt-cache'

-        with:

-          path: /tmp/obsdeps

-          key: ${{ runner.os }}-pr-${{ env.CACHE_NAME }}-${{ env.MACOS_DEPS_VERSION }}

       - name: 'Restore VLC dependency from cache'

         id: vlc-cache

-        uses: actions/cache@v1

+        uses: actions/cache@v2.1.2

         env:

           CACHE_NAME: 'vlc-cache'

         with:

@@ -88,7 +81,7 @@

           key: ${{ runner.os }}-pr-${{ env.CACHE_NAME }}-${{ env.VLC_VERSION }}

       - name: 'Restore Sparkle dependency from cache'

         id: sparkle-cache

-        uses: actions/cache@v1

+        uses: actions/cache@v2.1.2

         env:

           CACHE_NAME: 'sparkle-cache'

         with:

@@ -132,10 +125,9 @@

           tar -xf ./cef_binary_${{ env.CEF_BUILD_VERSION }}_macosx64.tar.bz2 -C ${{ github.workspace }}/cmbuild/

           cd ${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_BUILD_VERSION }}_macosx64

           sed -i '.orig' '/add_subdirectory(tests\/ceftests)/d' ./CMakeLists.txt

-          # target 10.11

-          sed -i '.orig' s/\"10.9\"/\"10.11\"/ ./cmake/cef_variables.cmake

+          sed -i '.orig' s/\"10.9\"/\"${{ env.MIN_MACOS_VERSION }}\"/ ./cmake/cef_variables.cmake

           mkdir build && cd build

-          cmake  -DCMAKE_CXX_FLAGS="-std=c++11 -stdlib=libc++" -DCMAKE_EXE_LINKER_FLAGS="-std=c++11 -stdlib=libc++" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11  ..

+          cmake  -DCMAKE_CXX_FLAGS="-std=c++11 -stdlib=libc++ -Wno-deprecated-declarations" -DCMAKE_EXE_LINKER_FLAGS="-std=c++11 -stdlib=libc++" -DCMAKE_OSX_DEPLOYMENT_TARGET=${{ env.MIN_MACOS_VERSION }}  ..

           make -j4

           mkdir libcef_dll

           cd ../../

@@ -144,7 +136,7 @@

         run: |

           mkdir ./build

           cd ./build

-          cmake -DENABLE_UNIT_TESTS=YES -DENABLE_SPARKLE_UPDATER=ON -DDISABLE_PYTHON=ON -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 -DQTDIR="/tmp/obsdeps" -DSWIGDIR="/tmp/obsdeps" -DDepsPath="/tmp/obsdeps" -DVLCPath="${{ github.workspace }}/cmbuild/vlc-${{ env.VLC_VERSION }}" -DENABLE_VLC=ON -DBUILD_BROWSER=ON -DBROWSER_DEPLOY=ON -DBUILD_CAPTIONS=ON -DWITH_RTMPS=ON -DCEF_ROOT_DIR="${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_BUILD_VERSION }}_macosx64" ..

+          cmake -DENABLE_UNIT_TESTS=YES -DENABLE_SPARKLE_UPDATER=ON -DDISABLE_PYTHON=ON -DCMAKE_OSX_DEPLOYMENT_TARGET=${{ env.MIN_MACOS_VERSION }} -DQTDIR="/tmp/obsdeps" -DSWIGDIR="/tmp/obsdeps" -DDepsPath="/tmp/obsdeps" -DVLCPath="${{ github.workspace }}/cmbuild/vlc-${{ env.VLC_VERSION }}" -DENABLE_VLC=ON -DBUILD_BROWSER=ON -DBROWSER_DEPLOY=ON -DWITH_RTMPS=ON -DCEF_ROOT_DIR="${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_BUILD_VERSION }}_macosx64" ..

       - name: 'Build'

         shell: bash

         working-directory: ${{ github.workspace }}/build

@@ -167,7 +159,7 @@

       - name: 'Set Signing Identity'

         if: success() && startsWith(github.ref, 'refs/tags/') && github.event_name != 'pull_request'

         run: |

-          echo "::set-env name=SIGN_IDENTITY::${{ secrets.MACOS_SIGNING_IDENTITY }}"

+          echo "SIGN_IDENTITY=${{ secrets.MACOS_SIGNING_IDENTITY }}" >> $GITHUB_ENV

       - name: 'Create macOS application bundle'

         if: success() && (github.event_name != 'pull_request' || env.SEEKING_TESTERS == '1')

         working-directory: ${{ github.workspace }}/build

@@ -182,7 +174,7 @@

           cp rundir/RelWithDebInfo/bin/obs-ffmpeg-mux ./OBS.app/Contents/MacOS

           cp rundir/RelWithDebInfo/bin/libobsglad.0.dylib ./OBS.app/Contents/MacOS

           cp -R rundir/RelWithDebInfo/data ./OBS.app/Contents/Resources

-          cp ../CI/scripts/macos/app/obs.icns ./OBS.app/Contents/Resources

+          cp ../CI/scripts/macos/app/AppIcon.icns ./OBS.app/Contents/Resources

           cp -R rundir/RelWithDebInfo/obs-plugins/ ./OBS.app/Contents/PlugIns

           cp ../CI/scripts/macos/app/Info.plist ./OBS.app/Contents

@@ -199,6 +191,7 @@

             -s ./rundir/RelWithDebInfo/bin \

             -x ./OBS.app/Contents/PlugIns/coreaudio-encoder.so \

             -x ./OBS.app/Contents/PlugIns/decklink-ouput-ui.so \

+            -x ./OBS.app/Contents/PlugIns/decklink-captions.so \

             -x ./OBS.app/Contents/PlugIns/frontend-tools.so \

             -x ./OBS.app/Contents/PlugIns/image-source.so \

             -x ./OBS.app/Contents/PlugIns/linux-jack.so \

@@ -207,6 +200,7 @@

             -x ./OBS.app/Contents/PlugIns/mac-decklink.so \

             -x ./OBS.app/Contents/PlugIns/mac-syphon.so \

             -x ./OBS.app/Contents/PlugIns/mac-vth264.so \

+            -x ./OBS.app/Contents/PlugIns/mac-virtualcam.so \

             -x ./OBS.app/Contents/PlugIns/obs-browser.so \

             -x ./OBS.app/Contents/PlugIns/obs-browser-page \

             -x ./OBS.app/Contents/PlugIns/obs-ffmpeg.so \

@@ -231,8 +225,8 @@

           install_name_tool -id @executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork

           install_name_tool -change /tmp/obsdeps/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork

-          sudo cp -R "${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_BUILD_VERSION }}_macosx64/Release/Chromium Embedded Framework.framework" ./OBS.app/Contents/Frameworks/

-          sudo chown -R $(whoami) ./OBS.app/Contents/Frameworks/

+          cp -R "${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_BUILD_VERSION }}_macosx64/Release/Chromium Embedded Framework.framework" ./OBS.app/Contents/Frameworks/

+          chown -R $(whoami) ./OBS.app/Contents/Frameworks/

           cp ../CI/scripts/macos/app/OBSPublicDSAKey.pem ./OBS.app/Contents/Resources

@@ -258,6 +252,8 @@

           codesign --force --options runtime --sign "${SIGN_IDENTITY:--}" "./OBS.app/Contents/Frameworks/Chromium Embedded Framework.framework/Libraries/libswiftshader_libGLESv2.dylib"

           codesign --force --options runtime --sign "${SIGN_IDENTITY:--}" --deep "./OBS.app/Contents/Frameworks/Chromium Embedded Framework.framework"

+          codesign --force --options runtime --deep --sign "${SIGN_IDENTITY:--}" "./OBS.app/Contents/Resources/data/obs-mac-virtualcam.plugin"

+

           codesign --force --options runtime --entitlements "../CI/scripts/macos/app/entitlements.plist" --sign "${SIGN_IDENTITY:--}" --deep ./OBS.app

           codesign -dvv ./OBS.app

@@ -268,7 +264,7 @@

         run: |

           FILE_DATE=$(date +%Y-%m-%d)

           FILE_NAME=$FILE_DATE-${{ env.OBS_GIT_HASH }}-${{ env.OBS_GIT_TAG }}-macOS.dmg

-          echo "::set-env name=FILE_NAME::${FILE_NAME}"

+          echo "FILE_NAME=${FILE_NAME}" >> $GITHUB_ENV

           cp ../CI/scripts/macos/package/settings.json.template ./settings.json

           sed -i '' 's#\$\$VERSION\$\$#${{ env.OBS_GIT_TAG }}#g' ./settings.json

@@ -282,7 +278,7 @@

           sudo cp ./${FILE_NAME} ../nightly/${FILE_NAME}

       - name: 'Publish'

         if: success() && (github.event_name != 'pull_request' || env.SEEKING_TESTERS == '1')

-        uses: actions/upload-artifact@v2-preview

+        uses: actions/upload-artifact@v2.2.0

         with:

           name: '${{ env.FILE_NAME }}'

           path: ./nightly/*.dmg

@@ -294,7 +290,7 @@

           FILE_DATE=$(date +%Y-%m-%d)

           FILE_NAME=$FILE_DATE-${{ env.OBS_GIT_HASH }}-${{ env.OBS_GIT_TAG }}-macOS.dmg

           RELEASE_FILE_NAME=$FILE_DATE-${{ env.OBS_GIT_HASH }}-${{ env.OBS_GIT_TAG }}-rel-macOS.dmg

-          echo "::set-env name=RELEASE_FILE_NAME::${RELEASE_FILE_NAME}"

+          echo "RELEASE_FILE_NAME=${RELEASE_FILE_NAME}" >> $GITHUB_ENV

           xcrun altool --store-password-in-keychain-item "AC_PASSWORD" -u "${{ secrets.MACOS_NOTARIZATION_USERNAME }}" -p "${{ secrets.MACOS_NOTARIZATION_PASSWORD }}"

@@ -310,7 +306,7 @@

           sudo mv ./$FILE_NAME ../release/$RELEASE_FILE_NAME

       - name: 'Publish Release'

         if: success() && startsWith(github.ref, 'refs/tags/') && github.event_name != 'pull_request'

-        uses: actions/upload-artifact@v2-preview

+        uses: actions/upload-artifact@v2.2.0

         with:

           name: '${{ env.RELEASE_FILE_NAME }}'

           path: ./release/*.dmg

@@ -319,24 +315,24 @@

     runs-on: [ubuntu-latest]

     steps:

       - name: 'Checkout'

-        uses: actions/checkout@v2

+        uses: actions/checkout@v2.3.3

         with:

           submodules: 'recursive'

       - name: 'Fetch Git Tags'

         run: |

           git fetch --prune --unshallow

-          echo ::set-env name=OBS_GIT_BRANCH::$(git rev-parse --abbrev-ref HEAD)

-          echo ::set-env name=OBS_GIT_HASH::$(git rev-parse --short HEAD)

-          echo ::set-env name=OBS_GIT_TAG::$(git describe --tags --abbrev=0)

+          echo "OBS_GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV

+          echo "OBS_GIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV

+          echo "OBS_GIT_TAG=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV

       - name: 'Check for Github Labels'

         if: github.event_name == 'pull_request'

         run: |

           LABELS_URL="$(echo ${{ github.event.pull_request.url }} | sed s'/pulls/issues/')"

           LABEL_FOUND="$(curl -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" "${LABELS_URL}/labels" | sed -n 's/.*"name": "\(.*\)",/\1/p' | grep 'Seeking Testers' || true)"

           if [ "${LABEL_FOUND}" = "Seeking Testers" ]; then

-            echo ::set-env name=SEEKING_TESTERS::1

+            echo "SEEKING_TESTERS=1" >> $GITHUB_ENV

           else

-            echo ::set-env name=SEEKING_TESTERS::0

+            echo "SEEKING_TESTERS=0" >> $GITHUB_ENV

           fi

       - name: Install prerequisites (Apt)

         shell: bash

@@ -363,6 +359,7 @@

            libluajit-5.1-dev \

            libpulse-dev \

            libqt5x11extras5-dev \

+           libsndio-dev \

            libspeexdsp-dev \

            libswresample-dev \

            libswscale-dev \

@@ -383,10 +380,12 @@

            qtbase5-dev \

            libqt5svg5-dev \

            swig \

-           libcmocka-dev

+           libcmocka-dev \

+           linux-generic \

+           v4l2loopback-dkms

       - name: 'Restore Chromium Embedded Framework from cache'

         id: cef-cache

-        uses: actions/cache@v1

+        uses: actions/cache@v2.1.2

         env:

           CACHE_NAME: 'cef-cache'

         with:

@@ -404,7 +403,7 @@

         run: |

           mkdir ./build

           cd ./build

-          cmake -DUNIX_STRUCTURE=0 -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/obs-studio-portable" -DENABLE_UNIT_TESTS=ON -DENABLE_VLC=ON -DBUILD_CAPTIONS=ON -DWITH_RTMPS=ON -DBUILD_BROWSER=ON -DCEF_ROOT_DIR="${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_BUILD_VERSION }}_linux64" ..

+          cmake -DUNIX_STRUCTURE=0 -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/obs-studio-portable" -DENABLE_UNIT_TESTS=ON -DENABLE_VLC=ON -DWITH_RTMPS=ON -DBUILD_BROWSER=ON -DCEF_ROOT_DIR="${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_BUILD_VERSION }}_linux64" ..

       - name: 'Build'

         shell: bash

         working-directory: ${{ github.workspace }}/build

@@ -419,7 +418,7 @@

         run: |

           FILE_DATE=$(date +%Y-%m-%d)

           FILE_NAME=$FILE_DATE-${{ env.OBS_GIT_HASH }}-${{ env.OBS_GIT_TAG }}-linux64.tar.gz

-          echo "::set-env name=FILE_NAME::${FILE_NAME}"

+          echo "FILE_NAME=${FILE_NAME}" >> $GITHUB_ENV

           cd ./build

           sudo checkinstall --default --install=no --pkgname=obs-studio --fstrans=yes --backup=no --pkgversion="$(date +%Y%m%d)-git" --deldoc=yes

           mkdir ../nightly

@@ -428,7 +427,7 @@

           cd -

       - name: 'Publish'

         if: success() && (github.event_name != 'pull_request' || env.SEEKING_TESTERS == '1')

-        uses: actions/upload-artifact@v2-preview

+        uses: actions/upload-artifact@v2.2.0

         with:

           name: '${{ env.FILE_NAME }}'

           path: './nightly/*.tar.gz'

@@ -445,20 +444,21 @@

       TWITCH-HASH: ${{ secrets.TWITCH_HASH }}

       RESTREAM-CLIENTID: ${{ secrets.RESTREAM-CLIENTID }}

       RESTREAM-HASH: ${{ secrets.RESTREAM-HASH }}

+      VIRTUALCAM-GUID: "A3FCE0F5-3493-419F-958A-ABA1250EC20B"

     steps:

       - name: 'Add msbuild to PATH'

-        uses: microsoft/setup-msbuild@v1.0.0

+        uses: microsoft/setup-msbuild@v1.0.2

       - name: 'Checkout'

-        uses: actions/checkout@v2

+        uses: actions/checkout@v2.3.3

         with:

           submodules: 'recursive'

       - name: 'Fetch Git Tags'

         shell: bash

         run: |

           git fetch --prune --unshallow

-          echo ::set-env name=OBS_GIT_BRANCH::$(git rev-parse --abbrev-ref HEAD)

-          echo ::set-env name=OBS_GIT_HASH::$(git rev-parse --short HEAD)

-          echo ::set-env name=OBS_GIT_TAG::$(git describe --tags --abbrev=0)

+          echo "OBS_GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV

+          echo "OBS_GIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV

+          echo "OBS_GIT_TAG=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV

       - name: 'Check for Github Labels'

         if: github.event_name == 'pull_request'

         shell: bash

@@ -466,13 +466,13 @@

           LABELS_URL="$(echo ${{ github.event.pull_request.url }} | sed s'/pulls/issues/')"

           LABEL_FOUND="$(curl -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" "${LABELS_URL}/labels" | sed -n 's/.*"name": "\(.*\)",/\1/p' | grep 'Seeking Testers' || true)"

           if [ "${LABEL_FOUND}" = "Seeking Testers" ]; then

-            echo ::set-env name=SEEKING_TESTERS::1

+            echo "SEEKING_TESTERS=1" >> $GITHUB_ENV

           else

-            echo ::set-env name=SEEKING_TESTERS::0

+            echo "SEEKING_TESTERS=0" >> $GITHUB_ENV

           fi

       - name: 'Restore QT dependency from cache'

         id: qt-cache

-        uses: actions/cache@v1

+        uses: actions/cache@v2.1.2

         env:

           CACHE_NAME: 'windows-qt-cache'

         with:

@@ -480,7 +480,7 @@

           key: ${{ runner.os }}-pr-${{ env.CACHE_NAME }}-${{ env.QT_VERSION }}

       - name: 'Restore pre-built dependencies from cache'

         id: deps-cache

-        uses: actions/cache@v1

+        uses: actions/cache@v2.1.2

         env:

           CACHE_NAME: 'windows-deps-cache'

         with:

@@ -488,7 +488,7 @@

           key: ${{ runner.os }}-pr-${{ env.CACHE_NAME }}-${{ env.WINDOWS_DEPS_VERSION }}

       - name: 'Restore VLC dependency from cache'

         id: vlc-cache

-        uses: actions/cache@v1

+        uses: actions/cache@v2.1.2

         env:

           CACHE_NAME: 'windows-vlc-cache'

         with:

@@ -496,7 +496,7 @@

           key: ${{ runner.os }}-pr-${{ env.CACHE_NAME }}-${{ env.VLC_VERSION }}

       - name: 'Restore CEF dependency from cache (64 bit)'

         id: cef-cache

-        uses: actions/cache@v1

+        uses: actions/cache@v2.1.2

         env:

           CACHE_NAME: 'windows-cef-64-cache'

         with:

@@ -527,7 +527,7 @@

           mkdir ./build

           mkdir ./build64

           cd ./build64

-          cmake -G"${{ env.CMAKE_GENERATOR }}" -A"x64" -DCMAKE_SYSTEM_VERSION="${{ env.CMAKE_SYSTEM_VERSION }}" -DBUILD_BROWSER=true -DBUILD_CAPTIONS=true -DCOMPILE_D3D12_HOOK=true -DVLCPath="${{ github.workspace }}/cmbuild/vlc" -DDepsPath="${{ github.workspace }}/cmbuild/deps/win64" -DQTDIR="${{ github.workspace }}/cmbuild/QT/${{ env.QT_VERSION }}/msvc2017_64" -DENABLE_VLC=ON -DCEF_ROOT_DIR="${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_VERSION }}_windows64_minimal" -DCOPIED_DEPENDENCIES=FALSE -DCOPY_DEPENDENCIES=TRUE ..

+          cmake -G"${{ env.CMAKE_GENERATOR }}" -A"x64" -DCMAKE_SYSTEM_VERSION="${{ env.CMAKE_SYSTEM_VERSION }}" -DBUILD_BROWSER=true -DCOMPILE_D3D12_HOOK=true -DVLCPath="${{ github.workspace }}/cmbuild/vlc" -DDepsPath="${{ github.workspace }}/cmbuild/deps/win64" -DQTDIR="${{ github.workspace }}/cmbuild/QT/${{ env.QT_VERSION }}/msvc2017_64" -DENABLE_VLC=ON -DCEF_ROOT_DIR="${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_VERSION }}_windows64_minimal" -DCOPIED_DEPENDENCIES=FALSE -DCOPY_DEPENDENCIES=TRUE -DVIRTUALCAM_GUID=${{ env.VIRTUALCAM-GUID }} ..

       - name: 'Build'

         run: msbuild /m /p:Configuration=RelWithDebInfo .\build64\obs-studio.sln

       - name: 'Package'

@@ -535,16 +535,15 @@

         run: |

           $env:FILE_DATE=(Get-Date -UFormat "%F")

           $env:FILE_NAME="${env:FILE_DATE}-${{ env.OBS_GIT_HASH }}-${{ env.OBS_GIT_TAG }}-win64.zip"

-          echo "::set-env name=FILE_NAME::${env:FILE_NAME}"

+          echo "FILE_NAME=${env:FILE_NAME}" >> ${env:GITHUB_ENV}

           robocopy .\build64\rundir\RelWithDebInfo .\build\ /E /XF .gitignore

           7z a ${env:FILE_NAME} .\build\*

       - name: 'Publish'

         if: success() && (github.event_name != 'pull_request' || env.SEEKING_TESTERS == '1')

-        uses: actions/upload-artifact@v2-preview

+        uses: actions/upload-artifact@v2.2.0

         with:

           name: '${{ env.FILE_NAME }}'

           path: '*-win64.zip'

-

   win32:

     name: 'Windows 32-bit'

     runs-on: [windows-latest]

@@ -557,20 +556,21 @@

       TWITCH-HASH: ${{ secrets.TWITCH_HASH }}

       RESTREAM-CLIENTID: ${{ secrets.RESTREAM-CLIENTID }}

       RESTREAM-HASH: ${{ secrets.RESTREAM-HASH }}

+      VIRTUALCAM-GUID: "A3FCE0F5-3493-419F-958A-ABA1250EC20B"

     steps:

       - name: 'Add msbuild to PATH'

-        uses: microsoft/setup-msbuild@v1.0.0

+        uses: microsoft/setup-msbuild@v1.0.2

       - name: 'Checkout'

-        uses: actions/checkout@v2

+        uses: actions/checkout@v2.3.3

         with:

           submodules: 'recursive'

       - name: 'Fetch Git Tags'

         shell: bash

         run: |

           git fetch --prune --unshallow

-          echo ::set-env name=OBS_GIT_BRANCH::$(git rev-parse --abbrev-ref HEAD)

-          echo ::set-env name=OBS_GIT_HASH::$(git rev-parse --short HEAD)

-          echo ::set-env name=OBS_GIT_TAG::$(git describe --tags --abbrev=0)

+          echo "OBS_GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV

+          echo "OBS_GIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV

+          echo "OBS_GIT_TAG=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV

       - name: 'Check for Github Labels'

         if: github.event_name == 'pull_request'

         shell: bash

@@ -578,13 +578,13 @@

           LABELS_URL="$(echo ${{ github.event.pull_request.url }} | sed s'/pulls/issues/')"

           LABEL_FOUND="$(curl -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" "${LABELS_URL}/labels" | sed -n 's/.*"name": "\(.*\)",/\1/p' | grep 'Seeking Testers' || true)"

           if [ "${LABEL_FOUND}" = "Seeking Testers" ]; then

-            echo ::set-env name=SEEKING_TESTERS::1

+            echo "SEEKING_TESTERS=1" >> $GITHUB_ENV

           else

-            echo ::set-env name=SEEKING_TESTERS::0

+            echo "SEEKING_TESTERS=0" >> $GITHUB_ENV

           fi

       - name: 'Restore QT dependency from cache'

         id: qt-cache

-        uses: actions/cache@v1

+        uses: actions/cache@v2.1.2

         env:

           CACHE_NAME: 'qt-cache'

         with:

@@ -592,7 +592,7 @@

           key: ${{ runner.os }}-pr-${{ env.CACHE_NAME }}-${{ env.QT_VERSION }}

       - name: 'Restore pre-built dependencies from cache'

         id: deps-cache

-        uses: actions/cache@v1

+        uses: actions/cache@v2.1.2

         env:

           CACHE_NAME: 'deps-cache'

         with:

@@ -600,7 +600,7 @@

           key: ${{ runner.os }}-pr-${{ env.CACHE_NAME }}-${{ env.WINDOWS_DEPS_VERSION }}

       - name: 'Restore VLC dependency from cache'

         id: vlc-cache

-        uses: actions/cache@v1

+        uses: actions/cache@v2.1.2

         env:

           CACHE_NAME: 'vlc-cache'

         with:

@@ -608,7 +608,7 @@

           key: ${{ runner.os }}-pr-${{ env.CACHE_NAME }}-${{ env.WINDOWS_VLC_VERSION }}

       - name: 'Restore CEF dependency from cache (32 bit)'

         id: cef-cache

-        uses: actions/cache@v1

+        uses: actions/cache@v2.1.2

         env:

           CACHE_NAME: 'cef-32-cache'

         with:

@@ -639,7 +639,7 @@

           mkdir ./build

           mkdir ./build32

           cd ./build32

-          cmake -G"${{ env.CMAKE_GENERATOR }}" -A"Win32" -DCMAKE_SYSTEM_VERSION="${{ env.CMAKE_SYSTEM_VERSION }}" -DENABLE_VLC=ON -DBUILD_BROWSER=true -DBUILD_CAPTIONS=true -DCOMPILE_D3D12_HOOK=true -DVLCPath="${{ github.workspace }}/cmbuild/vlc" -DDepsPath="${{ github.workspace }}/cmbuild/deps/win32" -DQTDIR="${{ github.workspace }}/cmbuild/QT/${{ env.QT_VERSION }}/msvc2017" -DCEF_ROOT_DIR="${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_VERSION }}_windows32_minimal" -DCOPIED_DEPENDENCIES=FALSE -DCOPY_DEPENDENCIES=TRUE ..

+          cmake -G"${{ env.CMAKE_GENERATOR }}" -A"Win32" -DCMAKE_SYSTEM_VERSION="${{ env.CMAKE_SYSTEM_VERSION }}" -DENABLE_VLC=ON -DBUILD_BROWSER=true -DCOMPILE_D3D12_HOOK=true -DVLCPath="${{ github.workspace }}/cmbuild/vlc" -DDepsPath="${{ github.workspace }}/cmbuild/deps/win32" -DQTDIR="${{ github.workspace }}/cmbuild/QT/${{ env.QT_VERSION }}/msvc2017" -DCEF_ROOT_DIR="${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_VERSION }}_windows32_minimal" -DCOPIED_DEPENDENCIES=FALSE -DCOPY_DEPENDENCIES=TRUE -DVIRTUALCAM_GUID=${{ env.VIRTUALCAM-GUID }} ..

       - name: 'Build'

         run: msbuild /m /p:Configuration=RelWithDebInfo .\build32\obs-studio.sln

       - name: 'Package'

@@ -647,12 +647,12 @@

         run: |

           $env:FILE_DATE=(Get-Date -UFormat "%F")

           $env:FILE_NAME="${env:FILE_DATE}-${{ env.OBS_GIT_HASH }}-${{ env.OBS_GIT_TAG }}-win32.zip"

-          echo "::set-env name=FILE_NAME::${env:FILE_NAME}"

+          echo "FILE_NAME=${env:FILE_NAME}" >> ${env:GITHUB_ENV}

           robocopy .\build32\rundir\RelWithDebInfo .\build\ /E /XF .gitignore

           7z a ${env:FILE_NAME} .\build\*

       - name: 'Publish'

         if: success() && (github.event_name != 'pull_request' || env.SEEKING_TESTERS == '1')

-        uses: actions/upload-artifact@v2-preview

+        uses: actions/upload-artifact@v2.2.0

         with:

           name: '${{ env.FILE_NAME }}'

           path: '*-win32.zip'

​

@@ -284,34 +284,38 @@

   - ZILZAL

   - Abdullah AL-Qahtani (Za7ef_SA)

   - majdcomp

-  - aaakjt

   - Tareq Almutairi (Tareq_s)

+  - aaakjt

+  - AiAF (7MR)

   - ibrahim younis (sintorea_incyx)

   - معتصم دعنا (rozana-media)

   - Mohamed Zain (Thecheeseman)

   - Gol D. Ace (goldace)

   - Vainock

   - Saleh oukiki (salehoukiki)

+  - Ahmad Alkurbi (DontPlay)

   - Tensai

   - Mustafa2018

   - BeleganStartup

   - Ndalabo Taema (hake_bsowq)

-  - Ahmad Alkurbi (DontPlay)

+  - Fahad Alshaya (fashaya)

   - Hani Sweileh (hno.sweileh)

-  - BWU Wheelman (Wheelman)

   - Nasser Bin Laboun (nasserbinlaboun)

+  - BWU Wheelman (Wheelman)

   - FC Barcelona HD (kurdnews)

   - osmansalih (hpcplus2016)

-  - unknowndomain

   - Yhea Ahmad (yhea.ahmad7741)

+  - unknowndomain

   - Ahmed Hawam (Hawam)

   - Mnsor The-Ghost (mnsor1722011)

   - Malaz Gold Edition (Malo7zz)

   - dodgepong

   - chaironeko

   - Hadi Gamer (hadigamer3131)

+ Aragonese:

+  - juanpabl

  Azerbaijani:

-  - Shahin Farzaliyev (Khan27)

+  - ShahinF27 (Khan27)

   - Javid-An

   - unknowndomain

   - Kənan Axundov (kenanaxundov2)

@@ -325,16 +329,18 @@

   - Xabier Aramendi (azpidatziak)

   - Osoitz

   - Gol D. Ace (goldace)

+  - Sergio Varela (IngrownMink4)

   - Vainock

   - EG Gamer (eggamer131)

   - txaro

   - etxondoko

   - unknowndomain

+  - Fiwi1265

   - dodgepong

-  - jolaus

+  - zientek

   - alaitzgabi

+  - jolaus

   - ziztazale

-  - zientek

  Bengali:

   - shamuntohamd

   - Rudro Rasel (rdrrsl)

@@ -350,7 +356,7 @@

   - Zakxaev68

   - kalmarin

   - Seyhan Halil (yildirim17)

-  - Martin Georgiev (DivideByNone)

+  - DivideByNone

   - Vainock

   - Viktor Kitov (viktorkitov)

   - djradimix

@@ -363,6 +369,8 @@

   - Salif Mehmed (salifm)

   - Warchamp7

   - dodgepong

+ Burmese:

+  - linwinthu

  Catalan:

   - Jaime Muñoz Martín (jmmartin_5)

   - Benet R. i Camps (BennyBeat) (BennyBeat)

@@ -374,6 +382,7 @@

   - Gol D. Ace (goldace)

   - jan (test83318)

   - vilagamer999

+  - Xavier Muntada Samà (XavierMSama)

   - Pere O. (gotrunks)

   - unknowndomain

   - Adolfo Jayme (fitoschido)

@@ -399,8 +408,8 @@

   - cai_miao

   - Opportunity (OpportunityLiu)

   - MarsYoung

-  - Inku Xuan (inkuxuan)

   - SR_Mango

+  - Inku Xuan (inkuxuan)

   - Yi-Jyun Pan (pan93412)

   - yunluzhang

   - copyliu

@@ -443,13 +452,15 @@

   - Watson Tsai (ashaneba)

   - Han-Jen Cheng (notexist)

   - Inndy.Lin (inndy)

+  - offthegrid-mike

   - khng300

   - abc0922001

-  - ak-47root

   - Meng Hao Li (GazCore)

+  - ak-47root

   - Edison Lee (edisonlee55)

   - Append Huang (append)

   - fangzheng

+  - yeft

   - zhtw

   - JackYeah

   - unknowndomain

@@ -460,18 +471,18 @@

   - FaZe Fakay (fazefakay)

   - chaironeko

   - tomoe-musashi

-  - watadon

-  - WeingHong

-  - Bob Wei (BobWaver)

   - Tatsujin (c910335)

+  - Bob Wei (BobWaver)

   - Tommy Chiang (oToToT)

+  - watadon

+  - WeingHong

  Croatian:

   - medicmomcilo

   - srdjan_m

   - Fran Kelava (fkelava)

+  - schwabengeiz

   - Runicar (dajtisina)

   - Wildrage

-  - schwabengeiz

   - penta (junp5i)

   - OfficialwobY

   - Gol D. Ace (goldace)

@@ -486,18 +497,19 @@

   - Matěj Kozák (GrrrandyCZ)

   - Kryštof Černý (cleverline1mc)

   - Vainock

+  - X3r1k (x3r1k)

   - Stewio MC (stepandolsky)

   - Gol D. Ace (goldace)

   - JIMMY (vopasek)

   - Kiznoh

   - Sawanyo

-  - MrJaroslavik#8412 (MJaroslavik)

+  - MrJaroslavik

   - TheWolfiKK

-  - Erik Bročko (ericek111)

   - unknowndomain

-  - dodgepong

-  - Martin Pilát (piltmartin)

+  - Erik Bročko (ericek111)

   - Daniel Padrta (dpadrta)

+  - Martin Pilát (piltmartin)

+  - dodgepong

   - Jáchym Plánička (Jacerros)

  Danish:

   - NCAA

@@ -521,19 +533,20 @@

   - Mytologi

  Dutch:

   - Eric Bataille (ThoNohT)

+  - A. Voogt (atvoogt)

   - Michel Snippe (michelsnippe)

   - Greendweller

   - exeldro

   - Albakham (albakham)

-  - Coen (Trigstur)

   - Lars Acou (lars.acou)

+  - Coen (Trigstur)

   - Danny (Dkamps18)

   - Richard Stanway (r1ch)

+  - Harm van den Hoek (harm27)

   - Nicole (Dutchess_Nicole)

   - robbert0891 (robbertoorschot38)

   - Gol D. Ace (goldace)

   - Kjetil Verstrepen (kjetilv)

-  - Harm van den Hoek (harm27)

   - Jasper J (JassieJ)

   - Vainock

   - b__dm

@@ -545,6 +558,7 @@

   - andymidside

   - F_Producktions

   - Thom Knepper (MrKnepp)

+  - Lesley Natrop (lesleynatrop)

   - Bo Alsemgeest (bo.alsemgeest.wausie)

   - lokerhp

   - unknowndomain

@@ -563,24 +577,27 @@

   - Noah Husby (noahhusby)

   - Endysis

   - Pete Russell (pete.russell.photos)

+ Esperanto:

+  - Matt Aaldenberg (MattAalden)

+  - Vainock

  Estonian:

   - MartinEwing

   - Oliver Jõgar (treier57lol) (difiter23)

   - AndresTraks

+  - Agu Ratas (aguratas)

   - C3kos (C3kos1)

   - Gol D. Ace (goldace)

   - unknowndomain

   - Vainock

-  - Agu Ratas (aguratas)

  Filipino:

   - dwaeji-aizelle

   - nyakayed

-  - Loyd Stephen Jayme (loydjayme25)

   - CodeYan01

+  - Loyd Stephen Jayme (loydjayme25)

   - jermel

+  - Raffy (Tested)

   - Gol D. Ace (goldace)

   - Vainock

-  - Raffy (Tested)

   - arnoldsecret

   - Raylir

   - unknowndomain

@@ -592,8 +609,8 @@

   - dodgepong

   - Tero Keso (tero.keso)

   - Gol D. Ace (goldace)

-  - Pyscowicz

   - Vainock

+  - Pyscowicz

   - Obama (Obama44)

   - unknowndomain

   - Ville Närhi (daimaah)

@@ -606,10 +623,10 @@

   - Tocram2 (tocram2)

   - Benjamin Cambour (lesinfox)

   - Yberion

+  - Guillaume Turchini (orion78fr)

   - Léo (leeo97one)

   - RisedSky (THEMINECRAFT951)

   - Pikana

-  - Guillaume Turchini (orion78fr)

   - BoboopTeam

   - DoK_-

   - DarckCrystale

@@ -618,8 +635,8 @@

   - DarkInFire

   - Theguiguix

   - Gol D. Ace (goldace)

-  - Vainock

   - Youtubeur FR│Giaco35 (Giaco35)

+  - Vainock

   - steve_fr

   - kyllian (tardigradeus)

   - Deski_

@@ -627,11 +644,13 @@

   - Aime23

   - Grisou2907

   - BaguetteDePain_

+  - Anat ROCHUT (arochut)

   - Keter LordFR (YorHaDen)

   - Jérémy LITIQUE (JeremyLTE)

   - illusdidi

-  - 🌠 DarK | #Hello 🌠 (DarKTV_FR)

   - Mathieu Hautebas (matteyeux)

+  - 🌠 DarK | #Hello 🌠 (DarKTV_FR)

+  - christophe (TedM)

   - Yolopix

   - Gabriel Dugny (Gabigabigo)

   - tburette

@@ -643,20 +662,25 @@

   - Alexis Brandner (Alexinfos)

   - Camille Nury (kamsdu30)

   - dodgepong

-  - Lexane Sirac (Exilexi)

   - Jean-Mathieu Jm Samson (sjm450666)

-  - Albakham (albakham)

+  - Lexane Sirac (Exilexi)

+  - Wizi_89

   - HistoriCode97

-  - Warchamp7

+  - Albakham (albakham)

   - SkylixX

-  - chaironeko

+  - Warchamp7

   - Lucas Juif (trycarnage)

-  - William Dunn (williamdunnperso)

-  - Marc André Audet (Manhim)

-  - HoPollo (HoPolloTV)

+  - chaironeko

+  - RuruDuTurfu_

+  - Antwan

   - E Ju (enuajenuaj)

   - Parfum

-  - Antwan

+  - HoPollo (HoPolloTV)

+  - William Dunn (williamdunnperso)

+  - Isa (isabellez_bp)

+  - Skew (noan.perrot)

+  - Marc André Audet (Manhim)

+  - FauconSpartiate

  Galician:

   - mbouzada

   - Xesús M. Mosquera Carregal (xesusmosquera)

@@ -664,6 +688,7 @@

   - Vainock

   - Gol D. Ace (goldace)

   - unknowndomain

+  - HexaTree (nightcamel)

   - chaironeko

   - aluaces

   - dodgepong

@@ -675,8 +700,8 @@

   - Gol D. Ace (goldace)

   - unknowndomain

  German:

-  - Gol D. Ace (goldace)

   - Vainock

+  - Gol D. Ace (goldace)

   - Michael Fabian Dirks (Xaymar)

   - Sven Kirschbaum (fallobst22) (fallobst22)

   - Gregor Bigalke (gregtcltk)

@@ -708,7 +733,6 @@

   - Hadi Gamer (hadigamer3131)

   - degra78 (degra789)

   - Tiim

-  - Dominik Weissenseel (domisum)

   - Lasse Niermann (TheLasseHD)

   - Elementies

   - Fabian Küntzler (tringlp)

@@ -728,14 +752,15 @@

   - Scourgemcdak

   - Mepharees

   - Pigot :P (pigot715)

+  - TheMetalHelper

   - Tasos Sahanidis (tatokis)

   - George T. (tzikas97)

   - Vainock

   - Alex Kalles (alexakis1997)

+  - Ανδρέας Γεωργόπουλος (andrewgeo)

   - Kostas F (Kostas-F)

   - Warmaster

   - Gol D. Ace (goldace)

-  - Ανδρέας Γεωργόπουλος (andrewgeo)

   - iosifidis

   - Giorgos (bigdiskboi)

   - Themis T. (Deminho)

@@ -750,21 +775,23 @@

   - lonelywolf11

   - djsavta

   - Omeritzics Games (omeritzicschwartz)

+  - idanbo27

+  - עידו דנה (idodana01)

   - nachmanpop

   - Vainock

   - Yotam Ziv (yotamziv87)

-  - עידו דנה (idodana01)

   - Chemi

   - Gol D. Ace (goldace)

   - Light1c3

   - Yoel (ye8323)

   - epic_ziver_D

   - Netro (roi_adler)

+  - Hilla Glebotzki (Hilla123)

   - TheOver (upmeboost)

   - unknowndomain

   - yair (5shekel)

-  - אפיק רוזנר (afikr333)

   - ghsi

+  - אפיק רוזנר (afikr333)

   - Tal Machani (talmachani)

  Hindi:

   - Saswata Banerjee (azure.saswata)

@@ -773,6 +800,7 @@

   - SneakyFish5

   - shamuntohamd

   - unknowndomain

+  - Vainock

   - Gol D. Ace (goldace)

  Hungarian:

   - Gige

@@ -780,12 +808,15 @@

   - Gol D. Ace (goldace)

   - Sárga Pulcsis (SargaPulcsis)

   - sarkanyka444

+  - zolikonta

   - Vainock

   - Dániel P. (Daniii_)

   - Balázs Meskó (meskobalazs)

   - TOM005

+  - Isti (eisti)

   - Adam Liszkai (adamos42)

   - vargag159

+  - Biró Bence (birobence19)

   - unknowndomain

   - abydosan (abydoshun)

   - dodgepong

@@ -794,12 +825,13 @@

   - EzigboOmenana

  Indonesian:

   - M Akmal (akmalcakep59)

+  - Rafy Shafryan (NexaForX)

+  - Anbiya Shafaat (Anfia)

   - Rendi (rendiazmi)

   - ziasukmana

   - GudankGaming GG (GudankGaming)

   - Vainock

   - Lieba Natur Brilian (naturbrilian)

-  - Anbiya Shafaat (Anfia)

   - doplank

   - unknowndomain