Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mpd for openSUSE:Factory checked in
at 2022-08-08 11:43:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mpd (Old)
and /work/SRC/openSUSE:Factory/.mpd.new.1521 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mpd"
Mon Aug 8 11:43:02 2022 rev:42 rq:993718 version:0.23.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/mpd/mpd.changes 2022-08-01 21:34:45.206406030
+0200
+++ /work/SRC/openSUSE:Factory/.mpd.new.1521/mpd.changes 2022-08-08
11:43:04.558413507 +0200
@@ -1,0 +2,5 @@
+Mon Aug 8 08:19:19 UTC 2022 - Cor Blom <corne...@solcon.nl>
+
+- Add fix-build-ffmpeg5.patch to fix build with ffmpeg 5.1
+
+-------------------------------------------------------------------
New:
----
fix-build-ffmpeg5.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mpd.spec ++++++
--- /var/tmp/diff_new_pack.PPk2ac/_old 2022-08-08 11:43:05.114414260 +0200
+++ /var/tmp/diff_new_pack.PPk2ac/_new 2022-08-08 11:43:05.118414266 +0200
@@ -33,13 +33,15 @@
Source5: %{name}.tmpfiles.d
Patch0: %{name}-conf.patch
Patch1: %{name}-sndfile.patch
+# PATCH-FIX-UPSTREAM - support ffmpeg 5.1
+Patch2: fix-build-ffmpeg5.patch
BuildRequires: cmake
BuildRequires: gcc
BuildRequires: gcc-c++
-BuildRequires: group(audio)
BuildRequires: hicolor-icon-theme
BuildRequires: libboost_headers-devel
BuildRequires: libcue-devel
+BuildRequires: group(audio)
# MPD_ENABLE_AUTO_LIB
BuildRequires: libgcrypt-devel
BuildRequires: libmikmod-devel
++++++ fix-build-ffmpeg5.patch ++++++
>From 59792cb0b801854ee41be72d33db9542735df754 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max.kellerm...@gmail.com>
Date: Wed, 27 Jul 2022 10:59:48 +0200
Subject: [PATCH] decoder/ffmpeg: wrap FFmpeg include in "extern C"
Commit ebae25d175eb31 added that #include, but forgot to wrap it in
"extern C", so the linker tried to look up C++ symbols, causing linker
failure.
Closes https://github.com/MusicPlayerDaemon/MPD/issues/1582
---
diff --git a/src/decoder/plugins/FfmpegIo.cxx b/src/decoder/plugins/FfmpegIo.cxx
index 2e22d95991..5b5c8b40e3 100644
--- a/src/decoder/plugins/FfmpegIo.cxx
+++ b/src/decoder/plugins/FfmpegIo.cxx
@@ -21,10 +21,13 @@
#define __STDC_CONSTANT_MACROS
#include "FfmpegIo.hxx"
-#include "libavutil/mem.h"
#include "../DecoderAPI.hxx"
#include "input/InputStream.hxx"
+extern "C" {
+#include <libavutil/mem.h>
+}
+
AvioStream::~AvioStream()
{
if (io != nullptr) {
