Packman Build Service PMBS

obs-studio.changes Changed

@@ -1,4 +1,28 @@
 -------------------------------------------------------------------
+Fri Nov  8 11:55:52 UTC 2024 - Marcus 'darix' Rückert <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

obs-studio.spec Changed

@@ -8,6 +8,7 @@
 %endif
 
 %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'
@@ -41,6 +42,8 @@
 Source17:       %{cef_binary}.tar.bz2
 %endif
 Patch1:         0001-Prefix-modinfo-with-sbin-since-not-in-normal-path.patch
+Patch2:         libx264-optional.patch
+Patch3:         ffmpeg-x11-linking.patch
 BuildRequires:  update-desktop-files
 BuildRequires:  cmake >= 2.8.12
 BuildRequires:  pkgconfig(fdk-aac)
@@ -63,7 +66,9 @@
 BuildRequires:  qt6-base-private-devel
 BuildRequires:  libudev-devel
 BuildRequires:  libv4l-devel
+%if %{without split_obs_x264}
 BuildRequires:  libx264-devel
+%endif
 BuildRequires:  mbedtls-devel
 BuildRequires:  pipewire-devel
 BuildRequires:  pkgconfig
@@ -124,6 +129,7 @@
 %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
 #
@@ -132,6 +138,7 @@
 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
@@ -211,7 +218,9 @@
 # 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.*
@@ -222,11 +231,14 @@
 %{_datadir}/applications/com.obsproject.Studio.desktop
 %{_datadir}/icons/hicolor
 %{_datadir}/obs/
+%if %{with split_obs_x264}
 %exclude %{_datadir}/obs/obs-x264/
 
+%if %{with split_obs_x264}
 %files x264
 %{_libdir}/obs-plugins/obs-x264.so
 %{_datadir}/obs/obs-x264/
+%endif
 
 %files devel
 %{_libdir}/libobs.so

ffmpeg-x11-linking.patch Added

libx264-optional.patch Added

Changes of Revision 13