[audacity-freeworld] Use compat-ffmpeg4 for f36+
by Leigh Scott
commit 388a38385604709bcd966c7231d8e5c2eb5a7971
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Feb 24 13:13:03 2022 +0000
Use compat-ffmpeg4 for f36+
audacity-freeworld.spec | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
---
diff --git a/audacity-freeworld.spec b/audacity-freeworld.spec
index 3cccc72..891be87 100644
--- a/audacity-freeworld.spec
+++ b/audacity-freeworld.spec
@@ -6,7 +6,7 @@
Name: audacity-freeworld
Version: 3.1.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Multitrack audio editor
License: GPLv2
URL: http://audacity.sourceforge.net
@@ -65,7 +65,11 @@ BuildRequires: zlib-devel
BuildRequires: python3
BuildRequires: libappstream-glib
+%if 0%{?fedora} && 0%{?fedora} > 35
+Recommends: compat-ffmpeg4
+%else
Recommends: ffmpeg-libs
+%endif
# For new symbols in portaudio
Requires: portaudio%{?_isa} >= 19-16
@@ -160,6 +164,9 @@ rm -f %{buildroot}%{_prefix}/%{realname}
%license LICENSE.txt
%changelog
+* Thu Feb 24 2022 Leigh Scott <leigh123linux(a)gmail.com> - 3.1.3-3
+- Use compat-ffmpeg4 for f36+
+
* Wed Feb 09 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 3.1.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
2 years, 10 months
[ffmpeg] Revert "Epoch the fedora ffmpeg-free packages"
by Leigh Scott
commit 9f022ecff6efc52ca12acf876c25a8e7f053f0b4
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Feb 23 17:27:23 2022 +0000
Revert "Epoch the fedora ffmpeg-free packages"
This reverts commit 15e852674da008afd34e8e23d9e0ef9927bea727.
ffmpeg.spec | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 6b5b17d..3bdb3a4 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -132,8 +132,6 @@ Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
Patch0: fix-vmaf-model-path.patch
# upstream asm commits
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-# Fedora dev's decided to conflict with our package
-Provides: %{name}-free%{?_isa} = 100:%{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})}
@@ -241,13 +239,6 @@ and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash.
%package libs
Summary: Libraries for %{name}
%{?_with_vmaf:Recommends: vmaf-models}
-Provides: libavcodec-free%{?_isa} = 100:%{version}-%{release}
-Provides: libavfilter-free%{?_isa} = 100:%{version}-%{release}
-Provides: libavformat-free%{?_isa} = 100:%{version}-%{release}
-Provides: libavutil-free%{?_isa} = 100:%{version}-%{release}
-Provides: libpostproc-free%{?_isa} = 100:%{version}-%{release}
-Provides: libswresample-free%{?_isa} = 100:%{version}-%{release}
-Provides: libswscale-free%{?_isa} = 100:%{version}-%{release}
%description libs
FFmpeg is a complete and free Internet live audio and video
@@ -258,8 +249,7 @@ This package contains the libraries for %{name}
%package -n libavdevice%{?flavor}
Summary: Special devices muxing/demuxing library
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-Provides: libavdevice-free%{?_isa} = 100:%{version}-%{release}
+Requires: %{name}-libs%{_isa} = %{version}-%{release}
%description -n libavdevice%{?flavor}
Libavdevice is a complementary library to libavf "libavformat". It provides
@@ -268,8 +258,8 @@ devices, audio capture and playback etc.
%package devel
Summary: Development package for %{name}
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-Requires: libavdevice%{?flavor}%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs%{_isa} = %{version}-%{release}
+Requires: libavdevice%{?flavor}%{_isa} = %{version}-%{release}
Requires: pkgconfig
%description devel
2 years, 10 months
[faad2/el9] Fix conditional
by Leigh Scott
Summary of changes:
9bd2068... Fix conditional (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 10 months
[faad2] Fix conditional
by Leigh Scott
commit 9bd2068138916f325af3fd6b443aad93c2d7b34f
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Feb 23 13:20:30 2022 +0000
Fix conditional
faad2.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/faad2.spec b/faad2.spec
index b274987..6c6ca71 100644
--- a/faad2.spec
+++ b/faad2.spec
@@ -1,4 +1,4 @@
-%if 0%{?fedora} < 35 || 0%{?rhel} < 8
+%if 0%{?fc34} || 0%{?el7}
%ifnarch i686
%global _with_xmms 1
%global xmmsinputplugindir %(xmms-config --input-plugin-dir 2>/dev/null)
2 years, 10 months
[x264] Revert "switch to bootstrap"
by Leigh Scott
commit cb8e7d694005cf3b58b3313b3319354c22e67d17
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Feb 23 13:17:08 2022 +0000
Revert "switch to bootstrap"
This reverts commit e962a1deda2d0fb1e769d14d83dc65c2ed6f9ce9.
x264.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/x264.spec b/x264.spec
index ca7686a..3fd93de 100644
--- a/x264.spec
+++ b/x264.spec
@@ -7,7 +7,7 @@
%global gver .%{gitdate}git%{gitversion}
%global branch stable
-%global _with_bootstrap 1
+#global _with_bootstrap 1
%{?_with_bootstrap:
%global _without_gpac 1
2 years, 10 months
[faad2/el9] Fix conditional
by Leigh Scott
Summary of changes:
cff4492... Fix conditional (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 10 months
[faad2] Fix conditional
by Leigh Scott
commit cff449273b9ff0be50719927843b1c5ccdfecf69
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Feb 23 12:41:42 2022 +0000
Fix conditional
faad2.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/faad2.spec b/faad2.spec
index 98c00fc..b274987 100644
--- a/faad2.spec
+++ b/faad2.spec
@@ -1,4 +1,4 @@
-%if 0%{?fedora} < 35|| 0%{?el7}
+%if 0%{?fedora} < 35 || 0%{?rhel} < 8
%ifnarch i686
%global _with_xmms 1
%global xmmsinputplugindir %(xmms-config --input-plugin-dir 2>/dev/null)
2 years, 10 months
[x264/el9] switch to bootstrap
by Leigh Scott
Summary of changes:
e962a1d... switch to bootstrap (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 10 months
[x264] switch to bootstrap
by Leigh Scott
commit e962a1deda2d0fb1e769d14d83dc65c2ed6f9ce9
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Feb 23 12:29:59 2022 +0000
switch to bootstrap
x264.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/x264.spec b/x264.spec
index 3fd93de..ca7686a 100644
--- a/x264.spec
+++ b/x264.spec
@@ -7,7 +7,7 @@
%global gver .%{gitdate}git%{gitversion}
%global branch stable
-#global _with_bootstrap 1
+%global _with_bootstrap 1
%{?_with_bootstrap:
%global _without_gpac 1
2 years, 10 months
[vlc/f36] Fixup
by Nicolas Chauvet
Summary of changes:
88ad023... Fixup (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 10 months
