Request 6308 (accepted)

Overview

Request 6308 (accepted)

- Update to version 31.1.2:
* libobs: Update version to 31.1.2
* CI: Update obs-crowdin-sync action
* libobs: Start video output even if there is no mix
* Revert "linux-pipewire: Fix 10- and 16-bit captures"
* CI: Fix failures of analyze workflow runs due to GitHub policy change
* linux-pipewire: Ensure the release point is always signaled
* linux-pipewire: Dup syncobj fds
* linux-pipewire: Require Gio 2.76
* libobs-opengl: Make some includes unconditional
* frontend: Fix settings scrollbar size
* frontend: Fix progress bar appearance
* linux-v4l2: Avoid stopping capture on AVERROR(EAGAIN)
* frontend: Do not set maximum_video_tracks if user has set it to "Auto"
* CI: Update sphinx-publish-action commit
* frontend: Fix build failure with Clang 20+ in OBSCanvas
* build-aux: Use rebuilt CEF on Linux with backported API on Flatpak
* CI: Add checkout to fix gh CLI usage

Created by darix about 1 month ago
In state accepted
Package maintainers: boombatower, darix, and frispete

Submit obs-studio

Submit package home:darix:branches:Multimedia / obs-studio to package Multimedia / obs-studio

obs-studio.changes Changed

@@ -1,4 +1,26 @@
 -------------------------------------------------------------------
+Mon Jul 28 20:01:46 UTC 2025 - darix <packman@nordisch.org>
+
+- Update to version 31.1.2:
+  * libobs: Update version to 31.1.2
+  * CI: Update obs-crowdin-sync action
+  * libobs: Start video output even if there is no mix
+  * Revert "linux-pipewire: Fix 10- and 16-bit captures"
+  * CI: Fix failures of analyze workflow runs due to GitHub policy change
+  * linux-pipewire: Ensure the release point is always signaled
+  * linux-pipewire: Dup syncobj fds
+  * linux-pipewire: Require Gio 2.76
+  * libobs-opengl: Make some includes unconditional
+  * frontend: Fix settings scrollbar size
+  * frontend: Fix progress bar appearance
+  * linux-v4l2: Avoid stopping capture on AVERROR(EAGAIN)
+  * frontend: Do not set maximum_video_tracks if user has set it to "Auto"
+  * CI: Update sphinx-publish-action commit
+  * frontend: Fix build failure with Clang 20+ in OBSCanvas
+  * build-aux: Use rebuilt CEF on Linux with backported API on Flatpak
+  * CI: Add checkout to fix gh CLI usage
+
+-------------------------------------------------------------------
 Sat Jul 12 14:13:46 UTC 2025 - darix <packman@nordisch.org>
 
 - Update to version 31.1.1:

obs-studio.spec Changed

_service Changed

_servicedata Changed

obs-studio-31.1.1.tar.xz/.github/actions/generate-docs/action.yaml -> obs-studio-31.1.2.tar.xz/.github/actions/generate-docs/action.yaml Changed

obs-studio-31.1.1.tar.xz/.github/workflows/analyze-project.yaml -> obs-studio-31.1.2.tar.xz/.github/workflows/analyze-project.yaml Changed

obs-studio-31.1.1.tar.xz/.github/workflows/dispatch.yaml -> obs-studio-31.1.2.tar.xz/.github/workflows/dispatch.yaml Changed

obs-studio-31.1.1.tar.xz/.github/workflows/publish.yaml -> obs-studio-31.1.2.tar.xz/.github/workflows/publish.yaml Changed

obs-studio-31.1.1.tar.xz/.github/workflows/scheduled.yaml -> obs-studio-31.1.2.tar.xz/.github/workflows/scheduled.yaml Changed

obs-studio-31.1.1.tar.xz/build-aux/modules/99-cef.json -> obs-studio-31.1.2.tar.xz/build-aux/modules/99-cef.json Changed

obs-studio-31.1.1.tar.xz/frontend/data/themes/Yami.obt -> obs-studio-31.1.2.tar.xz/frontend/data/themes/Yami.obt Changed

