From d94e35ef313b9becd4bc3b2b1afdecffc63fedee98ca083a0a25ebf39248af18 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 15 Mar 2020 18:07:57 +0000 Subject: [PATCH 1/4] Accepting request 785380 from home:guoyunhe:branches:multimedia:libs - Enable libsmbclient support OBS-URL: https://build.opensuse.org/request/show/785380 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=105 --- ffmpeg-4.changes | 5 +++++ ffmpeg-4.spec | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index 1ead746..48d3eae 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Mar 15 11:22:21 UTC 2020 - Yunhe Guo + +- Enable libsmbclient support + ------------------------------------------------------------------- Tue Mar 3 13:07:51 UTC 2020 - Bjørn Lie diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index 07aafb8..2c978a6 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -47,11 +47,12 @@ %bcond_with amrwb %bcond_without cuda_sdk %else -%bcond_with cuda_sdk +%bcond_with cuda_sdk %endif %bcond_with fdk_aac_dlopen %bcond_with librtmp %bcond_with opencore +%bcond_with smbclient %bcond_with x264 %bcond_with x265 %bcond_with xvid @@ -643,6 +644,10 @@ LDFLAGS="%_lto_cflags" \ %if %{with rubberband} --enable-librubberband \ %endif +%if %{with smbclient} + --enable-libsmbclient \ + --enable-version3 \ +%endif %if %{with soxr} --enable-libsoxr \ %endif From 3e933d51a88af0c6906789cf51b101b2d7da52e13868b21ae373113d56967305 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 16 Mar 2020 16:59:03 +0000 Subject: [PATCH 2/4] Accepting request 785645 from home:AndreasSchwab:f - Add -ffat-lto-objects to _lto_cflags to fix configure checks OBS-URL: https://build.opensuse.org/request/show/785645 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=106 --- ffmpeg-4.changes | 5 +++++ ffmpeg-4.spec | 3 +++ 2 files changed, 8 insertions(+) diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index 48d3eae..f8d248c 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 16 13:30:41 UTC 2020 - Andreas Schwab + +- Add -ffat-lto-objects to _lto_cflags to fix configure checks + ------------------------------------------------------------------- Sun Mar 15 11:22:21 UTC 2020 - Yunhe Guo diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index 2c978a6..ffcd53d 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -583,6 +583,9 @@ break compatibility without any notice. %ifarch %ix86 %arm %define _lto_cflags %nil %endif +%if "%_lto_cflags" != "" +%global _lto_cflags %_lto_cflags -ffat-lto-objects +%endif CFLAGS="%optflags" \ %if %suse_version > 1500 %ifarch %ix86 From 9ab3a296eea34790002e85ef26d32eb1eab2e6268688c70d1149ae1031a942d0 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 16 Mar 2020 16:59:57 +0000 Subject: [PATCH 3/4] Revert req785380 because it did not actually turn on SMB OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=107 --- ffmpeg-4.changes | 5 ----- ffmpeg-4.spec | 5 ----- 2 files changed, 10 deletions(-) diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index f8d248c..1db48dd 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -3,11 +3,6 @@ Mon Mar 16 13:30:41 UTC 2020 - Andreas Schwab - Add -ffat-lto-objects to _lto_cflags to fix configure checks -------------------------------------------------------------------- -Sun Mar 15 11:22:21 UTC 2020 - Yunhe Guo - -- Enable libsmbclient support - ------------------------------------------------------------------- Tue Mar 3 13:07:51 UTC 2020 - Bjørn Lie diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index ffcd53d..ccef63b 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -52,7 +52,6 @@ %bcond_with fdk_aac_dlopen %bcond_with librtmp %bcond_with opencore -%bcond_with smbclient %bcond_with x264 %bcond_with x265 %bcond_with xvid @@ -647,10 +646,6 @@ LDFLAGS="%_lto_cflags" \ %if %{with rubberband} --enable-librubberband \ %endif -%if %{with smbclient} - --enable-libsmbclient \ - --enable-version3 \ -%endif %if %{with soxr} --enable-libsoxr \ %endif From 7d6c360a1b6fa87eefe7082da9e752c2f84c603ebaf0b665cc36c28260dfe2c6 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 30 Mar 2020 08:13:15 +0000 Subject: [PATCH 4/4] Accepting request 789660 from home:scarabeus_iv:branches:multimedia:libs - 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 --- ffmpeg-4.changes | 8 ++++++++ ffmpeg-4.spec | 13 ------------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index 1db48dd..ea9c102 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Mar 30 07:14:39 UTC 2020 - Tomáš Chvátal + +- 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 diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index ccef63b..153dc65 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -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