[ffmpeg] Clean up
by Leigh Scott
commit 7425d371e1a3c4fa77c7a4e416a16d9aa76f1569
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Dec 31 18:35:08 2020 +0000
Clean up
ffmpeg.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 075bbc9..b61ef8a 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -98,7 +98,7 @@ ExclusiveArch: armv7hnl
%global lesser L
%endif
-%if 0%{!?_without_amr} || 0%{?_with_gmp} || 0%{?_with_smb} || 0%{?_with_vmaf} || 0%{?_with_smb}
+%if 0%{!?_without_amr} || 0%{?_with_gmp} || 0%{?_with_smb} || 0%{?_with_vmaf}
%global ffmpeg_license %{?lesser}GPLv3+
%else
%global ffmpeg_license %{?lesser}GPLv2+
3 years, 4 months
[ffmpeg] Enable smb support
by Leigh Scott
commit dae562d93415b894de39cb3ac601653c256404bf
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Dec 31 17:03:00 2020 +0000
Enable smb support
ffmpeg.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 576ffa7..075bbc9 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -28,6 +28,9 @@
%endif
%if 0%{?fedora} || 0%{?rhel} > 7
+%ifnarch i686
+%global _with_smb 1
+%endif
%ifarch x86_64 i686
%global _with_vapoursynth 1
%endif
@@ -95,7 +98,7 @@ ExclusiveArch: armv7hnl
%global lesser L
%endif
-%if 0%{!?_without_amr} || 0%{?_with_gmp} || 0%{?_with_smb} || 0%{?_with_vmaf}
+%if 0%{!?_without_amr} || 0%{?_with_gmp} || 0%{?_with_smb} || 0%{?_with_vmaf} || 0%{?_with_smb}
%global ffmpeg_license %{?lesser}GPLv3+
%else
%global ffmpeg_license %{?lesser}GPLv2+
@@ -317,7 +320,7 @@ This package contains development files for %{name}
%{?_with_rav1e:--enable-librav1e} \\\
%{?_with_rtmp:--enable-librtmp} \\\
%{?_with_rubberband:--enable-librubberband} \\\
- %{?_with_smb:--enable-libsmbclient} \\\
+ %{?_with_smb:--enable-libsmbclient --enable-version3} \\\
%{?_with_snappy:--enable-libsnappy} \\\
--enable-libsoxr \\\
--enable-libspeex \\\
3 years, 4 months
[xpra-codecs-freeworld] Release 4.0.6
by sagitter
commit ff1fa90c045a359989ce7bd6429c797f7b5c56ac
Author: Antonio T <sagitter(a)fedoraproject.org>
Date: Thu Dec 31 16:10:25 2020 +0100
Release 4.0.6
.gitignore | 1 +
sources | 2 +-
xpra-codecs-freeworld.spec | 7 +++++--
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cacd3b7..2be5683 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,4 @@ xpra-0.16.3.tar.xz
/xpra-4.0.3.tar.xz
/xpra-4.0.4.tar.xz
/xpra-4.0.5.tar.xz
+/xpra-4.0.6.tar.xz
diff --git a/sources b/sources
index 6ee20d5..3d45319 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xpra-4.0.5.tar.xz) = d2aa2b70b6ec702bca5b0c2b06378107d45c4cad79f83ee2a1ed27fd5f66474e2d8e1d28d5111e60417ed089f91bab0b1566b0c9b3dcf6f0cb5e204ff5c42c92
+SHA512 (xpra-4.0.6.tar.xz) = e3dc66040898ed40ef12b8cdb89e5f42c2f36edc071afb435334389e727f376ddc116dbee47018468bff24f2cdd7be35750b58bc108ba73c5558bd9eccbd04ea
diff --git a/xpra-codecs-freeworld.spec b/xpra-codecs-freeworld.spec
index 34f941d..ea5bc14 100644
--- a/xpra-codecs-freeworld.spec
+++ b/xpra-codecs-freeworld.spec
@@ -25,8 +25,8 @@
%endif
Name: xpra-codecs-freeworld
-Version: 4.0.5
-Release: 2%{?dist}
+Version: 4.0.6
+Release: 1%{?dist}
Summary: Additional codecs for xpra using x264 and ffmpeg
License: GPLv2+
URL: http://www.xpra.org/
@@ -121,6 +121,9 @@ find %{buildroot}%{python3_sitearch}/xpra -name '*.so' \
%license COPYING
%changelog
+* Thu Dec 31 2020 Antonio Trande <sagitter(a)fedoraproject.org> - 4.0.6-1
+- Release 4.0.6
+
* Fri Nov 27 2020 Sérgio Basto <sergio(a)serjux.com> - 4.0.5-2
- Mass rebuild for x264-0.161
3 years, 4 months
[ffmpeg] Bump libvmaf required version
by Leigh Scott
commit db2bb5846a47fc3ac32bbcef7aaef0e8372e9372
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Dec 31 15:00:47 2020 +0000
Bump libvmaf required version
ffmpeg.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 601e787..576ffa7 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -199,7 +199,7 @@ BuildRequires: pkgconfig(srt)
#BuildRequires: texi2html
BuildRequires: texinfo
%{?_with_twolame:BuildRequires: twolame-devel}
-%{?_with_vmaf:BuildRequires: libvmaf-devel}
+%{?_with_vmaf:BuildRequires: libvmaf-devel >= 1.5.2}
%{?_with_wavpack:BuildRequires: wavpack-devel}
%{!?_without_vidstab:BuildRequires: vid.stab-devel}
%{!?_without_vulkan:BuildRequires: vulkan-loader-devel glslang-devel >= 11.0}
3 years, 4 months
[ffmpeg] Update to 20201231git477dd2d
by Leigh Scott
commit 59bfd6c3be07c4b91dc28c47022eb6f57543e366
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Dec 31 14:57:20 2020 +0000
Update to 20201231git477dd2d
.gitignore | 1 +
ffmpeg-snapshot.sh | 1 +
ffmpeg.spec | 17 ++++---
fix-vmaf-model-path.patch | 11 ++---
glslang_linker_flags.patch | 33 -------------
libavfilter_glslang.cpp.patch | 14 ------
libavutil_x86_x86inc.asm.patch | 101 ----------------------------------------
sources | 2 +-
tests_checkasm_vf_blend.c.patch | 15 ------
9 files changed, 16 insertions(+), 179 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 09ec616..194fd7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ ffmpeg-*.rpm
/ffmpeg-20200524.tar.bz2
/ffmpeg-20200531.tar.bz2
/ffmpeg-20200606.tar.bz2
+/ffmpeg-20201231.tar.bz2
diff --git a/ffmpeg-snapshot.sh b/ffmpeg-snapshot.sh
index d4a9ab5..b6d07be 100755
--- a/ffmpeg-snapshot.sh
+++ b/ffmpeg-snapshot.sh
@@ -17,5 +17,6 @@ date=$(date +%Y%m%d)
pushd "$tmp"
git clone git://git.ffmpeg.org/ffmpeg.git
cd ffmpeg
+git rev-parse HEAD
git archive --prefix="ffmpeg-${date}/" --format=tar master | bzip2 > "$pwd"/ffmpeg-${date}.tar.bz2
popd
diff --git a/ffmpeg.spec b/ffmpeg.spec
index f0b521b..601e787 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -1,8 +1,9 @@
# TODO: add make test to %%check section
#global branch oldabi-
-#global date 20200606
-#global rel rc1
+%global date 20201231
+%global commit 477dd2df60e6419ad8776a9865c421e8d42f68fe
+%global rel %(c=%{commit}; echo ${c:0:7})
%ifarch %{ix86}
# Fails due to asm issue
@@ -102,8 +103,8 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
-Version: 4.3.1
-Release: 15%{?date}%{?date:git}%{?rel}%{?dist}
+Version: 4.4
+Release: 0.1%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -112,12 +113,7 @@ Source0: ffmpeg-%{?branch}%{date}.tar.bz2
Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
%endif
Patch0: fix-vmaf-model-path.patch
-Patch1: glslang_linker_flags.patch
-# upstream glslang commit
-Patch2: libavfilter_glslang.cpp.patch
# upstream asm commits
-Patch3: libavutil_x86_x86inc.asm.patch
-Patch4: tests_checkasm_vf_blend.c.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})}
@@ -471,6 +467,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Thu Dec 31 2020 Leigh Scott <leigh123linux(a)gmail.com> - 4.4-0.1.20201231git477dd2d
+- Update to 20201231git477dd2d
+
* Thu Dec 24 2020 Leigh Scott <leigh123linux(a)gmail.com> - 4.3.1-15
- Enable dash demuxer (rfbz#5876)
- Enable lv2 support (rfbz#5863)
diff --git a/fix-vmaf-model-path.patch b/fix-vmaf-model-path.patch
index 88a949b..737bf35 100644
--- a/fix-vmaf-model-path.patch
+++ b/fix-vmaf-model-path.patch
@@ -1,6 +1,6 @@
-From 37b8f54578ac1bcb7a63dc9038a5238fd6a58793 Mon Sep 17 00:00:00 2001
+From d87f2ce576ddb0ce8f6ade22b3c66a8b63c90713 Mon Sep 17 00:00:00 2001
From: Leigh Scott <leigh123linux(a)gmail.com>
-Date: Sat, 23 May 2020 12:32:44 +0100
+Date: Thu, 31 Dec 2020 13:08:06 +0000
Subject: [PATCH] fix vmaf model path
---
@@ -8,7 +8,7 @@ Subject: [PATCH] fix vmaf model path
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavfilter/vf_libvmaf.c b/libavfilter/vf_libvmaf.c
-index 14c3216b3a..e7273b6d1d 100644
+index 4d49127efc..bd6f4519e8 100644
--- a/libavfilter/vf_libvmaf.c
+++ b/libavfilter/vf_libvmaf.c
@@ -72,7 +72,7 @@ typedef struct LIBVMAFContext {
@@ -18,8 +18,7 @@ index 14c3216b3a..e7273b6d1d 100644
- {"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},
+ {"log_fmt", "Set the format of the log (csv, json or xml).", 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
-
+2.29.2
diff --git a/sources b/sources
index 4d5a142..a41703e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ffmpeg-4.3.1.tar.xz) = 64e1052c45145e27726e43d4fe49c9a92058e55562d34fd3b3adf54d3506e6bd680f016b748828215e1bfc8ce19aa85b6f7e4eb05fafe21479118a4ad528a81f
+SHA512 (ffmpeg-20201231.tar.bz2) = f64087aa8222d3d7817a969abe80aa3bd769685432b5e28220a5e8d7482278b7b65745df6ad56ebe37e7eb2c2438c50b6856bad3ed9f8e2b9f1e41eafffe60a3
3 years, 4 months
[intel-media-driver] Update to 20.4.5
by Nicolas Chauvet
commit ec3240fb61294e97fdf4f317ed4d30c12fd3ac47
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Dec 31 15:51:32 2020 +0100
Update to 20.4.5
intel-media-driver.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/intel-media-driver.spec b/intel-media-driver.spec
index 2b76ef5..acaff2e 100644
--- a/intel-media-driver.spec
+++ b/intel-media-driver.spec
@@ -3,7 +3,7 @@
%undefine __cmake_in_source_build
Name: intel-media-driver
-Version: 20.4.0
+Version: 20.4.5
Release: 1%{?dist}
Summary: The Intel Media Driver for VAAPI
License: MIT and BSD
@@ -96,6 +96,9 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig
%changelog
+* Thu Dec 31 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 20.4.5-1
+- Update to 20.4.5
+
* Thu Nov 05 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 20.4.0-1
- Update to 20.4.0
diff --git a/sources b/sources
index 06888a8..60577da 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (intel-media-20.4.0.tar.gz) = 37e9ecc5089f2b53cd6a3743da98d605736b96c84613bcc7ae4afbaa945e8cbfef4da39d5e2434914f0b5c36035b7b83c2036a9cd8526f15bb8eafd47b9de29c
+SHA512 (intel-media-20.4.5.tar.gz) = dfd70dc83eae181830844f9055ad728d91a51a55ea29ea5d272b154f16a92dfba86568d9b4e8f8c56d500582056b73602c999d2e877386fcf46df1633fc5e2ea
3 years, 4 months
[intel-media-driver] Update to 20.4.0
by Nicolas Chauvet
commit 28705474a64c3c47d49a4064a22a19fa9c248c63
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Nov 5 12:28:55 2020 +0100
Update to 20.4.0
intel-media-driver.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/intel-media-driver.spec b/intel-media-driver.spec
index c9e072c..2b76ef5 100644
--- a/intel-media-driver.spec
+++ b/intel-media-driver.spec
@@ -3,7 +3,7 @@
%undefine __cmake_in_source_build
Name: intel-media-driver
-Version: 20.3.0
+Version: 20.4.0
Release: 1%{?dist}
Summary: The Intel Media Driver for VAAPI
License: MIT and BSD
@@ -96,6 +96,9 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig
%changelog
+* Thu Nov 05 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 20.4.0-1
+- Update to 20.4.0
+
* Wed Sep 30 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 20.3.0-1
- Update to 20.3.0
diff --git a/sources b/sources
index 1791b23..06888a8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (intel-media-20.3.0.tar.gz) = 59fa8c5db268491f0ae41de85d6e65ad7811f89dbc787f63b7378138952ba742b480a6b3cd21758c8d3b73fec2ab8d9854d8dda1a3d7f1b07e81df0c1c745f78
+SHA512 (intel-media-20.4.0.tar.gz) = 37e9ecc5089f2b53cd6a3743da98d605736b96c84613bcc7ae4afbaa945e8cbfef4da39d5e2434914f0b5c36035b7b83c2036a9cd8526f15bb8eafd47b9de29c
3 years, 4 months
