[yocto] [meta-qt4][PATCH] qmmp: Fix gcc-6 build error

Ricardo Ribalda Delgado ricardo.ribalda at gmail.com
Fri Jul 7 03:30:47 PDT 2017


Invalid conversion (const).

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda at gmail.com>
---
 recipes-qt4/qt-apps/qmmp/invalid-conv.patch | 37 +++++++++++++++++++++++++++++
 recipes-qt4/qt-apps/qmmp_0.8.6.bb           |  1 +
 2 files changed, 38 insertions(+)
 create mode 100644 recipes-qt4/qt-apps/qmmp/invalid-conv.patch

diff --git a/recipes-qt4/qt-apps/qmmp/invalid-conv.patch b/recipes-qt4/qt-apps/qmmp/invalid-conv.patch
new file mode 100644
index 000000000000..f862d1bbd38d
--- /dev/null
+++ b/recipes-qt4/qt-apps/qmmp/invalid-conv.patch
@@ -0,0 +1,37 @@
+Upstream-Status: Inappropriate [current version does not have this plugin]
+diff --git a/src/plugins/Effect/srconverter/srconverter.cpp b/src/plugins/Effect/srconverter/srconverter.cpp
+index fcd77bc04cb7..873923e6219e 100644
+--- a/src/plugins/Effect/srconverter/srconverter.cpp
++++ b/src/plugins/Effect/srconverter/srconverter.cpp
+@@ -51,17 +51,18 @@ void SRConverter::applyEffect(Buffer *b)
+ {
+     if (m_src_state && b->nbytes > 0)
+     {
++	float *data_in = new float [m_src_data.input_frames * channels()];
+         m_src_data.end_of_input = 0;
+         m_src_data.input_frames = b->nbytes / m_sz / channels();
+-        m_src_data.data_in = new float [m_src_data.input_frames * channels()];
+         m_src_data.output_frames = m_src_data.src_ratio * m_src_data.input_frames + 1;
+         m_src_data.data_out = new float [m_src_data.output_frames * channels()];
+ 
+ 
+         if(format() == Qmmp::PCM_S16LE)
+         {
+-            src_short_to_float_array((short*) b->data, m_src_data.data_in,
++            src_short_to_float_array((short*) b->data, data_in,
+                                      m_src_data.input_frames * channels());
++            m_src_data.data_in = data_in;
+         }
+         else
+         {
+@@ -75,8 +76,9 @@ void SRConverter::applyEffect(Buffer *b)
+                         data[i] |= 0xff000000;
+                 }
+             }
+-            src_int_to_float_array((int*) b->data, m_src_data.data_in,
++            src_int_to_float_array((int*) b->data, data_in,
+                                    m_src_data.input_frames * channels());
++            m_src_data.data_in = data_in;
+         }
+ 
+         if ((m_srcError = src_process(m_src_state, &m_src_data)) > 0)
diff --git a/recipes-qt4/qt-apps/qmmp_0.8.6.bb b/recipes-qt4/qt-apps/qmmp_0.8.6.bb
index e68ad0f189a4..acb7dad34600 100644
--- a/recipes-qt4/qt-apps/qmmp_0.8.6.bb
+++ b/recipes-qt4/qt-apps/qmmp_0.8.6.bb
@@ -10,6 +10,7 @@ DEPENDS = "taglib libmad libvorbis libogg alsa-lib libsndfile1 libsamplerate0 cu
 
 SRC_URI = "http://qmmp.ylsoftware.com/files/${BP}.tar.bz2 \
            file://no-host-paths.patch \
+           file://invalid-conv.patch \
           "
 
 SRC_URI[md5sum] = "67e96e89c61b7432e5a12f555db702b1"
-- 
2.13.2




More information about the yocto mailing list