@@ -1,9 +1,371 @@

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

+Tue Jun 24 11:46:50 UTC 2025 - darix <packman@nordisch.org>

+

+- drop fix-json11-build.patch 

+  - already in 31.x

+

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

 Tue Jun 17 14:34:43 UTC 2025 - Hans-Peter Jansen <hp@urpla.net>

 - fix build with fix-json11-build.patch

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

+Mon Jun 16 23:19:59 UTC 2025 - darix <packman@nordisch.org>

+

+- Update to version 31.1.0~rc1:

+  * frontend: Set Frontend-API QActions role to NoRole

+  * frontend: Fix visibility issues of meta type stream operators

+  * frontend: Fix preview zoom buttons translation string

+  * obs-websocket: Update version to 5.6.1

+  * obs-browser: Update to 2.25.1

+  * frontend: Fix group icon position in System theme

+  * CI: Use rebuilt CEF to avoid memory allocation crashes on macOS

+  * CI: Update sign-windows commit

+  * Update translations from Crowdin

+

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

+Sat Jun 07 01:02:25 UTC 2025 - darix <packman@nordisch.org>

+

+- Update to version 31.1.0~beta2:

+  * CI: Update steam-upload runner to macos-15

+  * CI: Update windows-signing to rclone 1.69.3

+  * CI: Make windows-signing fully architecture aware

+  * CI: Use architecture subfolder for OBS builds for windows-signing

+  * CI: Use architecture subfolder for old builds for windows-patches

+  * CI: Fix Steam upload again

+  * CI: Unpin actions/upload-artifact to v4.3.5 for windows-patches

+  * frontend: Make Mac font base value configurable

+  * frontend: Recognize OBS appearance setting usage in math statements

+  * obs-ffmpeg: Add B-frame CQP support for AMD AV1 encoder

+  * CI: Explicitly label Windows artifact and asset architecture

+  * frontend: Fix metatype declaration for scenes' SignalContainer

+  * frontend: Fix tab padding for the new appearance options

+  * frontend/forms: Fix text cut off in multitrack video info

+  * frontend/forms: Fix duplicate UI element name warning

+  * frontend: Set minimum width for menubar padding

+  * frontend: Fix appearance settings enabling Apply button

+  * frontend: Update projector menu for disabled preview

+  * frontend: Adjust volume mixer styling on Classic theme

+  * libobs: Actually mark obs_add|remove_data_path as deprecated

+  * shared/obs-hook-config: Update graphics hook to 1.8.7

+  * CI: Fix CEF ubuntu-aarch64 build

+  * CI: Fix Steam Upload

+  * CI: Add WoA artifacts to releases

+

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

+Fri May 30 01:21:06 UTC 2025 - darix <packman@nordisch.org>

+

+- refreshed patch

+  0001-Prefix-modinfo-with-sbin-since-not-in-normal-path.patch

+- drop 11906.patch

+  included in update

+- track series file to make it easier to refresh patches

+- New BuildRequires extra-cmake-modules

+

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

+Fri May 30 01:16:46 UTC 2025 - darix <packman@nordisch.org>

+

+- Update to version 31.1.0~beta1:

+  * frontend: Ensure cookie ID is always 16 hexadecimal characters

+  * frontend: Update Dock toolbar styling

+  * linux-pipewire: Fix render technique in captures

+  * frontend: Enable browser hw accel toggle under Linux

+  * libobs: Update version to 31.1.0

+  * build-aux: Update Flatpak modules

+  * CI: Update deps to 2025-05-23 release

+  * obs-websocket: Update version to 5.6.0

+  * win-capture: Fix crash if cursor size is zero

+  * frontend: Fix spacing of group expand button

+  * frontend: Make profile export menu item translatable

+  * frontend: Fix multiview translation string

+  * frontend: Fix button pressed color in Rachni theme

+  * libobs/util: Fix coprocess not having environment variables

+  * frontend: Swap preview zoom buttons

+  * frontend: Add missing translations

