Accepting request 329464 from multimedia:apps

1

OBS-URL: https://build.opensuse.org/request/show/329464
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qmmp?expand=0&rev=30
This commit is contained in:
Dominique Leuenberger 2015-09-08 15:44:41 +00:00 committed by Git OBS Bridge
commit e3c6f67810
5 changed files with 161 additions and 79 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7fe9347ad6c66e8013b73f2c5cf628037c58151e0cfcb926a8f27b93ad2d7c0d
size 991464

3
qmmp-0.9.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9314f8b019689fa9f3f1bc8df4076a4b32d384ad992d578fd437284a5c86918b
size 1112342

View File

@ -1,13 +1,11 @@
Index: src/qmmp/output.cpp --- a/src/qmmp/output.cpp
=================================================================== +++ b/src/qmmp/output.cpp
--- src/qmmp/output.cpp.orig @@ -144,7 +144,7 @@ OutputFactory *Output::currentFactory()
+++ src/qmmp/output.cpp
@@ -140,7 +140,7 @@ OutputFactory *Output::currentFactory()
loadPlugins(); loadPlugins();
QSettings settings (Qmmp::configFile(), QSettings::IniFormat); QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
#ifdef Q_OS_LINUX #ifdef Q_OS_LINUX
- QString name = settings.value("Output/current_plugin", "alsa").toString(); - QString name = settings.value("Output/current_plugin", "alsa").toString();
+ QString name = settings.value("Output/current_plugin", "pulse").toString(); + QString name = settings.value("Output/current_plugin", "pulse").toString();
#elif defined Q_WS_WIN #elif defined Q_WS_WIN
QString name = settings.value("Output/current_plugin", "waveout").toString(); QString name = settings.value("Output/current_plugin", "directsound").toString();
#else #else

View File

@ -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 Tue Jun 9 05:42:10 UTC 2015 - quarckster@gmail.com

