@@ -1,4 +1,1992 @@

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

+Sat Dec 07 00:55:05 UTC 2024 - packman@nordisch.org

+

+- Update to version 31.0.0:

+  * Update translations from Crowdin

+  * libobs: Remove relative positioning functions

+  * libobs: Fix scale calculation when applying new group transform

+  * UI: Fix collision of existing backup files for new scene collections

+  * cmake: Fix build directory exclusion for real

+  * UI: Add unassigned icon

+

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

+Wed Nov 20 22:38:46 UTC 2024 - packman@nordisch.org

+

+- Update to version 31.0.0~rc1:

+  * obs-ffmpeg: Avoid setting negative bitrate for lossless audio codec

+  * UI: Fix broken module paths provided via environment on macOS

+  * frontend-tools: Correctly pass settings to modified cb on reload

+  * UI: Fix falling back to non-multitrack output after error

+  * UI: Fix autoconfig saving signed stream key

+  * UI: Forward auto rtmp/rtmps IVS preference

+  * UI: Ignore all auto URLs for server selection

+  * decklink: Fix string handling causing plugin to not function

+  * win-capture: Avoid NULL deref when capture not initialized

+  * cmake: Fix build directory exclusion

+  * mac-capture: Don't read channels for disconnected audio device

+  * obs-qsv11: Remove checks for DX11

+  * obs-qsv11: Remove old DX9 code

+  * obs-qsv11: Remove unused debug variable

+  * obs-qsv11: Move debug code into debug sections

+  * obs-qsv11: Remove old MSDK 1.6 code

+  * obs-filters: Move nvafx migration to queued task

+  * UI: Create YouTube Dock when switching profile

+

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

+Fri Nov  8 11:55:52 UTC 2024 - packman@nordisch.org

+

+- ok ... this split out obs-x264 needs more work. there is a few

+  places where it is hardcoded as a default. and there is no h264

+  non-hardware encoder via ffmpeg yet

+

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

+Fri Nov  8 11:35:58 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>

+

+- Add ffmpeg-x11-linking.patch:

+  This one is weird ... the ffmpeg-mux plugin isn't actually using

+  XOpenDisplay and friends. So it could be a missing library in the

+  ffmpeg-7 devel packages in TW compared to packman.

+

+  I guess a bug in the ffmpeg build system which generates the

+  pkg-config files.

+

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

+Fri Nov  8 11:35:34 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>

+

+- Make the build of the x264 plugin optional

+  adds libx264-optional.patch

+

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

+Fri Nov  8 11:13:05 UTC 2024 - packman@nordisch.org

+

+- split out the obs-studio libx264 support into a subpackage as a

+  preparation to only build it on packman 

+

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

+Fri Nov  8 11:12:21 UTC 2024 - packman@nordisch.org

+

+- switch buildrequires for fdk-aac to pkgconfig to make it work

+  with different naming of packages

+

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

+Sun Nov  3 02:37:15 UTC 2024 - packman@nordisch.org

+

+- bump ffnvcodec headers to at least 12.1.14.0 for

+  NV_ENC_ERR_NEED_MORE_OUTPUT

+

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

+Fri Nov 01 23:28:55 UTC 2024 - packman@nordisch.org

+

+- Update to version 31.0.0~beta3:

+  * obs-websocket: Update version to 5.5.4

+  * UI: Add trash and general icon

+  * UI: Add trash icon

+  * UI/themes: Fix missing icon in system theme

+  * UI/themes: Fix control button pressed color in Rachni theme

+  * graphics-hook: Fix null pointer dereference

+  * UI: Update profile encoder information after module load

+  * UI: Open active profile directory via File menu

+  * librtmp: Use /etc/ssl/certs/ path on FreeBSD

+  * UI/importers: Translate capture sources depending on WS

+  * UI: Add TikTok Live Studio Virtual Camera to DLL blocklist

+  * UI: Restore frontend API events being dispatched during initialization

+  * UI: Remove LineEditAutoResize widget

+  * UI: Remove SendChatMessage from YoutubeApiWrappers

+  * UI: Remove custom YouTube chat input

+  * linux-pipewire: Fix memory leaks

+  * cmake: Install desktop files and icons on FreeBSD

+  * cmake/plugins: Enable -Wswitch on GCC

+  * UI: Split out Whats New dialog, fix crash on shutdown

+  * cmake: Fix target_add_resource ARGN support on Linux

+  * UI: Log Twitch 403 error bodies

+  * UI: Don't load Restream UI before CEF is ready

