Compare commits

...

26 Commits
el9 ... el8

Author SHA1 Message Date
Leigh Scott 16fa12452c
Update to 4.2.10
3 months ago
Leigh Scott 1781de4e8c Update to 4.2.9 release
2 years ago
Leigh Scott 2613c2de0c Update to 4.2.8 release
2 years ago
Leigh Scott b61593c239 Update to 4.2.7 release
2 years ago
Leigh Scott e15388183f Update to 4.2.6 release
3 years ago
Leigh Scott e0532689e0 Rebuild
3 years ago
Leigh Scott e5277bd280 Update to 4.2.5 release
3 years ago
Leigh Scott d423d73fb2 Rebuild for aom bump
3 years ago
Leigh Scott d74b9e3621 Update to 4.2.4 release
4 years ago
Leigh Scott 26d3e44d77 Disable vapoursynth
4 years ago
Leigh Scott bff4f0e7fc Rebuilt
4 years ago
Leigh Scott 7d4c249e9d Fix conditionals
4 years ago
Leigh Scott bd85a43080 Update changelog
4 years ago
Leigh Scott 68146d424e Enable vapoursynth
4 years ago
Nicolas Chauvet 23d70ba678 fixup vmaf needs version3
4 years ago
Leigh Scott e18c069fad Update changelog
4 years ago
Leigh Scott 9cd3ee87ed Enable libmodplug
4 years ago
Leigh Scott 8538a7ebd5 Update changelog
5 years ago
Leigh Scott cee8b53778 fix vmaf model path
5 years ago
Leigh Scott 363a058a9b Update to 4.2.3 release
5 years ago
Nicolas Chauvet 4604cc7aed Switch to cuda 10.2
5 years ago
Nicolas Chauvet 7da73f01c6 Update changelog
5 years ago
Nicolas Chauvet 2b906ac1fe Enable libsrt by default
5 years ago
leigh123linux a77ba2fc75 Rebuilt for i686
5 years ago
Leigh Scott 0a4600f56d Fixup for i686
5 years ago
Leigh Scott 9af646436c Rebuild for x265
5 years ago

