Compare commits

...

No commits in common. 'el9' and 'i10ce' have entirely different histories.
el9 ... i10ce

@ -0,0 +1 @@
69e11a56def9ac7073aca9d6602fa9d51a6ed6b6 SOURCES/ffmpeg-7.0.2.tar.xz

5
.gitignore vendored

@ -1,4 +1 @@
ffmpeg-*.tar.xz
ffmpeg-*.rpm
ffmpeg-*.tar.bz2
ffmpeg-*.tar.xz.asc
SOURCES/ffmpeg-7.0.2.tar.xz

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQFMBAABCgA2FiEE/PmG6hXm4pOlZE8QtDIvBNZ2WNgFAmatZQYYHGZmbXBlZy1k
ZXZlbEBmZm1wZWcub3JnAAoJELQyLwTWdljYIlcIAKF1VWqnhhKkBHSxEnH8ipUH
nlJmPitKaJTwgtAtHGH8DL4XlgUwxfws9YohJ6V2fz/LjD+4rcU1BB9lMKNTaEW3
g27lIRHXC571OGgBKJFadhsbULtUu9oUOIcqS28zOl3fsok/G7NVd3ajkpiRUPhu
LRXUXNbCIwtXbIdS0yECpiRcHMj/hX6nkY3yHrmWXAts/TtmIQyaNTbnC4ervA1s
Ijc4cY/unb6OD9DpmC6DznVykyfzc2GjjCiNxRXrljp+MaZ7jBEMwjXfOIATwBwj
gCN+N6nlxc5e3gMOGcAJy93iD9HpbgVDAn6S6jnB/z5+Tyv6ZeP+sytsgOCNjlQ=
=R372
-----END PGP SIGNATURE-----

@ -1,4 +1,4 @@
From 4464ecf750bb9440e2571a8d810627cdec85ae02 Mon Sep 17 00:00:00 2001
From d32aacab65a322b66d6a1b48f6cdb03e42bde0f9 Mon Sep 17 00:00:00 2001
From: Frank Liberato <liberato@chromium.org>
Date: Wed, 7 Jul 2021 19:01:22 -0700
Subject: [PATCH] Add av_stream_get_first_dts for Chromium
@ -9,12 +9,12 @@ Subject: [PATCH] Add av_stream_get_first_dts for Chromium
2 files changed, 11 insertions(+)
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index f12fa7d904..0b9fd1f061 100644
index 1916aa2dc5..e6682849fa 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1128,6 +1128,10 @@ struct AVCodecParserContext *av_stream_get_parser(const AVStream *s);
*/
int64_t av_stream_get_end_pts(const AVStream *st);
@@ -1170,6 +1170,10 @@ typedef struct AVStreamGroup {
struct AVCodecParserContext *av_stream_get_parser(const AVStream *s);
+// Chromium: We use the internal field first_dts vvv
+int64_t av_stream_get_first_dts(const AVStream *st);
@ -27,14 +27,14 @@ diff --git a/libavformat/utils.c b/libavformat/utils.c
index cf4d68bff9..7d750abf88 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -55,6 +55,13 @@ int ff_unlock_avformat(void)
@@ -56,6 +56,13 @@ int ff_unlock_avformat(void)
return ff_mutex_unlock(&avformat_mutex) ? -1 : 0;
}
+// Chromium: We use the internal field first_dts vvv
+int64_t av_stream_get_first_dts(const AVStream *st)
+{
+ return cffstream(st)->first_dts;
+ return cffstream(st)->first_dts;
+}
+// Chromium: We use the internal field first_dts ^^^
+

