@@ -768,6 +768,20 @@

 - Remove 8376.patch

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

+Thu May 18 01:22:55 UTC 2023 - Marcus Rueckert <mrueckert@suse.de>

+

+- packaging fixes

+  - Build with Qt6 (can be switched with the qt_version define on

+    top)

+  - update buildrequires for the websocket support

+    - pkgconfig(asio)

+    - pkgconfig(websocketpp)

+    - pkgconfig(nlohmann_json)

+  - enable sndio support (new BR: sndio-devel)

+  - pkgconfig(uuid) is now required

+  - enable libfdk support to fix AAC support

+

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

 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

​

@@ -7,6 +7,9 @@

 %bcond_with cef

 %endif

+%define qt_version 6

+%bcond_without websockets

+

 Name:           obs-studio

 Version:        29.1.2

 Release:        0

@@ -40,10 +43,17 @@

 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

 BuildRequires:  libx264-devel

@@ -51,27 +61,31 @@

 BuildRequires:  pipewire-devel

 BuildRequires:  pkgconfig

 BuildRequires:  pkgconfig(alsa)

-BuildRequires:  pkgconfig(asio)

 BuildRequires:  pkgconfig(jack)

 BuildRequires:  pkgconfig(libavcodec)

 BuildRequires:  pkgconfig(libavdevice)

 BuildRequires:  pkgconfig(libavfilter)

 BuildRequires:  pkgconfig(libavformat)

 BuildRequires:  pkgconfig(libavutil)

+BuildRequires:  pkgconfig(libmfx)

 BuildRequires:  pkgconfig(librist)

 BuildRequires:  pkgconfig(libswresample)

 BuildRequires:  pkgconfig(libswscale)

 BuildRequires:  pkgconfig(libva)

 BuildRequires:  pkgconfig(lua)

 BuildRequires:  pkgconfig(luajit)

-BuildRequires:  pkgconfig(nlohmann_json)

 BuildRequires:  pkgconfig(srt) >= 1.4

 BuildRequires:  pkgconfig(uuid)

-BuildRequires:  pkgconfig(websocketpp)

+%if %{with websockets}

+BuildRequires:  pkgconfig(nlohmann_json) >= 3

+BuildRequires:  pkgconfig(websocketpp) >= 0.8.0

+BuildRequires:  pkgconfig(asio) >= 1.12.1

+%endif

 BuildRequires:  python3-devel

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

 BuildRequires:  speexdsp-devel

 %endif

+BuildRequires:  sndio-devel

 BuildRequires:  swig

 BuildRequires:  vlc-devel

 %if %{with cef}

@@ -127,6 +141,13 @@

   -DENABLE_PIPEWIRE=OFF \

 %endif

   -DENABLE_JACK=ON \

+  -DENABLE_LIBFDK=ON \

+  -DENABLE_SNDIO=ON \

+%if %{with websockets}

+  -DENABLE_WEBSOCKET=ON \

+%else

+  -DENABLE_WEBSOCKET=OFF \

+%endif

 %if %{with cef}

   -DBUILD_BROWSER=ON \

   -DCEF_ROOT_DIR="%{_builddir}/%{cef_binary}" \

@@ -135,6 +156,8 @@

 %endif

   ..

+%cmake_build

+

 %install

 %cmake_install

 %suse_update_desktop_file com.obsproject.Studio

@@ -153,12 +176,12 @@

 %{_bindir}/obs-ffmpeg-mux

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

 # by moving them to the proper directory.

-%{_libdir}/obs-plugins

+%{_libdir}/obs-plugins/

 %{_libdir}/libobs.so.*

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

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

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

-%{_libdir}/obs-scripting

+%{_libdir}/obs-scripting/

 %dir %{_datadir}/metainfo

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

 %{_datadir}/applications/com.obsproject.Studio.desktop

@@ -173,4 +196,5 @@

 %{_libdir}/cmake

 %{_libdir}/pkgconfig/libobs.pc

 %{_includedir}/obs

+

 %changelog

​