Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package deadbeef for openSUSE:Factory
checked in at 2022-11-09 12:57:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deadbeef (Old)
and /work/SRC/openSUSE:Factory/.deadbeef.new.1597 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deadbeef"
Wed Nov 9 12:57:18 2022 rev:19 rq:1034557 version:1.9.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/deadbeef/deadbeef.changes 2022-11-04
17:36:20.561242315 +0100
+++ /work/SRC/openSUSE:Factory/.deadbeef.new.1597/deadbeef.changes
2022-11-09 12:57:56.704520304 +0100
@@ -1,0 +2,5 @@
+Sun Nov 6 10:56:06 UTC 2022 - Bj??rn Lie <bjorn....@gmail.com>
+
+- Add fix-ffmpeg-5-support.patch: Fix build against ffmpeg 5.0x
+
+-------------------------------------------------------------------
New:
----
fix-ffmpeg-5-support.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deadbeef.spec ++++++
--- /var/tmp/diff_new_pack.xRhkt9/_old 2022-11-09 12:57:57.812526551 +0100
+++ /var/tmp/diff_new_pack.xRhkt9/_new 2022-11-09 12:57:57.816526573 +0100
@@ -35,6 +35,8 @@
Patch1: %{name}-drop-documents-installation.patch
Patch2: %{name}-fix-includes.patch
Patch3: fix-warning.patch
+# PATCH-FIX-UPSTREAM fix-ffmpeg-5-support.patch -- Fix build against ffmpeg
5.0x
+Patch4: fix-ffmpeg-5-support.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: clang
++++++ fix-ffmpeg-5-support.patch ++++++
>From ca892b6f87077f2128faeefac85e146328a8f2a9 Mon Sep 17 00:00:00 2001
From: xuzhen <xuz...@users.noreply.github.com>
Date: Sun, 2 Oct 2022 12:23:02 +0800
Subject: [PATCH] Fix build with ffmpeg 5.0+
av_iformat_next was replaced with av_demuxer_iterate.
https://trac.ffmpeg.org/wiki/Bump59
---
plugins/ffmpeg/ffmpeg.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c
index 5409cc482..bfc9b6f6f 100644
--- a/plugins/ffmpeg/ffmpeg.c
+++ b/plugins/ffmpeg/ffmpeg.c
@@ -802,7 +802,12 @@ ffmpeg_init_exts (void) {
* encoding purpose, because ffmpeg will guess the output format from
* the file name specified by users.
*/
+#if LIBAVFORMAT_VERSION_MAJOR >= 59
+ void *iter = NULL;
+ while ((ifmt = av_demuxer_iterate(&iter))) {
+#else
while ((ifmt = av_iformat_next(ifmt))) {
+#endif
#ifdef AV_IS_INPUT_DEVICE
if (ifmt->priv_class &&
AV_IS_INPUT_DEVICE(ifmt->priv_class->category))
continue; // Skip all input devices
@@ -849,7 +854,9 @@ ffmpeg_message (uint32_t id, uintptr_t ctx, uint32_t p1,
uint32_t p2) {
static int
ffmpeg_start (void) {
ffmpeg_init_exts ();
+#if LIBAVFORMAT_VERSION_MAJOR < 58
av_register_all ();
+#endif
return 0;
}