@ -1,11 +1,11 @@
# TODO: add make test to %%check section
#global branch oldabi-
#global date 20220104
#global commit 311ea9c529117fb8e38abd6ca7e81782b6b21257
#global date 20230221
#global commit 691d01989936d4b0681aa226aea8a19f06c04cea
#global rel %(c=%{commit}; echo ${c:0:7})
%if (0%{?fedora} >= 37 || 0%{?rhel} >= 9) && 0%{!?_with_cuda:0}
%if 0%{?fedora} >= 37 || 0%{?rhel} >= 9
%bcond_without libavcodec_freeworld
%else
%bcond_with libavcodec_freeworld
@ -13,7 +13,7 @@
%undefine _package_note_file
%ifarch %{ix86}
%ifarch %{ix86} %{arm}
# Fails due to asm issue
%global _lto_cflags %{nil}
%endif
@ -23,54 +23,44 @@
# Disable because of gcc issue
%global _without_lensfun 1
%if 0%{?fedora}
%global _with_placebo 1
# Disable due to undefined symbols in libavformat
#global _with_dvddemuxer 1
%ifnarch i686
%global _with_bs2b 1
%global _with_codec2 1
%global _with_chromaprint 1
%global _with_ilbc 1
%global _with_openh264 1
%if 0%{?fedora}
%global _with_placebo 1
%endif
%global _with_rav1e 1
%global _with_smb 1
%global _with_snappy 1
%global _with_svtav1 1
%global _with_tesseract 1
%global _with_twolame 1
%global _with_wavpack 1
%global _with_webp 1
%global _with_zmq 1
%else
%global _without_libklvanc 1
%global _without_libaribb24 1
%global _without_libaribcaption 1
%global _without_rubberband 1
%global _without_vulkan 1
%endif
%endif
%ifarch x86_64
%global _with_mfx 1
%global _with_svtav1 1
%global _with_vpl 1
%global _with_vapoursynth 1
%global _with_vmaf 1
%endif
# flavor nonfree
%if 0%{?_with_cuda:1}
%global debug_package %{nil}
%global flavor -cuda
%global progs_suffix -cuda
#global build_suffix -lgpl
%ifarch %{cuda_arches}
%global _with_cuvid 1
%global _with_libnpp 1
%endif
%global _with_fdk_aac 1
%global _without_cdio 1
%global _without_frei0r 1
%global _without_gpl 1
%global _without_rubberband 1
%global _without_vidstab 1
%global _without_x264 1
%global _without_x265 1
%global _without_xvid 1
%undefine _with_smb
%endif
# Disable nvenc when not relevant
%ifnarch %{cuda_arches} aarch64
@ -79,7 +69,7 @@
# extras flags
%if 0%{!?_cuda_version:1}
%global _cuda_version 11.2
%global _cuda_version 12.6
%endif
%global _cuda_version_rpm %(echo %{_cuda_version} | sed -e 's/\\./-/')
%global _cuda_bindir %{_cuda_prefix}/bin
@ -112,8 +102,8 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 5.1.6
Release: 2%{?dist}
Version: 7.0.2
Release: 4%{?dist}
License: %{ffmpeg_license}
URL: https://ffmpeg.org/
%if 0%{?date}
@ -126,6 +116,7 @@ Source2: https://ffmpeg.org/ffmpeg-devel.asc
# We don't endorse adding this patch but fedora insists on breaking the ffmpeg ABI
Patch0: ffmpeg-chromium.patch
Conflicts: %{name}-free
Provides: %{name}-bin = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%{?_with_cuda:BuildRequires: cuda-minimal-build-%{_cuda_version_rpm} cuda-drivers-devel}
%{?_with_cuda:%{?!_with_cuda_nvcc:BuildRequires: clang}}
@ -133,6 +124,7 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
BuildRequires: alsa-lib-devel
BuildRequires: AMF-devel
BuildRequires: bzip2-devel
%{?_with_codec2:BuildRequires: codec2-devel}
%{?_with_faac:BuildRequires: faac-devel}
%{?_with_fdk_aac:BuildRequires: fdk-aac-devel}
%{?_with_flite:BuildRequires: flite-devel}
@ -144,34 +136,43 @@ BuildRequires: fribidi-devel
BuildRequires: gnupg2
BuildRequires: gnutls-devel
BuildRequires: gsm-devel
BuildRequires: harfbuzz-devel
%{?_with_ilbc:BuildRequires: ilbc-devel}
BuildRequires: lame-devel >= 3.98.3
%{!?_without_jack:BuildRequires: jack-audio-connection-kit-devel}
%{!?_without_jxl:BuildRequires: libjxl-devel}
%{!?_without_ladspa:BuildRequires: ladspa-devel}
BuildRequires: lcms2-devel
%{!?_without_aom:BuildRequires: libaom-devel}
%{!?_without_aribb24:BuildRequires: pkgconfig(aribb24) >= 1.0.3}
%{!?_without_dav1d:BuildRequires: libdav1d-devel}
%{?_with_dvddemuxer:BuildRequires: libdvdnav-devel libdvdread-devel}
%{!?_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}
%{!?_without_lensfun:BuildRequires: lensfun-devel}
%if 0%{?_with_ieee1394}
BuildRequires: libavc1394-devel
BuildRequires: libdc1394-devel
BuildRequires: libiec61883-devel
%endif
%{!?_without_libaribcaption:BuildRequires: pkgconfig(libaribcaption) >= 1.1.1}
BuildRequires: libdrm-devel
BuildRequires: libgcrypt-devel
%{!?_without_libklvanc:BuildRequires: libklvanc-devel}
BuildRequires: libGL-devel
BuildRequires: libmodplug-devel
BuildRequires: libmysofa-devel
%if 0%{?fedora} && 0%{?fedora} > 39
%{?_with_openh264:BuildRequires: noopenh264-devel}
%else
%{?_with_openh264:BuildRequires: openh264-devel}
%endif
BuildRequires: libopenmpt-devel
%{?_with_placebo:BuildRequires: libplacebo-devel}
%{?_with_placebo:BuildRequires: libplacebo-devel >= 4.192.0}
BuildRequires: librsvg2-devel
# Disable rtmp because of rfbz: 6441 & 2399
%{?_with_rtmp:BuildRequires: librtmp-devel}
@ -207,6 +208,7 @@ BuildRequires: openjpeg2-devel
%{!?_without_opus:BuildRequires: opus-devel >= 1.1.3}
%{!?_without_pulse:BuildRequires: pulseaudio-libs-devel}
BuildRequires: perl(Pod::Man)
BuildRequires: qrencode-devel
%{?_with_rav1e:BuildRequires: pkgconfig(rav1e)}
%{!?_without_rubberband:BuildRequires: rubberband-devel}
%{!?_without_tools:BuildRequires: SDL2-devel}
@ -220,9 +222,10 @@ BuildRequires: pkgconfig(srt)
BuildRequires: texinfo
%{?_with_twolame:BuildRequires: twolame-devel}
%{?_with_vmaf:BuildRequires: libvmaf-devel >= 1.5.2}
%{?_with_vpl:BuildRequires: pkgconfig(vpl) >= 2.6}
%{?_with_wavpack:BuildRequires: wavpack-devel}
%{!?_without_vidstab:BuildRequires: vid.stab-devel}
%{!?_without_vulkan:BuildRequires: vulkan-loader-devel pkgconfig(shaderc)}
%{!?_without_vulkan:BuildRequires: pkgconfig(shaderc) pkgconfig(vulkan) >= 1.3.277}
%{!?_without_x264:BuildRequires: x264-devel >= 0.0.0-0.31}
%{!?_without_x265:BuildRequires: x265-devel}
%{!?_without_xvid:BuildRequires: xvidcore-devel}
@ -312,24 +315,28 @@ Freeworld libavcodec to complement the distro counterparts
%{!?_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} \\\
--enable-lcms2 \\\
%{!?_without_aom:--enable-libaom} \\\
%{!?_without_libaribb24:--enable-libaribb24} \\\
%{!?_without_libaribcaption:--enable-libaribcaption} \\\
%{!?_without_dav1d:--enable-libdav1d} \\\
%{!?_without_ass:--enable-libass} \\\
%{!?_without_bluray:--enable-libbluray} \\\
%{?_with_bs2b:--enable-libbs2b} \\\
%{?_with_caca:--enable-libcaca} \\\
%{?_with_codec2:--enable-libcodec2} \\\
%{?_with_cuda_nvcc:--enable-cuda-nvcc --enable-nonfree} \\\
%{?_with_cuvid:--enable-cuvid --enable-nonfree} \\\
%{!?_without_cdio:--enable-libcdio} \\\
%{?_with_ieee1394:--enable-libdc1394 --enable-libiec61883} \\\
--enable-libdrm \\\
%{?_with_dvddemuxer:--enable-libdvdnav --enable-libdvdread} \\\
%{?_with_faac:--enable-libfaac --enable-nonfree} \\\
%{?_with_fdk_aac:--enable-libfdk-aac --enable-nonfree} \\\
%{?_with_flite:--enable-libflite} \\\
@ -339,6 +346,7 @@ Freeworld libavcodec to complement the distro counterparts
%{!?_without_fribidi:--enable-libfribidi} \\\
%{?_with_gme:--enable-libgme} \\\
--enable-libgsm \\\
--enable-libharfbuzz \\\
%{?_with_ilbc:--enable-libilbc} \\\
%{!?_without_lensfun:--enable-liblensfun} \\\
%{?_with_libnpp:--enable-libnpp --enable-nonfree} \\\
@ -363,6 +371,7 @@ Freeworld libavcodec to complement the distro counterparts
%{?_with_rav1e:--enable-librav1e} \\\
%{?_with_rtmp:--enable-librtmp} \\\
%{!?_without_rubberband:--enable-librubberband} \\\
--enable-libqrencode \\\
%{?_with_smb:--enable-libsmbclient --enable-version3} \\\
%{?_with_snappy:--enable-libsnappy} \\\
--enable-libsoxr \\\
@ -428,6 +437,7 @@ cp -pr doc/examples/{*.c,Makefile,README} _doc/examples/
--cpu=%{_target_cpu} \
%endif
%{?_with_mfx:--enable-libmfx} \
%{?_with_vpl:--enable-libvpl} \
%ifarch %{ix86} x86_64 %{power64}
--enable-runtime-cpudetect \
%endif
@ -482,8 +492,6 @@ mkdir -p %{buildroot}%{_libdir}/%{name}
echo -e "%{_libdir}/%{name}\n" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_lib}.conf
cp -pa %{buildroot}%{_libdir}/libavcodec.so.* \
%{buildroot}%{_libdir}/%{name}
# Strip to prevent debuginfo duplication
strip %{buildroot}%{_libdir}/%{name}/libavcodec.so.*
%endif
%ldconfig_scriptlets libs
@ -532,28 +540,127 @@ strip %{buildroot}%{_libdir}/%{name}/libavcodec.so.*
%changelog
* Wed Nov 13 2024 Leigh Scott <leigh123linux@gmail.com> - 5.1.6-2
- Rebuild for new dav1d version
* Wed Dec 25 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 7.0.2-4
- Rebuilt for MSVSphere 10
* Wed Oct 09 2024 Leigh Scott <leigh123linux@gmail.com> - 7.0.2-4
- Disable DVD demuxer due to undefined symbols in libavformat
* Mon Oct 07 2024 Nicolas Chauvet <kwizart@gmail.com> - 7.0.2-3
- Sync with fedora deps:
Enable Kernel Labs VANC processing and ARIB text/caption decoding
* Mon Aug 05 2024 Leigh Scott <leigh123linux@gmail.com> - 5.1.6-1
- Update to 5.1.6
* Fri Sep 20 2024 Leigh Scott <leigh123linux@gmail.com> - 7.0.2-2
- Rebuild
* Sun Aug 04 2024 Leigh Scott <leigh123linux@gmail.com> - 7.0.2-1
- Update to 7.0.2
* Thu Aug 01 2024 RPM Fusion Release Engineering <sergiomb@rpmfusion.org> - 7.0.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Fri May 31 2024 Robert-André Mauchin <zebob.m@gmail.com> - 7.0.1-2
- Rebuild for svt-av1 2.1.0
* Sun May 26 2024 Leigh Scott <leigh123linux@gmail.com> - 7.0.1-1
- Update to 7.0.1
* Fri Apr 19 2024 Leigh Scott <leigh123linux@gmail.com> - 7.0-1
- Update to 7.0
* Sat Apr 06 2024 Leigh Scott <leigh123linux@gmail.com> - 6.1.1-8
- Rebuild for new x265 version
* Sun Jun 16 2024 Leigh Scott <leigh123linux@gmail.com> - 5.1.5-1
- Update to 5.1.5
* Fri Mar 22 2024 Sérgio Basto <sergio@serjux.com> - 6.1.1-7
- Rebuild for jpegxl (libjxl) 0.10.2
* Tue Mar 12 2024 Dominik Mierzejewski <dominik@greysector.net> - 6.1.1-6
- Enable drawtext filter (requires libharfbuzz, rfbz#6889)
* Thu Feb 01 2024 Leigh Scott <leigh123linux@gmail.com> - 6.1.1-5
- rebuilt
* Thu Feb 01 2024 Leigh Scott <leigh123linux@gmail.com> - 6.1.1-4
- Switch to noopenh264-devel for f39+
* Tue Jan 16 2024 Nicolas Chauvet <kwizart@gmail.com> - 6.1.1-3
- Rebuilt for libavcodec-freeworld
* Sun Jan 14 2024 Leigh Scott <leigh123linux@gmail.com> - 6.1.1-2
- rebuilt
* Wed Nov 15 2023 Nicolas Chauvet <kwizart@gmail.com> - 5.1.4-1
- Update to 5.1.4
* Mon Jan 01 2024 Leigh Scott <leigh123linux@gmail.com> - 6.1.1-1
- Update to 6.1.1 release
* Sun May 14 2023 Leigh Scott <leigh123linux@gmail.com> - 5.1.3-3
* Wed Nov 15 2023 Nicolas Chauvet <kwizart@gmail.com> - 6.1-3
- Bump
* Wed Nov 15 2023 Leigh Scott <leigh123linux@gmail.com> - 6.1-2
- Add patch to fix fedora ffmpeg brokenABI change
* Sat Nov 11 2023 Leigh Scott <leigh123linux@gmail.com> - 6.1-1
- Update to 6.1 release
* Fri Nov 10 2023 Leigh Scott <leigh123linux@gmail.com> - 6.0.1-1
- Update to 6.0.1 release
* Sun Oct 08 2023 Dominik Mierzejewski <dominik@greysector.net> - 6.0-18
- Backport upstream patch to fix segfault when passing non-existent filter
option (rfbz#6773)
* Fri Sep 29 2023 Nicolas Chauvet <nchauvet@linagora.com> - 6.0-17
- Rebuild for libplacebo
- Backport upstream patch to fix assembly with binutils 2.41 - rathann
* Fri Jul 28 2023 Nicolas Chauvet <kwizart@gmail.com> - 6.0-16
- rebuilt
* Sun Jul 16 2023 Leigh Scott <leigh123linux@gmail.com> - 6.0-15
- rebuilt
* Fri Jun 23 2023 Leigh Scott <leigh123linux@gmail.com> - 6.0-14
- rebuilt
* Fri Jun 23 2023 Leigh Scott <leigh123linux@gmail.com> - 6.0-13
- rebuilt
* Wed Jun 14 2023 Leigh Scott <leigh123linux@gmail.com> - 6.0-12
- rebuilt
* Sun May 14 2023 Leigh Scott <leigh123linux@gmail.com> - 6.0-11
- fedora cisco repo isn't multiarch
* Fri May 12 2023 Leigh Scott <leigh123linux@gmail.com> - 5.1.3-2
* Fri May 12 2023 Leigh Scott <leigh123linux@gmail.com> - 6.0-10
- Enable openh264 for fedora
* Fri Mar 31 2023 Leigh Scott <leigh123linux@gmail.com> - 5.1.3-1
- Update to 5.1.3 release
* Mon Apr 24 2023 Nicolas Chauvet <kwizart@gmail.com> - 6.0-9
- Add ffmpeg-bin for deps
* Fri Apr 07 2023 Leigh Scott <leigh123linux@gmail.com> - 6.0-8
- rebuilt
* Fri Mar 24 2023 Leigh Scott <leigh123linux@gmail.com> - 6.0-7
- rebuilt
* Wed Mar 22 2023 Nicolas Chauvet <kwizart@gmail.com> - 6.0-6
- Rebuilt
* Sat Mar 18 2023 Todd Zullinger <tmz@pobox.com> - 6.0-5
- verify upstream source signature
* Sun Mar 12 2023 Leigh Scott <leigh123linux@gmail.com> - 6.0-4
- Rebuild against new nvcodec-headers
* Sun Mar 12 2023 Leigh Scott <leigh123linux@gmail.com> - 6.0-3
- Enable chromaprint
- Enable svt-av1 on all arches
* Tue Feb 28 2023 Leigh Scott <leigh123linux@gmail.com> - 6.0-2
- Disable chromaprint
* Tue Feb 21 2023 Leigh Scott <leigh123linux@gmail.com> - 6.0-1
- Update to 6.0 release
* Sun Jan 08 2023 Leigh Scott <leigh123linux@gmail.com> - 5.1.2-9
- Enable libplacebo (rfbz#6549)

@ -1,21 +0,0 @@
#!/bin/bash
set -e
tmp=$(mktemp -d)
trap cleanup EXIT
cleanup() {
set +e
[ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
}
unset CDPATH
pwd=$(pwd)
date=$(date +%Y%m%d)
pushd "$tmp"
git clone git://git.videolan.org/ffmpeg.git -b oldabi
cd ffmpeg
git archive --prefix="ffmpeg-oldabi-${date}/" --format=tar oldabi | bzip2 > "$pwd"/ffmpeg-oldabi-${date}.tar.bz2
popd

@ -1,23 +0,0 @@
#!/bin/bash
set -e
tmp=$(mktemp -d)
trap cleanup EXIT
cleanup() {
set +e
[ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
}
unset CDPATH
pwd=$(pwd)
date=$(date +%Y%m%d)
pushd "$tmp"
git clone git://git.ffmpeg.org/ffmpeg.git
cd ffmpeg
git checkout release/5.0
git rev-parse HEAD
git archive --prefix="ffmpeg-${date}/" --format=tar release/5.0 | bzip2 > "$pwd"/ffmpeg-${date}.tar.bz2
popd

@ -1,2 +0,0 @@
SHA512 (ffmpeg-5.1.6.tar.xz) = bae42c4ff1e779da02f3ccc21b8361f6dbe7e0b6e4fdd4aa0253c47a14d44fa25e8a850b21e7e3c5a95712432e6c93ad430621c167134afb8dd98be1e78979bb
SHA512 (ffmpeg-5.1.6.tar.xz.asc) = 954111aeea2da012548279b124c6fc17776edc4b61a6c3153f7279ce5f0fe9346d91ac538c59dac9c4b1b059f26594ff2eb6f775ad87dbe9c347c0188e201399
Loading…
Cancel
Save