Hello community, here is the log from the commit of package qmmp for openSUSE:Factory checked in at 2012-06-01 22:32:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qmmp (Old) and /work/SRC/openSUSE:Factory/.qmmp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qmmp", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/qmmp/qmmp.changes 2012-05-29 11:46:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qmmp.new/qmmp.changes 2012-06-01 22:32:40.000000000 +0200 @@ -1,0 +2,12 @@ +Thu May 31 21:08:33 UTC 2012 - [email protected] + +- Disable HAL plugin build +- Disable OSS plugin build +- Use PulseAudio by default instead of ALSA + +------------------------------------------------------------------- +Sun May 27 23:35:53 UTC 2012 - [email protected] + +- Fix build with ffmpeg 0.11 + +------------------------------------------------------------------- New: ---- qmmp-0.5.5-default_pulse.patch qmmp-0.5.5-ffmpeg_011.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qmmp.spec ++++++ --- /var/tmp/diff_new_pack.9U4Q39/_old 2012-06-01 22:32:41.000000000 +0200 +++ /var/tmp/diff_new_pack.9U4Q39/_new 2012-06-01 22:32:41.000000000 +0200 @@ -31,6 +31,10 @@ 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 +# PATCH-FEATURE-OPENSUSE qmmp-0.5.5-default_pulse.patch [email protected] -- Use PulseAudio instead of ALSA by default +Patch2: qmmp-0.5.5-default_pulse.patch BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: gcc-c++ @@ -116,6 +120,8 @@ %prep %setup -q %patch0 +%patch1 +%patch2 %build mkdir build @@ -123,8 +129,8 @@ 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 ++++++ qmmp-0.5.5-default_pulse.patch ++++++ 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 ++++++ qmmp-0.5.5-ffmpeg_011.patch ++++++ 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"); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