+  * frontend: Fix visibility and lock checkbox in System theme

+  * frontend: Explicitly set titlebar item padding

+  * frontend: Fix canvas remove event

+  * frontend: Fix dock title button sizes

+  * CI: Add CEF & enable obs-browser for Windows on ARM

+  * win-capture: Add SDL_app to list of generic classes

+  * obs-outputs: Correct FLV composition time offset calculations

+  * libobs-opengl: Promote eglCreateImage failure to LOG_ERROR

+  * linux-v4l2: Skip decode H264/MJPEG frames during capture

+  * CONTRIBUTING.rst: Fix typo

+  * frontend: Add close icon

+  * CI: Update obs-crowdin-sync to latest

+  * frontend: Use winId for Wayland surface in Qt 6.9+

+  * frontend: Use public QNativeInterface in Qt 6.5+

+  * obs-browser: Update to 2.25.0

+  * frontend: Fix build on FreeBSD

+  * libobs: Fix canvas_dosignal_source() using wrong signal handler

+  * libobs: Add obs_canvas_get_signal_handler

+  * docs: Fix function name obs_set_video_sdr_white_level

+  * decklink: Fix incorrect HDR min mastering luminance value

+  * libobs: Add checks to some graphics API functions

+  * frontend: Allow 5 multitrack reconnect attempts before re-running GCC

+  * libobs/util: Fix build on FreeBSD

+  * frontend: Fix character encoding issue during profile import

+  * libobs: Fall back to main canvas dimensions if group canvas unset

+  * libobs: Add obs_canvas_rename_source()

+  * media-playback: Fix possible crash on startup

+  * rtmp-services: Remove defunct servers/services

+  * frontend: Use static_cast when casting from void pointers

+  * win-capture: Fix crash if no display is available

+  * Revert "obs-ffmpeg: New default AMD encoding settings"

+  * Revert "obs-ffmpeg: Add Pre-Analysis checkbox for AMD encoder"

+  * obs-ffmpeg: Add Pre-Analysis checkbox for AMD encoder

+  * obs-ffmpeg: New default AMD encoding settings

+  * frontend: Allow selecting additional canvases for multitrack

+  * frontend: Update multitrack API model

+  * frontend: Always limit multitrack video encoders to libobs maximum

+  * libobs: Raise max number of output encoders to 10

+  * libobs/util: Fix os_process_pipe_create on Linux

+  * libobs: Improve readability of scene duplication type

+  * frontend: Make sure all QObject subclasses have Q_OBJECT macro

+  * libobs: Fix module load in relocatable scenario

+  * nv-filters: Fix warnings with Visual Studio 2022 17.14

+  * win-capture: Fix warnings with Visual Studio 2022 17.14

+  * frontend: Add frontend API canvas methods

+  * frontend: Add support loading/saving additional canvases

+  * frontend: Add OBS::Canvas class

+  * frontend: Use Q_OBJECT macro for BrowserDock

+  * rtmp-services: Add Enhanced Streaming support for Dolby Millicast

+  * libobs: Mark data path modification functions as deprecated

+  * UI,libobs,obs-outputs: Remove HAVE_OBSCONFIG_H ifdefs

+  * frontend: Allow Network Optimizations with multitrack video

+  * obs-outputs: Include all audio encoder bitrates

+  * frontend: Allow Stream Delay with multitrack video

+  * obs-outputs: Correct mp4_output_destory to mp4_output_destroy

+  * linux-v4l2: Add support for virtual camera on non-Linux environments

+  * frontend: Clip source names when dock too small

+  * libobs: Use absolute path for install prefix module load

+  * win-capture: Update hooked state before unhooked signal

+  * libobs/callback: Catch fail cases with missing error data

+  * libobs: Fix setting non-0 order on only scene item

+  * cmake: Replace Xcb CMake finders with ECM

+  * cmake: Replace Wayland CMake finder with ECM

+  * cmake: Use Extra CMake Modules on Linux

