diff --git a/mpv.changes b/mpv.changes index 20e2ebb..9327b01 100644 --- a/mpv.changes +++ b/mpv.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Dec 11 11:09:13 UTC 2015 - tchvatal@suse.com + +- Sort out the ffmpeg deps to reduce conditionals + ------------------------------------------------------------------- Thu Dec 3 21:04:26 UTC 2015 - dmueller@suse.com diff --git a/mpv.spec b/mpv.spec index 69941b1..de610c8 100644 --- a/mpv.spec +++ b/mpv.spec @@ -56,6 +56,11 @@ BuildRequires: pkgconfig(enca) BuildRequires: pkgconfig(jack) BuildRequires: pkgconfig(lcms2) >= 2.6 BuildRequires: pkgconfig(libass) >= 0.12.1 +BuildRequires: pkgconfig(libavcodec) +BuildRequires: pkgconfig(libavdevice) >= 55.0.0 +BuildRequires: pkgconfig(libavfilter) >= 5.0.0 +BuildRequires: pkgconfig(libavformat) +BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libbluray) >= 0.3.0 BuildRequires: pkgconfig(libbs2b) BuildRequires: pkgconfig(libcdio) @@ -63,6 +68,7 @@ BuildRequires: pkgconfig(libcdio_cdda) BuildRequires: pkgconfig(libcdio_paranoia) BuildRequires: pkgconfig(libiso9660) BuildRequires: pkgconfig(libpulse) >= 1.0 +BuildRequires: pkgconfig(libswresample) >= 1.1.100 BuildRequires: pkgconfig(libswscale) BuildRequires: pkgconfig(libudf) BuildRequires: pkgconfig(libv4l2) @@ -84,21 +90,7 @@ BuildRequires: pkgconfig(zlib) Recommends: youtube-dl BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?BUILD_ORIG} -# ffmpeg pkgconfig not possible on factory due to missing preffer in prjconfigs -BuildRequires: pkgconfig(libavcodec) -BuildRequires: pkgconfig(libavdevice) >= 55.0.0 -BuildRequires: pkgconfig(libavfilter) >= 5.0.0 -BuildRequires: pkgconfig(libavformat) -BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libmpg123) -BuildRequires: pkgconfig(libswresample) >= 1.1.100 -%else -BuildRequires: libavcodec-devel -BuildRequires: libavdevice-devel -BuildRequires: libavfilter-devel -BuildRequires: libavformat-devel -BuildRequires: libavutil-devel -BuildRequires: libswscale-devel %endif # PDF manual. # JIT for lua. @@ -192,7 +184,7 @@ export CCFLAGS="%{optflags}" %install ./waf --destdir=%{buildroot} install -install -D -m 0644 %{S:3} %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/%{name}.png +install -D -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/%{name}.png %post %desktop_database_post