+  * CI: Enable WebRTC on FreeBSD

+  * build-aux: Remove CEF stripping workaround

+

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

+Mon Oct 21 19:14:48 UTC 2024 - packman@nordisch.org

+

+- Update to version 31.0.0~beta2:

+  * obs-nvenc: Force at least 4 b-frames when using UHQ tune

+  * UI: Use custom property on QAction to retain profile or collection name

+  * UI: Update order of profiles and scene collections in their menus

+  * UI: Restore XDG config path update for FreeBSD

+  * libobs: Remove non-USE_XDG code

+  * obs-browser: Update version to 2.24.4

+  * obs-browser: Update version to 2.24.3

+  * UI: Remove toolButton styling

+  * UI: Replace toolButton property with style class

+  * CONTRIBUTING.rst: Update for 120 column limit

+  * CI: Bump FreeBSD image to 14.1

+  * libobs: Fix items in groups using wrong scale reference

+  * libobs: Fix ungrouped transfom calculation in relative mode

+  * obs-outputs: Add cast to fix build with Clang 19

+  * UI: Catch error from copy in MigrateGlobalSettings

+  * obs-qsv11: Update minimum VPL version to 2.9

+  * UI: Fix initialization bug when launching without existing profile

+  * UI: Set minimum version for nlohmann_json to 3.11

+  * UI/themes: Consistently select indicator-mute instead of MuteCheckBox

+  * libobs: Add source profiler to public headers

+  * UI: Fix crash when providing scene collection or profile via CLI

+  * UI: Fix deletion of scene collection backup on collection deletion

+  * UI: Fix activation order of profile and scene collections after delete

+  * UI/themes: Fix selectors in Yami Light

+  * UI: Correctly set Yami border radius for buttons in tables

+  * CI: Fix rclone env var formatting in Windows Patches action

+

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

+Wed Oct  9 10:15:12 UTC 2024 - packman@nordisch.org

+

+- reenable websockets

+

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

+Wed Oct  9 00:40:12 UTC 2024 - packman@nordisch.org

+

+- needs python 3.8 at least now. forcing 3.11 for leap

+- Qt6 only now

+- we need at least ffmpeg 6.1, lets force 7 right away 

+- leap 15.6 needs a compiler that supports C++ standard 17 at least

+  force gcc 13

+- pkgconfig(nlohmann_json) is also needed outside of the websocket

+  scope

+- new general BR:

+  rnnoise, ffnvcodec, vpl, uthash-devel

+- new websockets BR:

+  libdatachannel-devel, qrcodecgencpp

+- disable websockets for now until we get qrcodecgencpp

+- needs 2 new downgrades of errors to warnings:

+  -Wno-error=switch -Wno-error=catch-value=

+- drop 0002-Include-diverse-luajit.patch

+

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

+Tue Oct 08 22:41:12 UTC 2024 - packman@nordisch.org

+

+- Update to version 31.0.0~beta1:

+  * CI: Fix sparkle-appcast comment syntax

+  * shared/opts-parser: Fix crash when no options were given to the parser

+  * libobs/graphics: Remove unused source file graphics-magick.c

+  * UI: Avoid path<->string conversion when refreshing profile cache

+  * obs-ffmpeg: Fix deadlock on shutting down muxer

+  * win-update: Remove legacy CMake file

+  * UI: Fix locale key for rename profile text

+  * obs-nvenc: Add missing locale text

+  * UI: Fix settings mismatch

+  * libobs/util: Crash on bmalloc(0)

+  * linux-pipewire: Avoid trying to allocate 0 byte

+  * linux-capture: Fix potential null pointer dereference

+  * libobs/util: Prevent null pointer deref with dstr_cmp

+  * cmake: Use fixed SOVERSION everywhere

+  * Update translations from Crowdin

+  * CI: Fix translation download script bugs

+  * plugins: Update translations from Crowdin

+  * CI: Use correct commit hash for translation download

+  * CI: Bump Crowdin Sync to fix translation download

+  * libobs: Update version to 31.0.0

+  * .git-blame-ignore-revs: Add change from column limit increase

+  * clang-format: Increase column limit from 80 to 120

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

+  * libobs: Update version to 30.2.3

+  * libobs/util: Improve inhibit functions on Linux

+  * UI: Enable first-party YouTube Chat features in OBS

+  * UI: Use shared cookie manager for YT Control Panel

+  * shared/bpm: Fixed crash when using Stream Delay

+  * UI: Replace themeID and style hints with class property