+  * frontend: Add dedicated translation of remaining time

+  * cmake: Group blake2 targets under same directory for IDEs

+  * frontend: Use default location for user settings as fallback

+  * libobs/util: Prevent locking mutex in child process when checking Qt5

+  * build-aux: Fix incorrect HEVC vertical resolution on AMD VCN

+  * obs-ffmpeg: Query and log the AMF codec level

+  * obs-ffmpeg: Set AMF codec level properly

+  * frontend: Remove unused item delegate parameters

+  * frontend: Adjust missing files dialog

+  * mac-capture: Fix incorrect enum comparison

+  * frontend/components: Remove NonCheckableButton

+  * frontend: Highlight control dock buttons using style class

+  * linux-v4l2: Fix virtual camera start failure

+  * media-playback: Fix possible crash if frame width or height is zero

+  * graphics-hook: Fix crash with Vulkan DirectDisplay

+  * frontend/widgets: Optimize preview primitive rendering

+  * libobs/graphics: Add gs_draw_quadf()

+  * libobs/graphics: Improve sprite drawing perf

+  * libobs/graphics: Optimize certain matrix4 functions

+  * libobs/graphics: Remove some unnecessary checks

+  * libobs/graphics: Separate some sections via comments

+  * frontend: Clean up various strings

+  * frontend/widgets: Fix integer overflow

+  * obs-qsv11: Remove non-functional CQM-related code

+  * CI: Use Flatpak action upstream

+  * frontend: Add new appearance options

+  * frontend: Migrate scene collection usage to new SceneCollection class

+  * frontend: Add SceneCollection class as data model for Scene Collections

+  * rtmp-services: Update niconico ingests

+  * rtmp-services: Add HEVC to supported video codecs for Bilibili

+  * clang-format: Update source code files with clang-format 19.1.1

+  * clang-format: Enable skipping of macro definitions for clang-format 19

+  * CI: Update clang-format version to 19.1.1

+  * build-aux: Use GitHub repo for LuaJIT

+  * frontend: Reorganize Preview/Source context menu

+  * frontend: Increase MAX_CRASH_REPORT_SIZE to 200 KB

+  * CI: Update signing action commit

+  * CI: Support signed ARM builds

+  * CI: Fix Windows signing workflow name

+  * CI: Sign game capture with RSA cert first

+  * frontend/themes: Re-add transparent border

+  * frontend: Re-set list spacing of source and scene tree to 0

+  * frontend: Remove additional spacing hack in SourceTreeItem

+  * obs-ffmpeg: Add OpenH264 H.264 software codec

+  * frontend: Focus text entry in NameDialog

+  * frontend: Adjust styling for SourceTree

+  * frontend: Auto-select manually added file imports

+  * frontend: Adjust scene collection importer

+  * frontend: Unify appearance of menus

+  * mac-avcapture: Use list-based format selector

+  * CI: Update bouf to v0.6.5

+  * deps/json11: Fix compile error on GCC 15+

+  * CI: Clean up Flatpak cache detection

+  * docs: Add canvases documentation

+  * libobs: Use UUIDs in scene undo/redo data

+  * libobs: Add Canvas object RAII wrappers

+  * libobs: Introduce Canvases

+  * libobs: Add video_reset signal

+  * libobs: Add view type to view object

+  * frontend: Enable multitrack video controls on Linux

+  * frontend: Support enhanced broadcasting on Linux

+  * frontend: Convert "profile" to an integer for VAAPI encoders

+  * obs-ffmpeg: Make VAAPI rc_mode comparison case insensitive

+  * libobs/util: Update `os_get_free_size()`

+  * libobs, libobs-opengl: Add memory and identification APIs

+  * frontend: Add preview zoom controls

+  * libobs: Deprecate obs_get_transition_by_name|uuid

+  * frontend: Make list spacing consistent

+  * linux-pipewire: Fix 10- and 16-bit captures

+  * cmake: Adjust macOS SDK detection

+  * libobs: Update version to 31.0.3

