[gstreamer1-libav/el9] Revert "Drop patch"
by Leigh Scott
commit da95ca5c9f13c2bc6e3d2f5ffae8078b9660bbda
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Jul 3 11:32:14 2022 +0100
Revert "Drop patch"
This reverts commit b3df946314e0970fdfc976f11e4570d2915ea8c7.
gstreamer1-libav-ffmpeg44-fix.patch | 223 ++++++++++++++++++++++++++++++++++++
gstreamer1-libav.spec | 6 +-
2 files changed, 225 insertions(+), 4 deletions(-)
---
diff --git a/gstreamer1-libav-ffmpeg44-fix.patch b/gstreamer1-libav-ffmpeg44-fix.patch
new file mode 100644
index 0000000..310a4d4
--- /dev/null
+++ b/gstreamer1-libav-ffmpeg44-fix.patch
@@ -0,0 +1,223 @@
+--- gst-libav-1.18.2.old/ext/libav/gstavdemux.c 2021-02-26 16:47:35.842537392 -0800
++++ gst-libav-1.18.2.new/ext/libav/gstavdemux.c 2021-02-26 16:47:55.137537967 -0800
+@@ -41,6 +41,211 @@
+ typedef struct _GstFFMpegDemux GstFFMpegDemux;
+ typedef struct _GstFFStream GstFFStream;
+
++typedef struct FFFrac {
++ int64_t val, num, den;
++} FFFrac;
++
++struct AVStreamInternal {
++ /**
++ * Set to 1 if the codec allows reordering, so pts can be different
++ * from dts.
++ */
++ int reorder;
++
++ /**
++ * bitstream filter to run on stream
++ * - encoding: Set by muxer using ff_stream_add_bitstream_filter
++ * - decoding: unused
++ */
++ AVBSFContext *bsfc;
++
++ /**
++ * Whether or not check_bitstream should still be run on each packet
++ */
++ int bitstream_checked;
++
++ /**
++ * The codec context used by avformat_find_stream_info, the parser, etc.
++ */
++ AVCodecContext *avctx;
++ /**
++ * 1 if avctx has been initialized with the values from the codec parameters
++ */
++ int avctx_inited;
++
++ enum AVCodecID orig_codec_id;
++
++ /* the context for extracting extradata in find_stream_info()
++ * inited=1/bsf=NULL signals that extracting is not possible (codec not
++ * supported) */
++ struct {
++ AVBSFContext *bsf;
++ AVPacket *pkt;
++ int inited;
++ } extract_extradata;
++
++ /**
++ * Whether the internal avctx needs to be updated from codecpar (after a late change to codecpar)
++ */
++ int need_context_update;
++
++ int is_intra_only;
++
++ FFFrac *priv_pts;
++
++#define MAX_STD_TIMEBASES (30*12+30+3+6)
++ /**
++ * Stream information used internally by avformat_find_stream_info()
++ */
++ struct {
++ int64_t last_dts;
++ int64_t duration_gcd;
++ int duration_count;
++ int64_t rfps_duration_sum;
++ double (*duration_error)[2][MAX_STD_TIMEBASES];
++ int64_t codec_info_duration;
++ int64_t codec_info_duration_fields;
++ int frame_delay_evidence;
++
++ /**
++ * 0 -> decoder has not been searched for yet.
++ * >0 -> decoder found
++ * <0 -> decoder with codec_id == -found_decoder has not been found
++ */
++ int found_decoder;
++
++ int64_t last_duration;
++
++ /**
++ * Those are used for average framerate estimation.
++ */
++ int64_t fps_first_dts;
++ int fps_first_dts_idx;
++ int64_t fps_last_dts;
++ int fps_last_dts_idx;
++
++ } *info;
++
++ AVIndexEntry *index_entries; /**< Only used if the format does not
++ support seeking natively. */
++ int nb_index_entries;
++ unsigned int index_entries_allocated_size;
++
++ int64_t interleaver_chunk_size;
++ int64_t interleaver_chunk_duration;
++
++ /**
++ * stream probing state
++ * -1 -> probing finished
++ * 0 -> no probing requested
++ * rest -> perform probing with request_probe being the minimum score to accept.
++ */
++ int request_probe;
++ /**
++ * Indicates that everything up to the next keyframe
++ * should be discarded.
++ */
++ int skip_to_keyframe;
++
++ /**
++ * Number of samples to skip at the start of the frame decoded from the next packet.
++ */
++ int skip_samples;
++
++ /**
++ * If not 0, the number of samples that should be skipped from the start of
++ * the stream (the samples are removed from packets with pts==0, which also
++ * assumes negative timestamps do not happen).
++ * Intended for use with formats such as mp3 with ad-hoc gapless audio
++ * support.
++ */
++ int64_t start_skip_samples;
++
++ /**
++ * If not 0, the first audio sample that should be discarded from the stream.
++ * This is broken by design (needs global sample count), but can't be
++ * avoided for broken by design formats such as mp3 with ad-hoc gapless
++ * audio support.
++ */
++ int64_t first_discard_sample;
++
++ /**
++ * The sample after last sample that is intended to be discarded after
++ * first_discard_sample. Works on frame boundaries only. Used to prevent
++ * early EOF if the gapless info is broken (considered concatenated mp3s).
++ */
++ int64_t last_discard_sample;
++
++ /**
++ * Number of internally decoded frames, used internally in libavformat, do not access
++ * its lifetime differs from info which is why it is not in that structure.
++ */
++ int nb_decoded_frames;
++
++ /**
++ * Timestamp offset added to timestamps before muxing
++ */
++ int64_t mux_ts_offset;
++
++ /**
++ * Internal data to check for wrapping of the time stamp
++ */
++ int64_t pts_wrap_reference;
++
++ /**
++ * Options for behavior, when a wrap is detected.
++ *
++ * Defined by AV_PTS_WRAP_ values.
++ *
++ * If correction is enabled, there are two possibilities:
++ * If the first time stamp is near the wrap point, the wrap offset
++ * will be subtracted, which will create negative time stamps.
++ * Otherwise the offset will be added.
++ */
++ int pts_wrap_behavior;
++
++ /**
++ * Internal data to prevent doing update_initial_durations() twice
++ */
++ int update_initial_durations_done;
++
++#define MAX_REORDER_DELAY 16
++
++ /**
++ * Internal data to generate dts from pts
++ */
++ int64_t pts_reorder_error[MAX_REORDER_DELAY+1];
++ uint8_t pts_reorder_error_count[MAX_REORDER_DELAY+1];
++
++ int64_t pts_buffer[MAX_REORDER_DELAY+1];
++
++ /**
++ * Internal data to analyze DTS and detect faulty mpeg streams
++ */
++ int64_t last_dts_for_order_check;
++ uint8_t dts_ordered;
++ uint8_t dts_misordered;
++
++ /**
++ * Internal data to inject global side data
++ */
++ int inject_global_side_data;
++
++ /**
++ * display aspect ratio (0 if unknown)
++ * - encoding: unused
++ * - decoding: Set by libavformat to calculate sample_aspect_ratio internally
++ */
++ AVRational display_aspect_ratio;
++
++ AVProbeData probe_data;
++
++ /**
++ * last packet in packet_buffer for this stream when muxing.
++ */
++ struct AVPacketList *last_in_packet_buffer;
++};
++
+ struct _GstFFStream
+ {
+ GstPad *pad;
+@@ -483,7 +688,7 @@ gst_ffmpegdemux_do_seek (GstFFMpegDemux
+ GST_LOG_OBJECT (demux, "keyframeidx: %d", keyframeidx);
+
+ if (keyframeidx >= 0) {
+- fftarget = stream->index_entries[keyframeidx].timestamp;
++ fftarget = stream->internal->index_entries[keyframeidx].timestamp;
+ target = gst_ffmpeg_time_ff_to_gst (fftarget, stream->time_base);
+
+ GST_LOG_OBJECT (demux,
diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec
index a8e850a..6e41719 100644
--- a/gstreamer1-libav.spec
+++ b/gstreamer1-libav.spec
@@ -1,10 +1,11 @@
Name: gstreamer1-libav
Version: 1.18.4
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: GStreamer 1.0 libav-based plug-ins
License: LGPLv2+
URL: https://gstreamer.freedesktop.org/
Source0: %{url}/src/gst-libav/gst-libav-%{version}.tar.xz
+Patch0: https://gitlab.freedesktop.org/gstreamer/gst-libav/uploads/1340cbe52e8384...
BuildRequires: gcc-c++
BuildRequires: meson
@@ -69,9 +70,6 @@ plug-in.
%endif
%changelog
-* Wed Mar 24 2021 Leigh Scott <leigh123linux(a)gmail.com> - 1.18.4-2
-- Drop patch
-
* Wed Mar 17 2021 Leigh Scott <leigh123linux(a)gmail.com> - 1.18.4-1
- 1.18.4
1 year, 9 months
[gstreamer1-libav/el9] Revert "Update"
by Leigh Scott
commit d8df2027aaf15ce4a4f65621646e553e92d6df16
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Jul 3 11:32:14 2022 +0100
Revert "Update"
This reverts commit 3d05a5880f95e217197e4988c36fe57af1e4884a.
gstreamer1-libav.spec | 7 ++-----
sources | 2 +-
2 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec
index bbb80a1..a8e850a 100644
--- a/gstreamer1-libav.spec
+++ b/gstreamer1-libav.spec
@@ -1,6 +1,6 @@
Name: gstreamer1-libav
-Version: 1.19.1
-Release: 1%{?dist}
+Version: 1.18.4
+Release: 2%{?dist}
Summary: GStreamer 1.0 libav-based plug-ins
License: LGPLv2+
URL: https://gstreamer.freedesktop.org/
@@ -69,9 +69,6 @@ plug-in.
%endif
%changelog
-* Tue Jun 08 2021 Leigh Scott <leigh123linux(a)gmail.com> - 1.19.1-1
-- Update
-
* Wed Mar 24 2021 Leigh Scott <leigh123linux(a)gmail.com> - 1.18.4-2
- Drop patch
diff --git a/sources b/sources
index 1b47723..89920bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gst-libav-1.19.1.tar.xz) = 37541e5de9621bbc68e3d56504bd9ebe1ba286c7f22720478a3e6d8bd9d69a8722c050d05e54aaee18a83685c867d7673a9c17d81f6e208628bd948775d92db0
+SHA512 (gst-libav-1.18.4.tar.xz) = 4eb10af6698f724bbc8d5b7b215e7349e6ff3b52e24b3987ee4077db1ae27ae0d6f25309adc50f0fccdf5af4d617634a7339ad1e5466a737c40a25c52c0d023f
1 year, 9 months
[gstreamer1-libav/el9] Revert "Add epoch"
by Leigh Scott
commit 848f9235c9ea5618d2041bf70c25387b4315eb9d
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Jul 3 11:32:13 2022 +0100
Revert "Add epoch"
This reverts commit 9c1374e366d9fcd99ddf2b70c6b0ab0a702cf5db.
gstreamer1-libav.spec | 1 -
1 file changed, 1 deletion(-)
---
diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec
index 6a781af..bbb80a1 100644
--- a/gstreamer1-libav.spec
+++ b/gstreamer1-libav.spec
@@ -1,5 +1,4 @@
Name: gstreamer1-libav
-Epoch: 1
Version: 1.19.1
Release: 1%{?dist}
Summary: GStreamer 1.0 libav-based plug-ins
1 year, 9 months
[gstreamer1-libav/el9] Revert "gstreamer1.prov is broken and hangs, workarround it"
by Leigh Scott
commit ebbf3b26650d1322437fec4759dbbca1a4e70246
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Jul 3 11:32:13 2022 +0100
Revert "gstreamer1.prov is broken and hangs, workarround it"
This reverts commit 72f5ba7bfc96f428cd29e4446f1f23bd8ddd268c.
gstreamer1-libav.spec | 4 ----
1 file changed, 4 deletions(-)
---
diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec
index e8941b1..07cee82 100644
--- a/gstreamer1-libav.spec
+++ b/gstreamer1-libav.spec
@@ -1,6 +1,3 @@
-# gstreamer1.prov is broken and hangs, workarround it
-%global __gstreamer1_provides %{nil}
-
Name: gstreamer1-libav
Epoch: 1
Version: 1.19.1
@@ -75,7 +72,6 @@ plug-in.
%changelog
* Mon Aug 02 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1:1.19.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-- gstreamer1.prov is broken and hangs, workarround it
* Tue Jun 08 2021 Leigh Scott <leigh123linux(a)gmail.com> - 1.19.1-1
- Update
1 year, 9 months
[gstreamer1-libav/el9] Revert "Update gstreamer1-libav to 1.19.2"
by Leigh Scott
commit a214ff411d7ac2233e85cf9d75af48850681b06d
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Jul 3 11:32:13 2022 +0100
Revert "Update gstreamer1-libav to 1.19.2"
This reverts commit df731cde6f4a5548246d422b0c6aba6bc0215e50.
gstreamer1-libav.spec | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec
index 59a7c27..e8941b1 100644
--- a/gstreamer1-libav.spec
+++ b/gstreamer1-libav.spec
@@ -3,8 +3,8 @@
Name: gstreamer1-libav
Epoch: 1
-Version: 1.19.2
-Release: 1%{?dist}
+Version: 1.19.1
+Release: 2%{?dist}
Summary: GStreamer 1.0 libav-based plug-ins
License: LGPLv2+
URL: https://gstreamer.freedesktop.org/
@@ -73,9 +73,6 @@ plug-in.
%endif
%changelog
-* Sat Oct 09 2021 Sérgio Basto <sergio(a)serjux.com> - 1:1.19.2-1
-- Update gstreamer1-libav to 1.19.2
-
* Mon Aug 02 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1:1.19.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
- gstreamer1.prov is broken and hangs, workarround it
1 year, 9 months
[gstreamer1-libav/el9] Revert "rfpkg new-sources seems that sometimes fails"
by Leigh Scott
commit 6ed1aff00aa7b9f65d1ff633943d02f40921fd01
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Jul 3 11:32:13 2022 +0100
Revert "rfpkg new-sources seems that sometimes fails"
This reverts commit 388bae92a5c8d9da428f2297e4fa776178c9c342.
sources | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/sources b/sources
index 6805f84..1b47723 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gst-libav-1.19.2.tar.xz) = e10e0e21aea655c500ef1266eee0410e3777e3a4aa0b85c75bc127345ddd62224dd07f063d30a06d64bf60e66508e9aca361665777935ca999d28c1c8d0eba36
+SHA512 (gst-libav-1.19.1.tar.xz) = 37541e5de9621bbc68e3d56504bd9ebe1ba286c7f22720478a3e6d8bd9d69a8722c050d05e54aaee18a83685c867d7673a9c17d81f6e208628bd948775d92db0
1 year, 9 months
[gstreamer1-libav/el9] Revert "Rebuilt for new ffmpeg snapshot"
by Leigh Scott
commit e2719ce54d241f6566066cebfd562f8e896f8292
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Jul 3 11:32:13 2022 +0100
Revert "Rebuilt for new ffmpeg snapshot"
This reverts commit 3c02c2c2f273c04038f37f6f52a0f0ea989f6ce6.
gstreamer1-libav.spec | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
---
diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec
index 6b793e8..59a7c27 100644
--- a/gstreamer1-libav.spec
+++ b/gstreamer1-libav.spec
@@ -4,7 +4,7 @@
Name: gstreamer1-libav
Epoch: 1
Version: 1.19.2
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: GStreamer 1.0 libav-based plug-ins
License: LGPLv2+
URL: https://gstreamer.freedesktop.org/
@@ -73,9 +73,6 @@ plug-in.
%endif
%changelog
-* Thu Nov 11 2021 Leigh Scott <leigh123linux(a)gmail.com> - 1:1.19.2-2
-- Rebuilt for new ffmpeg snapshot
-
* Sat Oct 09 2021 Sérgio Basto <sergio(a)serjux.com> - 1:1.19.2-1
- Update gstreamer1-libav to 1.19.2
1 year, 9 months
[gstreamer1-libav/el9] Revert "fix"
by Leigh Scott
commit 9f0e7415e3d6cd9b44958fbb69350726ee28cb49
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Jul 3 11:32:12 2022 +0100
Revert "fix"
This reverts commit 9007d97f0f298ee9040d8ee489ca2b4a14e84640.
139.patch | 229 --------------------------------------------------
gstreamer1-libav.spec | 7 +-
2 files changed, 2 insertions(+), 234 deletions(-)
---
diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec
index 65e92b0..6b793e8 100644
--- a/gstreamer1-libav.spec
+++ b/gstreamer1-libav.spec
@@ -9,7 +9,6 @@ Summary: GStreamer 1.0 libav-based plug-ins
License: LGPLv2+
URL: https://gstreamer.freedesktop.org/
Source0: %{url}/src/gst-libav/gst-libav-%{version}.tar.xz
-Patch0: https://gitlab.freedesktop.org/gstreamer/gst-libav/-/merge_requests/139.p...
BuildRequires: gcc-c++
BuildRequires: meson
@@ -47,10 +46,8 @@ plug-in.
%prep
-%setup -n gst-libav-%{version}
-%if 0%{?fedora} >= 36
-%patch0 -p1 -b ffmpeg45
-%endif
+%autosetup -p1 -n gst-libav-%{version}
+
%build
%meson \
1 year, 9 months
[gstreamer1-libav/el9] Revert "Update gstreamer1-libav to 1.19.3"
by Leigh Scott
commit 52373cfa4a90a24e31c8bcd694d8fb01e3fd999b
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Jul 3 11:32:12 2022 +0100
Revert "Update gstreamer1-libav to 1.19.3"
This reverts commit c8051ec0744a269b39c2f2ac7b1c82953cdf2e2c.
gstreamer1-libav.spec | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec
index cd8737f..65e92b0 100644
--- a/gstreamer1-libav.spec
+++ b/gstreamer1-libav.spec
@@ -3,8 +3,8 @@
Name: gstreamer1-libav
Epoch: 1
-Version: 1.19.3
-Release: 1%{?dist}
+Version: 1.19.2
+Release: 2%{?dist}
Summary: GStreamer 1.0 libav-based plug-ins
License: LGPLv2+
URL: https://gstreamer.freedesktop.org/
@@ -76,9 +76,6 @@ plug-in.
%endif
%changelog
-* Mon Nov 15 2021 Sérgio Basto <sergio(a)serjux.com> - 1:1.19.3-1
-- Update gstreamer1-libav to 1.19.3
-
* Thu Nov 11 2021 Leigh Scott <leigh123linux(a)gmail.com> - 1:1.19.2-2
- Rebuilt for new ffmpeg snapshot
1 year, 9 months