+  * libobs: Assure large enough buffer in dstr_from_cfstring

+  * plugins/test: Remove legacy CMake remnants

+  * libobs: Remove unused is_in_bundle() method

+  * UI: Set NV12 as preferred format for multitrack video encoders

+  * libobs: Do not attempt to reconnect if stop event is set

+  * UI: Fix What's New increment settings mismatch

​

@@ -1,21 +1,35 @@

 # Chromium Embedded Framework

 %ifarch x86_64

-%bcond_without cef

+%bcond_with cef

 %define cef_binary cef_binary_5060_linux64

 %else

 %bcond_with cef

 %endif

-%if 0%{?suse_version} > 1500

-%define qt_version 6

+%bcond_without websockets

+%bcond_with    split_obs_x264

+

+# 31.0.0~beta1 wants at least 6.1 lets just use 7 straight away

+# zypper info --provides $(zypper se -t package -s ffmpeg-7 | awk -F '|' '/devel/ {print $2}') | grep pkgconfig | perl -p -e 's|^\s+pkgconfig\((^\)+)\) = (\S+)|%%global minimum_$1_version $2|g'

+%global minimum_libavcodec_version 61.19.100

+%global minimum_libavdevice_version 61.3.100

+%global minimum_libavfilter_version 10.4.100

+%global minimum_libavformat_version 61.7.100

+%global minimum_libavutil_version 59.39.100

+%global minimum_libpostproc_version 58.3.100

+%global minimum_libswresample_version 5.3.100

+%global minimum_libswscale_version 8.3.100

+

+%if 0%{?suse_version} && 0%{?suse_version} < 1600

+%global force_gcc_version 13

+%global python_version 311

 %else

-%define qt_version 5

+%global python_version 3

 %endif

-%bcond_without websockets

 Name:           obs-studio

-Version:        29.1.3

+Version:        31.0.0

 Release:        0

 Summary:        A recording/broadcasting program

 Group:          Productivity/Multimedia/Video/Editors and Convertors

@@ -27,17 +41,17 @@

 %if %{with cef}

 Source17:       %{cef_binary}.tar.bz2

 %endif

-Patch0:         0002-Include-diverse-luajit.patch

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

-BuildRoot:      %{_tmppath}/%{name}-%{version}-build

+Patch2:         libx264-optional.patch

+Patch3:         ffmpeg-x11-linking.patch

 BuildRequires:  update-desktop-files

 BuildRequires:  cmake >= 2.8.12

-BuildRequires:  fdk-aac-devel

+BuildRequires:  pkgconfig(fdk-aac)

 BuildRequires:  fdupes

 BuildRequires:  fontconfig-devel

 BuildRequires:  freetype2-devel

-BuildRequires:  gcc

-BuildRequires:  gcc-c++

+BuildRequires:  gcc%{?force_gcc_version}

+BuildRequires:  gcc%{?force_gcc_version}-c++

 BuildRequires:  hicolor-icon-theme

 BuildRequires:  libXcomposite-devel

 BuildRequires:  libXinerama-devel

@@ -47,53 +61,53 @@

 BuildRequires:  pciutils-devel

 BuildRequires:  pipewire-devel

 BuildRequires:  libpulse-devel

-%if "%{qt_version}" == "5"

-BuildRequires:  libqt5-qtbase-devel >= 5.3

-BuildRequires:  libqt5-qtbase-private-headers-devel

-BuildRequires:  libqt5-qtsvg-devel

-BuildRequires:  libqt5-qtx11extras-devel >= 5.3

-%endif

-%if "%{qt_version}" == "6"

 BuildRequires:  cmake(Qt6Core)

 BuildRequires:  cmake(Qt6Svg)

 BuildRequires:  qt6-base-private-devel

-%endif

 BuildRequires:  libudev-devel

 BuildRequires:  libv4l-devel

+%if %{without split_obs_x264}

 BuildRequires:  libx264-devel

+%endif

 BuildRequires:  mbedtls-devel

 BuildRequires:  pipewire-devel

 BuildRequires:  pkgconfig

 BuildRequires:  pkgconfig(alsa)

 BuildRequires:  pkgconfig(jack)

-BuildRequires:  pkgconfig(libavcodec)

-BuildRequires:  pkgconfig(libavdevice)

-BuildRequires:  pkgconfig(libavfilter)

-BuildRequires:  pkgconfig(libavformat)

-BuildRequires:  pkgconfig(libavutil)

+BuildRequires:  pkgconfig(libavcodec)  >= %{minimum_libavcodec_version}

