diff --git a/qmmp-0.5.5-ffmpeg_011.patch b/qmmp-0.5.5-ffmpeg_011.patch new file mode 100644 index 0000000..55fd9bf --- /dev/null +++ b/qmmp-0.5.5-ffmpeg_011.patch @@ -0,0 +1,14 @@ +Index: src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp +=================================================================== +--- src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp.orig ++++ src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp +@@ -133,9 +133,6 @@ bool DecoderFFmpeg::initialize() + m_stream->seekable = !input()->isSequential(); + m_stream->max_packet_size = INPUT_BUFFER_SIZE; + +- AVFormatParameters ap; +- memset(&ap, 0, sizeof(ap)); +- + if(avformat_open_input(&ic, m_path.toLocal8Bit().constData(), fmt, 0) != 0) + { + qDebug("DecoderFFmpeg: av_open_input_stream() failed"); diff --git a/qmmp.changes b/qmmp.changes index aa0aaf4..f95e21c 100644 --- a/qmmp.changes +++ b/qmmp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun May 27 23:35:53 UTC 2012 - reddwarf@opensuse.org + +- Fix build with ffmpeg 0.11 + ------------------------------------------------------------------- Sat May 26 10:45:52 UTC 2012 - reddwarf@opensuse.org diff --git a/qmmp.spec b/qmmp.spec index f660730..f068531 100644 --- a/qmmp.spec +++ b/qmmp.spec @@ -16,9 +16,9 @@ # -%bcond_with ffmpeg -%bcond_with mad -%bcond_with faad +%bcond_without ffmpeg +%bcond_without mad +%bcond_without faad %define soname 0 @@ -31,6 +31,8 @@ Group: Productivity/Multimedia/Sound/Players Url: http://qmmp.ylsoftware.com/ Source0: http://qmmp.googlecode.com/files/qmmp-%{version}.tar.bz2 Patch0: qmmp-0.5.5-libcdio_mess.patch +# Already in trunk +Patch1: qmmp-0.5.5-ffmpeg_011.patch BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: gcc-c++ @@ -116,6 +118,7 @@ Development files for libqmmp. %prep %setup -q %patch0 +%patch1 %build mkdir build