diff --git a/ffmpeg.spec b/ffmpeg.spec index b83ce1b..f32833c 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -39,7 +39,24 @@ %bcond_without dc1394 %endif -# Break chromaprint dependency cycle: +%if 0%{?rhel} +# Disable dependencies not offered in RHEL/EPEL +%bcond_with crystalhd +%bcond_with omxil +%else + +# crystalhd isn't available on IBM Z +%ifarch s390 s390x +%bcond_with crystalhd +%else +%bcond_without crystalhd +%endif + +%bcond_without omxil + +%endif + +# Break chromaprint dependency cycle (Fedora-only): # ffmpeg (libavcodec-free) → chromaprint → ffmpeg %if %{with bootstrap} %bcond_with chromaprint @@ -47,10 +64,6 @@ %bcond_without chromaprint %endif -%if 0%{?rhel} -# Disable dependencies not offered in RHEL -%bcond_with chromaprint -%endif %if %{with all_codecs} %bcond_without rtmp @@ -84,7 +97,7 @@ Name: ffmpeg %global pkg_name %{name}%{?pkg_suffix} -Version: 5.1 +Version: 5.1.1 Release: 1%{?dist} Summary: A complete solution to record, convert and stream audio and video License: GPLv3+ @@ -132,7 +145,7 @@ BuildRequires: gnupg2 BuildRequires: gsm-devel BuildRequires: ladspa-devel BuildRequires: lame-devel -%ifnarch s390 s390x +%if %{with crystalhd} BuildRequires: libcrystalhd-devel %endif BuildRequires: libgcrypt-devel @@ -167,7 +180,9 @@ BuildRequires: pkgconfig(libchromaprint) BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libjxl) BuildRequires: pkgconfig(libmodplug) +%if %{with omxil} BuildRequires: pkgconfig(libomxil-bellagio) +%endif BuildRequires: pkgconfig(libopenjp2) BuildRequires: pkgconfig(libopenmpt) BuildRequires: pkgconfig(libpulse) @@ -855,6 +870,11 @@ rm -rf %{buildroot}%{_datadir}/%{name}/examples %{_mandir}/man3/libswscale.3* %changelog +* Sun Sep 04 2022 Neal Gompa - 5.1.1-1 +- Update to version 5.1.1 +- Refresh dlopen headers for OpenH264 2.3.0 +- Disable omxil and crystalhd for RHEL + * Wed Aug 24 2022 Neal Gompa - 5.1-1 - Rebase to version 5.1 diff --git a/sources b/sources index ef3a73d..f7d9d74 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (ffmpeg-free-5.1.tar.xz) = 01ee9f329cd84406c392ed66b1a48f383740b8f44d5c049b26c5fe531d9f3a4ed18d4ff49678c7d78538bf7a115ddfae0b8d2cc288e1bbd857b6a8831d2bc1a4 -SHA512 (ffmpeg-5.1.tar.xz.asc) = 41fe8f4865bcd6829f9e7223d05bd7ad58b15e52969c556f0e218ab562fbe0264b37248ea494cd7ae1c4968d79ad59d7f28a1692a8d0838d0de646818ea9b933 -SHA512 (ffmpeg-dlopen-headers.tar.xz) = 3f0c66bea4c9b5135cf1a9883ae5ee433509bad6948eea2ea9f7d5e94276c278ef54e29e8e98fd9f16151fcc8fa0355c672b8ca3e2e2d9e32af61206f6cd05e6 +SHA512 (ffmpeg-free-5.1.1.tar.xz) = 6fb081c3c4ebd368c1ff29c1ac79c241c3454e477188d1283bd833dafcbda8f66415cb4f01dc482c78dc45e470700cd750e4d08fd103cca594b6dbe9279de5fb +SHA512 (ffmpeg-5.1.1.tar.xz.asc) = 4910dbccd108ffec03d08f96a497261964c22a234c786547de136953f57232d315cfd9790d943ad41a299d529ace259439e628c4e0fe6f4b6ff7363baa9c1be5 +SHA512 (ffmpeg-dlopen-headers.tar.xz) = 77e4676562f0cc726f83a6813861c87a546e3108cf7766fef490a03d87636a367cdb685646473f918702028113a569caaf7b2716015224b3bc742b01bfac6cb3 SHA512 (ffmpeg.keyring) = 9b36506835db36f776b7ddb53ad6fa9e915e6ca2f9c7cfebe8eb45513e1036a985283590a840ca313a111bf35dc3731f68885aaafb1fb7011ec433cc119e5165