From 996c1e0368d3abc7d5c88c656807860563e428c2e09e03be9ad33aaf841a180f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 18 Jul 2018 12:16:12 +0000 Subject: [PATCH 1/7] Accepting request 623645 from home:scarabeus_iv:branches:OBS_Maintained:chromium SLE-12 Backports support OBS-URL: https://build.opensuse.org/request/show/623645 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=7 --- ffmpeg-4.changes | 11 +++++++++++ ffmpeg-4.spec | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index f9ea0b3..63d664c 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Jul 18 12:13:38 UTC 2018 - tchvatal@suse.com + +- Add new bconds to build on SLE12 backports project without + requiring extra packages: + * %bcond_without codec2 + * %bcond_without bs2b + * %bcond_without lv2 + * %bcond_without rubberband + * %bcond_without soxr + ------------------------------------------------------------------- Fri Jul 6 10:54:14 UTC 2018 - tchvatal@suse.com diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index 22a842a..7f40e95 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -75,6 +75,21 @@ %bcond_with openmpt %endif +%if 0%{?suse_version} > 1500 || 0%{?is_opensuse} +%bcond_without codec2 +%bcond_without bs2b +%bcond_without lv2 +%bcond_without rubberband +%bcond_without soxr +%else +# backports SLE12 +%bcond_with codec2 +%bcond_with bs2b +%bcond_with lv2 +%bcond_with rubberband +%bcond_with soxr +%endif + %define _name ffmpeg %define _major_version 4 %define _major_expected 5 @@ -110,7 +125,9 @@ BuildRequires: pkg-config BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(celt) >= 0.11.0 +%if %{with codec2} BuildRequires: pkgconfig(codec2) +%endif BuildRequires: pkgconfig(enca) BuildRequires: pkgconfig(fontconfig) >= 2.4.2 BuildRequires: pkgconfig(freetype2) @@ -119,7 +136,9 @@ BuildRequires: pkgconfig(gnutls) BuildRequires: pkgconfig(jack) BuildRequires: pkgconfig(libass) BuildRequires: pkgconfig(libbluray) +%if %{with bs2b} BuildRequires: pkgconfig(libbs2b) +%endif BuildRequires: pkgconfig(libcdio) BuildRequires: pkgconfig(libcdio_paranoia) BuildRequires: pkgconfig(libdc1394-2) @@ -139,12 +158,18 @@ BuildRequires: pkgconfig(libva) >= 0.35.0 BuildRequires: pkgconfig(libwebp) >= 0.4 BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libzmq) +%if %{with lv2} BuildRequires: pkgconfig(lilv-0) +%endif BuildRequires: pkgconfig(ogg) BuildRequires: pkgconfig(opus) +%if %{with rubberband} BuildRequires: pkgconfig(rubberband) +%endif BuildRequires: pkgconfig(sdl2) +%if %{with soxr} BuildRequires: pkgconfig(soxr) +%endif BuildRequires: pkgconfig(speex) %if %{with srt} BuildRequires: pkgconfig(srt) @@ -555,7 +580,9 @@ CFLAGS="%optflags" \ --enable-libbluray \ --enable-libcelt \ --enable-libcdio \ +%if %{with codec2} --enable-libcodec2 \ +%endif --enable-libdc1394 \ --enable-libfontconfig \ --enable-libfreetype \ @@ -572,8 +599,12 @@ CFLAGS="%optflags" \ %endif --enable-libopus \ --enable-libpulse \ +%if %{with rubberband} --enable-librubberband \ +%endif +%if %{with soxr} --enable-libsoxr \ +%endif --enable-libspeex \ --enable-libssh \ %if %{with srt} @@ -594,7 +625,9 @@ CFLAGS="%optflags" \ %endif --enable-libzmq \ --enable-libzvbi \ +%if %{with lv2} --enable-lv2 \ +%endif --enable-vaapi \ --enable-vdpau \ %if %{with fdk_aac} From ec9556a88ccbfb3a8e6b3c1a09654affb4562d6cabb601df49e45f8e35fe6bf7 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 18 Jul 2018 12:55:02 +0000 Subject: [PATCH 2/7] Accepting request 623647 from home:scarabeus_iv:branches:OBS_Maintained:chromium SLE-12 Backports support OBS-URL: https://build.opensuse.org/request/show/623647 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=8 --- ffmpeg-4.changes | 1 + ffmpeg-4.spec | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index 63d664c..d1013d1 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -8,6 +8,7 @@ Wed Jul 18 12:13:38 UTC 2018 - tchvatal@suse.com * %bcond_without lv2 * %bcond_without rubberband * %bcond_without soxr + * %bcond_without zmq ------------------------------------------------------------------- Fri Jul 6 10:54:14 UTC 2018 - tchvatal@suse.com diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index 7f40e95..6280392 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -81,6 +81,7 @@ %bcond_without lv2 %bcond_without rubberband %bcond_without soxr +%bcond_without zmq %else # backports SLE12 %bcond_with codec2 @@ -88,6 +89,7 @@ %bcond_with lv2 %bcond_with rubberband %bcond_with soxr +%bcond_with zmq %endif %define _name ffmpeg @@ -157,7 +159,9 @@ BuildRequires: pkgconfig(libv4l2) BuildRequires: pkgconfig(libva) >= 0.35.0 BuildRequires: pkgconfig(libwebp) >= 0.4 BuildRequires: pkgconfig(libxml-2.0) +%if %{with zmq} BuildRequires: pkgconfig(libzmq) +%endif %if %{with lv2} BuildRequires: pkgconfig(lilv-0) %endif @@ -623,7 +627,9 @@ CFLAGS="%optflags" \ %if %{with zimg} --enable-libzimg \ %endif +%if %{with zmq} --enable-libzmq \ +%endif --enable-libzvbi \ %if %{with lv2} --enable-lv2 \ From 83aac8d607be7a69036fcf043fcbce0b5b7ae2d80d859a94efeacaf2e63b71e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 25 Jul 2018 09:39:26 +0000 Subject: [PATCH 3/7] Accepting request 625204 from home:scarabeus_iv:branches:multimedia:libs - Do not condition nvidia based on BUILD_ORIG all the support is in TW only and not on different instances as such safeguard it with version check only OBS-URL: https://build.opensuse.org/request/show/625204 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=9 --- ffmpeg-4.changes | 7 +++++++ ffmpeg-4.spec | 7 ++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index d1013d1..da06223 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jul 25 08:30:56 UTC 2018 - tchvatal@suse.com + +- Do not condition nvidia based on BUILD_ORIG all the support is in + TW only and not on different instances as such safeguard it with + version check only + ------------------------------------------------------------------- Wed Jul 18 12:13:38 UTC 2018 - tchvatal@suse.com diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index 6280392..fc3646e 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -38,11 +38,6 @@ %{preamble_string} ffmpeg-private-devel %{comparator} %{conflicts_version} \ %{nil} -%if 0%{?BUILD_ORIG} -%bcond_without nvidia -%else -%bcond_with nvidia -%endif %bcond_with fdk_aac %bcond_with librtmp %bcond_with opencore @@ -61,10 +56,12 @@ %bcond_without mysofa %bcond_without vidstab %bcond_without srt +%bcond_without nvidia %else %bcond_with mysofa %bcond_with vidstab %bcond_with srt +%bcond_with nvidia %endif %if 0%{?suse_version} >= 1500 From c290df3da35127579c19d7b450555d446c7f8fa2b1372658bdb951e02321a113 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 25 Jul 2018 09:49:51 +0000 Subject: [PATCH 4/7] version check only bsc#1102532 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=10 --- ffmpeg-4.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index da06223..ba4c67b 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -3,7 +3,7 @@ Wed Jul 25 08:30:56 UTC 2018 - tchvatal@suse.com - Do not condition nvidia based on BUILD_ORIG all the support is in TW only and not on different instances as such safeguard it with - version check only + version check only bsc#1102532 ------------------------------------------------------------------- Wed Jul 18 12:13:38 UTC 2018 - tchvatal@suse.com From 55afa21bc7841b1e6219183121f0c8d8255599279214ab2fef79cc40f9900499 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 26 Jul 2018 10:18:09 +0000 Subject: [PATCH 5/7] Accepting request 625376 from home:scarabeus_iv:branches:multimedia:libs - Redo the nvidia condition based on review feeback OBS-URL: https://build.opensuse.org/request/show/625376 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=11 --- ffmpeg-4.changes | 5 +++++ ffmpeg-4.spec | 14 +++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index ba4c67b..70fc5c9 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 26 08:09:32 UTC 2018 - tchvatal@suse.com + +- Redo the nvidia condition based on review feeback + ------------------------------------------------------------------- Wed Jul 25 08:30:56 UTC 2018 - tchvatal@suse.com diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index fc3646e..09c64ba 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -38,6 +38,16 @@ %{preamble_string} ffmpeg-private-devel %{comparator} %{conflicts_version} \ %{nil} +# nvidia adds library present only after leap15 +%bcond_with nvcodec +%if 0%{?BUILD_ORIG} +%bcond_without nvidia +%if 0%{?suse_version} > 1500 +%bcond_without nvcodec +%endif +%else +%bcond_with nvidia +%endif %bcond_with fdk_aac %bcond_with librtmp %bcond_with opencore @@ -56,12 +66,10 @@ %bcond_without mysofa %bcond_without vidstab %bcond_without srt -%bcond_without nvidia %else %bcond_with mysofa %bcond_with vidstab %bcond_with srt -%bcond_with nvidia %endif %if 0%{?suse_version} >= 1500 @@ -202,7 +210,7 @@ BuildRequires: pkgconfig(fdk-aac) %if %{with librtmp} BuildRequires: pkgconfig(librtmp) %endif -%if %{with nvidia} +%if %{with nvcodec} BuildRequires: pkgconfig(ffnvcodec) %endif %if %{with xvid} From 94d245c68fcf57aa5c501efe34c0bdfccd51040c63b04c39ed0c6ad1ffc32403 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 27 Jul 2018 07:03:21 +0000 Subject: [PATCH 6/7] - Enable "kmsgrab" input device OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=12 --- ffmpeg-4.changes | 5 +++++ ffmpeg-4.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index 70fc5c9..91900c1 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jul 27 07:03:06 UTC 2018 - jengelh@inai.de + +- Enable "kmsgrab" input device + ------------------------------------------------------------------- Thu Jul 26 08:09:32 UTC 2018 - tchvatal@suse.com diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index 09c64ba..7587ddf 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -149,6 +149,7 @@ BuildRequires: pkgconfig(libbs2b) BuildRequires: pkgconfig(libcdio) BuildRequires: pkgconfig(libcdio_paranoia) BuildRequires: pkgconfig(libdc1394-2) +BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libgme) BuildRequires: pkgconfig(liboil-0.3) >= 0.3.15 BuildRequires: pkgconfig(libopenjp2) >= 2.1.0 @@ -593,6 +594,7 @@ CFLAGS="%optflags" \ --enable-libcodec2 \ %endif --enable-libdc1394 \ + --enable-libdrm \ --enable-libfontconfig \ --enable-libfreetype \ --enable-libfribidi \ From 2a180730e47236f91497adcfb0d6749238558f7ebf2cbdd36b2aec41ebad37b4 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 27 Jul 2018 09:30:17 +0000 Subject: [PATCH 7/7] Accepting request 625731 from home:scarabeus_iv:branches:multimedia:libs - Reduce the optional conditional for the SLE12 backports to cover everything, most of the packages in old codestreams were not really ready as they need additional baselibs/etc. * Since these are new features user will simply wait or use TW OBS-URL: https://build.opensuse.org/request/show/625731 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=13 --- ffmpeg-4.changes | 8 ++++++++ ffmpeg-4.spec | 29 ++++++++++++----------------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index 91900c1..25f745b 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jul 27 08:56:56 UTC 2018 - tchvatal@suse.com + +- Reduce the optional conditional for the SLE12 backports to + cover everything, most of the packages in old codestreams were + not really ready as they need additional baselibs/etc. + * Since these are new features user will simply wait or use TW + ------------------------------------------------------------------- Fri Jul 27 07:03:06 UTC 2018 - jengelh@inai.de diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index 7587ddf..30d9ff0 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -66,10 +66,22 @@ %bcond_without mysofa %bcond_without vidstab %bcond_without srt +%bcond_without codec2 +%bcond_without bs2b +%bcond_without lv2 +%bcond_without rubberband +%bcond_without soxr +%bcond_without zmq %else %bcond_with mysofa %bcond_with vidstab %bcond_with srt +%bcond_with codec2 +%bcond_with bs2b +%bcond_with lv2 +%bcond_with rubberband +%bcond_with soxr +%bcond_with zmq %endif %if 0%{?suse_version} >= 1500 @@ -80,23 +92,6 @@ %bcond_with openmpt %endif -%if 0%{?suse_version} > 1500 || 0%{?is_opensuse} -%bcond_without codec2 -%bcond_without bs2b -%bcond_without lv2 -%bcond_without rubberband -%bcond_without soxr -%bcond_without zmq -%else -# backports SLE12 -%bcond_with codec2 -%bcond_with bs2b -%bcond_with lv2 -%bcond_with rubberband -%bcond_with soxr -%bcond_with zmq -%endif - %define _name ffmpeg %define _major_version 4 %define _major_expected 5