Packman Build Service PMBS

File project.diff of Package obs-studio (Revision 232bcbb646613dd34b45770a2128d820)

Currently displaying revision 232bcbb646613dd34b45770a2128d820 , Show latest

--- obs-studio.changes.orig
+++ obs-studio.changes
@@ -1,4 +1,14 @@
 -------------------------------------------------------------------
+Fri May 12 14:27:03 UTC 2023 - Hans-Peter Jansen <hp@urpla.net>
+
+- Apply upstream pull request 8376.patch to fix build with ffmpeg >= 6
+
+-------------------------------------------------------------------
+Sat Apr 22 16:16:29 UTC 2023 - Hans-Peter Jansen <hpj@urpla.net>
+
+- Disable __requires_exclude_from for testing
+
+-------------------------------------------------------------------
 Tue Apr 18 16:52:06 UTC 2023 - Hans-Peter Jansen <hp@urpla.net>
 
 - Add more hidden deps
--- obs-studio.spec.orig
+++ obs-studio.spec
@@ -20,6 +20,7 @@ Source17:       %{cef_binary}.tar.bz2
 %endif
 Patch0:         0002-Include-diverse-luajit.patch
 Patch1:         0001-Prefix-modinfo-with-sbin-since-not-in-normal-path.patch
+Patch2:         8376.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  update-desktop-files
 BuildRequires:  cmake >= 2.8.12
@@ -81,7 +82,7 @@ ExclusiveArch:  x86_64 aarch64
 
 # 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_from ^(%{_libdir}/obs-plugins/.*|%{_libdir}/obs-scripting/.*)$
+#%%global __requires_exclude_from ^(%%{_libdir}/obs-plugins/.*|%%{_libdir}/obs-scripting/.*)$
 %global __requires_exclude ^libcef\\.so$
 
 %description