commit 3985df80723d3c171cbede6070096afdcc8638cf Author: Xavier Bachelot <xavier(a)bachelot.org&gt; Date: Fri Sep 20 15:54:02 2019 +0200 Add fdk-aac 2.0.0 patch fdk-acc-2.0.0.patch | 26 ++++++++++++++++++++++++++ gstreamer1-plugins-bad-nonfree.spec | 4 ++++ 2 files changed, 30 insertions(+) --- diff --git a/fdk-acc-2.0.0.patch b/fdk-acc-2.0.0.patch new file mode 100644 index 0000000..b61ddf0 --- /dev/null +++ b/fdk-acc-2.0.0.patch @@ -0,0 +1,26 @@ +--- a/ext/fdkaac/gstfdkaacenc.c ++++ b/ext/fdkaac/gstfdkaacenc.c +@@ -71,10 +71,6 @@ + GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, + GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, + GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT}}, { +- 3, MODE_2_1, { +- GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, +- GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, +- GST_AUDIO_CHANNEL_POSITION_LFE1}}, { + 4, MODE_1_2_1, { + GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, + GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, + +--- a/ext/fdkaac/gstfdkaacdec.c ++++ b/ext/fdkaac/gstfdkaacdec.c +@@ -159,7 +159,7 @@ + } + + if ((err = +- aacDecoder_SetParam (self->dec, AAC_PCM_OUTPUT_INTERLEAVED, ++ aacDecoder_SetParam (self->dec, AAC_PCM_OUTPUT_CHANNEL_MAPPING, + 1)) != AAC_DEC_OK) { + GST_ERROR_OBJECT (self, "Failed to set interleaved output: %d", err); + return FALSE; + diff --git a/gstreamer1-plugins-bad-nonfree.spec b/gstreamer1-plugins-bad-nonfree.spec index a5b0a79..b2efb99 100644 --- a/gstreamer1-plugins-bad-nonfree.spec +++ b/gstreamer1-plugins-bad-nonfree.spec @@ -8,6 +8,9 @@ Release: 1%{?dist}.1 License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ Source0: %url/src/gst-plugins-bad/gst-plugins-bad-%{version}.tar.xz +# Fixes FTBFS with new fdk-acc version. +# https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/issues/825 +Patch0: fdk-acc-2.0.0.patch BuildRequires: gcc BuildRequires: gstreamer1-devel >= %{version} @@ -73,6 +76,7 @@ rm -fv %{buildroot}%{_libdir}/gstreamer-1.0/*.la * Fri Sep 20 2019 Xavier Bachelot <xavier(a)bachelot.org&gt; - 1.14.0-1.1 - Backport spec changes from master. - Add BuildRequires: python3. +- Add patch to build against fdk-aac 2.0.0. * Sun Apr 15 2018 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.14.0-1 - Update to 1.14.0