[ffmpeg] Add conflicts
by Leigh Scott
commit f6e8c9441babfa92fcb69971020e48e6616ba4d5
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Apr 5 13:28:43 2022 +0100
Add conflicts
ffmpeg.spec | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 743764f..5361ce6 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -144,7 +144,7 @@ Source0: ffmpeg-%{?branch}%{date}.tar.bz2
Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
%endif
Patch0: fix-vmaf-model-path.patch
-# upstream asm commits
+Conflicts: %{name}-free
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}}
@@ -253,6 +253,13 @@ and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash.
%package libs
Summary: Libraries for %{name}
+Conflicts: libavcodec-free
+Conflicts: libavfilter-free
+Conflicts: libavformat-free
+Conflicts: libavutil-free
+Conflicts: libpostproc-free
+Conflicts: libswresample-free
+Conflicts: libswscale-free
%{?_with_vmaf:Recommends: vmaf-models}
%description libs
@@ -264,6 +271,7 @@ This package contains the libraries for %{name}
%package -n libavdevice%{?flavor}
Summary: Special devices muxing/demuxing library
+Conflicts: libavdevice-free
Requires: %{name}-libs%{_isa} = %{version}-%{release}
%description -n libavdevice%{?flavor}
@@ -273,6 +281,7 @@ devices, audio capture and playback etc.
%package devel
Summary: Development package for %{name}
+Conflicts: %{name}-free-devel
Requires: %{name}-libs%{_isa} = %{version}-%{release}
Requires: libavdevice%{?flavor}%{_isa} = %{version}-%{release}
Requires: pkgconfig
2 years
[nvidia-settings-470xx] Fix appdata
by Leigh Scott
commit dc576c3e955e6175944276dd567c11b61c36ffd4
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Apr 5 11:37:48 2022 +0100
Fix appdata
nvidia-settings-470xx.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/nvidia-settings-470xx.spec b/nvidia-settings-470xx.spec
index 3a628d9..c083604 100644
--- a/nvidia-settings-470xx.spec
+++ b/nvidia-settings-470xx.spec
@@ -3,7 +3,7 @@
Name: %{appname}-470xx
Epoch: 3
Version: 470.103.01
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Summary: Configure the NVIDIA 470xx series graphics driver
@@ -104,6 +104,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain
%{_mandir}/man1/%{appname}.1.*
%changelog
+* Tue Apr 05 2022 Leigh Scott <leigh123linux(a)gmail.com> - 3:470.103.01-3
+- Fix appdata
+
* Thu Feb 10 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 3:470.103.01-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
2 years
[xorg-x11-drv-nvidia-470xx] Fix appdata
by Leigh Scott
commit 0f2798790036db0e589caeadca71ef1cde774852
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Apr 5 11:35:00 2022 +0100
Fix appdata
xorg-x11-drv-nvidia-470xx.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/xorg-x11-drv-nvidia-470xx.spec b/xorg-x11-drv-nvidia-470xx.spec
index 7dcc460..093623b 100644
--- a/xorg-x11-drv-nvidia-470xx.spec
+++ b/xorg-x11-drv-nvidia-470xx.spec
@@ -25,7 +25,7 @@
Name: xorg-x11-drv-%{_nvidia_serie}
Epoch: 3
Version: 470.103.01
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: NVIDIA's 470xx series proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -555,6 +555,9 @@ fi ||:
%endif
%changelog
+* Tue Apr 05 2022 Leigh Scott <leigh123linux(a)gmail.com> - 3:470.103.01-4
+- Fix appdata
+
* Sat Feb 12 2022 Sérgio Basto <sergio(a)serjux.com> - 3:470.103.01-3
- Rebuild with target f36-nonfree-multilibs
2 years
[intel-media-driver/f36] Update to 22.3.1
by Nicolas Chauvet
commit 49ad3f822e7b34f8c423dbcd7d8161a60bb297e4
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Apr 1 19:06:49 2022 +0200
Update to 22.3.1
intel-media-driver.spec | 7 +++++--
sources | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/intel-media-driver.spec b/intel-media-driver.spec
index c3a262a..792fba7 100644
--- a/intel-media-driver.spec
+++ b/intel-media-driver.spec
@@ -1,8 +1,8 @@
#global pre .pre8
Name: intel-media-driver
-Version: 22.1.1
-Release: 4%{?dist}
+Version: 22.3.1
+Release: 1%{?dist}
Summary: The Intel Media Driver for VAAPI
License: MIT and BSD
URL: https://github.com/intel/media-driver
@@ -94,6 +94,9 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig
%changelog
+* Fri Apr 01 2022 Nicolas Chauvet <kwizart(a)gmail.com> - 22.3.1-1
+- Update to 22.3.1
+
* Fri Apr 01 2022 Nicolas Chauvet <kwizart(a)gmail.com> - 22.1.1-4
- rebuilt
diff --git a/sources b/sources
index bb74f35..4e7a3e6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (intel-media-22.1.1.tar.gz) = 8ab0e5671d90d00b94c42ae6ef7712d20ba6fcd0e67a55a9daa1193ffc8c78455a02c7d3730e8d865ab15e3659e761898da6142348d16f04614a01dc75ae1260
+SHA512 (intel-media-22.3.1.tar.gz) = 286f974a11546f8541429230330c5bd514c5eb372d3278461a132fb236f19908aa544a44010e52981bb942573ab6c2047c8c03471517182e2daf2da87b0eb74f
2 years
[ffmpeg/f36] Add more el9 deps
by Nicolas Chauvet
Summary of changes:
5732e69... Add more el9 deps (*)
(*) This commit already existed in another branch; no separate mail sent
2 years
[ffmpeg] Add more el9 deps
by Nicolas Chauvet
commit 5732e69c33f2ea3a702d0327e024a1f02c2dd5e0
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Apr 5 10:13:33 2022 +0200
Add more el9 deps
ffmpeg.spec | 3 ---
1 file changed, 3 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 59cd5b3..743764f 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -64,12 +64,9 @@
%endif
%endif
%if 0%{?el9}
-%global _without_ass 1
%global _without_frei0r 1
%global _without_jack 1
-%global _without_zimg 1
%undefine _with_caca
-%undefine _with_vapoursynth
%ifnarch x86_64
%global _without_vaapi 1
%endif
2 years