+  * libobs: Fix duplicating scene with custom size

+  * frontend: Remove Exit button (#11887)

+  * obs-websocket: Update version to 5.5.6

+  * rtmp-services: Add "VRCDN - Live" service

+  * frontend: Only emit frontend events for existing scene collection

+  * CI: Add workflow_dispatch trigger to scheduled repository workflow

+  * rtmp-services: Update Castr.io ingests

+  * rtmp-services: Remove defunct servers/services

+  * mac-avcapture: Clear memory when creating frame struct

+  * obs-browser: Update version to 2.24.6

+  * nv-filters:  Silence initial load error for Blur

+  * nv-filters: Remove reset signal for Video effects

+  * nv-filters: Fix  CudaStream used in Video effects

+  * nv-filters: Reallocate state when resetting AIGS filters

+  * nv-filters: Fix destruction of Background Blur effect

+  * nv-filters: Set max effective threshold to 0.95 for Background removal

+  * obs-nvenc: Fix incorrect CUDA array size allocation

+  * libobs: Reset reconnecting state when can_reconnect is false

+  * frontend: Add reconnect callback for multitrack video

+  * libobs: Add optional reconnect callback to outputs

+  * Revert "libobs: Do not allow reconnect if stop code is OBS_OUTPUT_INVALID_STREAM"

+  * CI: Update flatpak-builder and flat-manager actions

+  * build-aux: Update Flatpak modules

+  * build-aux,CI: Update KDE Flatpak runtime to 6.8

+  * build-aux: Update Flatpak libdatachannel to v0.21.1

+  * cmake: Fix some Qt DLLs not being copied due to filename patterns

+  * obs-ffmpeg: Fix throughput checks for older AMD driver

+  * CI: Use rebuilt CEF to avoid memory allocation crashes on macOS

+  * obs-ffmpeg: Add AMD AV1 B-frame support

+  * obs-qsv11: Fix CBR Spike for Battlemage

+  * win-capture: Add FragPunk to compatibility list

+  * CI: Add Windows ARM64 to build matrix

+  * plugins: Add ARM64 support to obs-ffmpeg, obs-filters, and obs-outputs

+  * cmake: Update cross-platform build project management for Windows

+  * CI: Update deps to 2025-03-06 release

+  * libobs: Update version to 31.0.2

+  * mac-avcapture: Prevent race condition in source init/deinit

+  * win-dshow: Fix possible crash if frame width or height is zero

+  * libobs,win-capture,win-wasapi: Fix typo in macro WIN32_LEAN_AND_MEAN

+  * obs-browser: Update version to 2.24.5

+  * obs-websocket: Update version to 5.5.5

+  * cmake: Don't copy legacy, unused Chromium file

+  * frontend: Define WIN32_LEAN_AND_MEAN conditionally for ARM64

+  * obs-outputs: Use _CountTrailingZeros() in ctz32 for ARM64

+  * obs-filters: Rename S_THRESHOLD to S_FILTER_THRESHOLD

+  * libobs: Add ARM64 support to Windows crash handler

+  * deps: Add ARM64 definitions in w32-pthreads

+  * frontend: Fix manifest commit hash comparison

+  * libobs: Do not lock sources mutex unnecessarily

+  * obs-nvenc: Fix lookahead depth value logging

+  * libobs: Use limited range for R10l output

+  * bpm: Fix potential null-pointer dereference

+  * frontend: Add support for TEB/GoLiveApi on Apple Silicon

+  * cmake: Replace COMPILE_FLAGS with COMPILE_OPTIONS

+  * obs-nvenc: Correct max target quality for AV1

+  * cmake: Specify NOMINMAX all the time on Windows

+  * linux-pipewire: Add explicit sync support

+  * libobs,libobs-opengl: Add gs_sync_t

+  * deps/glad: Add EGL_ANDROID_native_fence_sync

+  * frontend: Round up Resize Output (Source Size)

+  * frontend: Use OBSBasic::Get() in all places

+  * frontend: Add Input Monitoring to permissions dialog

+  * libobs: Rewrite macOS Hotkeys to use CGEventTap

+  * cmake: Fix regexp to detect installed FFmpeg version

+  * nv-filters: Remove CUDA RT functions

+  * nv-filters: Update SDK version targeted

+  * CI: Fix typo in setup-macos-codesigning action

+  * rtmp-services: Remove unresponsive servers

+  * frontend: Simplify how projectors are saved/loaded

+  * frontend: Remove unnecessary projector variable

+  * frontend: Log streaming service recommended maximums

+  * obs-webrtc: Enable PacingHandler

+  * mac-videotoolbox: Add Spatial AQ option (macOS 15)

+  * frontend: Support preferred video format/space/range in GoLiveApi

+  * libobs: Support format/space/range conversion in encoder GPU scaling

+  * libobs: Deprecate obs_(nv12|p010)_tex_active()

+  * obs-qsv11: Migrate to obs_encoder_video_tex_active()

+  * obs-ffmpeg: Use `obs_encoder_video_tex_active()` for AMF

+  * obs-nvenc: Migrate to obs_encoder_video_tex_active()

+  * libobs: Add obs_encoder_video_tex_active()

+  * frontend: Add audio properties to GetClientConfiguration request

+  * libos: Add `obs_get_audio_info2()`

+  * libobs: plugins: Use MAD for sRGB functions

+  * aja: Remove holding source settings

+  * frontend: Restart multitrack output if stream key has become invalid

+  * frontend: Remove multitrack deactivate handlers

+  * libobs: Only modify raw_active counter if (dis-)connection succeeded

+  * libobs: Add video_output_disconnect2()

+  * obs-scripting: Fix macOS Homebrew Python loading

+  * obs-outputs: Make MP4 output buffer/chunk size configurable

+  * .gitignore: Remove UI exclusion

+  * frontend: Move media control dynamic properties to ui file

+  * obs-outputs: Attempt to generate path if one is not specified

+  * obs-ffmpeg: Fix deprecation with FFmpeg 7.1

+  * libobs/util: Fix tv_nsec becoming 1000000000 in os_event_timedwait

+  * obs-ffmpeg: Add QVBR rate control for VA-API

+  * cmake: Update macOS development version requirements

+  * CI: Update macOS workflows to macOS 15 runners with Xcode 16.1

+  * libobs: Update version to 31.0.1

+  * frontend: Use filename stem as fallback value on empty collection name

+  * frontend: Prevent creation of scene collections with empty name

+  * cmake: Turn off camera reaction by default on macOS 14.4 and later

+  * libobs: Fix underlinking by adding libx11

+  * image-source: Fix slideshow stopping on last file in random mode

+  * obs-nvenc: Abort encoder init if custom options are invalid

+  * obs-nvenc: Fix translation string for 4:4:4 unsupported error

+  * frontend: Finalize merge of OBSBasic Sources with module sources

+  * CI: Update actions and build scripts to use new frontend directory

+  * build-aux: Replace UI directory with frontend directory for formatters

+  * cmake: Update main CMakeLists file to use refactored frontend

+  * frontend: Migrate frontend plugins

+  * frontend: Migrate Qt UI files

+  * frontend: Migrate OBS Studio data directory

+  * frontend: Migrate obs-frontend-api

+  * frontend: Migrate CMake files

+  * frontend: Migrate Windows updater

+  * frontend: Split main application implementation into single files

+  * frontend: Prepare main application implementation for splits

+  * frontend: Split Qt UI autoconfig implementations into single files

+  * frontend: Prepare Qt UI autoconfig wizards for splits

+  * frontend: Split Qt UI Widget implementations into single files per class

+  * frontend: Prepare Qt UI Widgets for splits

+  * frontend: Add renamed Qt UI Widgets

+  * frontend: Split UI utility implementation into single files per class

+  * frontend: Prepare UI utility files for splits

+  * frontend: Add renamed UI utility classes and functions

+  * frontend: Prepare sources for merge with OBSBasic modules

+  * frontend: Split Settings implementation into single files per C++ class

+  * frontend: Add renamed Qt UI dialogs

+  * frontend: Prepare Qt Settings UI files for splits

+  * frontend: Add renamed Qt Settings UI implementation

+  * frontend: Split OAuth implementation into single files per C++ class

+  * frontend: Prepare OAuth implementation for splits

+  * frontend: Add renamed OAuth implementation

+  * frontend: Split OBSImporter into single files per C++ class

+  * frontend: Add OBSImporter and importer implementations

+  * frontend: Add renamed Qt UI docks

+  * frontend: Split Qt UI dialogs into single files per C++ class

+  * frontend: Prepare Qt UI dialogs for splits

+  * frontend: Split Qt UI component into single file per C++ class

+  * frontend: Prepare Qt UI components for splits

+  * frontend: Add renamed Qt UI components

+  * frontend: Add new frontend directory to gitignore file

+  * libobs: Fix deadlock on macOS input method change

+  * libobs-opengl: Avoid trying to allocate 0 byte on Linux

+  * Revert "WIP"

+  * WIP

+

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

 Wed Apr  9 08:48:22 UTC 2025 - darix <packman@nordisch.org>

 - Pull in https://github.com/obsproject/obs-studio/pull/11906.patch

​

@@ -35,7 +35,7 @@

 %endif

 Name:           obs-studio

-Version:        31.0.3

+Version:        31.1.0~rc1

 Release:        0

 Summary:        A recording/broadcasting program

 Group:          Productivity/Multimedia/Video/Editors and Convertors

@@ -47,13 +47,13 @@

 %if %{with cef}

 Source17:       %{cef_binary}.tar.bz2

 %endif

+Source99:       series

 Patch1:         0001-Prefix-modinfo-with-sbin-since-not-in-normal-path.patch

 Patch2:         libx264-optional.patch

 Patch3:         ffmpeg-x11-linking.patch

-Patch4:         11906.patch

-Patch5:         fix-json11-build.patch

 BuildRequires:  update-desktop-files

 BuildRequires:  cmake >= 2.8.12

+BuildRequires:  extra-cmake-modules

 BuildRequires:  pkgconfig(fdk-aac)

 BuildRequires:  fdupes

 BuildRequires:  fontconfig-devel

@@ -173,8 +173,8 @@

 mkdir -p build && cd build

 # does not like cmake macro as it fails to link in math.h (-lma

 # the compile flags must be relaxed in order to compile obs-studio successfully

-export CFLAGS="%{optflags} -Wno-error=type-limits -Wno-error=unused-variable -Wno-error=deprecated-declarations -Wno-error=return-type -Wno-error=unused-but-set-variable -Wno-error=pointer-sign -Wno-error=reorder -Wno-error=switch -Wno-error=catch-value="

-export CXXFLAGS="%{optflags} -Wno-error=type-limits -Wno-error=unused-variable -Wno-error=deprecated-declarations -Wno-error=return-type -Wno-error=unused-but-set-variable -Wno-error=pointer-sign -Wno-error=reorder -Wno-error=switch -Wno-error=catch-value="

+export CFLAGS="%{optflags} -Wno-error=type-limits -Wno-error=unused-variable -Wno-error=deprecated-declarations -Wno-error=return-type -Wno-error=unused-but-set-variable -Wno-error=pointer-sign -Wno-error=reorder -Wno-error=switch -Wno-error=catch-value -Wno-error=stringop-truncation"

+export CXXFLAGS="%{optflags} -Wno-error=type-limits -Wno-error=unused-variable -Wno-error=deprecated-declarations -Wno-error=return-type -Wno-error=unused-but-set-variable -Wno-error=pointer-sign -Wno-error=reorder -Wno-error=switch -Wno-error=catch-value -Wno-error=stringop-truncation"

 cmake \

   -DCMAKE_CXX_STANDARD=17 \

​

@@ -7,11 +7,11 @@

  plugins/linux-v4l2/v4l2-output.c | 2 +-

  1 file changed, 1 insertion(+), 1 deletion(-)

-diff --git a/plugins/linux-v4l2/v4l2-output.c b/plugins/linux-v4l2/v4l2-output.c

-index 05ac70b42..d48088ad4 100644

---- a/plugins/linux-v4l2/v4l2-output.c

-+++ b/plugins/linux-v4l2/v4l2-output.c

-@@ -86,7 +86,7 @@ bool loopback_module_available()

+Index: obs-studio/plugins/linux-v4l2/v4l2-output.c

+===================================================================

+--- obs-studio.orig/plugins/linux-v4l2/v4l2-output.c

++++ obs-studio/plugins/linux-v4l2/v4l2-output.c

+@@ -90,7 +90,7 @@ bool loopback_module_available()

        return true;

    }

