From c985807e7b64e5e685c2f54a6d1da0273d421b89 Mon Sep 17 00:00:00 2001 From: RPM Fusion Release Engineering Date: Thu, 10 Feb 2022 13:38:19 +0100 Subject: [PATCH 01/19] Initial setup of the repo --- .gitignore | 0 sources | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From 88a45388d5e657675b5cb8581c349105b5aa3c4b Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Thu, 10 Feb 2022 13:23:09 +0000 Subject: [PATCH 02/19] Initial build --- .gitignore | 1 + compat-ffmpeg4.spec | 334 ++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 336 insertions(+) create mode 100644 compat-ffmpeg4.spec diff --git a/.gitignore b/.gitignore index e69de29..20c477f 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/ffmpeg-4.3.3.tar.xz diff --git a/compat-ffmpeg4.spec b/compat-ffmpeg4.spec new file mode 100644 index 0000000..aa53f9e --- /dev/null +++ b/compat-ffmpeg4.spec @@ -0,0 +1,334 @@ +%undefine _package_note_file + +# Cuda and others are only available on some arches +%if 0%{?el7} +%global _without_aom 1 +%global _without_dav1d 1 +%global _without_frei0r 1 +%global _without_opus 1 +%global _without_vpx 1 +%endif + +%if 0%{?fedora} || 0%{?rhel} > 7 +%ifarch x86_64 +%global _with_mfx 1 +%endif +%endif + +# Disable nvenc when not relevant +%ifnarch x86_64 aarch64 +%global _without_nvenc 1 +%endif + +%if 0%{?_without_gpl} +%global lesser L +%endif + +%if 0%{!?_without_amr} || 0%{?_with_gmp} +%global ffmpeg_license %{?lesser}GPLv3+ +%else +%global ffmpeg_license %{?lesser}GPLv2+ +%endif + +Summary: Digital VCR and streaming server +Name: compat-ffmpeg4 +Version: 4.3.3 +Release: 1%{?dist} +License: %{ffmpeg_license} +URL: http://ffmpeg.org/ +Source0: %{url}/releases/ffmpeg-%{version}.tar.xz + +BuildRequires: gcc +BuildRequires: alsa-lib-devel +BuildRequires: bzip2-devel +%{?_with_faac:BuildRequires: faac-devel} +%{?_with_fdk_aac:BuildRequires: fdk-aac-devel} +%{?_with_flite:BuildRequires: flite-devel} +BuildRequires: fontconfig-devel +BuildRequires: freetype-devel +BuildRequires: fribidi-devel +%{!?_without_frei0r:BuildRequires: frei0r-devel} +%{?_with_gme:BuildRequires: game-music-emu-devel} +BuildRequires: gnutls-devel +BuildRequires: gsm-devel +%{?_with_ilbc:BuildRequires: ilbc-devel} +BuildRequires: lame-devel >= 3.98.3 +%{!?_without_jack:BuildRequires: jack-audio-connection-kit-devel} +%{!?_without_ladspa:BuildRequires: ladspa-devel} +%{!?_without_aom:BuildRequires: libaom-devel} +%{!?_without_dav1d:BuildRequires: libdav1d-devel >= 0.2.1} +%{!?_without_ass:BuildRequires: libass-devel} +%{!?_without_bluray:BuildRequires: libbluray-devel} +%{?_with_bs2b:BuildRequires: libbs2b-devel} +%{?_with_caca:BuildRequires: libcaca-devel} +%{!?_without_cdio:BuildRequires: libcdio-paranoia-devel} +%{?_with_chromaprint:BuildRequires: libchromaprint-devel} +%{?_with_crystalhd:BuildRequires: libcrystalhd-devel} +%if 0%{?_with_ieee1394} +BuildRequires: libavc1394-devel +BuildRequires: libdc1394-devel +BuildRequires: libiec61883-devel +%endif +BuildRequires: libdrm-devel +BuildRequires: libgcrypt-devel +BuildRequires: libGL-devel +BuildRequires: libmodplug-devel +BuildRequires: libmysofa-devel +BuildRequires: libopenmpt-devel +BuildRequires: librsvg2-devel +%{?_with_rtmp:BuildRequires: librtmp-devel} +BuildRequires: libssh-devel +BuildRequires: libtheora-devel +BuildRequires: libv4l-devel +%{?!_without_vaapi:BuildRequires: libva-devel >= 0.31.0} +BuildRequires: libvdpau-devel +BuildRequires: libvorbis-devel +%{?!_without_vpx:BuildRequires: libvpx-devel >= 1.4.0} +%{?_with_mfx:BuildRequires: pkgconfig(libmfx) >= 1.23-1} +%ifarch %{ix86} x86_64 +BuildRequires: nasm +%endif +%{?_with_webp:BuildRequires: libwebp-devel} +%{?_with_netcdf:BuildRequires: netcdf-devel} +%{?_with_rpi:BuildRequires: raspberrypi-vc-devel} +%{!?_without_nvenc:BuildRequires: nv-codec-headers} +%{!?_without_amr:BuildRequires: opencore-amr-devel vo-amrwbenc-devel} +%{?_with_omx:BuildRequires: libomxil-bellagio-devel} +BuildRequires: libxcb-devel +BuildRequires: libxml2-devel +%{!?_without_openal:BuildRequires: openal-soft-devel} +%if 0%{!?_without_opencl:1} +BuildRequires: opencl-headers ocl-icd-devel +%{?fedora:Recommends: opencl-icd} +%endif +%{?_with_opencv:BuildRequires: opencv-devel} +BuildRequires: openjpeg2-devel +%{!?_without_opus:BuildRequires: opus-devel >= 1.1.3} +%{!?_without_pulse:BuildRequires: pulseaudio-libs-devel} +BuildRequires: perl(Pod::Man) +%{?_with_rubberband:BuildRequires: rubberband-devel} +%{?_with_snappy:BuildRequires: snappy-devel} +BuildRequires: soxr-devel +BuildRequires: speex-devel +BuildRequires: pkgconfig(srt) +%{?_with_tesseract:BuildRequires: tesseract-devel} +#BuildRequires: texi2html +BuildRequires: texinfo +%{?_with_twolame:BuildRequires: twolame-devel} +%{?_with_wavpack:BuildRequires: wavpack-devel} +%{!?_without_vidstab:BuildRequires: vid.stab-devel} +%{!?_without_x264:BuildRequires: x264-devel >= 0.0.0-0.31} +%{!?_without_x265:BuildRequires: x265-devel} +%{!?_without_xvid:BuildRequires: xvidcore-devel} +BuildRequires: zimg-devel >= 2.7.0 +BuildRequires: zlib-devel +%{?_with_zmq:BuildRequires: zeromq-devel} +%{!?_without_zvbi:BuildRequires: zvbi-devel} + +%description +FFmpeg is a complete and free Internet live audio and video +broadcasting solution for Linux/Unix. It also includes a digital +VCR. It can encode in real time in many formats including MPEG1 audio +and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash. + +!!! BIG FAT WARNING!!! +This package is made for compatibility with older components +It is not intended to be used in insecure environment. + +%package devel +Summary: Development package for %{name} +Requires: %{name}%{_isa} = %{version}-%{release} +Requires: pkgconfig + +%description devel +FFmpeg is a complete and free Internet live audio and video +broadcasting solution for Linux/Unix. It also includes a digital +VCR. It can encode in real time in many formats including MPEG1 audio +and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash. +This package contains development files for %{name} + +# Don't use the %%configure macro as this is not an autotool script +%global ff_configure \ +./configure \\\ + --prefix=%{_prefix} \\\ + --bindir=%{_bindir} \\\ + --datadir=%{_datadir}/%{name} \\\ + --docdir=%{_docdir}/%{name} \\\ + --incdir=%{_includedir}/%{name} \\\ + --libdir=%{_libdir}/%{name} \\\ + --mandir=%{_mandir} \\\ + --arch=%{_target_cpu} \\\ + --optflags="%{optflags}" \\\ + --extra-ldflags="%{?__global_ldflags}" \\\ + --disable-manpages \\\ + %{!?_without_amr:--enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libvo-amrwbenc --enable-version3} \\\ + --enable-bzlib \\\ + %{?_with_chromaprint:--enable-chromaprint} \\\ + %{!?_with_crystalhd:--disable-crystalhd} \\\ + --enable-fontconfig \\\ + %{!?_without_frei0r:--enable-frei0r} \\\ + --enable-gcrypt \\\ + %{?_with_gmp:--enable-gmp --enable-version3} \\\ + --enable-gnutls \\\ + %{!?_without_ladspa:--enable-ladspa} \\\ + %{!?_without_aom:--enable-libaom} \\\ + %{!?_without_dav1d:--enable-libdav1d} \\\ + %{!?_without_ass:--enable-libass} \\\ + %{!?_without_bluray:--enable-libbluray} \\\ + %{?_with_bs2b:--enable-libbs2b} \\\ + %{?_with_caca:--enable-libcaca} \\\ + %{?_with_cuvid:--enable-cuvid --enable-nonfree} \\\ + %{!?_without_cdio:--enable-libcdio} \\\ + %{?_with_ieee1394:--enable-libdc1394 --enable-libiec61883} \\\ + --enable-libdrm \\\ + %{?_with_faac:--enable-libfaac --enable-nonfree} \\\ + %{?_with_fdk_aac:--enable-libfdk-aac --enable-nonfree} \\\ + %{?_with_flite:--enable-libflite} \\\ + %{!?_without_jack:--enable-libjack} \\\ + --enable-libfreetype \\\ + %{!?_without_fribidi:--enable-libfribidi} \\\ + %{?_with_gme:--enable-libgme} \\\ + --enable-libgsm \\\ + %{?_with_ilbc:--enable-libilbc} \\\ + %{?_with_libnpp:--enable-libnpp --enable-nonfree} \\\ + --enable-libmp3lame \\\ + --enable-libmysofa \\\ + %{?_with_netcdf:--enable-netcdf} \\\ + %{?_with_mmal:--enable-mmal} \\\ + %{!?_without_nvenc:--enable-nvenc} \\\ + %{?_with_omx:--enable-omx} \\\ + %{?_with_omx_rpi:--enable-omx-rpi} \\\ + %{!?_without_openal:--enable-openal} \\\ + %{!?_without_opencl:--enable-opencl} \\\ + %{?_with_opencv:--enable-libopencv} \\\ + %{!?_without_opengl:--enable-opengl} \\\ + --enable-libopenjpeg \\\ + --enable-libopenmpt \\\ + %{!?_without_opus:--enable-libopus} \\\ + %{!?_without_pulse:--enable-libpulse} \\\ + --enable-librsvg \\\ + %{?_with_rtmp:--enable-librtmp} \\\ + %{?_with_rubberband:--enable-librubberband} \\\ + %{?_with_snappy:--enable-libsnappy} \\\ + --enable-libsoxr \\\ + --enable-libspeex \\\ + --enable-libssh \\\ + %{?_with_tesseract:--enable-libtesseract} \\\ + --enable-libtheora \\\ + %{?_with_twolame:--enable-libtwolame} \\\ + --enable-libvorbis \\\ + --enable-libv4l2 \\\ + %{!?_without_vidstab:--enable-libvidstab} \\\ + %{!?_without_vpx:--enable-libvpx} \\\ + %{?_with_webp:--enable-libwebp} \\\ + %{!?_without_x264:--enable-libx264} \\\ + %{!?_without_x265:--enable-libx265} \\\ + %{!?_without_xvid:--enable-libxvid} \\\ + --enable-libxml2 \\\ + --enable-libzimg \\\ + %{?_with_zmq:--enable-libzmq} \\\ + %{!?_without_zvbi:--enable-libzvbi} \\\ + --enable-avfilter \\\ + --enable-libmodplug \\\ + --enable-postproc \\\ + --enable-pthreads \\\ + --disable-static \\\ + --enable-shared \\\ + %{!?_without_gpl:--enable-gpl} \\\ + --disable-debug \\\ + --disable-stripping + + +%prep +%autosetup -p1 -n ffmpeg-%{version} + +# fix -O3 -g in host_cflags +sed -i "s|check_host_cflags -O3|check_host_cflags %{optflags}|" configure + +%build +%{ff_configure}\ + --shlibdir=%{_libdir} \ + --disable-doc \ + --disable-ffmpeg --disable-ffplay --disable-ffprobe \ +%ifnarch %{ix86} + --enable-lto \ +%endif +%ifarch %{ix86} + --cpu=%{_target_cpu} \ +%endif + %{?_with_mfx:--enable-libmfx} \ +%ifarch %{ix86} x86_64 %{power64} + --enable-runtime-cpudetect \ +%endif +%ifarch %{power64} +%ifarch ppc64 + --cpu=g5 \ +%endif +%ifarch ppc64p7 + --cpu=power7 \ +%endif +%ifarch ppc64le + --cpu=power8 \ +%endif + --enable-pic \ +%endif +%ifarch %{arm} + --disable-runtime-cpudetect --arch=arm \ +%ifarch armv6hl + --cpu=armv6 \ +%endif +%ifarch armv7hl armv7hnl + --cpu=armv7-a \ + --enable-vfpv3 \ + --enable-thumb \ +%endif +%ifarch armv7hl + --disable-neon \ +%endif +%ifarch armv7hnl + --enable-neon \ +%endif +%endif + || cat ffbuild/config.log + +%make_build V=1 + +%install +%make_install V=1 +#Alternative ffmpeg package move headers into a special directory +if ! [ %{name} == ffmpeg ] ; then +mkdir -p %{buildroot}%{_libdir}/%{name}/pkgconfig +for s in %{buildroot}/%{_libdir}/*.so ; do + ffmpegsym=`basename ${s}` + ffmpeglib=`readlink ${s}` + echo "Symlink $ffmpeglib" + ln -fs ../${ffmpeglib} \ + %{buildroot}%{_libdir}/%{name}/${ffmpegsym} +done +rm -rf %{buildroot}/%{_libdir}/*.so +fi +rm -rf %{buildroot}/%{_datadir}/compat-ffmpeg4/ + +%ldconfig_scriptlets + + +%files +%doc CREDITS README.md +%license COPYING.* +%{_libdir}/lib*.so.* + + +%files devel +%doc MAINTAINERS doc/APIchanges doc/*.txt +%{_includedir}/%{name} +%dir %{_libdir}/%{name} +%dir %{_libdir}/%{name}/pkgconfig +%{_libdir}/%{name}/pkgconfig/lib*.pc +%{_libdir}/%{name}/lib*.so + + +%changelog +* Wed Feb 09 2022 Leigh Scott - 4.3.3-1 +- Initial build + + diff --git a/sources b/sources index e69de29..f0aa9bf 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +SHA512 (ffmpeg-4.3.3.tar.xz) = 5324ee6711006372a7b6ac2d853df2ad5d78411531e79b72dcdb57709ea66b516bc0e6b0d1321c110d3a0acbac716b2b47e90dc673d5807b23d15699f83951e3 From 012ebac9bf444535f33280694a62d45bbc1ebfb8 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Mon, 14 Feb 2022 13:18:16 +0000 Subject: [PATCH 03/19] Update to 4.4.1 --- .gitignore | 1 + compat-ffmpeg4.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 20c477f..d9711c8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /ffmpeg-4.3.3.tar.xz +/ffmpeg-4.4.1.tar.xz diff --git a/compat-ffmpeg4.spec b/compat-ffmpeg4.spec index aa53f9e..7604ac5 100644 --- a/compat-ffmpeg4.spec +++ b/compat-ffmpeg4.spec @@ -32,7 +32,7 @@ Summary: Digital VCR and streaming server Name: compat-ffmpeg4 -Version: 4.3.3 +Version: 4.4.1 Release: 1%{?dist} License: %{ffmpeg_license} URL: http://ffmpeg.org/ @@ -328,6 +328,9 @@ rm -rf %{buildroot}/%{_datadir}/compat-ffmpeg4/ %changelog +* Mon Feb 14 2022 Leigh Scott - 4.4.1-1 +- Update to 4.4.1 + * Wed Feb 09 2022 Leigh Scott - 4.3.3-1 - Initial build diff --git a/sources b/sources index f0aa9bf..9b95ea9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ffmpeg-4.3.3.tar.xz) = 5324ee6711006372a7b6ac2d853df2ad5d78411531e79b72dcdb57709ea66b516bc0e6b0d1321c110d3a0acbac716b2b47e90dc673d5807b23d15699f83951e3 +SHA512 (ffmpeg-4.4.1.tar.xz) = c651c120b71db6991ffc54abc291986e7d35d776203af327f9a28853d1d0af468ca0956e2d3d893f55a211f70a40c041d5aa9aa9664ef581302b27494be9374e From 85a6d448b0097cfaa7fbb594c0415ad307605678 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sat, 26 Feb 2022 09:26:29 +0000 Subject: [PATCH 04/19] fixup for el9 --- compat-ffmpeg4.spec | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/compat-ffmpeg4.spec b/compat-ffmpeg4.spec index 7604ac5..bbc7990 100644 --- a/compat-ffmpeg4.spec +++ b/compat-ffmpeg4.spec @@ -9,7 +9,18 @@ %global _without_vpx 1 %endif -%if 0%{?fedora} || 0%{?rhel} > 7 +%if 0%{?el9} +%global _without_ass 1 +%global _without_frei0r 1 +%global _without_jack 1 +%global _without_zimg 1 +%ifnarch x86_64 +%global _without_vaapi 1 +%global _with_mfx 1 +%endif +%endif + +%if 0%{?fedora} %ifarch x86_64 %global _with_mfx 1 %endif @@ -120,7 +131,7 @@ BuildRequires: texinfo %{!?_without_x264:BuildRequires: x264-devel >= 0.0.0-0.31} %{!?_without_x265:BuildRequires: x265-devel} %{!?_without_xvid:BuildRequires: xvidcore-devel} -BuildRequires: zimg-devel >= 2.7.0 +%{!?_without_zimg:BuildRequires: zimg-devel >= 2.7.0} BuildRequires: zlib-devel %{?_with_zmq:BuildRequires: zeromq-devel} %{!?_without_zvbi:BuildRequires: zvbi-devel} @@ -225,7 +236,7 @@ This package contains development files for %{name} %{!?_without_x265:--enable-libx265} \\\ %{!?_without_xvid:--enable-libxvid} \\\ --enable-libxml2 \\\ - --enable-libzimg \\\ + %{!?_without_zimg--enable-libzimg} \\\ %{?_with_zmq:--enable-libzmq} \\\ %{!?_without_zvbi:--enable-libzvbi} \\\ --enable-avfilter \\\ From 583f36ce119c973032e96b2974175192a8335d8e Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sat, 26 Feb 2022 09:34:44 +0000 Subject: [PATCH 05/19] fix --- compat-ffmpeg4.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/compat-ffmpeg4.spec b/compat-ffmpeg4.spec index bbc7990..15ab880 100644 --- a/compat-ffmpeg4.spec +++ b/compat-ffmpeg4.spec @@ -14,9 +14,11 @@ %global _without_frei0r 1 %global _without_jack 1 %global _without_zimg 1 +%ifarch x86_64 +%global _with_mfx 1 +%endif %ifnarch x86_64 %global _without_vaapi 1 -%global _with_mfx 1 %endif %endif From 18ab038ce88f772ab9f07c34cd6a646ac726e29d Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Fri, 15 Apr 2022 16:01:56 +0100 Subject: [PATCH 06/19] Update to 4.4.2 release --- .gitignore | 1 + compat-ffmpeg4.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d9711c8..06fe5bd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /ffmpeg-4.3.3.tar.xz /ffmpeg-4.4.1.tar.xz +/ffmpeg-4.4.2.tar.xz diff --git a/compat-ffmpeg4.spec b/compat-ffmpeg4.spec index 15ab880..7856a4b 100644 --- a/compat-ffmpeg4.spec +++ b/compat-ffmpeg4.spec @@ -45,7 +45,7 @@ Summary: Digital VCR and streaming server Name: compat-ffmpeg4 -Version: 4.4.1 +Version: 4.4.2 Release: 1%{?dist} License: %{ffmpeg_license} URL: http://ffmpeg.org/ @@ -53,6 +53,7 @@ Source0: %{url}/releases/ffmpeg-%{version}.tar.xz BuildRequires: gcc BuildRequires: alsa-lib-devel +BuildRequires: AMF-devel BuildRequires: bzip2-devel %{?_with_faac:BuildRequires: faac-devel} %{?_with_fdk_aac:BuildRequires: fdk-aac-devel} @@ -341,6 +342,9 @@ rm -rf %{buildroot}/%{_datadir}/compat-ffmpeg4/ %changelog +* Fri Apr 15 2022 Leigh Scott - 4.4.2-1 +- Update to 4.4.2 + * Mon Feb 14 2022 Leigh Scott - 4.4.1-1 - Update to 4.4.1 diff --git a/sources b/sources index 9b95ea9..1d32a05 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ffmpeg-4.4.1.tar.xz) = c651c120b71db6991ffc54abc291986e7d35d776203af327f9a28853d1d0af468ca0956e2d3d893f55a211f70a40c041d5aa9aa9664ef581302b27494be9374e +SHA512 (ffmpeg-4.4.2.tar.xz) = abce847c607ac6d63fe32ceff8bf8724888acf2b7db9a083cba50e3235590cdcb27feb7e0a314133d0030809fb54d474f64001fc9ab7d896a819159869c09d5a From 9365fc2515521e2cc5ee3f3282552cd51dc9a93c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 12 Jun 2022 06:40:07 +0100 Subject: [PATCH 07/19] Mass rebuild for x264-0.164 --- compat-ffmpeg4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/compat-ffmpeg4.spec b/compat-ffmpeg4.spec index 7856a4b..3c97ead 100644 --- a/compat-ffmpeg4.spec +++ b/compat-ffmpeg4.spec @@ -46,7 +46,7 @@ Summary: Digital VCR and streaming server Name: compat-ffmpeg4 Version: 4.4.2 -Release: 1%{?dist} +Release: 2%{?dist} License: %{ffmpeg_license} URL: http://ffmpeg.org/ Source0: %{url}/releases/ffmpeg-%{version}.tar.xz @@ -342,6 +342,9 @@ rm -rf %{buildroot}/%{_datadir}/compat-ffmpeg4/ %changelog +* Sun Jun 12 2022 Sérgio Basto - 4.4.2-2 +- Mass rebuild for x264-0.164 + * Fri Apr 15 2022 Leigh Scott - 4.4.2-1 - Update to 4.4.2 From b5466ef6fe972d386f72e8564a61cd75fe461879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Thu, 23 Jun 2022 15:08:25 +0200 Subject: [PATCH 08/19] Rebuilt for new AOM, dav1d, rav1e and svt-av1 --- compat-ffmpeg4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/compat-ffmpeg4.spec b/compat-ffmpeg4.spec index 3c97ead..17fa16f 100644 --- a/compat-ffmpeg4.spec +++ b/compat-ffmpeg4.spec @@ -46,7 +46,7 @@ Summary: Digital VCR and streaming server Name: compat-ffmpeg4 Version: 4.4.2 -Release: 2%{?dist} +Release: 3%{?dist} License: %{ffmpeg_license} URL: http://ffmpeg.org/ Source0: %{url}/releases/ffmpeg-%{version}.tar.xz @@ -342,6 +342,9 @@ rm -rf %{buildroot}/%{_datadir}/compat-ffmpeg4/ %changelog +* Thu Jun 23 2022 Robert-André Mauchin - 4.4.2-3 +- Rebuilt for new AOM, dav1d, rav1e and svt-av1 + * Sun Jun 12 2022 Sérgio Basto - 4.4.2-2 - Mass rebuild for x264-0.164 From 7f98f63c31812e9fafc88e81f98954bbef737222 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 7 Aug 2022 01:13:29 +0100 Subject: [PATCH 09/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg 5.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sérgio M. Basto --- compat-ffmpeg4.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/compat-ffmpeg4.spec b/compat-ffmpeg4.spec index 17fa16f..cb42f40 100644 --- a/compat-ffmpeg4.spec +++ b/compat-ffmpeg4.spec @@ -46,7 +46,7 @@ Summary: Digital VCR and streaming server Name: compat-ffmpeg4 Version: 4.4.2 -Release: 3%{?dist} +Release: 4%{?dist} License: %{ffmpeg_license} URL: http://ffmpeg.org/ Source0: %{url}/releases/ffmpeg-%{version}.tar.xz @@ -342,6 +342,10 @@ rm -rf %{buildroot}/%{_datadir}/compat-ffmpeg4/ %changelog +* Sun Aug 07 2022 RPM Fusion Release Engineering - 4.4.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg + 5.1 + * Thu Jun 23 2022 Robert-André Mauchin - 4.4.2-3 - Rebuilt for new AOM, dav1d, rav1e and svt-av1 From 0816a6b4e9e985821e1e356b0faba1f0f74ced92 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 4 Sep 2022 18:04:09 +0100 Subject: [PATCH 10/19] Use standard location for pkgconfig and development libs --- compat-ffmpeg4.spec | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/compat-ffmpeg4.spec b/compat-ffmpeg4.spec index cb42f40..f11e757 100644 --- a/compat-ffmpeg4.spec +++ b/compat-ffmpeg4.spec @@ -46,7 +46,7 @@ Summary: Digital VCR and streaming server Name: compat-ffmpeg4 Version: 4.4.2 -Release: 4%{?dist} +Release: 5%{?dist} License: %{ffmpeg_license} URL: http://ffmpeg.org/ Source0: %{url}/releases/ffmpeg-%{version}.tar.xz @@ -153,6 +153,8 @@ It is not intended to be used in insecure environment. Summary: Development package for %{name} Requires: %{name}%{_isa} = %{version}-%{release} Requires: pkgconfig +Conflicts: ffmpeg-devel +Conflicts: ffmpeg-free-devel %description devel FFmpeg is a complete and free Internet live audio and video @@ -169,7 +171,7 @@ This package contains development files for %{name} --datadir=%{_datadir}/%{name} \\\ --docdir=%{_docdir}/%{name} \\\ --incdir=%{_includedir}/%{name} \\\ - --libdir=%{_libdir}/%{name} \\\ + --libdir=%{_libdir} \\\ --mandir=%{_mandir} \\\ --arch=%{_target_cpu} \\\ --optflags="%{optflags}" \\\ @@ -309,18 +311,6 @@ sed -i "s|check_host_cflags -O3|check_host_cflags %{optflags}|" configure %install %make_install V=1 -#Alternative ffmpeg package move headers into a special directory -if ! [ %{name} == ffmpeg ] ; then -mkdir -p %{buildroot}%{_libdir}/%{name}/pkgconfig -for s in %{buildroot}/%{_libdir}/*.so ; do - ffmpegsym=`basename ${s}` - ffmpeglib=`readlink ${s}` - echo "Symlink $ffmpeglib" - ln -fs ../${ffmpeglib} \ - %{buildroot}%{_libdir}/%{name}/${ffmpegsym} -done -rm -rf %{buildroot}/%{_libdir}/*.so -fi rm -rf %{buildroot}/%{_datadir}/compat-ffmpeg4/ %ldconfig_scriptlets @@ -335,13 +325,14 @@ rm -rf %{buildroot}/%{_datadir}/compat-ffmpeg4/ %files devel %doc MAINTAINERS doc/APIchanges doc/*.txt %{_includedir}/%{name} -%dir %{_libdir}/%{name} -%dir %{_libdir}/%{name}/pkgconfig -%{_libdir}/%{name}/pkgconfig/lib*.pc -%{_libdir}/%{name}/lib*.so +%{_libdir}/pkgconfig/lib*.pc +%{_libdir}/lib*.so %changelog +* Sun Sep 04 2022 Leigh Scott - 4.4.2-5 +- Use standard location for pkgconfig and development libs + * Sun Aug 07 2022 RPM Fusion Release Engineering - 4.4.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg 5.1 From 1913274ce717791ea38a434119915a9aecccedc6 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 4 Sep 2022 21:45:16 +0100 Subject: [PATCH 11/19] Remove pkgconfig provides from devel --- compat-ffmpeg4.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/compat-ffmpeg4.spec b/compat-ffmpeg4.spec index f11e757..7c65778 100644 --- a/compat-ffmpeg4.spec +++ b/compat-ffmpeg4.spec @@ -1,4 +1,5 @@ %undefine _package_note_file +%global __provides_exclude_from ^(%{_libdir}/pkgconfig)/.*$ # Cuda and others are only available on some arches %if 0%{?el7} @@ -46,7 +47,7 @@ Summary: Digital VCR and streaming server Name: compat-ffmpeg4 Version: 4.4.2 -Release: 5%{?dist} +Release: 6%{?dist} License: %{ffmpeg_license} URL: http://ffmpeg.org/ Source0: %{url}/releases/ffmpeg-%{version}.tar.xz @@ -330,6 +331,9 @@ rm -rf %{buildroot}/%{_datadir}/compat-ffmpeg4/ %changelog +* Sun Sep 04 2022 Leigh Scott - 4.4.2-6 +- Remove pkgconfig provides from devel + * Sun Sep 04 2022 Leigh Scott - 4.4.2-5 - Use standard location for pkgconfig and development libs From f20ae81fe413aa021005d1ca69697b84ca5f425c Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 4 Sep 2022 22:02:22 +0100 Subject: [PATCH 12/19] Remove pkgconfig requires from devel --- compat-ffmpeg4.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/compat-ffmpeg4.spec b/compat-ffmpeg4.spec index 7c65778..535077b 100644 --- a/compat-ffmpeg4.spec +++ b/compat-ffmpeg4.spec @@ -1,5 +1,6 @@ %undefine _package_note_file %global __provides_exclude_from ^(%{_libdir}/pkgconfig)/.*$ +%global __requires_exclude_from ^(%{_libdir}/pkgconfig)/.*$ # Cuda and others are only available on some arches %if 0%{?el7} From 581d0d613441f76b2992bbc56151788fb57962de Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Mon, 10 Oct 2022 10:44:46 +0100 Subject: [PATCH 13/19] Update to 4.4.3 release --- .gitignore | 1 + compat-ffmpeg4.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 06fe5bd..512777d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /ffmpeg-4.3.3.tar.xz /ffmpeg-4.4.1.tar.xz /ffmpeg-4.4.2.tar.xz +/ffmpeg-4.4.3.tar.xz diff --git a/compat-ffmpeg4.spec b/compat-ffmpeg4.spec index 535077b..6a1879e 100644 --- a/compat-ffmpeg4.spec +++ b/compat-ffmpeg4.spec @@ -47,8 +47,8 @@ Summary: Digital VCR and streaming server Name: compat-ffmpeg4 -Version: 4.4.2 -Release: 6%{?dist} +Version: 4.4.3 +Release: 1%{?dist} License: %{ffmpeg_license} URL: http://ffmpeg.org/ Source0: %{url}/releases/ffmpeg-%{version}.tar.xz @@ -332,6 +332,9 @@ rm -rf %{buildroot}/%{_datadir}/compat-ffmpeg4/ %changelog +* Mon Oct 10 2022 Leigh Scott - 4.4.3-1 +- Update to 4.4.3 + * Sun Sep 04 2022 Leigh Scott - 4.4.2-6 - Remove pkgconfig provides from devel diff --git a/sources b/sources index 1d32a05..9d04993 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ffmpeg-4.4.2.tar.xz) = abce847c607ac6d63fe32ceff8bf8724888acf2b7db9a083cba50e3235590cdcb27feb7e0a314133d0030809fb54d474f64001fc9ab7d896a819159869c09d5a +SHA512 (ffmpeg-4.4.3.tar.xz) = 0b232b66555237ed1a061807f88dbc5e6cd156e604c5d611bb6ac0c32b9006414cc4f30d632b482d9cb95f526df98b36efa3af9c863c52e7b7aa1a183545d915 From 6b4633889bca505c5e68168a2dcc3a27adc3640a Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 16 Nov 2022 13:25:13 +0100 Subject: [PATCH 14/19] Reduce missing el9 deps --- compat-ffmpeg4.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/compat-ffmpeg4.spec b/compat-ffmpeg4.spec index 6a1879e..81733d8 100644 --- a/compat-ffmpeg4.spec +++ b/compat-ffmpeg4.spec @@ -12,16 +12,11 @@ %endif %if 0%{?el9} -%global _without_ass 1 %global _without_frei0r 1 %global _without_jack 1 -%global _without_zimg 1 %ifarch x86_64 %global _with_mfx 1 %endif -%ifnarch x86_64 -%global _without_vaapi 1 -%endif %endif %if 0%{?fedora} From 0bab041a4bbb6071f78e145c82fcb46a283c12e5 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 16 Nov 2022 13:25:37 +0100 Subject: [PATCH 15/19] Update changelgo --- compat-ffmpeg4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/compat-ffmpeg4.spec b/compat-ffmpeg4.spec index 81733d8..9fd0f34 100644 --- a/compat-ffmpeg4.spec +++ b/compat-ffmpeg4.spec @@ -43,7 +43,7 @@ Summary: Digital VCR and streaming server Name: compat-ffmpeg4 Version: 4.4.3 -Release: 1%{?dist} +Release: 2%{?dist} License: %{ffmpeg_license} URL: http://ffmpeg.org/ Source0: %{url}/releases/ffmpeg-%{version}.tar.xz @@ -327,6 +327,9 @@ rm -rf %{buildroot}/%{_datadir}/compat-ffmpeg4/ %changelog +* Wed Nov 16 2022 Nicolas Chauvet - 4.4.3-2 +- Rebuilt + * Mon Oct 10 2022 Leigh Scott - 4.4.3-1 - Update to 4.4.3 From 479fde934a6395273bbffafc2b55436584f040d3 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 22 Mar 2023 20:50:25 +0100 Subject: [PATCH 16/19] Switch to https --- compat-ffmpeg4.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compat-ffmpeg4.spec b/compat-ffmpeg4.spec index 9fd0f34..ecff028 100644 --- a/compat-ffmpeg4.spec +++ b/compat-ffmpeg4.spec @@ -45,7 +45,7 @@ Name: compat-ffmpeg4 Version: 4.4.3 Release: 2%{?dist} License: %{ffmpeg_license} -URL: http://ffmpeg.org/ +URL: https://ffmpeg.org/ Source0: %{url}/releases/ffmpeg-%{version}.tar.xz BuildRequires: gcc From b110fc939b82f614e1f9f8c3f19632775ad5cbae Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 22 Mar 2023 20:50:46 +0100 Subject: [PATCH 17/19] Rebuilt --- compat-ffmpeg4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/compat-ffmpeg4.spec b/compat-ffmpeg4.spec index ecff028..d510a35 100644 --- a/compat-ffmpeg4.spec +++ b/compat-ffmpeg4.spec @@ -43,7 +43,7 @@ Summary: Digital VCR and streaming server Name: compat-ffmpeg4 Version: 4.4.3 -Release: 2%{?dist} +Release: 3%{?dist} License: %{ffmpeg_license} URL: https://ffmpeg.org/ Source0: %{url}/releases/ffmpeg-%{version}.tar.xz @@ -327,6 +327,9 @@ rm -rf %{buildroot}/%{_datadir}/compat-ffmpeg4/ %changelog +* Wed Mar 22 2023 Nicolas Chauvet - 4.4.3-3 +- rebuilt + * Wed Nov 16 2022 Nicolas Chauvet - 4.4.3-2 - Rebuilt From fc05e9316074454e0deb334e75fb7b0eb4445ebb Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Thu, 13 Apr 2023 14:05:21 +0100 Subject: [PATCH 18/19] Update to 4.4.4 --- .gitignore | 2 ++ compat-ffmpeg4.spec | 11 +++++++++-- ffmpeg-devel.asc | 30 ++++++++++++++++++++++++++++++ sources | 3 ++- 4 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 ffmpeg-devel.asc diff --git a/.gitignore b/.gitignore index 512777d..1e065c1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ /ffmpeg-4.4.1.tar.xz /ffmpeg-4.4.2.tar.xz /ffmpeg-4.4.3.tar.xz +/ffmpeg-4.4.4.tar.xz +/ffmpeg-4.4.4.tar.xz.asc diff --git a/compat-ffmpeg4.spec b/compat-ffmpeg4.spec index d510a35..c9a6dfb 100644 --- a/compat-ffmpeg4.spec +++ b/compat-ffmpeg4.spec @@ -42,11 +42,13 @@ Summary: Digital VCR and streaming server Name: compat-ffmpeg4 -Version: 4.4.3 -Release: 3%{?dist} +Version: 4.4.4 +Release: 1%{?dist} License: %{ffmpeg_license} URL: https://ffmpeg.org/ Source0: %{url}/releases/ffmpeg-%{version}.tar.xz +Source1: %{url}/releases/ffmpeg-%{version}.tar.xz.asc +Source2: %{url}/ffmpeg-devel.asc BuildRequires: gcc BuildRequires: alsa-lib-devel @@ -60,6 +62,7 @@ BuildRequires: freetype-devel BuildRequires: fribidi-devel %{!?_without_frei0r:BuildRequires: frei0r-devel} %{?_with_gme:BuildRequires: game-music-emu-devel} +BuildRequires: gnupg2 BuildRequires: gnutls-devel BuildRequires: gsm-devel %{?_with_ilbc:BuildRequires: ilbc-devel} @@ -253,6 +256,7 @@ This package contains development files for %{name} %prep +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup -p1 -n ffmpeg-%{version} # fix -O3 -g in host_cflags @@ -327,6 +331,9 @@ rm -rf %{buildroot}/%{_datadir}/compat-ffmpeg4/ %changelog +* Thu Apr 13 2023 Leigh Scott - 4.4.4-1 +- Update to 4.4.4 + * Wed Mar 22 2023 Nicolas Chauvet - 4.4.3-3 - rebuilt diff --git a/ffmpeg-devel.asc b/ffmpeg-devel.asc new file mode 100644 index 0000000..3a4d521 --- /dev/null +++ b/ffmpeg-devel.asc @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQENBE22rV0BCAC3DzRmA2XlhrqYv9HKoEvNHHf+PzosmCTHmYhWHDqvBxPkSvCl +ipkbvJ4pBnVvcX6mW5QyKhspHm5j1X5ibe9Bt9/chS/obnIobmvF8shSUgjQ0qRW +9c1aWOjvT26SxYQ1y9TmYCFwixeydGFHYKjAim+evGUccni5KMlfPoT3VTPtim78 +ufkr3E9Nco/Mobn/8APO0NmLEGWAM6ln/8J/c9h6a1QKnQyBqWfT0YnAaebafFaZ +YwOtRdDG54VbJ4xwcHbCj5cKhTABk/QtBzDvnW4bG+uSpqdHbFZEY2JpURDuj/T3 +NudKQGzn0bYNpY1XY2l0pqs/btKHnBW0fVMjABEBAAG0NEZGbXBlZyByZWxlYXNl +IHNpZ25pbmcga2V5IDxmZm1wZWctZGV2ZWxAZmZtcGVnLm9yZz6JATgEEwECACIF +Ak22rV0CGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJELQyLwTWdljYKxUH +/1fqzl7SKie2g4t4PJbqUbkLuMsC+CP6gp0dcVZOHkuUYAoD3PM3iVxpLBVyKIXI +g7wMSTAtlIcYnzhWIpnoCBes6/O2Mrq6xHgGeTp6CDcm3LmmSYR1f5KdD8KUaA+l +c/M/1fEnwrSs/UGDk6R6iUmbqwxPsbozlOvmUHOLbDZBnKrk9XfAJdUhAuFACrSA +T+KF1jniz0OfNGd23SaHWRCphoRW9pXDc5FfkdaueBUvBvGv19ZNcDhcxT3/u6z2 +DaUFC0rLWqk8obo951jVvi/zOhB94Pw6u1SLvcTq3V1q5URWJtgSbpih9VRqxUbQ +NbXduKGzbHz6Vwpkupz4JRe5AQ0ETbatXQEIANjYrygJi/fn1nlSg5Mz0l9KHDm4 +yfWtaOrXUjJcyiGe4G0XXJLGh45qxJ0DOKzi9id+9W4jby+kKuzG9O6Vn0iDeODO +aOGnz4ua7Vu6d0AbYfNXZPWge/GCodo/ZD/qri1tPkLmRtT/sniahwy6LruPNHfF +SRoNIjwbcD/IL+EbY1pL1/IFSzEAA1ZZamgmHgB7o9pwDIkK6HuvHMR/Y5MsoMfV +fWV3ZGtA6v9z51CvnHsHPsADRSnUp7aYtR412SiAO4XodMLTA92L3LxgYhI4ma7D +XZ8jgKg4JkKO+DXmoU63HtRdq/HZjeXJKk1JGJF3zCvP3DyIzZ8LWIjN8t0AEQEA +AYkBHwQYAQIACQUCTbatXQIbDAAKCRC0Mi8E1nZY2LS8B/0bMoUAl4X9D0WQbL4l +U0czCIOKOsvbHpIxivjCnOQxU23+PV5WZdoCCpSuAHGv+2OHzhNrij++P9BNTJeQ +skxdS9FH4MZwy1IRSPrxegSxbCUpBI1rd0Zf7qb9BNPrHPTueWFV1uExOSB2Apsv +WrKo2D8mR0uZAPYfYl2ToFVoa5PR7/+ii9WiJr/flF6qm7hoLpI5Bm4VcZh2GPsJ +9Vo/8x/qOGwtdWHqBykYloKsrwD4U69rjn+d9feLoPBRgoVroXWQttt0sUnyoudz ++x8ETJgPoNK3kQoDagApj4qAt83Ayac3HzNIuEJ7LdvfINIOprujnJ9vH4n04XLg +I4EZ +=Rjbw +-----END PGP PUBLIC KEY BLOCK----- diff --git a/sources b/sources index 9d04993..f54e410 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (ffmpeg-4.4.3.tar.xz) = 0b232b66555237ed1a061807f88dbc5e6cd156e604c5d611bb6ac0c32b9006414cc4f30d632b482d9cb95f526df98b36efa3af9c863c52e7b7aa1a183545d915 +SHA512 (ffmpeg-4.4.4.tar.xz) = 253799eccd129dad331db85def5352178ae22303e42af47fc013a6adfd4b60d1e59ff5f9ac6118fe3b403affa56ea1f3ba658042f526a914fba27050c3065daf +SHA512 (ffmpeg-4.4.4.tar.xz.asc) = 47afa042d8b529d0bfce391455a25cda261f39f8510601d7de2aba6398483ecb623992626e8489aa2a636e3cb93008f26b32080e526143254226d4e2651accea From 9e60be6bd9d891519297162bfe25e770e448b591 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 20:07:43 +0300 Subject: [PATCH 19/19] Remove unnecessary files --- sources | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index f54e410..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -SHA512 (ffmpeg-4.4.4.tar.xz) = 253799eccd129dad331db85def5352178ae22303e42af47fc013a6adfd4b60d1e59ff5f9ac6118fe3b403affa56ea1f3ba658042f526a914fba27050c3065daf -SHA512 (ffmpeg-4.4.4.tar.xz.asc) = 47afa042d8b529d0bfce391455a25cda261f39f8510601d7de2aba6398483ecb623992626e8489aa2a636e3cb93008f26b32080e526143254226d4e2651accea