Accepting request 122498 from multimedia:apps

Requires libcdio-paranoia from multimedia:libs, that I hope will be submitted soon... but the current 0.5.4 in Factory has the same problem, this doesn't make anything worse.

- Update to 0.5.5
  * added latest libcdio support
  * fixed Russian translation
  * fixed acc streams support
  * fixed aac bitrate calculation
  * fixed scrobbler failure when using Qt 4.8
  * fixed some cuesheets parsing
  * fixed --pause command line option behavior
  * updated Japanese translation
- Add missing %desktop_database_post and %icon_theme_cache_post
  scripts
- Remove obsoleted %suse_update_desktop_file calls
- Add qmmp-0.5.5-libcdio_mess.patch to fix build with git version
  of libcdio

OBS-URL: https://build.opensuse.org/request/show/122498
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qmmp?expand=0&rev=2
This commit is contained in:
Stephan Kulow 2012-05-29 09:45:11 +00:00 committed by Git OBS Bridge
commit e0e502b807
5 changed files with 103 additions and 51 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6f95d1bb97cb1ef91b9d664f4d5ce013c6cc93f3aefb24cd64cf2500a525be0f
size 708421

View File

@ -0,0 +1,20 @@
Index: src/plugins/Input/cdaudio/decoder_cdaudio.cpp
===================================================================
--- src/plugins/Input/cdaudio/decoder_cdaudio.cpp.orig
+++ src/plugins/Input/cdaudio/decoder_cdaudio.cpp
@@ -24,14 +24,11 @@
#include <QSettings>
#include <QFileInfo>
#include <QDir>
-#include <cdio/cdtext.h>
-#include <cdio/track.h>
+#include <cdio/cdio.h>
#include <cdio/cdda.h>
#include <cdio/audio.h>
-#include <cdio/sector.h>
#include <cdio/cd_types.h>
#include <cdio/logging.h>
-#include <cdio/version.h>
#include <cddb/cddb.h>
#include <qmmp/buffer.h>
#include <qmmp/output.h>

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

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:525d7528c58c885e45149f698125dfff6bedca0e9af979b2490e3f0b902943a6
size 709008

View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Sat May 26 10:45:52 UTC 2012 - reddwarf@opensuse.org
- Update to 0.5.5
* added latest libcdio support
* fixed Russian translation
* fixed acc streams support
* fixed aac bitrate calculation
* fixed scrobbler failure when using Qt 4.8
* fixed some cuesheets parsing
* fixed --pause command line option behavior
* updated Japanese translation
- Add missing %desktop_database_post and %icon_theme_cache_post
scripts
- Remove obsoleted %suse_update_desktop_file calls
- Add qmmp-0.5.5-libcdio_mess.patch to fix build with git version
of libcdio
-------------------------------------------------------------------
Mon Sep 6 16:47:29 UTC 2010 - reddwarf@opensuse.org

110
qmmp.spec
View File