+BuildRequires:  pkgconfig(libavdevice) >= %{minimum_libavdevice_version}

+BuildRequires:  pkgconfig(libavfilter) >= %{minimum_libavfilter_version}

+BuildRequires:  pkgconfig(libavformat) >= %{minimum_libavformat_version}

+BuildRequires:  pkgconfig(libavutil)   >= %{minimum_libavutil_version}

 %ifarch %{ix86} x86_64

 # comment out until resolved: nothing provides pkgconfig(libmfx)

 # BuildRequires:  pkgconfig(libmfx)

 %endif

 BuildRequires:  pkgconfig(librist)

-BuildRequires:  pkgconfig(libswresample)

-BuildRequires:  pkgconfig(libswscale)

+BuildRequires:  pkgconfig(libswresample) >= %{minimum_libswresample_version}

+BuildRequires:  pkgconfig(libswscale)    >= %{minimum_libswscale_version}

 BuildRequires:  pkgconfig(libva)

 BuildRequires:  pkgconfig(lua)

 BuildRequires:  pkgconfig(luajit)

 BuildRequires:  pkgconfig(srt) >= 1.4

 BuildRequires:  pkgconfig(uuid)

-%if %{with websockets}

+BuildRequires:  pkgconfig(rnnoise)

+BuildRequires:  pkgconfig(ffnvcodec) >= 12.1.14.0

+BuildRequires:  pkgconfig(vpl)

+BuildRequires:  libdatachannel-devel

 BuildRequires:  pkgconfig(nlohmann_json) >= 3

+%if %{with websockets}

 BuildRequires:  pkgconfig(websocketpp) >= 0.8.0

 BuildRequires:  pkgconfig(asio) >= 1.12.1

+BuildRequires:  pkgconfig(qrcodegencpp)

 %endif

-BuildRequires:  python3-devel

+BuildRequires:  python%{python_version}-devel >= 3.8

 %if 0%{?suse_version} != 1315 || 0%{?is_opensuse}

 BuildRequires:  speexdsp-devel

 %endif

 BuildRequires:  sndio-devel

 BuildRequires:  swig

+BuildRequires:  uthash-devel

 BuildRequires:  vlc-devel

 %if %{with cef}

 BuildRequires:  mozilla-nss

@@ -106,6 +120,8 @@

 Recommends:     libqt5-qtwayland

 ExclusiveArch:  x86_64 aarch64

+Recommends:     obs-studio-x264

+

 # these are plugins, built as libs and as such should not be mixed up with their originals

 %global __provides_exclude_from ^(%{_libdir}/obs-plugins/.*\\.so.*|%{_libdir}/obs-scripting/.*\\.so.*)$

 %global __requires_exclude libcef\\.so

@@ -113,6 +129,17 @@

 %description

 Open Broadcaster Software is free and open source software for video recording and live streaming.

+%if %{with split_obs_x264}

+%package x264

+Summary:        libx264 support for obs-studio

+#

+Requires:       obs-studio = %{version}-%{release}

+%description x264

+Open Broadcaster Software is free and open source software for video recording and live streaming.

+

+This package holds the obs-x264 plugin for obs-studio

+%endif

+

 %package devel

 Summary:        A recording/broadcasting program - Development Files

 Group:          Development/Multimedia

@@ -128,11 +155,16 @@

 %endif

 %build

+%if 0%{?force_gcc_version}

+export CC="gcc-%{?force_gcc_version}"

+export CXX="g++-%{?force_gcc_version}"

+%endif

+

 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"

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

+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="

 cmake \

   -DCMAKE_CXX_STANDARD=17 \

@@ -182,19 +214,32 @@

 %files

 %{_bindir}/obs

 %{_bindir}/obs-ffmpeg-mux

+%{_bindir}/obs-nvenc-test

 # Upstream forces libs dir regardless of arch and building plugins is encumbered

 # by moving them to the proper directory.

 %{_libdir}/obs-plugins/

+%if %{with split_obs_x264}

+%exclude %{_libdir}/obs-plugins/obs-x264.so

+%endif

 %{_libdir}/libobs.so.*

 %{_libdir}/libobs-frontend-api.so.*

 %{_libdir}/libobs-opengl.so.*

 %{_libdir}/libobs-scripting.so.*

 %{_libdir}/obs-scripting/

 %dir %{_datadir}/metainfo

-%{_datadir}/metainfo/com.obsproject.Studio.appdata.xml

​

@@ -1,18 +0,0 @@

