lagertonne/yolobs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update upstream source from tag 'upstream/24.0.6+dfsg1'

Browse source 
Update to upstream version '24.0.6+dfsg1'
with Debian dir 9b8bf2a515
This commit is contained in:
Sebastian Ramacher 2019-12-24 10:07:36 +01:00
commit 26d3d9273c
10 changed files with 42 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CI/before-deploy-osx.sh
View file

@ -41,6 +41,10 @@ fi
cp /usr/local/opt/mbedtls/lib/libmbedtls.12.dylib ./OBS.app/Contents/Frameworks/ 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/libmbedcrypto.3.dylib ./OBS.app/Contents/Frameworks/
cp /usr/local/opt/mbedtls/lib/libmbedx509.0.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/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/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 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 @@ install_name_tool -change @rpath/libobs.0.dylib @executable_path/../Frameworks/l
# copy sparkle into the app # copy sparkle into the app
hr "Copying Sparkle.framework" 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 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 # Copy Chromium embedded framework to app Frameworks directory
hr "Copying Chromium Embedded Framework.framework" hr "Copying Chromium Embedded Framework.framework"
sudo mkdir -p OBS.app/Contents/Frameworks 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/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/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore ./OBS.app/Contents/Plugins/obs-browser.so

4
CI/install/osx/Info.plist
View file

@ -9,13 +9,11 @@
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>OBS - Free and Open Source Streaming/Recording Software</string> <string>OBS - Free and Open Source Streaming/Recording Software</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>OBS</string> <string>obs</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>com.obsproject.obs-studio</string> <string>com.obsproject.obs-studio</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>
<string>10.8.5</string> <string>10.8.5</string>
<key>NSHighResolutionCapable</key> <key>NSHighResolutionCapable</key>

16
CI/install/osx/packageApp.sh
View file

@ -6,10 +6,10 @@ mkdir OBS.app/Contents/MacOS
mkdir OBS.app/Contents/Plugins mkdir OBS.app/Contents/Plugins
mkdir OBS.app/Contents/Resources mkdir OBS.app/Contents/Resources
cp -r rundir/RelWithDebInfo/bin/ ./OBS.app/Contents/MacOS cp -R rundir/RelWithDebInfo/bin/ ./OBS.app/Contents/MacOS
cp -r rundir/RelWithDebInfo/data ./OBS.app/Contents/Resources cp -R rundir/RelWithDebInfo/data ./OBS.app/Contents/Resources
cp ../CI/install/osx/obs.icns ./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 cp ../CI/install/osx/Info.plist ./OBS.app/Contents
../CI/install/osx/dylibBundler -b -cd -d ./OBS.app/Contents/Frameworks -p @executable_path/../Frameworks/ \ ../CI/install/osx/dylibBundler -b -cd -d ./OBS.app/Contents/Frameworks -p @executable_path/../Frameworks/ \
@ -46,10 +46,16 @@ cp ../CI/install/osx/Info.plist ./OBS.app/Contents
mv ./OBS.app/Contents/MacOS/libobs-opengl.so ./OBS.app/Contents/Frameworks mv ./OBS.app/Contents/MacOS/libobs-opengl.so ./OBS.app/Contents/Frameworks
# put qt network in here becasuse streamdeck uses it # put qt network in here becasuse streamdeck uses it
cp -r /usr/local/opt/qt/lib/QtNetwork.framework ./OBS.app/Contents/Frameworks cp -R /usr/local/opt/qt/lib/QtNetwork.framework ./OBS.app/Contents/Frameworks
chmod +w ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork 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 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 # 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/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/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore ./OBS.app/Contents/Plugins/decklink-ouput-ui.so

14
UI/obs-app.cpp
View file

