From b31c2905d13143c800d672d384eef3a58032dd48 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 18 Mar 2021 16:14:22 +0100 Subject: [PATCH 1/2] Switch to clang instead of nvcc --- ffmpeg.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ffmpeg.spec b/ffmpeg.spec index 97aa183..f99d034 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -67,6 +67,7 @@ %global _without_x264 1 %global _without_x265 1 %global _without_xvid 1 +%undefine _with_smb %endif # Disable nvenc when not relevant @@ -122,6 +123,7 @@ Patch0: fix-vmaf-model-path.patch # upstream asm commits 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}} %{?_with_libnpp:BuildRequires: pkgconfig(nppc-%{_cuda_version})} BuildRequires: alsa-lib-devel BuildRequires: bzip2-devel @@ -289,7 +291,7 @@ This package contains development files for %{name} %{!?_without_bluray:--enable-libbluray} \\\ %{?_with_bs2b:--enable-libbs2b} \\\ %{?_with_caca:--enable-libcaca} \\\ - %{?_with_cuda:--enable-cuda-sdk --enable-nonfree} \\\ + %{?_with_cuda_nvcc:--enable-cuda-nvcc --enable-nonfree} \\\ %{?_with_cuvid:--enable-cuvid --enable-nonfree} \\\ %{!?_without_cdio:--enable-libcdio} \\\ %{?_with_ieee1394:--enable-libdc1394 --enable-libiec61883} \\\ From 02ac0d8814df6645288ddfc8ed0aaac2d7f576c0 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 23 Mar 2021 20:35:29 +0000 Subject: [PATCH 2/2] Update to 4.4-0.6.20210323git0be265e --- .gitignore | 1 + ffmpeg-snapshot.sh | 3 ++- ffmpeg.spec | 10 +++++++--- sources | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 1d5909b..6cd8513 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ ffmpeg-*.rpm /ffmpeg-20210125.tar.bz2 /ffmpeg-20210218.tar.bz2 /ffmpeg-20210312.tar.bz2 +/ffmpeg-20210323.tar.bz2 diff --git a/ffmpeg-snapshot.sh b/ffmpeg-snapshot.sh index b6d07be..47dc104 100755 --- a/ffmpeg-snapshot.sh +++ b/ffmpeg-snapshot.sh @@ -17,6 +17,7 @@ date=$(date +%Y%m%d) pushd "$tmp" git clone git://git.ffmpeg.org/ffmpeg.git cd ffmpeg +git checkout release/4.4 git rev-parse HEAD -git archive --prefix="ffmpeg-${date}/" --format=tar master | bzip2 > "$pwd"/ffmpeg-${date}.tar.bz2 +git archive --prefix="ffmpeg-${date}/" --format=tar release/4.4 | bzip2 > "$pwd"/ffmpeg-${date}.tar.bz2 popd diff --git a/ffmpeg.spec b/ffmpeg.spec index f99d034..1aeabc8 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -1,8 +1,8 @@ # TODO: add make test to %%check section #global branch oldabi- -%global date 20210312 -%global commit 51367267c8a9f1a840f5e810f8c788e6e03712a5 +%global date 20210323 +%global commit 0be265e9a100adc778c1c3cf52155a6326043b85 %global rel %(c=%{commit}; echo ${c:0:7}) %ifarch %{ix86} @@ -111,7 +111,7 @@ ExclusiveArch: armv7hnl Summary: Digital VCR and streaming server Name: ffmpeg%{?flavor} Version: 4.4 -Release: 0.5%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist} +Release: 0.6%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist} License: %{ffmpeg_license} URL: http://ffmpeg.org/ %if 0%{?date} @@ -478,6 +478,10 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir} %changelog +* Tue Mar 23 2021 Leigh Scott - 4.4-0.6.20210323git0be265e +- Update to 4.4-0.6.20210323git0be265e +- Switch to release/4.4 branch + * Fri Mar 12 2021 Leigh Scott - 4.4-0.5.20210312git5136726 - Update to 20210312git5136726 diff --git a/sources b/sources index 8b308ce..e35728c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ffmpeg-20210312.tar.bz2) = b13d43eb465d87944a7c7c335c046e1ee64993193a82eaf22abd0608df20c4f09c6a63a8dc69034e8990567958c195d4abd1e83ec16d87287296d840cec10b98 +SHA512 (ffmpeg-20210323.tar.bz2) = 44e35678d2d03288c820f6b8d9d2656ee50de3f38a0bd7a96f9ab094d55b07af0e78c3c70a300df0a07aabb7739fd299071cdc9cf7fda5185bfe96819db8fb8d