[ffmpeg] Bump
by Nicolas Chauvet
commit 416d9824f2ba4f670edacab163adcf1bf45cac03
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Nov 15 20:05:31 2023 +0100
Bump
ffmpeg.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 484143b..1c49786 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -112,7 +112,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 6.1
-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}
@@ -534,6 +534,9 @@ strip %{buildroot}%{_libdir}/%{name}/libavcodec.so.*
%changelog
+* Wed Nov 15 2023 Nicolas Chauvet <kwizart(a)gmail.com> - 6.1-3
+- Bump
+
* Wed Nov 15 2023 Leigh Scott <leigh123linux(a)gmail.com> - 6.1-2
- Add patch to fix fedora ffmpeg brokenABI change
1 year
[ffmpeg/f39] Enforces conflicts and virtual provides
by Nicolas Chauvet
commit 3d71b8542fce3e8a7a55647326dfa524139c41a9
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Nov 15 20:03:46 2023 +0100
Enforces conflicts and virtual provides
ffmpeg.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 5b9e66e..3534b45 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -253,6 +253,7 @@ Conflicts: libpostproc-free
Conflicts: libswresample-free
Conflicts: libswscale-free
%{?_with_vmaf:Recommends: vmaf-models}
+Provides: libavcodec-freeworld = %{version}-%{release}
%description libs
FFmpeg is a complete and free Internet live audio and video
@@ -290,6 +291,7 @@ This package contains development files for %{name}
Summary: Freeworld libavcodec to complement the distro counterparts
# Supplements doesn't work well yet - we can rely on comps for now
#Supplements: libavcodec-free >= %%{version}
+Conflicts: libavcodec-free < %{version}
%description -n libavcodec-freeworld
Freeworld libavcodec to complement the distro counterparts
1 year
[ffmpeg] Enforces conflicts and virtual provides
by Nicolas Chauvet
commit b5033a5bebc3978a5114152427eb12efc153b857
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Nov 15 20:03:46 2023 +0100
Enforces conflicts and virtual provides
ffmpeg.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 51c2364..484143b 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -248,6 +248,7 @@ Conflicts: libpostproc-free
Conflicts: libswresample-free
Conflicts: libswscale-free
%{?_with_vmaf:Recommends: vmaf-models}
+Provides: libavcodec-freeworld = %{version}-%{release}
%description libs
FFmpeg is a complete and free Internet live audio and video
@@ -285,6 +286,7 @@ This package contains development files for %{name}
Summary: Freeworld libavcodec to complement the distro counterparts
# Supplements doesn't work well yet - we can rely on comps for now
#Supplements: libavcodec-free >= %%{version}
+Conflicts: libavcodec-free < %{version}
%description -n libavcodec-freeworld
Freeworld libavcodec to complement the distro counterparts
1 year
[gstreamer1-plugins-bad-freeworld] Update to 1.22.7
by Nicolas Chauvet
commit 6a897314ca2fa9c3dae85d8fb74fe85d8b97e458
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Nov 15 18:42:36 2023 +0100
Update to 1.22.7
gstreamer1-plugins-bad-freeworld.spec | 7 +++++--
sources | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/gstreamer1-plugins-bad-freeworld.spec b/gstreamer1-plugins-bad-freeworld.spec
index 4ad4686..4639e47 100644
--- a/gstreamer1-plugins-bad-freeworld.spec
+++ b/gstreamer1-plugins-bad-freeworld.spec
@@ -1,8 +1,8 @@
Summary: GStreamer 1.0 streaming media framework "bad" plug-ins
Name: gstreamer1-plugins-bad-freeworld
Epoch: 1
-Version: 1.22.6
-Release: 2%{?dist}
+Version: 1.22.7
+Release: 1%{?dist}
License: LGPLv2+
URL: https://gstreamer.freedesktop.org/
Source0: %{url}/src/gst-plugins-bad/gst-plugins-bad-%{version}.tar.xz
@@ -99,6 +99,9 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig
%changelog
+* Wed Nov 15 2023 Nicolas Chauvet <kwizart(a)gmail.com> - 1:1.22.7-1
+- Update to 1.22.7
+
* Wed Nov 08 2023 Leigh Scott <leigh123linux(a)gmail.com> - 1:1.22.6-2
- Rebuild for new faad2 version
diff --git a/sources b/sources
index 6f60025..50d801f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gst-plugins-bad-1.22.6.tar.xz) = 90f14ce92bf14e1b8fc0bda03482e22bb0c4fdcbda463a4eea4e084823134dcf6ded0f28cad1bea346ff14833463fa38dbefc530c0de061891ca15469d7f22a0
+SHA512 (gst-plugins-bad-1.22.7.tar.xz) = 0854ae604014278958d4f5d149ddd1a5d3004e2c3b9386d7711312f4993002ae18ddf82d152c78092f23d15dd9b5c83d2798ea5ae80626599df0bf61d05a0b6e
1 year
[ffmpeg/f39] Add patch to fix fedora ffmpeg broken ABI change
by Leigh Scott
commit 251040b242f2c515f132355c1e428788a220f5eb
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Nov 15 17:05:19 2023 +0000
Add patch to fix fedora ffmpeg broken ABI change
ffmpeg-chromium.patch | 46 ++++++++++++++++++++++++++++++++++++++++++++++
ffmpeg.spec | 7 ++++++-
2 files changed, 52 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg-chromium.patch b/ffmpeg-chromium.patch
new file mode 100644
index 0000000..2160609
--- /dev/null
+++ b/ffmpeg-chromium.patch
@@ -0,0 +1,46 @@
+From d32aacab65a322b66d6a1b48f6cdb03e42bde0f9 Mon Sep 17 00:00:00 2001
+From: Frank Liberato <liberato(a)chromium.org>
+Date: Wed, 7 Jul 2021 19:01:22 -0700
+Subject: [PATCH] Add av_stream_get_first_dts for Chromium
+
+---
+ libavformat/avformat.h | 4 ++++
+ libavformat/utils.c | 7 +++++++
+ 2 files changed, 11 insertions(+)
+
+diff --git a/libavformat/avformat.h b/libavformat/avformat.h
+index 1916aa2dc5..e6682849fa 100644
+--- a/libavformat/avformat.h
++++ b/libavformat/avformat.h
+@@ -1019,6 +1019,10 @@ attribute_deprecated
+ int64_t av_stream_get_end_pts(const AVStream *st);
+ #endif
+
++// Chromium: We use the internal field first_dts vvv
++int64_t av_stream_get_first_dts(const AVStream *st);
++// Chromium: We use the internal field first_dts ^^^
++
+ #define AV_PROGRAM_RUNNING 1
+
+ /**
+diff --git a/libavformat/utils.c b/libavformat/utils.c
+index cf4d68bff9..7d750abf88 100644
+--- a/libavformat/utils.c
++++ b/libavformat/utils.c
+@@ -55,6 +55,13 @@ int ff_unlock_avformat(void)
+ return ff_mutex_unlock(&avformat_mutex) ? -1 : 0;
+ }
+
++// Chromium: We use the internal field first_dts vvv
++int64_t av_stream_get_first_dts(const AVStream *st)
++{
++ return cffstream(st)->first_dts;
++}
++// Chromium: We use the internal field first_dts ^^^
++
+ /* an arbitrarily chosen "sane" max packet size -- 50M */
+ #define SANE_CHUNK_SIZE (50000000)
+
+--
+2.41.0
+
diff --git a/ffmpeg.spec b/ffmpeg.spec
index b0d25aa..5b9e66e 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.1
-Release: 1%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
+Release: 2%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
License: %{ffmpeg_license}
URL: https://ffmpeg.org/
%if 0%{?date}
@@ -127,6 +127,8 @@ Patch1: 0001-avfilter-vf_libplacebo-remove-deprecated-field.patch
# Backport fix for segfault when passing non-existent filter option
# See: https://bugzilla.rpmfusion.org/show_bug.cgi?id=6773
Patch2: 0001-fftools-ffmpeg_filter-initialize-the-o-to-silence-th.patch
+# We don't endorse adding this patch but fedora insists on breaking the ffmpeg ABI
+Patch3: ffmpeg-chromium.patch
Conflicts: %{name}-free
Provides: %{name}-bin = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@@ -535,6 +537,9 @@ strip %{buildroot}%{_libdir}/%{name}/libavcodec.so.*
%changelog
+* Wed Nov 15 2023 Leigh Scott <leigh123linux(a)gmail.com> - 6.0.1-2
+- Add patch to fix fedora ffmpeg brokenABI change
+
* Fri Nov 10 2023 Leigh Scott <leigh123linux(a)gmail.com> - 6.0.1-1
- Update to 6.0.1 release
1 year
[ffmpeg] Add patch to fix fedora ffmpeg broken ABI change
by Leigh Scott
commit 63792f0c8cd635b88934ed1a9704ee7ba66e0cb6
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Nov 15 17:05:19 2023 +0000
Add patch to fix fedora ffmpeg broken ABI change
ffmpeg-chromium.patch | 46 ++++++++++++++++++++++++++++++++++++++++++++++
ffmpeg.spec | 7 ++++++-
2 files changed, 52 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg-chromium.patch b/ffmpeg-chromium.patch
new file mode 100644
index 0000000..2160609
--- /dev/null
+++ b/ffmpeg-chromium.patch
@@ -0,0 +1,46 @@
+From d32aacab65a322b66d6a1b48f6cdb03e42bde0f9 Mon Sep 17 00:00:00 2001
+From: Frank Liberato <liberato(a)chromium.org>
+Date: Wed, 7 Jul 2021 19:01:22 -0700
+Subject: [PATCH] Add av_stream_get_first_dts for Chromium
+
+---
+ libavformat/avformat.h | 4 ++++
+ libavformat/utils.c | 7 +++++++
+ 2 files changed, 11 insertions(+)
+
+diff --git a/libavformat/avformat.h b/libavformat/avformat.h
+index 1916aa2dc5..e6682849fa 100644
+--- a/libavformat/avformat.h
++++ b/libavformat/avformat.h
+@@ -1019,6 +1019,10 @@ attribute_deprecated
+ int64_t av_stream_get_end_pts(const AVStream *st);
+ #endif
+
++// Chromium: We use the internal field first_dts vvv
++int64_t av_stream_get_first_dts(const AVStream *st);
++// Chromium: We use the internal field first_dts ^^^
++
+ #define AV_PROGRAM_RUNNING 1
+
+ /**
+diff --git a/libavformat/utils.c b/libavformat/utils.c
+index cf4d68bff9..7d750abf88 100644
+--- a/libavformat/utils.c
++++ b/libavformat/utils.c
+@@ -55,6 +55,13 @@ int ff_unlock_avformat(void)
+ return ff_mutex_unlock(&avformat_mutex) ? -1 : 0;
+ }
+
++// Chromium: We use the internal field first_dts vvv
++int64_t av_stream_get_first_dts(const AVStream *st)
++{
++ return cffstream(st)->first_dts;
++}
++// Chromium: We use the internal field first_dts ^^^
++
+ /* an arbitrarily chosen "sane" max packet size -- 50M */
+ #define SANE_CHUNK_SIZE (50000000)
+
+--
+2.41.0
+
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 77d5fa1..51c2364 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -112,7 +112,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 6.1
-Release: 1%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
+Release: 2%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
License: %{ffmpeg_license}
URL: https://ffmpeg.org/
%if 0%{?date}
@@ -122,6 +122,8 @@ Source0: https://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
Source1: https://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz.asc
Source2: https://ffmpeg.org/ffmpeg-devel.asc
%endif
+# We don't endorse adding this patch but fedora insists on breaking the ffmpeg ABI
+Patch0: ffmpeg-chromium.patch
Conflicts: %{name}-free
Provides: %{name}-bin = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@@ -530,6 +532,9 @@ strip %{buildroot}%{_libdir}/%{name}/libavcodec.so.*
%changelog
+* Wed Nov 15 2023 Leigh Scott <leigh123linux(a)gmail.com> - 6.1-2
+- Add patch to fix fedora ffmpeg brokenABI change
+
* Sat Nov 11 2023 Leigh Scott <leigh123linux(a)gmail.com> - 6.1-1
- Update to 6.1 release
1 year
[gstreamer1-plugins-ugly] Update to 1.22.7
by Nicolas Chauvet
commit 51b685b90165fd1f0a8cf0f5264ba5b55958cc92
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Nov 15 08:44:49 2023 +0100
Update to 1.22.7
gstreamer1-plugins-ugly.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/gstreamer1-plugins-ugly.spec b/gstreamer1-plugins-ugly.spec
index 1fcf933..f92a400 100644
--- a/gstreamer1-plugins-ugly.spec
+++ b/gstreamer1-plugins-ugly.spec
@@ -3,7 +3,7 @@
Summary: GStreamer 1.0 streaming media framework "ugly" plug-ins
Name: gstreamer1-plugins-ugly
Epoch: 1
-Version: 1.22.6
+Version: 1.22.7
Release: 1%{?dist}
License: LGPLv2+
URL: https://gstreamer.freedesktop.org/
@@ -72,6 +72,9 @@ gstreamer-plugins-good because:
%changelog
+* Wed Nov 15 2023 Nicolas Chauvet <kwizart(a)gmail.com> - 1:1.22.7-1
+- Update to 1.22.7
+
* Thu Nov 02 2023 Leigh Scott <leigh123linux(a)gmail.com> - 1:1.22.6-1
- Update gstreamer1-plugins-ugly to 1.22.6
diff --git a/sources b/sources
index 524376d..c7ff6e3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gst-plugins-ugly-1.22.6.tar.xz) = ada67ae880c93471986d99a52458ac7daa6c450948a3065ee37864f112000984a7f27d64f07922bb89f88fb9900e7c1010157f311ecb78bbfb97afc67291d1df
+SHA512 (gst-plugins-ugly-1.22.7.tar.xz) = 86905d15bd0720b24654684337b4d699a281999de697e933f61b386cf81d0138e77a1dbe905c19606037b52a245dfb8b455a573b7e5aaff44f493f2baf56170e
1 year