pool/ffmpeg-4
SHA256
2
0
Fork 3
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Accepting request 789667 from multimedia:libs

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/789667
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ffmpeg-4?expand=0&rev=25
This commit is contained in:
Dominique Leuenberger 2020-03-31 15:32:34 +00:00 committed by Git OBS Bridge
commit 131fdd0c2f
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ffmpeg-4.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
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>
- Add -ffat-lto-objects to _lto_cflags to fix configure checks
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 3 13:07:51 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com> Tue Mar 3 13:07:51 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>

18
ffmpeg-4.spec
View File

@ -47,7 +47,7 @@
%bcond_with amrwb %bcond_with amrwb
%bcond_without cuda_sdk %bcond_without cuda_sdk
%else %else
%bcond_with cuda_sdk %bcond_with cuda_sdk
%endif %endif
%bcond_with fdk_aac_dlopen %bcond_with fdk_aac_dlopen
%bcond_with librtmp %bcond_with librtmp
@ -56,13 +56,6 @@
%bcond_with x265 %bcond_with x265
%bcond_with xvid %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 %if 0%{?suse_version} > 1500
%bcond_without libaom %bcond_without libaom
%bcond_without mysofa %bcond_without mysofa
@ -582,6 +575,9 @@ break compatibility without any notice.
%ifarch %ix86 %arm %ifarch %ix86 %arm
%define _lto_cflags %nil %define _lto_cflags %nil
%endif %endif
%if "%_lto_cflags" != ""
%global _lto_cflags %_lto_cflags -ffat-lto-objects
%endif
CFLAGS="%optflags" \ CFLAGS="%optflags" \
%if %suse_version > 1500 %if %suse_version > 1500
%ifarch %ix86 %ifarch %ix86
@ -735,14 +731,10 @@ done
%install %install
b="%buildroot" b="%buildroot"
%make_install install-man %make_install install-man
%if %{with full_build}
rm -Rf "$b/%_datadir/ffmpeg/examples" rm -Rf "$b/%_datadir/ffmpeg/examples"
for i in %extratools; do for i in %extratools; do
cp -a "tools/$i" "$b/%_bindir/" cp -a "tools/$i" "$b/%_bindir/"
done done
%else
rm -Rf "$b/%_bindir" "$b/%_mandir/man1" "$b/%_datadir/ffmpeg"
%endif
# Install private headers required by libav-tools # Install private headers required by libav-tools
for i in libavformat/options_table.h libavformat/os_support.h \ for i in libavformat/options_table.h libavformat/os_support.h \
@ -773,13 +765,11 @@ done
%post -n libswscale5 -p /sbin/ldconfig %post -n libswscale5 -p /sbin/ldconfig
%postun -n libswscale5 -p /sbin/ldconfig %postun -n libswscale5 -p /sbin/ldconfig
%if %{with full_build}
%files %files
%doc Changelog CREDITS README.md %doc Changelog CREDITS README.md
%_bindir/* %_bindir/*
%_mandir/man1/ff*.1* %_mandir/man1/ff*.1*
%_datadir/ffmpeg/ %_datadir/ffmpeg/
%endif
%files -n libavcodec58 %files -n libavcodec58
%license COPYING.GPLv2 LICENSE.md %license COPYING.GPLv2 LICENSE.md