[gstreamer1-plugins-bad-nonfree] Rebuild for new fdk-aac
commit 74e80f9351a037b3ddb648a11689cb422ef6228f
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sat Nov 24 13:44:07 2018 +0000
Rebuild for new fdk-aac
fdk-acc-2.0.0.patch | 26 ++++++++++++++++++++++++++
gstreamer1-plugins-bad-nonfree.spec | 10 ++++++++--
2 files changed, 34 insertions(+), 2 deletions(-)
---
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 bbb4f5a..2a1762d 100644
--- a/gstreamer1-plugins-bad-nonfree.spec
+++ b/gstreamer1-plugins-bad-nonfree.spec
@@ -4,10 +4,13 @@
Summary: GStreamer 1.0 streaming media framework "bad" non-free
plug-ins
Name: gstreamer1-plugins-bad-nonfree
Version: 1.14.4
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+
URL: http://gstreamer.freedesktop.org/
Source0:
http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%{ve...
+# Fixes FTBFS with new fdk-acc version.
+# This FTBFS should be reported upstream by someone who cares enough to do so.
+Patch0: fdk-acc-2.0.0.patch
BuildRequires: gcc
BuildRequires: gstreamer1-devel >= %{version}
@@ -30,7 +33,7 @@ license.
%prep
-%autosetup -n gst-plugins-bad-%{version}
+%autosetup -p1 -n gst-plugins-bad-%{version}
%build
@@ -69,6 +72,9 @@ rm -fv %{buildroot}%{_libdir}/gstreamer-1.0/*.la
%{_libdir}/gstreamer-1.0/libgstfdkaac.so
%changelog
+* Sat Nov 24 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.14.4-2
+- Rebuild for new fdk-aac
+
* Tue Oct 09 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 1.14.4-1
- 1.14.4