Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package moc for openSUSE:Factory checked in
at 2022-09-06 13:01:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/moc (Old)
and /work/SRC/openSUSE:Factory/.moc.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "moc"
Tue Sep 6 13:01:06 2022 rev:16 rq:1001355 version:2.6.0~svn2994
Changes:
--------
--- /work/SRC/openSUSE:Factory/moc/moc.changes 2022-04-02 18:21:03.585925412
+0200
+++ /work/SRC/openSUSE:Factory/.moc.new.2083/moc.changes 2022-09-06
13:01:24.439023671 +0200
@@ -1,0 +2,8 @@
+Sun Sep 4 12:05:46 UTC 2022 - Bj??rn Lie <bjorn....@gmail.com>
+
+- Fix build with ffmpeg-5, add patches from debian:
+ + 0005-avcodec-include.patch
+ + 0006-uncast-warnings.patch
+ + 0007-cur-dts.patch
+
+-------------------------------------------------------------------
New:
----
0005-avcodec-include.patch
0006-uncast-warnings.patch
0007-cur-dts.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ moc.spec ++++++
--- /var/tmp/diff_new_pack.Xh8IU6/_old 2022-09-06 13:01:24.995025076 +0200
+++ /var/tmp/diff_new_pack.Xh8IU6/_new 2022-09-06 13:01:25.003025096 +0200
@@ -1,7 +1,7 @@
#
# spec file for package moc
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -28,6 +28,9 @@
Patch1: moc.timestamp.patch
Patch2: moc.TiMidity_Config.patch
Patch3: moc.crash.GLIB-2.35-1.patch
+Patch4: 0005-avcodec-include.patch
+Patch5: 0006-uncast-warnings.patch
+Patch6: 0007-cur-dts.patch
BuildRequires: autoconf
BuildRequires: automake
++++++ 0005-avcodec-include.patch ++++++
>From d75ef5832592c796b45018e81c939c375c1326b4 Mon Sep 17 00:00:00 2001
From: John Fitzgerald <mocma...@daper.net>
Date: Sat, 25 Jun 2022 13:15:37 +0300
Subject: [PATCH 1/3] avcodec include
Signed-off-by: Elimar Riesebieter <riese...@lxtec.de>
---
decoder_plugins/ffmpeg/ffmpeg.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/decoder_plugins/ffmpeg/ffmpeg.c b/decoder_plugins/ffmpeg/ffmpeg.c
index c043b5a..f5ea484 100644
--- a/decoder_plugins/ffmpeg/ffmpeg.c
+++ b/decoder_plugins/ffmpeg/ffmpeg.c
@@ -32,6 +32,7 @@
#include <stdint.h>
#include <errno.h>
+#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
#include <libavutil/mathematics.h>
#if HAVE_LIBAVUTIL_CHANNEL_LAYOUT_H
--
2.36.1
++++++ 0006-uncast-warnings.patch ++++++
>From 27fa391c6b3361ef781dbf0a045445ceabfaa07f Mon Sep 17 00:00:00 2001
From: John Fitzgerald <mocma...@daper.net>
Date: Sat, 25 Jun 2022 13:18:08 +0300
Subject: [PATCH 2/3] uncast warnings
Signed-off-by: Elimar Riesebieter <riese...@lxtec.de>
---
decoder_plugins/ffmpeg/ffmpeg.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/decoder_plugins/ffmpeg/ffmpeg.c b/decoder_plugins/ffmpeg/ffmpeg.c
index f5ea484..fd4582f 100644
--- a/decoder_plugins/ffmpeg/ffmpeg.c
+++ b/decoder_plugins/ffmpeg/ffmpeg.c
@@ -79,7 +79,7 @@ struct ffmpeg_data
AVIOContext *pb;
AVStream *stream;
AVCodecContext *enc;
- AVCodec *codec;
+ const AVCodec *codec;
char *remain_buf;
int remain_buf_len;
@@ -848,7 +848,7 @@ static int ffmpeg_can_decode (struct io_stream *stream)
{
int res;
AVProbeData probe_data;
- AVInputFormat *fmt;
+ const AVInputFormat *fmt;
char buf[8096 + AVPROBE_PADDING_SIZE] = {0};
res = io_peek (stream, buf, sizeof (buf));
@@ -1411,7 +1411,7 @@ static int ffmpeg_our_format_ext (const char *ext)
static int ffmpeg_our_format_mime (const char *mime_type)
{
- AVOutputFormat *fmt;
+ const AVOutputFormat *fmt;
fmt = av_guess_format (NULL, NULL, mime_type);
return fmt ? 1 : 0;
--
2.36.1
++++++ 0007-cur-dts.patch ++++++
>From dba3b4262b6187f688152126b4ca743f88e93c82 Mon Sep 17 00:00:00 2001
From: John Fitzgerald <mocma...@daper.net>
Date: Sat, 25 Jun 2022 13:20:46 +0300
Subject: [PATCH 3/3] cur dts
Signed-off-by: Elimar Riesebieter <riese...@lxtec.de>
---
decoder_plugins/ffmpeg/ffmpeg.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/decoder_plugins/ffmpeg/ffmpeg.c b/decoder_plugins/ffmpeg/ffmpeg.c
index fd4582f..64afe04 100644
--- a/decoder_plugins/ffmpeg/ffmpeg.c
+++ b/decoder_plugins/ffmpeg/ffmpeg.c
@@ -1172,7 +1172,7 @@ static bool seek_in_stream (struct ffmpeg_data *data)
static bool seek_in_stream (struct ffmpeg_data *data, int sec)
#endif
{
- int rc, flags = AVSEEK_FLAG_ANY;
+ int rc;
int64_t seek_ts;
#if SEEK_IN_DECODER
@@ -1198,10 +1198,8 @@ static bool seek_in_stream (struct ffmpeg_data *data,
int sec)
seek_ts += data->stream->start_time;
}
- if (data->stream->cur_dts > seek_ts)
- flags |= AVSEEK_FLAG_BACKWARD;
-
- rc = av_seek_frame (data->ic, data->stream->index, seek_ts, flags);
+ rc = av_seek_frame (data->ic, data->stream->index, seek_ts,
+ AVSEEK_FLAG_BACKWARD);
if (rc < 0) {
log_errno ("Seek error", rc);
return false;
--
2.36.1
