From 760018fe5dd892f77c87f1d64eb12567d1f2633c7bdab7043ac868036704b9cf Mon Sep 17 00:00:00 2001 From: Cristian Morales Vega Date: Sun, 27 May 2012 23:38:09 +0000 Subject: [PATCH 1/3] - Fix build with ffmpeg 0.11 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/qmmp?expand=0&rev=6 --- qmmp-0.5.5-ffmpeg_011.patch | 14 ++++++++++++++ qmmp.changes | 5 +++++ qmmp.spec | 9 ++++++--- 3 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 qmmp-0.5.5-ffmpeg_011.patch 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 From 64b6557138bffb206ed56e1ea1ae10258652b514e63f0d5f0dcec71f9100b7dc Mon Sep 17 00:00:00 2001 From: Cristian Morales Vega Date: Mon, 28 May 2012 13:53:34 +0000 Subject: [PATCH 2/3] I forgot to change the %bconds after testing OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/qmmp?expand=0&rev=7 --- qmmp.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qmmp.spec b/qmmp.spec index f068531..f4b760d 100644 --- a/qmmp.spec +++ b/qmmp.spec @@ -16,9 +16,9 @@ # -%bcond_without ffmpeg -%bcond_without mad -%bcond_without faad +%bcond_with ffmpeg +%bcond_with mad +%bcond_with faad %define soname 0 From 02837db0a908390203b86071ce13d9ba732cdf828c2884bb1ced4e7a44df7371 Mon Sep 17 00:00:00 2001 From: Cristian Morales Vega Date: Thu, 31 May 2012 21:09:45 +0000 Subject: [PATCH 3/3] - Disable HAL plugin build - Disable OSS plugin build - Use PulseAudio by default instead of ALSA OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/qmmp?expand=0&rev=9 --- qmmp-0.5.5-default_pulse.patch | 13 +++++++++++++ qmmp.changes | 7 +++++++ qmmp.spec | 7 +++++-- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 qmmp-0.5.5-default_pulse.patch diff --git a/qmmp-0.5.5-default_pulse.patch b/qmmp-0.5.5-default_pulse.patch new file mode 100644 index 0000000..c5fbe5c --- /dev/null +++ b/qmmp-0.5.5-default_pulse.patch @@ -0,0 +1,13 @@ +Index: src/qmmp/output.cpp +=================================================================== +--- src/qmmp/output.cpp.orig ++++ src/qmmp/output.cpp +@@ -473,7 +473,7 @@ OutputFactory *Output::currentFactory() + checkFactories(); + QSettings settings (Qmmp::configFile(), QSettings::IniFormat); + #ifdef Q_OS_LINUX +- QString name = settings.value("Output/current_plugin", "alsa").toString(); ++ QString name = settings.value("Output/current_plugin", "pulse").toString(); + #else + QString name = settings.value("Output/current_plugin", "oss").toString(); + #endif diff --git a/qmmp.changes b/qmmp.changes index f95e21c..3f97322 100644 --- a/qmmp.changes +++ b/qmmp.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu May 31 21:08:33 UTC 2012 - reddwarf@opensuse.org + +- Disable HAL plugin build +- Disable OSS plugin build +- Use PulseAudio by default instead of ALSA + ------------------------------------------------------------------- Sun May 27 23:35:53 UTC 2012 - reddwarf@opensuse.org diff --git a/qmmp.spec b/qmmp.spec index f4b760d..8d37945 100644 --- a/qmmp.spec +++ b/qmmp.spec @@ -33,6 +33,8 @@ 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 +# PATCH-FEATURE-OPENSUSE qmmp-0.5.5-default_pulse.patch reddwarf@opensuse.org -- Use PulseAudio instead of ALSA by default +Patch2: qmmp-0.5.5-default_pulse.patch BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: gcc-c++ @@ -119,6 +121,7 @@ Development files for libqmmp. %setup -q %patch0 %patch1 +%patch2 %build mkdir build @@ -126,8 +129,8 @@ cd build export CFLAGS='%{optflags}' export CXXFLAGS='%{optflags}' cmake -DCMAKE_BUILD_WITH_INSTALL_RPATH=1 -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DLIB_DIR=%{_lib} -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_VERBOSE_MAKEFILE=TRUE .. + -DLIB_DIR=%{_lib} -DCMAKE_BUILD_TYPE=Release -DUSE_HAL=FALSE \ + -DUSE_OSS=FALSE -DCMAKE_VERBOSE_MAKEFILE=TRUE .. make %{?_smp_mflags} %install