@@ -20,6 +20,3 @@

        return true;

    }

--- 

-2.31.1

-

​

@@ -1,112 +0,0 @@

-From 52d57cf70ca70f55378112f6eeb5708fb7680a6b Mon Sep 17 00:00:00 2001

-From: stephematician <steph.fn.contact@proton.me>

-Date: Wed, 19 Mar 2025 13:59:21 +1100

-Subject: PATCH linux-v4l2: Fix virtual camera start failure

-

-Add function that tries to reset v4l2loopback output for module versions

-from 0.12.5 to 0.12.7. If successful, then set flag that STREAMON and

-STREAMOFF are necessary each time the device is opened/closed.

----

- plugins/linux-v4l2/v4l2-output.c | 57 ++++++++++++++++++++++++++++++--

- 1 file changed, 54 insertions(+), 3 deletions(-)

-

-diff --git a/plugins/linux-v4l2/v4l2-output.c b/plugins/linux-v4l2/v4l2-output.c

-index 366fc474f69d4e..d5e4e0f6ad57fb 100644

---- a/plugins/linux-v4l2/v4l2-output.c

-+++ b/plugins/linux-v4l2/v4l2-output.c

-@@ -15,6 +15,7 @@ struct virtualcam_data {

-   obs_output_t *output;

-   int device;

-   uint32_t frame_size;

-+  bool use_caps_workaround;

- };