@ -1059,21 +1059,27 @@ bool OBSApp::InitTheme()
defaultPalette = palette(); defaultPalette = palette();
const char *themeName = 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 */ /* Use deprecated "Theme" value if available */
themeName = config_get_string(globalConfig, "General", "Theme"); themeName = config_get_string(globalConfig, "General", "Theme");
if (!themeName) if (!themeName)
themeName = DEFAULT_THEME; themeName = DEFAULT_THEME;
if (!themeName) if (!themeName)
themeName = "Dark"; themeName = "Dark";
}
if (strcmp(themeName, "Default") == 0) if (strcmp(themeName, "Default") == 0)
themeName = "System"; 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) OBSApp::OBSApp(int &argc, char **argv, profiler_name_store_t *store)

2
UI/window-basic-settings.cpp
View file

@ -2726,7 +2726,7 @@ void OBSBasicSettings::SaveGeneralSettings()
themeData = DEFAULT_THEME; themeData = DEFAULT_THEME;
if (WidgetChanged(ui->theme)) { if (WidgetChanged(ui->theme)) {
config_set_string(GetGlobalConfig(), "General", "CurrentTheme", config_set_string(GetGlobalConfig(), "General", "CurrentTheme2",
QT_TO_UTF8(themeData)); QT_TO_UTF8(themeData));
App()->SetTheme(themeData.toUtf8().constData()); App()->SetTheme(themeData.toUtf8().constData());

2
UI/window-extra-browsers.cpp
View file

@ -536,7 +536,7 @@ void OBSBasic::AddExtraBrowserDock(const QString &title, const QString &url,
/* Add support for Twitch Dashboard panels */ /* Add support for Twitch Dashboard panels */
if (url.contains("twitch.tv/popout") && if (url.contains("twitch.tv/popout") &&
url.contains("dashboard/live")) { url.contains("dashboard/live")) {
QRegularExpression re("twitch.tv\/popout\/([^/]+)\/"); QRegularExpression re("twitch.tv\\/popout\\/([^/]+)\\/");
QRegularExpressionMatch match = re.match(url); QRegularExpressionMatch match = re.match(url);
QString username = match.captured(1); QString username = match.captured(1);
if (username.length() > 0) { if (username.length() > 0) {

4
libobs/obs-cocoa.m
View file

@ -1754,6 +1754,10 @@ bool obs_hotkeys_platform_is_pressed(obs_hotkeys_platform_t *plat,
IOHIDValueRef value = 0; IOHIDValueRef value = 0;
IOHIDDeviceRef device = IOHIDElementGetDevice(element); IOHIDDeviceRef device = IOHIDElementGetDevice(element);
if (device == NULL) {
continue;
}
if (IOHIDDeviceGetValue(device, element, &value) != if (IOHIDDeviceGetValue(device, element, &value) !=
kIOReturnSuccess) { kIOReturnSuccess) {
i += 1; i += 1;

2
libobs/obs-config.h
View file

@ -41,7 +41,7 @@
* *
* Reset to zero each major or minor version * Reset to zero each major or minor version
*/ */
#define LIBOBS_API_PATCH_VER 5 #define LIBOBS_API_PATCH_VER 6
#define MAKE_SEMANTIC_VERSION(major, minor, patch) \ #define MAKE_SEMANTIC_VERSION(major, minor, patch) \
((major << 24) | (minor << 16) | patch) ((major << 24) | (minor << 16) | patch)

4
plugins/rtmp-services/data/package.json
View file

@ -1,10 +1,10 @@
{ {
"url": "https://obsproject.com/obs2_update/rtmp-services", "url": "https://obsproject.com/obs2_update/rtmp-services",
"version": 114, "version": 116,
"files": [ "files": [
{ {
"name": "services.json", "name": "services.json",
"version": 114 "version": 116
} }
] ]
} }

2
plugins/rtmp-services/data/services.json
View file

@ -573,7 +573,7 @@
"recommended": { "recommended": {
"keyint": 2, "keyint": 2,
"profile": "main", "profile": "main",
"max video bitrate": 4000, "max video bitrate": 6000,
"max audio bitrate": 128 "max audio bitrate": 128
} }
}, },