@@ -1,4 +1,20 @@

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

+Tue Dec 17 03:07:47 UTC 2019 - jimmy@boombatower.com

+

+- Update to version 24.0.6:

+  * CI: Fix QtNetwork in Mac packaging script

+  * UI: Ensure OBS launches when theme is missing

+  * CI: Fix mbedtls id in mac deploy script

+  * CI: Fix error deleting QT network framework on OSX

+  * libobs: Null check hotkey device on macos

+  * rtmp-services: Increase FB max bitrate to 6Mbps

+  * CI: Fix up QT network framework on OSX

+  * CI: Fix osx executable path in plist

+  * CI: Fix framework symlinks when building osx app

+  * obs-browser: Disable system flash

+  * UI: Fix invalid escape sequences in regex string

+

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

 Fri Dec 13 21:17:57 UTC 2019 - jimmy@boombatower.com

 - Update to version 24.0.5:

​

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

 Name:           obs-studio

-Version:        24.0.5

+Version:        24.0.6

 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/24.0.5</param>

+    <param name="revision">refs/tags/24.0.6</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">99638ba69782bdb10531a305093bbd25e5d3baef</param>

+    <param name="changesrevision">b96cc828dcd5b2922d3a43eba31144332d307c47</param>

   </service>

 </servicedata>

​

@@ -41,6 +41,10 @@

 cp /usr/local/opt/mbedtls/lib/libmbedtls.12.dylib ./OBS.app/Contents/Frameworks/

 cp /usr/local/opt/mbedtls/lib/libmbedcrypto.3.dylib ./OBS.app/Contents/Frameworks/

 cp /usr/local/opt/mbedtls/lib/libmbedx509.0.dylib ./OBS.app/Contents/Frameworks/

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

+install_name_tool -id @executable_path/../Frameworks/libmbedtls.12.dylib ./OBS.app/Contents/Frameworks/libmbedtls.12.dylib

+install_name_tool -id @executable_path/../Frameworks/libmbedcrypto.3.dylib ./OBS.app/Contents/Frameworks/libmbedcrypto.3.dylib

+install_name_tool -id @executable_path/../Frameworks/libmbedx509.0.dylib ./OBS.app/Contents/Frameworks/libmbedx509.0.dylib

 install_name_tool -change /usr/local/opt/mbedtls/lib/libmbedtls.12.dylib @executable_path/../Frameworks/libmbedtls.12.dylib ./OBS.app/Contents/Plugins/obs-outputs.so

 install_name_tool -change /usr/local/opt/mbedtls/lib/libmbedcrypto.3.dylib @executable_path/../Frameworks/libmbedcrypto.3.dylib ./OBS.app/Contents/Plugins/obs-outputs.so

 install_name_tool -change /usr/local/opt/mbedtls/lib/libmbedx509.0.dylib @executable_path/../Frameworks/libmbedx509.0.dylib ./OBS.app/Contents/Plugins/obs-outputs.so

@@ -49,13 +53,13 @@

 # copy sparkle into the app

 hr "Copying Sparkle.framework"

-cp -r ../../sparkle/Sparkle.framework ./OBS.app/Contents/Frameworks/

+cp -R ../../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

 # 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 cp -R ../../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

​

@@ -9,13 +9,11 @@

    <key>CFBundleGetInfoString</key>

    <string>OBS - Free and Open Source Streaming/Recording Software</string>

    <key>CFBundleExecutable</key>

-   <string>OBS</string>

+   <string>obs</string>

    <key>CFBundleIdentifier</key>

    <string>com.obsproject.obs-studio</string>

    <key>CFBundlePackageType</key>

    <string>APPL</string>

-   <key>CFBundleSignature</key>

-   <string>????</string>

    <key>LSMinimumSystemVersion</key>

    <string>10.8.5</string>

    <key>NSHighResolutionCapable</key>

​

@@ -6,10 +6,10 @@

 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 -R rundir/RelWithDebInfo/bin/ ./OBS.app/Contents/MacOS

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

 cp ../CI/install/osx/obs.icns ./OBS.app/Contents/Resources