- 

- static const char *virtualcam_name(void *unused)

-@@ -110,11 +111,54 @@ static void *virtualcam_create(obs_data_t *settings, obs_output_t *output)

-   return vcam;

- }

- 

-+bool try_reset_output_caps(const char *device)

-+{

-+  struct v4l2_capability capability;

-+  struct v4l2_format format;

-+  int fd;

-+

-+  blog(LOG_INFO, "Attempting to reset output capability of '%s'", device);

-+

-+  fd = open(device, O_RDWR);

-+  if (fd < 0)

-+      return false;

-+

-+  format.type = V4L2_BUF_TYPE_VIDEO_OUTPUT;

-+  if (ioctl(fd, VIDIOC_G_FMT, &format) < 0)

-+      goto reset_fail_close_fd;

-+

-+  if (ioctl(fd, VIDIOC_S_FMT, &format) < 0)

-+      goto reset_fail_close_fd;

-+

-+  if (ioctl(fd, VIDIOC_STREAMON, &format.type) < 0)

-+      goto reset_fail_close_fd;

-+

-+  if (ioctl(fd, VIDIOC_STREAMOFF, &format.type) < 0)

-+      goto reset_fail_close_fd;

-+

-+  close(fd);

-+

-+  fd = open(device, O_RDWR);

-+  if (fd < 0)

-+      return false;

-+

-+  if (ioctl(fd, VIDIOC_QUERYCAP, &capability) < 0)

-+      goto reset_fail_close_fd;

-+

-+  close(fd);

-+  return (capability.device_caps & V4L2_CAP_VIDEO_OUTPUT) != 0;

-+

-+reset_fail_close_fd:

-+  close(fd);

-+  return false;

-+}