@ -11,13 +11,19 @@
%global _without_aom 1
%global _without_dav1d 1
%global _without_frei0r 1
%global _without_mfx 1
%global _without_opus 1
%global _without_srt 1
%global _without_vpx 1
%endif
%if 0%{?fedora} || 0%{?rhel} > 7
%if 0%{?rhel} > 7
%ifarch x86_64 i686
%global _with_vapoursynth 1
%endif
%endif
%ifarch x86_64
%global _with_mfx 1
%global _with_vmaf 1
%endif
%endif
@ -49,7 +55,7 @@
# extras flags
%if 0%{!?_cuda_version:1}
%global _cuda_version 10.1
%global _cuda_version 10.2
%endif
%global _cuda_version_rpm %(echo %{_cuda_version} | sed -e 's/\\./-/')
%global _cuda_bindir %{_cuda_prefix}/bin
@ -82,8 +88,8 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 4.2.2
Release: 2%{?date}%{?date:git}%{?rel}%{?dist}
Version: 4.2.10
Release: 1%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@ -92,6 +98,7 @@ Source0: ffmpeg-%{?branch}%{date}.tar.bz2
Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
%endif
Patch0: fix_ppc_build.patch
Patch1: fix-vmaf-model-path.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%{?_with_cuda:BuildRequires: cuda-minimal-build-%{_cuda_version_rpm} cuda-drivers-devel}
%{?_with_libnpp:BuildRequires: pkgconfig(nppc-%{_cuda_version})}
@ -132,15 +139,17 @@ BuildRequires: libmodplug-devel
BuildRequires: librsvg2-devel
%{?_with_rtmp:BuildRequires: librtmp-devel}
%{?_with_smb:BuildRequires: libsmbclient-devel}
%{!?_without_srt:BuildRequires: srt-devel > 1.3.0}
BuildRequires: libssh-devel
BuildRequires: libtheora-devel
BuildRequires: libv4l-devel
%{?!_without_vaapi:BuildRequires: libva-devel >= 0.31.0}
BuildRequires: libvdpau-devel
BuildRequires: libvorbis-devel
%{?_with_vapoursynth:BuildRequires: vapoursynth-devel}
%{?!_without_vpx:BuildRequires: libvpx-devel >= 1.4.0}
%{?_with_mfx:BuildRequires: pkgconfig(libmfx) >= 1.23-1}
%ifarch %{ix86} x86_64
%{!?_without_mfx:BuildRequires: pkgconfig(libmfx) >= 1.23-1}
BuildRequires: nasm
%endif
%{?_with_webp:BuildRequires: libwebp-devel}
@ -284,6 +293,7 @@ This package contains development files for %{name}
%{?_with_rubberband:--enable-librubberband} \\\
%{?_with_smb:--enable-libsmbclient} \\\
%{?_with_snappy:--enable-libsnappy} \\\
%{!?_without_srt:--enable-libsrt} \\\
--enable-libsoxr \\\
--enable-libspeex \\\
--enable-libssh \\\
@ -293,7 +303,8 @@ This package contains development files for %{name}
--enable-libvorbis \\\
--enable-libv4l2 \\\
%{!?_without_vidstab:--enable-libvidstab} \\\
%{?_with_vmaf:--enable-libvmaf} \\\
%{?_with_vmaf:--enable-libvmaf --enable-version3} \\\
%{?_with_vapoursynth:--enable-vapoursynth} \\\
%{!?_without_vpx:--enable-libvpx} \\\
%{?_with_webp:--enable-libwebp} \\\
%{!?_without_x264:--enable-libx264} \\\
@ -304,6 +315,7 @@ This package contains development files for %{name}
%{!?_without_zvbi:--enable-libzvbi} \\\
--enable-avfilter \\\
--enable-avresample \\\
--enable-libmodplug \\\
--enable-postproc \\\
--enable-pthreads \\\
--disable-static \\\
@ -315,12 +327,11 @@ This package contains development files for %{name}
%prep
%if 0%{?date}
%setup -q -n ffmpeg-%{?branch}%{date}
%autosetup -p1 -n ffmpeg-%{?branch}%{date}
echo "git-snapshot-%{?branch}%{date}-rpmfusion" > VERSION
%else
%setup -q -n ffmpeg-%{version}
%autosetup -p1 -n ffmpeg-%{version}
%endif
%patch0 -p1
# fix -O3 -g in host_cflags
sed -i "s|check_host_cflags -O3|check_host_cflags %{optflags}|" configure
mkdir -p _doc/examples
@ -337,9 +348,7 @@ cp -pr doc/examples/{*.c,Makefile,README} _doc/examples/
%ifarch %{ix86}
--cpu=%{_target_cpu} \
%endif
%ifarch %{ix86} x86_64
%{!?_without_mfx:--enable-libmfx} \
%endif
%{?_with_mfx:--enable-libmfx} \
%ifarch %{ix86} x86_64 %{power64}
--enable-runtime-cpudetect \
%endif
@ -427,6 +436,61 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
* Sun Aug 04 2024 Leigh Scott <leigh123linux@gmail.com> - 4.2.10-1
- Update to 4.2.10
* Sat Apr 22 2023 Leigh Scott <leigh123linux@gmail.com> - 4.2.9-1
- Update to 4.2.9 release
* Mon Oct 17 2022 Leigh Scott <leigh123linux@gmail.com> - 4.2.8-1
- Update to 4.2.8 release
* Thu May 26 2022 Leigh Scott <leigh123linux@gmail.com> - 4.2.7-1
- Update to 4.2.7 release
* Sat Apr 16 2022 Leigh Scott <leigh123linux@gmail.com> - 4.2.6-1
- Update to 4.2.6 release
* Wed Dec 01 2021 Leigh Scott <leigh123linux@gmail.com> - 4.2.5-2
- rebuilt
* Fri Oct 15 2021 Leigh Scott <leigh123linux@gmail.com> - 4.2.5-1
- Update to 4.2.5 release
* Sun Jun 13 2021 Leigh Scott <leigh123linux@gmail.com> - 4.2.4-2
- Rebuild for aom bump
* Thu Jul 09 2020 Leigh Scott <leigh123linux@gmail.com> - 4.2.4-1
- Update to 4.2.4 release
- Enable vapoursynth for el8
* Sat Jul 04 2020 Leigh Scott <leigh123linux@gmail.com> - 4.2.3-6
- Disable vapoursynth
* Thu Jul 02 2020 Leigh Scott <leigh123linux@gmail.com> - 4.2.3-5
- Rebuilt
* Wed Jun 24 2020 Leigh Scott <leigh123linux@gmail.com> - 4.2.3-4
- Enable vapoursynth
* Sat Jun 06 2020 Leigh Scott <leigh123linux@gmail.com> - 4.2.3-3
- Enable libmodplug (rfbz#5670)
* Sat May 23 2020 Leigh Scott <leigh123linux@gmail.com> - 4.2.3-2
- Fix vmaf model path
* Thu May 21 2020 Leigh Scott <leigh123linux@gmail.com> - 4.2.3-1
- Update to 4.2.3 release
* Fri Apr 10 2020 Nicolas Chauvet <kwizart@gmail.com> - 4.2.2-5
- Enable libsrt by default
* Thu Mar 12 2020 leigh123linux <leigh123linux@googlemail.com> - 4.2.2-4
- Rebuilt for i686
* Sun Feb 23 2020 Leigh Scott <leigh123linux@gmail.com> - 4.2.2-3
- Rebuild for x265
* Tue Feb 04 2020 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 4.2.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

@ -0,0 +1,25 @@
From 37b8f54578ac1bcb7a63dc9038a5238fd6a58793 Mon Sep 17 00:00:00 2001
From: Leigh Scott <leigh123linux@gmail.com>
Date: Sat, 23 May 2020 12:32:44 +0100
Subject: [PATCH] fix vmaf model path
---
libavfilter/vf_libvmaf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavfilter/vf_libvmaf.c b/libavfilter/vf_libvmaf.c
index 14c3216b3a..e7273b6d1d 100644
--- a/libavfilter/vf_libvmaf.c
+++ b/libavfilter/vf_libvmaf.c
@@ -72,7 +72,7 @@ typedef struct LIBVMAFContext {
#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
static const AVOption libvmaf_options[] = {
- {"model_path", "Set the model to be used for computing vmaf.", OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/local/share/model/vmaf_v0.6.1.pkl"}, 0, 1, FLAGS},
+ {"model_path", "Set the model to be used for computing vmaf.", OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/share/model/vmaf_v0.6.1.pkl"}, 0, 1, FLAGS},
{"log_path", "Set the file path to be used to store logs.", OFFSET(log_path), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS},
{"log_fmt", "Set the format of the log (xml or json).", OFFSET(log_fmt), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS},
{"enable_transform", "Enables transform for computing vmaf.", OFFSET(enable_transform), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS},
--
2.26.2

@ -1 +1 @@
SHA512 (ffmpeg-4.2.2.tar.xz) = 381cd6732fa699eb89000621cf34256920596ed1f9de3c2194dbad35fdf2165269eb7d3a147a0eb75dc18fbb6d601382b5801750e09fc63547766842f84208e3
SHA512 (ffmpeg-4.2.10.tar.xz) = 92b9dde325bfd65246458adb9e3ab1fd031eb5fd73991c55e4f6c809fb269d40f2d6500942ee5011afa37afc6743a9ef3c65f028bca5a1c8618355648358bf9a

Loading…
Cancel
Save