-cp -r rundir/RelWithDebInfo/obs-plugins/ ./OBS.app/Contents/Plugins

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

 cp ../CI/install/osx/Info.plist ./OBS.app/Contents

 ../CI/install/osx/dylibBundler -b -cd -d ./OBS.app/Contents/Frameworks -p @executable_path/../Frameworks/ \

@@ -46,10 +46,16 @@

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

 # put qt network in here becasuse streamdeck uses it

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

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

+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/QtNetwork.prl

+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/5.10.1/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

​

@@ -1059,21 +1059,27 @@

    defaultPalette = palette();

    const char *themeName =

-       config_get_string(globalConfig, "General", "CurrentTheme");

+       config_get_string(globalConfig, "General", "CurrentTheme2");

-   if (!themeName) {

+   if (!themeName)

+       /* Use deprecated "CurrentTheme" value if available */

+       themeName = config_get_string(globalConfig, "General",

+                         "CurrentTheme");

+   if (!themeName)

        /* Use deprecated "Theme" value if available */

        themeName = config_get_string(globalConfig, "General", "Theme");

-       if (!themeName)

-           themeName = DEFAULT_THEME;

-       if (!themeName)

-           themeName = "Dark";

-   }

+   if (!themeName)

+       themeName = DEFAULT_THEME;

+   if (!themeName)

+       themeName = "Dark";

    if (strcmp(themeName, "Default") == 0)

        themeName = "System";

-   return SetTheme(themeName);

+   if (strcmp(themeName, "System") != 0 && SetTheme(themeName))

+       return true;

+

+   return SetTheme("System");

 }

 OBSApp::OBSApp(int &argc, char **argv, profiler_name_store_t *store)

​

@@ -2726,7 +2726,7 @@

        themeData = DEFAULT_THEME;

    if (WidgetChanged(ui->theme)) {

-       config_set_string(GetGlobalConfig(), "General", "CurrentTheme",

+       config_set_string(GetGlobalConfig(), "General", "CurrentTheme2",

                  QT_TO_UTF8(themeData));

        App()->SetTheme(themeData.toUtf8().constData());

​

@@ -536,7 +536,7 @@

    /* Add support for Twitch Dashboard panels */

    if (url.contains("twitch.tv/popout") &&

        url.contains("dashboard/live")) {

-       QRegularExpression re("twitch.tv\/popout\/([^/]+)\/");

+       QRegularExpression re("twitch.tv\\/popout\\/([^/]+)\\/");

        QRegularExpressionMatch match = re.match(url);

        QString username = match.captured(1);

        if (username.length() > 0) {

​

@@ -1754,6 +1754,10 @@

        IOHIDValueRef value = 0;

        IOHIDDeviceRef device = IOHIDElementGetDevice(element);

+       if (device == NULL) {

+           continue;

+       }

+

        if (IOHIDDeviceGetValue(device, element, &value) !=

            kIOReturnSuccess) {

            i += 1;

​

@@ -81,8 +81,6 @@

        }

    }

-   command_line->AppendSwitch("enable-system-flash");

-

    if (command_line->HasSwitch("disable-features")) {

        // Don't override existing, as this can break OSR

        std::string disableFeatures =

​

@@ -2,7 +2,7 @@

 #define OBS_BROWSER_VERSION_MAJOR 2

 #define OBS_BROWSER_VERSION_MINOR 7

-#define OBS_BROWSER_VERSION_PATCH 15

+#define OBS_BROWSER_VERSION_PATCH 16

 #ifndef MAKE_SEMANTIC_VERSION

 #define MAKE_SEMANTIC_VERSION(major, minor, patch) \

​

@@ -1,10 +1,10 @@

 {

    "url": "https://obsproject.com/obs2_update/rtmp-services",

-   "version": 114,

+   "version": 116,

    "files": [

        {

            "name": "services.json",

-           "version": 114

+           "version": 116

        }

    ]

 }

​

@@ -573,7 +573,7 @@

             "recommended": {

                 "keyint": 2,

                 "profile": "main",

-                "max video bitrate": 4000,

+                "max video bitrate": 6000,

                 "max audio bitrate": 128

             }

         },

​