@@ -139,6 +139,7 @@
     --volume_slider_label: calc(var(--volume_slider_box) * 2);
 
     --scrollbar_size: 12px;
+    --settings_scrollbar_size: calc(var(--scrollbar_size) + 9px);
     --scrollbar_handle: var(--grey4);
     
     --scrollbar_bg: var(--grey6);
@@ -457,7 +458,10 @@
     border: 1px solid var(--bg_base);
 }
 
-* {
+QCheckBox,
+QGroupBox,
+QMenuBar,
+QRadioButton {
     spacing: var(--spacing_small);
 }
 
@@ -473,6 +477,19 @@
     border: none;
 }
 
+QProgressBar {
+    text-align: center;
+    border-radius: 4px;
+    border-top: 2px solid transparent;
+}
+
+QProgressBar::chunk {
+    background: var(--blue3);
+    border-top: 1px solid var(--blue2);
+    border-bottom: 2px solid var(--blue4);
+    border-radius: var(--border_radius_small);
+}
+
 /* Context Menu */
 
 QMenu::indicator {
@@ -618,10 +635,12 @@
 
 OBSBasicSettings QScrollBar:vertical {
     width: var(--scrollbar_size);
+    width: var(--settings_scrollbar_size);
+    margin-left: 9px;
 }
 
 OBSBasicSettings QScrollBar:horizontal {
-    height: var(--scrollbar_size);
+    height: var(--settings_scrollbar_size);
 }
 
 /* Settings properties view */
@@ -720,6 +739,11 @@
     border-radius: var(--border_radius);
 }
 
+/* ScrollAreaContents */
+QScrollArea > QWidget > QWidget {
+    background: transparent;
+}
+
 /* Qt enforces a padding inside its status bar, so we
  * oversize it and use margin to crunch it back down
  */

obs-studio-31.1.1.tar.xz/frontend/utility/GoLiveAPI_PostData.cpp -> obs-studio-31.1.2.tar.xz/frontend/utility/GoLiveAPI_PostData.cpp Changed

obs-studio-31.1.1.tar.xz/frontend/utility/OBSCanvas.cpp -> obs-studio-31.1.2.tar.xz/frontend/utility/OBSCanvas.cpp Changed

obs-studio-31.1.1.tar.xz/frontend/utility/OBSCanvas.hpp -> obs-studio-31.1.2.tar.xz/frontend/utility/OBSCanvas.hpp Changed

obs-studio-31.1.1.tar.xz/libobs-opengl/gl-egl-common.c -> obs-studio-31.1.2.tar.xz/libobs-opengl/gl-egl-common.c Changed

obs-studio-31.1.1.tar.xz/libobs/obs-config.h -> obs-studio-31.1.2.tar.xz/libobs/obs-config.h Changed

obs-studio-31.1.1.tar.xz/libobs/obs.c -> obs-studio-31.1.2.tar.xz/libobs/obs.c Changed

@@ -3047,18 +3047,22 @@
 		     void (*callback)(void *param, struct video_data *frame), void *param)
 {
 	struct obs_core_video_mix *video = get_mix_for_video(v);
-	if (!video)
-		return;
-	if (video_output_connect2(v, conversion, frame_rate_divisor, callback, param))
+
+	// TODO: Make affected outputs use views/canvasses, and revert this later.
+	// https://github.com/obsproject/obs-studio/pull/12379
+	// https://github.com/obsproject/obs-studio/issues/12366
+	if (video_output_connect2(v, conversion, frame_rate_divisor, callback, param) && video)
 		os_atomic_inc_long(&video->raw_active);
 }
 
 void stop_raw_video(video_t *v, void (*callback)(void *param, struct video_data *frame), void *param)
 {
 	struct obs_core_video_mix *video = get_mix_for_video(v);
-	if (!video)
-		return;
-	if (video_output_disconnect2(v, callback, param))
+
+	// TODO: Make affected outputs use views/canvasses, and revert this later.
+	// https://github.com/obsproject/obs-studio/pull/12379
+	// https://github.com/obsproject/obs-studio/issues/12366
+	if (video_output_disconnect2(v, callback, param) && video)
 		os_atomic_dec_long(&video->raw_active);
 }

