Accepting request 1056269 from home:iznogood:branches:multimedia:libs

- Disable ffmpeg support, only needed for pw-play and pw-record.
  Break a circular dependency with ffmpeg-5. Do this via disabling
  pkgconfig(libavcodec), pkgconfig(libavfilter) and
  pkgconfig(libavformat) BuildRequires as well as passing
  ffmpeg=disabled to meson.


See https://lists.opensuse.org/archives/list/factory@lists.opensuse.org/thread/HJLBARP5AEW77UMVR2EDVRUFKZAAFE3T/

OBS-URL: https://build.opensuse.org/request/show/1056269
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pipewire?expand=0&rev=101
This commit is contained in:
Antonio Larrosa 2023-01-11 09:06:26 +00:00 committed by Git OBS Bridge
parent 35e8a91d0a
commit d7413215b1
2 changed files with 15 additions and 5 deletions

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Jan 5 20:07:10 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
- Disable ffmpeg support, only needed for pw-play and pw-record.
Break a circular dependency with ffmpeg-5. Do this via disabling
pkgconfig(libavcodec), pkgconfig(libavfilter) and
pkgconfig(libavformat) BuildRequires as well as passing
ffmpeg=disabled to meson.
-------------------------------------------------------------------
Wed Jan 4 11:25:48 UTC 2023 - Antonio Larrosa <alarrosa@suse.com>

View File

@ -113,9 +113,10 @@ BuildRequires: pkgconfig(jack) >= 1.9.10
BuildRequires: pkgconfig(ldacBT-abr)
BuildRequires: pkgconfig(ldacBT-enc)
%endif
BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(libavfilter)
BuildRequires: pkgconfig(libavformat)
# ffmpeg disabled on purpose, only used for pw-play and pw-record (break circular dependency with ffmpeg).
#BuildRequires: pkgconfig(libavcodec)
#BuildRequires: pkgconfig(libavfilter)
#BuildRequires: pkgconfig(libavformat)
%if %{with libcamera}
BuildRequires: libcamera-devel >= 0.0.1
%endif
@ -379,7 +380,7 @@ export CXX=g++-9
-Ddocs=enabled \
-Dman=enabled \
-Dgstreamer=enabled \
-Dffmpeg=enabled \
-Dffmpeg=disabled \
-Dsystemd=enabled \
-Dsystemd-user-unit-dir=%{_userunitdir} \
-Dgstreamer-device-provider=disabled \
@ -601,7 +602,7 @@ fi
%{_libdir}/spa-%{spa_ver}/avb/
%{_libdir}/spa-%{spa_ver}/bluez5/
%{_libdir}/spa-%{spa_ver}/control/
%{_libdir}/spa-%{spa_ver}/ffmpeg/
#%%{_libdir}/spa-%%{spa_ver}/ffmpeg/
%{_libdir}/spa-%{spa_ver}/jack/
%if %{with libcamera}
%{_libdir}/spa-%{spa_ver}/libcamera/