diff --git a/baselibs.conf b/baselibs.conf new file mode 100644 index 0000000..06b4963 --- /dev/null +++ b/baselibs.conf @@ -0,0 +1 @@ +libqmmp0 diff --git a/qmmp-0.9.1.tar.bz2 b/qmmp-0.9.1.tar.bz2 deleted file mode 100644 index 70728da..0000000 --- a/qmmp-0.9.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9314f8b019689fa9f3f1bc8df4076a4b32d384ad992d578fd437284a5c86918b -size 1112342 diff --git a/qmmp-0.9.2.tar.bz2 b/qmmp-0.9.2.tar.bz2 new file mode 100644 index 0000000..498b462 --- /dev/null +++ b/qmmp-0.9.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90ac69a21779df5073efe71b25f28a7461d6a928deb1afbaa1ef8268f62ae9c5 +size 1112974 diff --git a/qmmp.changes b/qmmp.changes index a68c42d..9476f4b 100644 --- a/qmmp.changes +++ b/qmmp.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Fri Oct 2 19:26:50 UTC 2015 - sor.alexei@meowr.ru + +- Update to 0.9.2: + * Optimise equaliser. + * Optimise FLAC and WavPack plugins. + * Improve skinned UI in the shaded mode: + - improved time indicator; + - fixed playlist colours. + * Fix clicks while playing some MP3 files. + * Fix memory leak in the WavPack plugin. + * Fix Qt 4.6 support. + * Fix ffmpeg 0.5 support. + * Fix effects and decoders sorting. + * Fix possible race condition. + * Update Greek translation. +- Rename libqmmp1-plugins to libqmmp-plugins: can't be + multiversioned. +- Only install libqmmp-plugin-mplayer in PMBS. + ------------------------------------------------------------------- Sun Sep 6 10:32:23 UTC 2015 - sor.alexei@meowr.ru diff --git a/qmmp.spec b/qmmp.spec index 1034cc0..c2c2c85 100644 --- a/qmmp.spec +++ b/qmmp.spec @@ -17,21 +17,20 @@ %define sover 0 -%bcond_with ffmpeg -%bcond_with mad -%bcond_with faad +%bcond_with restricted Name: qmmp -Version: 0.9.1 +Version: 0.9.2 Release: 0 -Summary: XMMS-like audio player +Summary: Qt-based Multimedia 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 +Source: http://qmmp.ylsoftware.com/files/%{name}-%{version}.tar.bz2 +Source1: baselibs.conf # 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 +Patch0: %{name}-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 +Patch1: %{name}-default-pulse.patch BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: gcc-c++ @@ -46,6 +45,7 @@ BuildRequires: pkgconfig(QtXml) BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(enca) >= 1.9 BuildRequires: pkgconfig(flac) +BuildRequires: pkgconfig(jack) BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) @@ -68,61 +68,65 @@ BuildRequires: pkgconfig(sndfile) BuildRequires: pkgconfig(taglib) BuildRequires: pkgconfig(vorbisfile) BuildRequires: pkgconfig(wavpack) -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) -%endif -%if %{with faad} +Requires: %{name}(%{sover})(Input) +Requires: %{name}(%{sover})(Output) +Requires: %{name}(%{sover})(Ui) +%if %{with rectricted} BuildRequires: libfaad-devel +BuildRequires: pkgconfig(mad) %endif %description -This program is an audio-player, written with help of Qt library. The program -has user interface, similar winamp or xmms. +This program is an audio-player, written with help of Qt library. -%package -n libqmmp%{sover} +%package -n lib%{name}%{sover} Summary: Qmmp library Group: System/Libraries -Recommends: libqmmp%{sover}-plugins +Recommends: lib%{name}-plugins -%description -n libqmmp%{sover} -Qmmp library. +%description -n lib%{name}%{sover} +This program is an audio-player, written with help of Qt library. -%package -n libqmmp%{sover}-plugins +This package provides the Qmmp library. + +%package -n lib%{name}-plugins Summary: Plugins for libqmmp Group: System/Libraries # 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) +Suggests: lib%{name}-plugin-mplayer +# libqmmp0-plugins & qmmp-plugin-pack-simple-ui were last used in openSUSE 13.2 (in PMBS). +Obsoletes: %{name}-plugin-pack-simple-ui < %{version} +Obsoletes: lib%{name}0-plugins +Provides: %{name}-plugin-pack-simple-ui = %{version} +Provides: %{name}(%{sover})(Input) +Provides: %{name}(%{sover})(Output) +Provides: %{name}(%{sover})(Ui) -%description -n libqmmp%{sover}-plugins -Plugins for libqmmp. +%description -n lib%{name}-plugins +This program is an audio-player, written with help of Qt library. -%package -n libqmmp%{sover}-plugin-mplayer +This package provides plugins for libqmmp. + +%if %{with restricted} +%package -n lib%{name}-plugin-mplayer Summary: MPlayer plugin for libqmmp Group: System/Libraries -Requires: %{_bindir}/mplayer +Requires: MPlayer -%description -n libqmmp%{sover}-plugin-mplayer -MPlayer plugin for libqmmp. +%description -n lib%{name}-plugin-mplayer +This program is an audio-player, written with help of Qt library. -%package -n libqmmp-devel +This package provides MPlayer plugin for libqmmp. +%endif + +%package -n lib%{name}-devel Summary: Development files for libqmmp Group: Development/Libraries/C and C++ -Requires: libqmmp%{sover} = %{version} +Requires: lib%{name}%{sover} = %{version} + +%description -n lib%{name}-devel +This program is an audio-player, written with help of Qt library. -%description -n libqmmp-devel Development files for libqmmp. %prep @@ -136,14 +140,17 @@ 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 \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \ + -DLIB_DIR=%{_lib} \ + -DUSE_HAL=OFF \ + -DUSE_OSS=OFF \ + -DUSE_OSS4=OFF \ +%if %{without restricted} + -DUSE_MPLAYER=OFF \ +%endif .. make %{?_smp_mflags} popd @@ -159,49 +166,47 @@ popd %desktop_database_postun %icon_theme_cache_postun -%post -n libqmmp%{sover} -p /sbin/ldconfig +%post -n lib%{name}%{sover} -p /sbin/ldconfig -%postun -n libqmmp%{sover} -p /sbin/ldconfig +%postun -n lib%{name}%{sover} -p /sbin/ldconfig -%post -n libqmmp%{sover}-plugins +%post -n lib%{name}-plugins %desktop_database_post -%postun -n libqmmp%{sover}-plugins +%postun -n lib%{name}-plugins %desktop_database_postun %files %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING README -%{_bindir}/qmmp -%{_datadir}/qmmp/ -%{_datadir}/applications/qmmp.desktop -%{_datadir}/applications/qmmp_enqueue.desktop -%{_datadir}/applications/qmmp_dir.desktop -%{_datadir}/icons/hicolor/*/apps/qmmp* +%{_bindir}/%{name} +%{_datadir}/%{name}/ +%{_datadir}/applications/%{name}*.desktop +%{_datadir}/icons/hicolor/*/apps/%{name}* -%files -n libqmmp%{sover} +%files -n lib%{name}%{sover} %defattr(-,root,root) -%{_libdir}/libqmmp.so.%{sover}* -%{_libdir}/libqmmpui.so.%{sover}* +%{_libdir}/lib%{name}*.so.%{sover}* -%files -n libqmmp%{sover}-plugins +%files -n lib%{name}-plugins %defattr(-,root,root) -%{_libdir}/qmmp/ -%exclude %{_libdir}/qmmp/Engines/libmplayer.so +%{_libdir}/%{name}/ +%exclude %{_libdir}/%{name}/Engines/libmplayer.so -%files -n libqmmp%{sover}-plugin-mplayer +%if %{with restricted} +%files -n lib%{name}-plugin-mplayer %defattr(-,root,root) -%dir %{_libdir}/qmmp/ -%dir %{_libdir}/qmmp/Engines/ -%{_libdir}/qmmp/Engines/libmplayer.so +%dir %{_libdir}/%{name}/ +%dir %{_libdir}/%{name}/Engines/ +%{_libdir}/%{name}/Engines/libmplayer.so +%endif -%files -n libqmmp-devel +%files -n lib%{name}-devel %defattr(-,root,root) -%{_includedir}/qmmp/ -%{_includedir}/qmmpui/ -%{_libdir}/libqmmp.so -%{_libdir}/libqmmpui.so -%{_libdir}/pkgconfig/qmmp.pc -%{_libdir}/pkgconfig/qmmpui.pc +%{_includedir}/%{name}/ +%{_includedir}/%{name}ui/ +%{_libdir}/lib%{name}*.so +%{_libdir}/pkgconfig/%{name}.pc +%{_libdir}/pkgconfig/%{name}ui.pc %changelog