@ -23,14 +23,16 @@
%define soname 0
Name: qmmp
Version: 0.5.4
Version: 0.5.5
Release: 0
Summary: XMMS-like audio player
License: GPL-2.0+
Group: Productivity/Multimedia/Sound/Players
Url: http://%{name}.ylsoftware.com/
Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2
Url: http://qmmp.ylsoftware.com/
Source0: http://qmmp.googlecode.com/files/qmmp-%{version}.tar.bz2
Patch0: qmmp-0.5.5-libcdio_mess.patch
BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: gcc-c++
BuildRequires: hicolor-icon-theme
BuildRequires: libmpcdec-devel
@ -47,7 +49,6 @@ BuildRequires: pkgconfig(flac)
%if 0%{?suse_version} > 1140
BuildRequires: pkgconfig(jack)
%endif
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(libbs2b)
BuildRequires: pkgconfig(libcddb)
BuildRequires: pkgconfig(libcdio)
@ -80,90 +81,103 @@ BuildRequires: libfaad-devel
This program is an audio-player, written with help of Qt library. The program
has user interface, similar winamp or xmms.
%package -n lib%{name}%{soname}
%package -n libqmmp%{soname}
Summary: Qmmp library
Group: System/Libraries
Recommends: lib%{name}%{soname}-plugin-mplayer
Recommends: lib%{name}%{soname}-plugins
Recommends: libqmmp%{soname}-plugin-mplayer
Recommends: libqmmp%{soname}-plugins
%description -n lib%{name}%{soname}
%description -n libqmmp%{soname}
Qmmp library.
%package -n lib%{name}%{soname}-plugins
Summary: Plugins for lib%{name}
%package -n libqmmp%{soname}-plugins
Summary: Plugins for libqmmp
Group: System/Libraries
%description -n lib%{name}%{soname}-plugins
Plugins for lib%{name}.
%description -n libqmmp%{soname}-plugins
Plugins for libqmmp.
%package -n lib%{name}%{soname}-plugin-mplayer
Summary: MPlayer plugin for lib%{name}
%package -n libqmmp%{soname}-plugin-mplayer
Summary: MPlayer plugin for libqmmp
Group: System/Libraries
Requires: %{_bindir}/mplayer
%description -n lib%{name}%{soname}-plugin-mplayer
MPlayer plugin for lib%{name}.
%description -n libqmmp%{soname}-plugin-mplayer
MPlayer plugin for libqmmp.
%package -n lib%{name}-devel
Summary: Development files for lib%{name}
%package -n libqmmp-devel
Summary: Development files for libqmmp
Group: Development/Libraries/C and C++
Requires: lib%{name}%{soname} = %{version}
Requires: libqmmp%{soname} = %{version}
%description -n lib%{name}-devel
Development files for lib%{name}.
%description -n libqmmp-devel
Development files for libqmmp.
%prep
%setup -q
%patch0
%build
mkdir build
cd build
export CFLAGS='%{optflags}'
export CXXFLAGS='%{optflags}'
cmake -DCMAKE_SKIP_RPATH=ON -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DLIB_DIR=%{_lib} -DCMAKE_BUILD_TYPE=Release ..
make %{?_smp_mflags} VERBOSE=1
cmake -DCMAKE_BUILD_WITH_INSTALL_RPATH=1 -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DLIB_DIR=%{_lib} -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_VERBOSE_MAKEFILE=TRUE ..
make %{?_smp_mflags}
%install
cd build
%make_install
%suse_update_desktop_file %{name}
%suse_update_desktop_file %{name}_enqueue
%suse_update_desktop_file %{name}_cue
%post -n lib%{name}%{soname} -p /sbin/ldconfig
%post
%icon_theme_cache_post
%desktop_database_post
%postun -n lib%{name}%{soname} -p /sbin/ldconfig
%postun
%desktop_database_postun
%icon_theme_cache_postun
%post -n libqmmp%{soname} -p /sbin/ldconfig
%postun -n libqmmp%{soname} -p /sbin/ldconfig
%post -n libqmmp%{soname}-plugins
%desktop_database_post
%postun -n libqmmp%{soname}-plugins
%desktop_database_postun
%files
%defattr(0644,root,root,0755)
%doc AUTHORS ChangeLog COPYING README
%attr(0755,root,root) %{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/applications/%{name}_enqueue.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}*
%attr(0755,root,root) %{_bindir}/qmmp
%{_datadir}/qmmp
%{_datadir}/applications/qmmp.desktop
%{_datadir}/applications/qmmp_enqueue.desktop
%{_datadir}/icons/hicolor/*/apps/qmmp*
%files -n lib%{name}%{soname}
%files -n libqmmp%{soname}
%defattr(0644,root,root,0755)
%{_libdir}/lib%{name}.so.%{soname}*
%{_libdir}/lib%{name}ui.so.%{soname}*
%{_libdir}/libqmmp.so.%{soname}*
%{_libdir}/libqmmpui.so.%{soname}*
%files -n lib%{name}%{soname}-plugins
%files -n libqmmp%{soname}-plugins
%defattr(0644,root,root,0755)
%{_libdir}/%{name}
%exclude %{_libdir}/%{name}/Engines/libmplayer.so
%{_datadir}/applications/%{name}_cue.desktop
%{_libdir}/qmmp
%exclude %{_libdir}/qmmp/Engines/libmplayer.so
%{_datadir}/applications/qmmp_cue.desktop
%files -n lib%{name}%{soname}-plugin-mplayer
%files -n libqmmp%{soname}-plugin-mplayer
%defattr(0644,root,root,0755)
%{_libdir}/%{name}/Engines/libmplayer.so
%{_libdir}/qmmp/Engines/libmplayer.so
%files -n lib%{name}-devel
%files -n libqmmp-devel
%defattr(0644,root,root,0755)
%{_includedir}/%{name}
%{_includedir}/%{name}ui
%{_libdir}/lib%{name}.so
%{_libdir}/lib%{name}ui.so
%{_includedir}/qmmp
%{_includedir}/qmmpui
%{_libdir}/libqmmp.so
%{_libdir}/libqmmpui.so
%changelog