obs-studio-31.1.1.tar.xz/plugins/linux-pipewire/CMakeLists.txt -> obs-studio-31.1.2.tar.xz/plugins/linux-pipewire/CMakeLists.txt Changed

obs-studio-31.1.1.tar.xz/plugins/linux-pipewire/pipewire.c -> obs-studio-31.1.2.tar.xz/plugins/linux-pipewire/pipewire.c Changed

@@ -26,6 +26,7 @@
 
 #include <gio/gio.h>
 #include <gio/gunixfdlist.h>
+#include <glib/gstdio.h>
 
 #include <fcntl.h>
 #include <glad/glad.h>
@@ -143,6 +144,7 @@
 		int release_syncobj_fd;
 		uint64_t acquire_point;
 		uint64_t release_point;
+		bool release_point_will_signal;
 		bool set;
 	} sync;
 };
@@ -765,15 +767,28 @@
 		}
 
 #if PW_CHECK_VERSION(1, 2, 0)
+		if (obs_pw_stream->sync.release_syncobj_fd != -1) {
+			if (!obs_pw_stream->sync.release_point_will_signal) {
+				gs_sync_signal_syncobj_timeline_point(obs_pw_stream->sync.release_syncobj_fd,
+								      obs_pw_stream->sync.release_point);
+				obs_pw_stream->sync.release_point_will_signal = true;
+			}
+		}
+
+		g_clear_fd(&obs_pw_stream->sync.acquire_syncobj_fd, NULL);
+		g_clear_fd(&obs_pw_stream->sync.release_syncobj_fd, NULL);
+
 		if (synctimeline && (buffer->n_datas == (planes + 2))) {
 			assert(buffer->datasplanes.type == SPA_DATA_SyncObj);
 			assert(buffer->datasplanes + 1.type == SPA_DATA_SyncObj);
 
-			obs_pw_stream->sync.acquire_syncobj_fd = buffer->datasplanes.fd;
+			obs_pw_stream->sync.acquire_syncobj_fd = fcntl(buffer->datasplanes.fd, F_DUPFD_CLOEXEC, 5);
 			obs_pw_stream->sync.acquire_point = synctimeline->acquire_point;
 
-			obs_pw_stream->sync.release_syncobj_fd = buffer->datasplanes + 1.fd;
+			obs_pw_stream->sync.release_syncobj_fd =
+				fcntl(buffer->datasplanes + 1.fd, F_DUPFD_CLOEXEC, 5);
 			obs_pw_stream->sync.release_point = synctimeline->release_point;
+			obs_pw_stream->sync.release_point_will_signal = false;
 
 			obs_pw_stream->sync.set = true;
 		} else {
@@ -791,10 +806,11 @@
 		g_clear_pointer(&obs_pw_stream->texture, gs_texture_destroy);
 
 		use_modifiers = obs_pw_stream->format.info.raw.modifier != DRM_FORMAT_MOD_INVALID;
-		obs_pw_stream->texture = gs_texture_create_from_dmabuf(
-			obs_pw_stream->format.info.raw.size.width, obs_pw_stream->format.info.raw.size.height,
-			obs_pw_video_format.drm_format, obs_pw_video_format.gs_format, planes, fds, strides, offsets,
-			use_modifiers ? modifiers : NULL);
+		obs_pw_stream->texture = gs_texture_create_from_dmabuf(obs_pw_stream->format.info.raw.size.width,
+								       obs_pw_stream->format.info.raw.size.height,
+								       obs_pw_video_format.drm_format, GS_BGRX, planes,
+								       fds, strides, offsets,
+								       use_modifiers ? modifiers : NULL);
 
 		if (obs_pw_stream->texture == NULL) {
 			remove_modifier_from_format(obs_pw_stream, obs_pw_stream->format.info.raw.format,
@@ -1179,6 +1195,8 @@
 	obs_pw_stream->cursor.visible = connect_info->screencast.cursor_visible;
 	obs_pw_stream->framerate.set = connect_info->video.framerate != NULL;
 	obs_pw_stream->resolution.set = connect_info->video.resolution != NULL;
+	obs_pw_stream->sync.acquire_syncobj_fd = -1;
+	obs_pw_stream->sync.release_syncobj_fd = -1;
 
 	if (obs_pw_stream->framerate.set)
 		obs_pw_stream->framerate.fraction = *connect_info->video.framerate;
@@ -1309,20 +1327,10 @@
 		gs_sync_destroy(acquire_sync);
 	}
 
-	effect = obs_get_base_effect(OBS_EFFECT_DEFAULT);
-	gs_technique_t *tech = gs_effect_get_technique(effect, "DrawSrgbDecompress");
-	gs_technique_begin(tech);
-	gs_technique_begin_pass(tech, 0);
-
-	const bool linear_srgb = gs_get_linear_srgb();
-	const bool previous = gs_framebuffer_srgb_enabled();
-	gs_enable_framebuffer_srgb(linear_srgb);
-
+	/* FIXME: Use obs_pw_stream->format.info.raw colorimetry info to handle
+	 * textures in their corresponding color space */
 	image = gs_effect_get_param_by_name(effect, "image");
-	if (linear_srgb)
-		gs_effect_set_texture_srgb(image, obs_pw_stream->texture);
-	else
-		gs_effect_set_texture(image, obs_pw_stream->texture);
+	gs_effect_set_texture(image, obs_pw_stream->texture);
 
 	rotated = push_rotation(obs_pw_stream);
 
@@ -1356,10 +1364,7 @@
 		gs_matrix_push();
 		gs_matrix_translate3f(cursor_x, cursor_y, 0.0f);
 
-		if (linear_srgb)
-			gs_effect_set_texture_srgb(image, obs_pw_stream->cursor.texture);
-		else
-			gs_effect_set_texture(image, obs_pw_stream->cursor.texture);
+		gs_effect_set_texture(image, obs_pw_stream->cursor.texture);
 		gs_draw_sprite(obs_pw_stream->texture, 0, obs_pw_stream->cursor.width, obs_pw_stream->cursor.height);
 
 		gs_matrix_pop();
@@ -1367,16 +1372,12 @@
 
 	gs_blend_state_pop();
 
-	gs_enable_framebuffer_srgb(previous);
-
-	gs_technique_end_pass(tech);
-	gs_technique_end(tech);
-
 	if (obs_pw_stream->sync.set) {
 		gs_sync_t *release_sync = gs_sync_create();
 		gs_sync_export_syncobj_timeline_point(release_sync, obs_pw_stream->sync.release_syncobj_fd,
 						      obs_pw_stream->sync.release_point);
 		gs_sync_destroy(release_sync);
+		obs_pw_stream->sync.release_point_will_signal = true;
 	}
 }
 
@@ -1409,6 +1410,9 @@
 	g_clear_pointer(&obs_pw_stream->stream, pw_stream_destroy);
 	pw_thread_loop_unlock(obs_pw_stream->obs_pw->thread_loop);
 
+	g_clear_fd(&obs_pw_stream->sync.acquire_syncobj_fd, NULL);
+	g_clear_fd(&obs_pw_stream->sync.release_syncobj_fd, NULL);
+
 	clear_format_info(obs_pw_stream);
 	bfree(obs_pw_stream);
 }

obs-studio-31.1.1.tar.xz/plugins/linux-pipewire/screencast-portal.c -> obs-studio-31.1.2.tar.xz/plugins/linux-pipewire/screencast-portal.c Changed

obs-studio-31.1.1.tar.xz/plugins/linux-v4l2/v4l2-decoder.c -> obs-studio-31.1.2.tar.xz/plugins/linux-v4l2/v4l2-decoder.c Changed

Build Results
RPM Lint

Refresh

Comments for request 6308 0

Request History

darix created request about 1 month ago

darix accepted request about 1 month ago