diff --git a/qmmp-0.5.5-ffmpeg_011.patch b/qmmp-0.5.5-ffmpeg_011.patch deleted file mode 100644 index 55fd9bf..0000000 --- a/qmmp-0.5.5-ffmpeg_011.patch +++ /dev/null @@ -1,14 +0,0 @@ -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-0.5.5.tar.bz2 b/qmmp-0.5.5.tar.bz2 deleted file mode 100644 index 26505a5..0000000 --- a/qmmp-0.5.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:525d7528c58c885e45149f698125dfff6bedca0e9af979b2490e3f0b902943a6 -size 709008 diff --git a/qmmp-0.5.5-default_pulse.patch b/qmmp-0.6.0-default_pulse.patch similarity index 86% rename from qmmp-0.5.5-default_pulse.patch rename to qmmp-0.6.0-default_pulse.patch index c5fbe5c..e03b4ce 100644 --- a/qmmp-0.5.5-default_pulse.patch +++ b/qmmp-0.6.0-default_pulse.patch @@ -2,12 +2,12 @@ Index: src/qmmp/output.cpp =================================================================== --- src/qmmp/output.cpp.orig +++ src/qmmp/output.cpp -@@ -473,7 +473,7 @@ OutputFactory *Output::currentFactory() +@@ -477,7 +477,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(); + QString name = settings.value("Output/current_plugin", "oss4").toString(); #endif diff --git a/qmmp-0.6.0.tar.bz2 b/qmmp-0.6.0.tar.bz2 new file mode 100644 index 0000000..c5e21cf --- /dev/null +++ b/qmmp-0.6.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e2c9cdfd630bb90b2c92cb3e2f95ac4239c7cf8f91c47ca4a5038dd519755fe +size 772882 diff --git a/qmmp.changes b/qmmp.changes index 3f97322..d632d76 100644 --- a/qmmp.changes +++ b/qmmp.changes @@ -1,3 +1,49 @@ +------------------------------------------------------------------- +Sat Jun 30 23:41:32 UTC 2012 - reddwarf@opensuse.org + +- Update to 0.6.0 + * added converter plugin + * added stream browser plugin + * added file type determination by content (experimental) + * added '--quit' command line option + * added text scroller background option + * added playlists separator option + * added multiband equalizer api + * added equalizer presets from Amarok (Thanks to Panagiotis Papadopoulos) + * added playlits access from command line + * added dithering to MPEG plugin + * added priority support to decoder api + * added user interface api + * added default destination and file name pattern to fileops plugin + * added additional directory filters + * added feature to add files from command line to specific playlist + * added pkg-config support + * added vqf support + * added feature to display shoutcast stream information + * added 'jump to track' and 'forward/rewind' global hotkeys + * added 'New Playlist' button + * added sorting by disc number (Brice Videau) + * added feature to use clipboard content in the URL dialog (Panagiotis Papadopoulos) + * added scrobbler cache synchronization after successful submission (Ferdinand Vesely) + * changed playlist insertion behavior + * disabled OSS3 plugin by default + * improved cue plugin + * moved skinned ui to separate plugin + * fixed 'hide on close' feature + * fixed moc warnings during compilation + * fixed IPC under windows + * fixed windows-specific bugs + * fixed problems with some asynchronous calls + * fixed qmmp_cue.desktop + * fixed saving playlists on logout + * updated about dialog + * updated Russian translation + * updated Ukrainian translation (Gennadi Motsyo) + * updated Japanese translation (Ryota Shimamoto) + * updated Polish translation (Grzegorz Gibas) + * updated German translation (Panagiotis Papadopoulos) + * updated Dutch translation (Ronald Uitermark) + ------------------------------------------------------------------- Thu May 31 21:08:33 UTC 2012 - reddwarf@opensuse.org diff --git a/qmmp.spec b/qmmp.spec index 8d37945..8256161 100644 --- a/qmmp.spec +++ b/qmmp.spec @@ -16,14 +16,14 @@ # -%bcond_with ffmpeg -%bcond_with mad -%bcond_with faad +%bcond_without ffmpeg +%bcond_without mad +%bcond_without faad %define soname 0 Name: qmmp -Version: 0.5.5 +Version: 0.6.0 Release: 0 Summary: XMMS-like audio player License: GPL-2.0+ @@ -31,10 +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 -# 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 +# PATCH-FEATURE-OPENSUSE qmmp-0.6.0-default_pulse.patch reddwarf@opensuse.org -- Use PulseAudio instead of ALSA by default +Patch2: qmmp-0.6.0-default_pulse.patch BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: gcc-c++ @@ -120,7 +118,6 @@ Development files for libqmmp. %prep %setup -q %patch0 -%patch1 %patch2 %build @@ -130,7 +127,7 @@ export CFLAGS='%{optflags}' export CXXFLAGS='%{optflags}' cmake -DCMAKE_BUILD_WITH_INSTALL_RPATH=1 -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DLIB_DIR=%{_lib} -DCMAKE_BUILD_TYPE=Release -DUSE_HAL=FALSE \ - -DUSE_OSS=FALSE -DCMAKE_VERBOSE_MAKEFILE=TRUE .. + -DCMAKE_VERBOSE_MAKEFILE=TRUE .. make %{?_smp_mflags} %install @@ -162,6 +159,7 @@ cd build %{_datadir}/qmmp %{_datadir}/applications/qmmp.desktop %{_datadir}/applications/qmmp_enqueue.desktop +%{_datadir}/applications/qmmp_dir.desktop %{_datadir}/icons/hicolor/*/apps/qmmp* %files -n libqmmp%{soname} @@ -185,5 +183,7 @@ cd build %{_includedir}/qmmpui %{_libdir}/libqmmp.so %{_libdir}/libqmmpui.so +%{_libdir}/pkgconfig/qmmp.pc +%{_libdir}/pkgconfig/qmmpui.pc %changelog