142
qmmp.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package qmmp # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -15,24 +15,23 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
%define sover 0
%bcond_with ffmpeg %bcond_with ffmpeg
%bcond_with mad %bcond_with mad
%bcond_with faad %bcond_with faad
%define soname 0
Name: qmmp Name: qmmp
Version: 0.8.5 Version: 0.9.1
Release: 0 Release: 0
Summary: XMMS-like audio player Summary: XMMS-like audio player
License: GPL-2.0+ License: GPL-2.0+
Group: Productivity/Multimedia/Sound/Players Group: Productivity/Multimedia/Sound/Players
Url: http://qmmp.ylsoftware.com/ Url: http://qmmp.ylsoftware.com/
Source0: http://qmmp.ylsoftware.com/files/qmmp-%{version}.tar.bz2 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 # PATCH-FIX-UPSTREAM qmmp-fix_cdda_version.patch pascal.bleser@opensuse.org -- Fix header detection for cdparanoia cdda.h.
Patch0: qmmp-0.6.1-default_pulse.patch Patch0: qmmp-fix_cdda_version.patch
# PATCH-FIX-UPSTREAM qmmp-fix_cdda_version.patch pascal.bleser@opensuse.org -- Fix header detection for cdparanoia cdda.h # PATCH-FEATURE-OPENSUSE qmmp-default_pulse.patch reddwarf@opensuse.org -- Use PulseAudio instead of ALSA by default.
Patch1: qmmp-fix_cdda_version.patch Patch1: qmmp-default-pulse.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -47,12 +46,9 @@ BuildRequires: pkgconfig(QtXml)
BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(enca) >= 1.9 BuildRequires: pkgconfig(enca) >= 1.9
BuildRequires: pkgconfig(flac) BuildRequires: pkgconfig(flac)
BuildRequires: pkgconfig(opus) >= 1.0.2 BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(opusfile) >= 0.2 BuildRequires: pkgconfig(libavformat)
# Standard Jack version is not new enough until openSUSE 12.1 BuildRequires: pkgconfig(libavutil)
%if 0%{?suse_version} > 1140
BuildRequires: pkgconfig(jack)
%endif
BuildRequires: pkgconfig(libbs2b) BuildRequires: pkgconfig(libbs2b)
BuildRequires: pkgconfig(libcddb) BuildRequires: pkgconfig(libcddb)
BuildRequires: pkgconfig(libcdio) BuildRequires: pkgconfig(libcdio)
@ -65,15 +61,19 @@ BuildRequires: pkgconfig(libprojectM)
BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libpulse)
BuildRequires: pkgconfig(libpulse-simple) BuildRequires: pkgconfig(libpulse-simple)
BuildRequires: pkgconfig(libsidplayfp) BuildRequires: pkgconfig(libsidplayfp)
BuildRequires: pkgconfig(opus) >= 1.0.2
BuildRequires: pkgconfig(opusfile) >= 0.2
BuildRequires: pkgconfig(samplerate) BuildRequires: pkgconfig(samplerate)
BuildRequires: pkgconfig(sndfile) BuildRequires: pkgconfig(sndfile)
BuildRequires: pkgconfig(taglib) BuildRequires: pkgconfig(taglib)
BuildRequires: pkgconfig(vorbisfile) BuildRequires: pkgconfig(vorbisfile)
BuildRequires: pkgconfig(wavpack) BuildRequires: pkgconfig(wavpack)
%if %{with ffmpeg} Requires: qmmp(%{sover})(Input)
BuildRequires: pkgconfig(libavcodec) Requires: qmmp(%{sover})(Output)
BuildRequires: pkgconfig(libavformat) Requires: qmmp(%{sover})(Ui)
BuildRequires: pkgconfig(libavutil) # Standard JACK version is not new enough until openSUSE 12.1.
%if 0%{?suse_version} > 1140
BuildRequires: pkgconfig(jack)
%endif %endif
%if %{with mad} %if %{with mad}
BuildRequires: pkgconfig(mad) BuildRequires: pkgconfig(mad)
@ -81,46 +81,46 @@ BuildRequires: pkgconfig(mad)
%if %{with faad} %if %{with faad}
BuildRequires: libfaad-devel BuildRequires: libfaad-devel
%endif %endif
Requires: qmmp(%{soname})(Input)
Requires: qmmp(%{soname})(Output)
Requires: qmmp(%{soname})(Ui)
%description %description
This program is an audio-player, written with help of Qt library. The program This program is an audio-player, written with help of Qt library. The program
has user interface, similar winamp or xmms. has user interface, similar winamp or xmms.
%package -n libqmmp%{soname} %package -n libqmmp%{sover}
Summary: Qmmp library Summary: Qmmp library
Group: System/Libraries Group: System/Libraries
Recommends: libqmmp%{soname}-plugins Recommends: libqmmp%{sover}-plugins
%description -n libqmmp%{soname} %description -n libqmmp%{sover}
Qmmp library. Qmmp library.
%package -n libqmmp%{soname}-plugins %package -n libqmmp%{sover}-plugins
Summary: Plugins for libqmmp Summary: Plugins for libqmmp
Group: System/Libraries Group: System/Libraries
Provides: qmmp(%{soname})(Input) # Suggests instead of Recommends since MPlayer is a too big dependency.
Provides: qmmp(%{soname})(Output) Suggests: libqmmp%{sover}-plugin-mplayer
Provides: qmmp(%{soname})(Ui) # qmmp-plugin-pack-simple-ui was last used in openSUSE 13.2 (in PMBS).
# Suggests instead of Recommends since MPlayer is a too big dependency Obsoletes: qmmp-plugin-pack-simple-ui < {version}
Suggests: libqmmp%{soname}-plugin-mplayer 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. Plugins for libqmmp.
%package -n libqmmp%{soname}-plugin-mplayer %package -n libqmmp%{sover}-plugin-mplayer
Summary: MPlayer plugin for libqmmp Summary: MPlayer plugin for libqmmp
Group: System/Libraries Group: System/Libraries
Requires: %{_bindir}/mplayer Requires: %{_bindir}/mplayer
%description -n libqmmp%{soname}-plugin-mplayer %description -n libqmmp%{sover}-plugin-mplayer
MPlayer plugin for libqmmp. MPlayer plugin for libqmmp.
%package -n libqmmp-devel %package -n libqmmp-devel
Summary: Development files for libqmmp Summary: Development files for libqmmp
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libqmmp%{soname} = %{version} Requires: libqmmp%{sover} = %{version}
%description -n libqmmp-devel %description -n libqmmp-devel
Development files for libqmmp. Development files for libqmmp.
@ -128,27 +128,28 @@ Development files for libqmmp.
%prep %prep
%setup -q %setup -q
%patch0 %patch0
%patch1 %patch1 -p1
%build %build
mkdir build mkdir build
cd build pushd build
export CFLAGS='%{optflags}' export CFLAGS="%{optflags}"
export CXXFLAGS='%{optflags}' export CXXFLAGS="%{optflags}"
cmake -DCMAKE_BUILD_WITH_INSTALL_RPATH=1 \ cmake \
-DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_BUILD_TYPE=Release \
-DLIB_DIR=%{_lib} \ -DCMAKE_VERBOSE_MAKEFILE=TRUE \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DCMAKE_VERBOSE_MAKEFILE=TRUE \ -DCMAKE_BUILD_WITH_INSTALL_RPATH=1 \
-DUSE_HAL=FALSE \ -DLIB_DIR=%{_lib} \
-DUSE_OSS=FALSE \ -DUSE_HAL=FALSE \
-DUSE_OSS4=FALSE \ -DUSE_OSS=FALSE \
.. -DUSE_OSS4=FALSE \
..
make %{?_smp_mflags} make %{?_smp_mflags}
popd
%install %install
cd build %make_install -C build
%make_install
%post %post
%icon_theme_cache_post %icon_theme_cache_post
@ -158,45 +159,46 @@ cd build
%desktop_database_postun %desktop_database_postun
%icon_theme_cache_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 %desktop_database_post
%postun -n libqmmp%{soname}-plugins %postun -n libqmmp%{sover}-plugins
%desktop_database_postun %desktop_database_postun
%files %files
%defattr(0644,root,root,0755) %defattr(-,root,root)
%doc AUTHORS ChangeLog COPYING README %doc AUTHORS ChangeLog COPYING README
%attr(0755,root,root) %{_bindir}/qmmp %{_bindir}/qmmp
%{_datadir}/qmmp %{_datadir}/qmmp/
%{_datadir}/applications/qmmp.desktop %{_datadir}/applications/qmmp.desktop
%{_datadir}/applications/qmmp_enqueue.desktop %{_datadir}/applications/qmmp_enqueue.desktop
%{_datadir}/applications/qmmp_dir.desktop %{_datadir}/applications/qmmp_dir.desktop
%{_datadir}/icons/hicolor/*/apps/qmmp* %{_datadir}/icons/hicolor/*/apps/qmmp*
%files -n libqmmp%{soname} %files -n libqmmp%{sover}
%defattr(0644,root,root,0755) %defattr(-,root,root)
%{_libdir}/libqmmp.so.%{soname}* %{_libdir}/libqmmp.so.%{sover}*
%{_libdir}/libqmmpui.so.%{soname}* %{_libdir}/libqmmpui.so.%{sover}*
%files -n libqmmp%{soname}-plugins %files -n libqmmp%{sover}-plugins
%defattr(0644,root,root,0755) %defattr(-,root,root)
%{_libdir}/qmmp %{_libdir}/qmmp/
%exclude %{_libdir}/qmmp/Engines/libmplayer.so %exclude %{_libdir}/qmmp/Engines/libmplayer.so
%{_datadir}/applications/qmmp_cue.desktop
%files -n libqmmp%{soname}-plugin-mplayer %files -n libqmmp%{sover}-plugin-mplayer
%defattr(0644,root,root,0755) %defattr(-,root,root)
%dir %{_libdir}/qmmp/
%dir %{_libdir}/qmmp/Engines/
%{_libdir}/qmmp/Engines/libmplayer.so %{_libdir}/qmmp/Engines/libmplayer.so
%files -n libqmmp-devel %files -n libqmmp-devel
%defattr(0644,root,root,0755) %defattr(-,root,root)
%{_includedir}/qmmp %{_includedir}/qmmp/
%{_includedir}/qmmpui %{_includedir}/qmmpui/
%{_libdir}/libqmmp.so %{_libdir}/libqmmp.so
%{_libdir}/libqmmpui.so %{_libdir}/libqmmpui.so
%{_libdir}/pkgconfig/qmmp.pc %{_libdir}/pkgconfig/qmmp.pc