[v4l2loopback/f38: 3/3] Merge remote-tracking branch 'origin/master' into f38
by jwrdegoede
commit a24987d8d7ebbd3211339666892ba65e17718916
Merge: e5cd7e9 552fd2d
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Mon May 15 11:11:18 2023 +0200
Merge remote-tracking branch 'origin/master' into f38
sources | 2 +-
v4l2loopback.spec | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
---
1 year, 6 months
[ffmpeg/f36] fedora cisco repo isn't multiarch
by Leigh Scott
commit a90f5db21fccc729d1ddfe9ebc2a820d0c80be87
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun May 14 14:23:47 2023 +0100
fedora cisco repo isn't multiarch
ffmpeg.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index f2ef976..a3cdc40 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -18,11 +18,11 @@
%if 0%{?fedora}
# Disable because of gcc issue
%global _without_lensfun 1
-%global _with_openh264 1
%ifnarch i686
%global _with_bs2b 1
%global _with_chromaprint 1
%global _with_ilbc 1
+%global _with_openh264 1
%global _with_rav1e 1
%global _with_rubberband 1
%global _with_smb 1
@@ -134,7 +134,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 5.0.3
-Release: 2%{?dist}
+Release: 3%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -517,6 +517,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Sun May 14 2023 Leigh Scott <leigh123linux(a)gmail.com> - 5.0.3-3
+- fedora cisco repo isn't multiarch
+
* Fri May 12 2023 Leigh Scott <leigh123linux(a)gmail.com> - 5.0.3-2
- Enable openh264 for fedora
1 year, 6 months
[ffmpeg/f37] update changelog
by Leigh Scott
commit 84347ff8cf858e9acb5978ed4b0116e80527e587
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun May 14 14:19:38 2023 +0100
update changelog
ffmpeg.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index ea000cd..777f831 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -112,7 +112,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 5.1.3
-Release: 2%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
+Release: 3%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
License: %{ffmpeg_license}
URL: https://ffmpeg.org/
%if 0%{?date}
@@ -527,6 +527,9 @@ strip %{buildroot}%{_libdir}/%{name}/libavcodec.so.*
%changelog
+* Sun May 14 2023 Leigh Scott <leigh123linux(a)gmail.com> - 5.1.3-3
+- fedora cisco repo isn't multiarch
+
* Fri May 12 2023 Leigh Scott <leigh123linux(a)gmail.com> - 5.1.3-2
- Enable openh264 for fedora
1 year, 6 months
[ffmpeg/f37] fedora cisco repo isn't multiarch
by Leigh Scott
commit 7b91076c5f890857a63b3fc1e36f94c1ed21f399
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun May 14 14:03:28 2023 +0100
fedora cisco repo isn't multiarch
ffmpeg.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index be72d6e..ea000cd 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -24,13 +24,13 @@
# Disable because of gcc issue
%global _without_lensfun 1
%if 0%{?fedora}
-%global _with_openh264 1
%global _with_placebo 1
%endif
%ifnarch i686
%global _with_bs2b 1
%global _with_chromaprint 1
%global _with_ilbc 1
+%global _with_openh264 1
%global _with_rav1e 1
%global _with_rubberband 1
%global _with_smb 1
1 year, 6 months
[ffmpeg/f38] (2 commits) ...update changelog
by Leigh Scott
Summary of changes:
4fb4bfc... fedora cisco repo isn't multiarch (*)
b205b73... update changelog (*)
(*) This commit already existed in another branch; no separate mail sent
1 year, 6 months
[ffmpeg] update changelog
by Leigh Scott
commit b205b732e301d364c5d55f9291ed22894c9fce92
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun May 14 14:05:03 2023 +0100
update changelog
ffmpeg.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 88779a9..8903371 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -112,7 +112,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 6.0
-Release: 10%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
+Release: 11%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
License: %{ffmpeg_license}
URL: https://ffmpeg.org/
%if 0%{?date}
@@ -532,6 +532,9 @@ strip %{buildroot}%{_libdir}/%{name}/libavcodec.so.*
%changelog
+* Sun May 14 2023 Leigh Scott <leigh123linux(a)gmail.com> - 6.0-11
+- fedora cisco repo isn't multiarch
+
* Fri May 12 2023 Leigh Scott <leigh123linux(a)gmail.com> - 6.0-10
- Enable openh264 for fedora
1 year, 6 months
[ffmpeg] fedora cisco repo isn't multiarch
by Leigh Scott
commit 4fb4bfcab451f92c51fa38a4230eb6761622d3dd
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun May 14 14:03:28 2023 +0100
fedora cisco repo isn't multiarch
ffmpeg.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index e7a0216..88779a9 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -24,13 +24,13 @@
# Disable because of gcc issue
%global _without_lensfun 1
%if 0%{?fedora}
-%global _with_openh264 1
%global _with_placebo 1
%endif
%ifnarch i686
%global _with_bs2b 1
%global _with_chromaprint 1
%global _with_ilbc 1
+%global _with_openh264 1
%global _with_rav1e 1
%global _with_rubberband 1
%global _with_smb 1
1 year, 6 months
