From 1b24c1d48280670031e1ddb279440ac22ad23b909974626d9ed455849436e1eb Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 7 Sep 2015 09:23:35 +0000 Subject: [PATCH] Accepting request 329371 from home:XRevan86 - Update to 0.9.1. OBS-URL: https://build.opensuse.org/request/show/329371 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/qmmp?expand=0&rev=62 --- qmmp-0.8.5.tar.bz2 | 3 - qmmp-0.9.1.tar.bz2 | 3 + ...lt_pulse.patch => qmmp-default-pulse.patch | 10 +- qmmp.changes | 82 ++++++++++ qmmp.spec | 142 +++++++++--------- 5 files changed, 161 insertions(+), 79 deletions(-) delete mode 100644 qmmp-0.8.5.tar.bz2 create mode 100644 qmmp-0.9.1.tar.bz2 rename qmmp-0.6.1-default_pulse.patch => qmmp-default-pulse.patch (50%) diff --git a/qmmp-0.8.5.tar.bz2 b/qmmp-0.8.5.tar.bz2 deleted file mode 100644 index 85054fa..0000000 --- a/qmmp-0.8.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7fe9347ad6c66e8013b73f2c5cf628037c58151e0cfcb926a8f27b93ad2d7c0d -size 991464 diff --git a/qmmp-0.9.1.tar.bz2 b/qmmp-0.9.1.tar.bz2 new file mode 100644 index 0000000..70728da --- /dev/null +++ b/qmmp-0.9.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9314f8b019689fa9f3f1bc8df4076a4b32d384ad992d578fd437284a5c86918b +size 1112342 diff --git a/qmmp-0.6.1-default_pulse.patch b/qmmp-default-pulse.patch similarity index 50% rename from qmmp-0.6.1-default_pulse.patch rename to qmmp-default-pulse.patch index 58c7a3b..04edb2c 100644 --- a/qmmp-0.6.1-default_pulse.patch +++ b/qmmp-default-pulse.patch @@ -1,13 +1,11 @@ -Index: src/qmmp/output.cpp -=================================================================== ---- src/qmmp/output.cpp.orig -+++ src/qmmp/output.cpp -@@ -140,7 +140,7 @@ OutputFactory *Output::currentFactory() +--- a/src/qmmp/output.cpp ++++ b/src/qmmp/output.cpp +@@ -144,7 +144,7 @@ OutputFactory *Output::currentFactory() loadPlugins(); 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(); #elif defined Q_WS_WIN - QString name = settings.value("Output/current_plugin", "waveout").toString(); + QString name = settings.value("Output/current_plugin", "directsound").toString(); #else diff --git a/qmmp.changes b/qmmp.changes index 50494ce..a68c42d 100644 --- a/qmmp.changes +++ b/qmmp.changes @@ -1,3 +1,85 @@ +------------------------------------------------------------------- +Sun Sep 6 10:32:23 UTC 2015 - sor.alexei@meowr.ru + +- Update to 0.9.1: + * Fix 16-bit converter. + * Improve Russian translation. +- Rename & rebase qmmp-0.6.1-default_pulse.patch to + qmmp-default-pulse.patch. +- Build with ffmpeg support outside PMBS as well. +- Do not force UNIX permissions in %files globally. +- Obsolete qmmp-plugin-pack-simple-ui as it's merged with + libqmmp0-plugins. + +------------------------------------------------------------------- +Sat Sep 5 07:45:00 UTC 2015 - quarckster@gmail.com + +- Update to 0.9.0: + * added "Save List" action to the tab menu; + * added *.med files support; + * added 9 channels support to equalizer; + * added album artist tag support; + * added asynchronous sorting; + * added audio-channel sequence converter; + * added default hotkey for the "Rename List" action; + * added feature to change user agent; + * added feature to change window title; + * added feature to disable fadeout in the gme plugin; + * added feature to disable plugins without qmmp.pri modification (qmake only) + * added feature to exclude cue data files; + * added feature to hide song length; + * added feature to hide track length; + * added feature to move files; + * added feature to remember playlist scroll position; + * added feature to reset fonts; + * added feature to reset shortcuts; + * added feature to restore default shortcuts; + * added multiple column support; + * added s3m, stm and xm extensions to desktop files; + * added Simple User Interface (QSUI) with the following changes: + * added sorting by album artist; + * added sorting by file modification date; + * changed default playlist separator; + * changed default skin to Glare; + * fixed cmake support; + * fixed config directory path; + * fixed crash when quitting while playlist is being populated; + * fixed details dialog form; + * fixed documentation; + * fixed home page; + * fixed main window activation; + * fixed minimizing throw taskbar under windows; + * fixed opus plugin; + * fixed some skins parsing; + * fixed some skins support; + * fixed support of keyboards with single play/pause button; + * fixed text scroller colors; + * fixed typos; + * improved ape tags support in the mpeg plugin; + * improved cmake build scripts; + * improved fileops plugin: + * improved global hotkey settings; + * improved playlist changes notification; + * improved status bar; + * improved title formatter; + * increased details dialog size; + * optimized playlist container; + * optimized sample rate converter; + * reduced cpu usage; + * reworked settings dialog; + * updated Czech translation; + * updated French translation; + * updated German translation; + * updated Greek translation; + * updated Hebrew translation; + * updated Japanese translation; + * updated Japanese translation; + * updated Polish translation; + * updated Portuguese translation; + * updated Russian translation; + * updated Ukrainian translation; + * using DirectSound output as default under Windows. + ------------------------------------------------------------------- Tue Jun 9 05:42:10 UTC 2015 - quarckster@gmail.com diff --git a/qmmp.spec b/qmmp.spec index 5001112..1034cc0 100644 --- a/qmmp.spec +++ b/qmmp.spec @@ -1,7 +1,7 @@ # # spec file for package qmmp # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,24 +15,23 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + +%define sover 0 %bcond_with ffmpeg %bcond_with mad %bcond_with faad - -%define soname 0 - Name: qmmp -Version: 0.8.5 +Version: 0.9.1 Release: 0 Summary: XMMS-like audio player License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Players Url: http://qmmp.ylsoftware.com/ Source0: http://qmmp.ylsoftware.com/files/qmmp-%{version}.tar.bz2 -# PATCH-FEATURE-OPENSUSE qmmp-0.6.1-default_pulse.patch reddwarf@opensuse.org -- Use PulseAudio instead of ALSA by default -Patch0: qmmp-0.6.1-default_pulse.patch -# PATCH-FIX-UPSTREAM qmmp-fix_cdda_version.patch pascal.bleser@opensuse.org -- Fix header detection for cdparanoia cdda.h -Patch1: qmmp-fix_cdda_version.patch +# PATCH-FIX-UPSTREAM qmmp-fix_cdda_version.patch pascal.bleser@opensuse.org -- Fix header detection for cdparanoia cdda.h. +Patch0: qmmp-fix_cdda_version.patch +# PATCH-FEATURE-OPENSUSE qmmp-default_pulse.patch reddwarf@opensuse.org -- Use PulseAudio instead of ALSA by default. +Patch1: qmmp-default-pulse.patch BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: gcc-c++ @@ -47,12 +46,9 @@ BuildRequires: pkgconfig(QtXml) BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(enca) >= 1.9 BuildRequires: pkgconfig(flac) -BuildRequires: pkgconfig(opus) >= 1.0.2 -BuildRequires: pkgconfig(opusfile) >= 0.2 -# Standard Jack version is not new enough until openSUSE 12.1 -%if 0%{?suse_version} > 1140 -BuildRequires: pkgconfig(jack) -%endif +BuildRequires: pkgconfig(libavcodec) +BuildRequires: pkgconfig(libavformat) +BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libbs2b) BuildRequires: pkgconfig(libcddb) BuildRequires: pkgconfig(libcdio) @@ -65,15 +61,19 @@ BuildRequires: pkgconfig(libprojectM) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libpulse-simple) BuildRequires: pkgconfig(libsidplayfp) +BuildRequires: pkgconfig(opus) >= 1.0.2 +BuildRequires: pkgconfig(opusfile) >= 0.2 BuildRequires: pkgconfig(samplerate) BuildRequires: pkgconfig(sndfile) BuildRequires: pkgconfig(taglib) BuildRequires: pkgconfig(vorbisfile) BuildRequires: pkgconfig(wavpack) -%if %{with ffmpeg} -BuildRequires: pkgconfig(libavcodec) -BuildRequires: pkgconfig(libavformat) -BuildRequires: pkgconfig(libavutil) +Requires: qmmp(%{sover})(Input) +Requires: qmmp(%{sover})(Output) +Requires: qmmp(%{sover})(Ui) +# Standard JACK version is not new enough until openSUSE 12.1. +%if 0%{?suse_version} > 1140 +BuildRequires: pkgconfig(jack) %endif %if %{with mad} BuildRequires: pkgconfig(mad) @@ -81,46 +81,46 @@ BuildRequires: pkgconfig(mad) %if %{with faad} BuildRequires: libfaad-devel %endif -Requires: qmmp(%{soname})(Input) -Requires: qmmp(%{soname})(Output) -Requires: qmmp(%{soname})(Ui) %description This program is an audio-player, written with help of Qt library. The program has user interface, similar winamp or xmms. -%package -n libqmmp%{soname} +%package -n libqmmp%{sover} Summary: Qmmp library Group: System/Libraries -Recommends: libqmmp%{soname}-plugins +Recommends: libqmmp%{sover}-plugins -%description -n libqmmp%{soname} +%description -n libqmmp%{sover} Qmmp library. -%package -n libqmmp%{soname}-plugins +%package -n libqmmp%{sover}-plugins Summary: Plugins for libqmmp Group: System/Libraries -Provides: qmmp(%{soname})(Input) -Provides: qmmp(%{soname})(Output) -Provides: qmmp(%{soname})(Ui) -# Suggests instead of Recommends since MPlayer is a too big dependency -Suggests: libqmmp%{soname}-plugin-mplayer +# Suggests instead of Recommends since MPlayer is a too big dependency. +Suggests: libqmmp%{sover}-plugin-mplayer +# qmmp-plugin-pack-simple-ui was last used in openSUSE 13.2 (in PMBS). +Obsoletes: qmmp-plugin-pack-simple-ui < {version} +Provides: qmmp-plugin-pack-simple-ui = %{version} +Provides: qmmp(%{sover})(Input) +Provides: qmmp(%{sover})(Output) +Provides: qmmp(%{sover})(Ui) -%description -n libqmmp%{soname}-plugins +%description -n libqmmp%{sover}-plugins Plugins for libqmmp. -%package -n libqmmp%{soname}-plugin-mplayer +%package -n libqmmp%{sover}-plugin-mplayer Summary: MPlayer plugin for libqmmp Group: System/Libraries Requires: %{_bindir}/mplayer -%description -n libqmmp%{soname}-plugin-mplayer +%description -n libqmmp%{sover}-plugin-mplayer MPlayer plugin for libqmmp. %package -n libqmmp-devel Summary: Development files for libqmmp Group: Development/Libraries/C and C++ -Requires: libqmmp%{soname} = %{version} +Requires: libqmmp%{sover} = %{version} %description -n libqmmp-devel Development files for libqmmp. @@ -128,27 +128,28 @@ Development files for libqmmp. %prep %setup -q %patch0 -%patch1 +%patch1 -p1 %build mkdir build -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 \ - -DUSE_HAL=FALSE \ - -DUSE_OSS=FALSE \ - -DUSE_OSS4=FALSE \ - .. +pushd build +export CFLAGS="%{optflags}" +export CXXFLAGS="%{optflags}" +cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_VERBOSE_MAKEFILE=TRUE \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DCMAKE_BUILD_WITH_INSTALL_RPATH=1 \ + -DLIB_DIR=%{_lib} \ + -DUSE_HAL=FALSE \ + -DUSE_OSS=FALSE \ + -DUSE_OSS4=FALSE \ + .. make %{?_smp_mflags} +popd %install -cd build -%make_install +%make_install -C build %post %icon_theme_cache_post @@ -158,45 +159,46 @@ cd build %desktop_database_postun %icon_theme_cache_postun -%post -n libqmmp%{soname} -p /sbin/ldconfig +%post -n libqmmp%{sover} -p /sbin/ldconfig -%postun -n libqmmp%{soname} -p /sbin/ldconfig +%postun -n libqmmp%{sover} -p /sbin/ldconfig -%post -n libqmmp%{soname}-plugins +%post -n libqmmp%{sover}-plugins %desktop_database_post -%postun -n libqmmp%{soname}-plugins +%postun -n libqmmp%{sover}-plugins %desktop_database_postun %files -%defattr(0644,root,root,0755) +%defattr(-,root,root) %doc AUTHORS ChangeLog COPYING README -%attr(0755,root,root) %{_bindir}/qmmp -%{_datadir}/qmmp +%{_bindir}/qmmp +%{_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} -%defattr(0644,root,root,0755) -%{_libdir}/libqmmp.so.%{soname}* -%{_libdir}/libqmmpui.so.%{soname}* +%files -n libqmmp%{sover} +%defattr(-,root,root) +%{_libdir}/libqmmp.so.%{sover}* +%{_libdir}/libqmmpui.so.%{sover}* -%files -n libqmmp%{soname}-plugins -%defattr(0644,root,root,0755) -%{_libdir}/qmmp +%files -n libqmmp%{sover}-plugins +%defattr(-,root,root) +%{_libdir}/qmmp/ %exclude %{_libdir}/qmmp/Engines/libmplayer.so -%{_datadir}/applications/qmmp_cue.desktop -%files -n libqmmp%{soname}-plugin-mplayer -%defattr(0644,root,root,0755) +%files -n libqmmp%{sover}-plugin-mplayer +%defattr(-,root,root) +%dir %{_libdir}/qmmp/ +%dir %{_libdir}/qmmp/Engines/ %{_libdir}/qmmp/Engines/libmplayer.so %files -n libqmmp-devel -%defattr(0644,root,root,0755) -%{_includedir}/qmmp -%{_includedir}/qmmpui +%defattr(-,root,root) +%{_includedir}/qmmp/ +%{_includedir}/qmmpui/ %{_libdir}/libqmmp.so %{_libdir}/libqmmpui.so %{_libdir}/pkgconfig/qmmp.pc