Request 4654 (accepted)

Overview

Request 4654 (accepted)

- 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

Created by boombatower about 5 years ago
In state accepted
Package maintainers: boombatower and frispete

Submit obs-studio

Submit package home:boombatow...es:Multimedia / obs-studio to package Multimedia / obs-studio

obs-studio.changes Changed

obs-studio.spec Changed

_service Changed

_servicedata Changed

obs-studio-24.0.5.tar.xz/CI/before-deploy-osx.sh -> obs-studio-24.0.6.tar.xz/CI/before-deploy-osx.sh Changed

@@ -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

obs-studio-24.0.5.tar.xz/CI/install/osx/Info.plist -> obs-studio-24.0.6.tar.xz/CI/install/osx/Info.plist Changed

obs-studio-24.0.5.tar.xz/CI/install/osx/packageApp.sh -> obs-studio-24.0.6.tar.xz/CI/install/osx/packageApp.sh Changed

@@ -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

obs-studio-24.0.5.tar.xz/UI/obs-app.cpp -> obs-studio-24.0.6.tar.xz/UI/obs-app.cpp Changed

@@ -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)

obs-studio-24.0.5.tar.xz/UI/window-basic-settings.cpp -> obs-studio-24.0.6.tar.xz/UI/window-basic-settings.cpp Changed

obs-studio-24.0.5.tar.xz/UI/window-extra-browsers.cpp -> obs-studio-24.0.6.tar.xz/UI/window-extra-browsers.cpp Changed

obs-studio-24.0.5.tar.xz/libobs/obs-cocoa.m -> obs-studio-24.0.6.tar.xz/libobs/obs-cocoa.m Changed

obs-studio-24.0.5.tar.xz/plugins/obs-browser/browser-app.cpp -> obs-studio-24.0.6.tar.xz/plugins/obs-browser/browser-app.cpp Changed

obs-studio-24.0.5.tar.xz/plugins/obs-browser/browser-version.h -> obs-studio-24.0.6.tar.xz/plugins/obs-browser/browser-version.h Changed

obs-studio-24.0.5.tar.xz/plugins/rtmp-services/data/package.json -> obs-studio-24.0.6.tar.xz/plugins/rtmp-services/data/package.json Changed

obs-studio-24.0.5.tar.xz/plugins/rtmp-services/data/services.json -> obs-studio-24.0.6.tar.xz/plugins/rtmp-services/data/services.json Changed

Build Results
RPM Lint

Refresh

Comments for request 4654 0

Request History

boombatower created request about 5 years ago

boombatower accepted request about 5 years ago