-+

- static bool try_connect(void *data, const char *device)

- {

-+  static bool use_caps_workaround = false;

-   struct virtualcam_data *vcam = (struct virtualcam_data *)data;

--  struct v4l2_format format;

-   struct v4l2_capability capability;

-+  struct v4l2_format format;

-   struct v4l2_streamparm parm;

- 

-   uint32_t width = obs_output_get_width(vcam->output);

-@@ -130,6 +174,13 @@ static bool try_connect(void *data, const char *device)

-   if (ioctl(vcam->device, VIDIOC_QUERYCAP, &capability) < 0)

-       goto fail_close_device;

- 

-+  if (!use_caps_workaround && !(capability.device_caps & V4L2_CAP_VIDEO_OUTPUT)) {

-+      if (!try_reset_output_caps(device))

-+          goto fail_close_device;

-+      use_caps_workaround = true;

-+  }

-+  vcam->use_caps_workaround = use_caps_workaround;

-+

-   format.type = V4L2_BUF_TYPE_VIDEO_OUTPUT;

- 

-   if (ioctl(vcam->device, VIDIOC_G_FMT, &format) < 0)

-@@ -165,7 +216,7 @@ static bool try_connect(void *data, const char *device)

-   memset(&parm, 0, sizeof(parm));

-   parm.type = V4L2_BUF_TYPE_VIDEO_OUTPUT;

- 

--  if (ioctl(vcam->device, VIDIOC_STREAMON, &parm) < 0) {

-+  if (vcam->use_caps_workaround && ioctl(vcam->device, VIDIOC_STREAMON, &parm.type) < 0) {

-       blog(LOG_ERROR, "Failed to start streaming on '%s' (%s)", device, strerror(errno));

-       goto fail_close_device;

-   }

-@@ -241,7 +292,7 @@ static void virtualcam_stop(void *data, uint64_t ts)

-   struct v4l2_streamparm parm = {0};

-   parm.type = V4L2_BUF_TYPE_VIDEO_OUTPUT;

- 

--  if (ioctl(vcam->device, VIDIOC_STREAMOFF, &parm) < 0) {

-+  if (vcam->use_caps_workaround && ioctl(vcam->device, VIDIOC_STREAMOFF, &parm) < 0) {

-       blog(LOG_WARNING, "Failed to stop streaming on video device %d (%s)", vcam->device, strerror(errno));

-   }

- 

​

@@ -1,12 +0,0 @@

-Index: b/deps/json11/json11.cpp

-===================================================================

---- a/deps/json11/json11.cpp

-+++ b/deps/json11/json11.cpp

-@@ -22,6 +22,7 @@

- #include "json11.hpp"

- #include <cassert>

- #include <cmath>

-+#include <cstdint>

- #include <cstdlib>

- #include <cstdio>

- #include <limits>

​

@@ -1,16 +1,16 @@

 <services>

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

+  <service name="tar_scm" mode="manual">

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

-    <param name="revision">31.0.3</param>

+    <param name="revision">31.1.0-rc1</param>

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

     <param name="versionrewrite-pattern">(\.\d+)-(a-z.*)</param>

     <param name="versionrewrite-replacement">\1~\2</param>

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

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

   </service>

-  <service name="recompress" mode="disabled">

+  <service name="recompress" mode="manual">

     <param name="compression">xz</param>

     <param name="file">*.tar</param>

   </service>

-  <service name="set_version" mode="disabled"/>

+  <service name="set_version" mode="manual"/>

 </services>

​

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

 <servicedata>

   <service name="tar_scm">

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

-    <param name="changesrevision">fcd1910bf5116b69404a6ecdda6efedd1d00ebdf</param>

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

   </service>

 </servicedata>

\ No newline at end of file

​

@@ -0,0 +1,3 @@

+0001-Prefix-modinfo-with-sbin-since-not-in-normal-path.patch

+libx264-optional.patch

+ffmpeg-x11-linking.patch

​