-Index: b/cmake/Modules/FindLuajit.cmake

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

---- a/cmake/Modules/FindLuajit.cmake

-+++ b/cmake/Modules/FindLuajit.cmake

-@@ -37,7 +37,12 @@ find_path(

-     luajit-2.1

-     include/luajit-2.1

-     luajit2.1

--    include/luajit2.1)

-+    include/luajit2.1

-+    luajit5.1

-+    include/luajit-5_1-2.1

-+    moonjit-2.2

-+    include/moonjit-2.2

-+)

- 

- find_library(

-   LUAJIT_LIB

​

@@ -1,96 +0,0 @@

-From 1603aaf4a2ef16b7aabb3cf330c7b3fde77ad8ca Mon Sep 17 00:00:00 2001

-From: pkv <pkv@obsproject.com>

-Date: Tue, 28 Feb 2023 17:28:38 +0100

-Subject: PATCH obs-ffmpeg: Fix for FFmpeg 6 deprecating a flag

-

-Also modifies libobs & deps/media-playback.

-AV_CODEC_CAP_TRUNCATED was removed in avcodec 60 1.

-We ifdef the code depending on it to allow compilation.

-

-1 avcodec: remove FF_API_FLAG_TRUNCATED

-https://github.com/FFmpeg/FFmpeg/commit/3ceffe783965767e62d59e8e68ecd265c98460ec

-

-Signed-off-by: pkv <pkv@obsproject.com>

----

- deps/media-playback/media-playback/decode.c | 2 ++

- deps/media-playback/media-playback/decode.h | 2 ++

- libobs/obs-ffmpeg-compat.h                  | 2 ++

- plugins/obs-ffmpeg/obs-ffmpeg-compat.h      | 2 ++

- plugins/win-dshow/ffmpeg-decode.c           | 2 ++

- 5 files changed, 10 insertions(+)

-

-diff --git a/deps/media-playback/media-playback/decode.c b/deps/media-playback/media-playback/decode.c

-index 05d6afcc649a2..e1aa9aec0577b 100644

---- a/deps/media-playback/media-playback/decode.c

-+++ b/deps/media-playback/media-playback/decode.c

-@@ -230,8 +230,10 @@ bool mp_decode_init(mp_media_t *m, enum AVMediaType type, bool hw)

-       d->in_frame = d->sw_frame;

-   }

- 

-+#if LIBAVCODEC_VERSION_MAJOR < 60

-   if (d->codec->capabilities & CODEC_CAP_TRUNC)

-       d->decoder->flags |= CODEC_FLAG_TRUNC;

-+#endif

- 

-   d->orig_pkt = av_packet_alloc();

-   d->pkt = av_packet_alloc();

-diff --git a/deps/media-playback/media-playback/decode.h b/deps/media-playback/media-playback/decode.h

-index 1ca271b419fbd..6da34061b3dee 100644

---- a/deps/media-playback/media-playback/decode.h

-+++ b/deps/media-playback/media-playback/decode.h

