fkastl/ffmpeg-4
SHA256
1
0
Fork 0
forked from jengelh/ffmpeg-4
Code Pull Requests Activity

Accepting request 789660 from home:scarabeus_iv:branches:multimedia:libs

Browse Source 
- Always build the binary ffmpeg-4 even on Leap releases boo#1167628:
  * The conflicts in place should allow users to decide if they
    want to use ffmpeg from ffmpeg package or ffmpeg-4 from this
    package

OBS-URL: https://build.opensuse.org/request/show/789660
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=108
This commit is contained in:
Jan Engelhardt 2020-03-30 08:13:15 +00:00 committed by Git OBS Bridge
parent 9ab3a296ee
commit 7d6c360a1b
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ffmpeg-4.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Mar 30 07:14:39 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
- Always build the binary ffmpeg-4 even on Leap releases boo#1167628:
* The conflicts in place should allow users to decide if they
want to use ffmpeg from ffmpeg package or ffmpeg-4 from this
package
-------------------------------------------------------------------
Mon Mar 16 13:30:41 UTC 2020 - Andreas Schwab <schwab@linux-m68k.org>

13
ffmpeg-4.spec
View File

@ -56,13 +56,6 @@
%bcond_with x265
%bcond_with xvid
# Full build or just support package on older codestream
%if 0%{?suse_version} > 1500
%bcond_without full_build
%else
%bcond_with full_build
%endif
%if 0%{?suse_version} > 1500
%bcond_without libaom
%bcond_without mysofa
@ -738,14 +731,10 @@ done
%install
b="%buildroot"
%make_install install-man
%if %{with full_build}
rm -Rf "$b/%_datadir/ffmpeg/examples"
for i in %extratools; do
cp -a "tools/$i" "$b/%_bindir/"
done
%else
rm -Rf "$b/%_bindir" "$b/%_mandir/man1" "$b/%_datadir/ffmpeg"
%endif
# Install private headers required by libav-tools
for i in libavformat/options_table.h libavformat/os_support.h \
@ -776,13 +765,11 @@ done
%post -n libswscale5 -p /sbin/ldconfig
%postun -n libswscale5 -p /sbin/ldconfig
%if %{with full_build}
%files
%doc Changelog CREDITS README.md
%_bindir/*
%_mandir/man1/ff*.1*
%_datadir/ffmpeg/
%endif
%files -n libavcodec58
%license COPYING.GPLv2 LICENSE.md