-@@ -37,8 +37,10 @@ extern "C" {

- #endif

- 

- #if LIBAVCODEC_VERSION_MAJOR >= 58

-+#if LIBAVCODEC_VERSION_MAJOR < 60

- #define CODEC_CAP_TRUNC AV_CODEC_CAP_TRUNCATED

- #define CODEC_FLAG_TRUNC AV_CODEC_FLAG_TRUNCATED

-+#endif

- #else

- #define CODEC_CAP_TRUNC CODEC_CAP_TRUNCATED

- #define CODEC_FLAG_TRUNC CODEC_FLAG_TRUNCATED

-diff --git a/libobs/obs-ffmpeg-compat.h b/libobs/obs-ffmpeg-compat.h

-index c4e23b9851242..ad633521e3b0b 100644

---- a/libobs/obs-ffmpeg-compat.h

-+++ b/libobs/obs-ffmpeg-compat.h

-@@ -23,8 +23,10 @@

- #endif

- 

- #if LIBAVCODEC_VERSION_MAJOR >= 58

-+#if LIBAVCODEC_VERSION_MAJOR < 60

- #define CODEC_CAP_TRUNC AV_CODEC_CAP_TRUNCATED

- #define CODEC_FLAG_TRUNC AV_CODEC_FLAG_TRUNCATED

-+#endif

- #define INPUT_BUFFER_PADDING_SIZE AV_INPUT_BUFFER_PADDING_SIZE

- #else

- #define CODEC_CAP_TRUNC CODEC_CAP_TRUNCATED

-diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-compat.h b/plugins/obs-ffmpeg/obs-ffmpeg-compat.h

-index 181167aff383d..39efa00c774b3 100644

---- a/plugins/obs-ffmpeg/obs-ffmpeg-compat.h

-+++ b/plugins/obs-ffmpeg/obs-ffmpeg-compat.h

-@@ -27,8 +27,10 @@

- #endif

- 

- #if LIBAVCODEC_VERSION_MAJOR >= 58

-+#if LIBAVCODEC_VERSION_MAJOR < 60

- #define CODEC_CAP_TRUNC AV_CODEC_CAP_TRUNCATED

- #define CODEC_FLAG_TRUNC AV_CODEC_FLAG_TRUNCATED

-+#endif

- #define CODEC_FLAG_GLOBAL_H AV_CODEC_FLAG_GLOBAL_HEADER

- #else

- #define CODEC_CAP_TRUNC CODEC_CAP_TRUNCATED

-diff --git a/plugins/win-dshow/ffmpeg-decode.c b/plugins/win-dshow/ffmpeg-decode.c

-index d27c98441da15..49df62b7a79f2 100644

---- a/plugins/win-dshow/ffmpeg-decode.c

-+++ b/plugins/win-dshow/ffmpeg-decode.c

-@@ -105,8 +105,10 @@ int ffmpeg_decode_init(struct ffmpeg_decode *decode, enum AVCodecID id,

-       return ret;

-   }

- 

-+#if LIBAVCODEC_VERSION_MAJOR < 60

-   if (decode->codec->capabilities & CODEC_CAP_TRUNC)

-       decode->decoder->flags |= CODEC_FLAG_TRUNC;

-+#endif

- 

-   return 0;

- }

​

@@ -0,0 +1,13 @@

+diff --git a/plugins/obs-ffmpeg/ffmpeg-mux/CMakeLists.txt b/plugins/obs-ffmpeg/ffmpeg-mux/CMakeLists.txt

+index c1f95297f..58835df26 100644

+--- a/plugins/obs-ffmpeg/ffmpeg-mux/CMakeLists.txt

++++ b/plugins/obs-ffmpeg/ffmpeg-mux/CMakeLists.txt

+@@ -11,7 +11,7 @@ target_sources(obs-ffmpeg-mux PRIVATE ffmpeg-mux.c ffmpeg-mux.h)

+ 

+ target_link_libraries(

+   obs-ffmpeg-mux

+-  PRIVATE OBS::libobs FFmpeg::avcodec FFmpeg::avutil FFmpeg::avformat $<$<PLATFORM_ID:Windows>:OBS::w32-pthreads>

++  PRIVATE OBS::libobs X11::X11 FFmpeg::avcodec FFmpeg::avutil FFmpeg::avformat $<$<PLATFORM_ID:Windows>:OBS::w32-pthreads>

+ )

+ 

+ target_compile_definitions(obs-ffmpeg-mux PRIVATE $<$<BOOL:${ENABLE_FFMPEG_MUX_DEBUG}>:ENABLE_FFMPEG_MUX_DEBUG>)

​

@@ -0,0 +1,19 @@

+diff --git a/plugins/obs-x264/CMakeLists.txt b/plugins/obs-x264/CMakeLists.txt

+index 958d553c8..59ea67205 100644

+--- a/plugins/obs-x264/CMakeLists.txt

++++ b/plugins/obs-x264/CMakeLists.txt

+@@ -1,7 +1,8 @@

+ cmake_minimum_required(VERSION 3.28...3.30)

+ 

+-find_package(Libx264 REQUIRED)

++find_package(Libx264)

+ 

++if(Libx264_FOUND)

+ if(NOT TARGET OBS::opts-parser)

+   add_subdirectory("${CMAKE_SOURCE_DIR}/shared/opts-parser" "${CMAKE_BINARY_DIR}/shared/opts-parser")

+ endif()

+@@ -20,3 +21,4 @@ endif()

+ set_target_properties_obs(obs-x264 PROPERTIES FOLDER plugins/obs-x264 PREFIX "")

+ 

+ include(cmake/x264-test.cmake)

++endif()

​

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

 <services>

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

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

-    <param name="revision">refs/tags/29.1.3</param>

+    <param name="revision">31.0.0</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>

​

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

 <servicedata>

   <service name="tar_scm">

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

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

+    <param name="changesrevision">0b2c85845e20f41c612cfe2583e380bd436b6b3c</param>

   </service>

 </servicedata>

\ No newline at end of file

​