[packages/qmmp] - up to 0.6.6; libcdio build fix
arekm
arekm at pld-linux.org
Sun Feb 3 22:20:05 CET 2013
commit f9fed23a831d7a8789fd4255c330307ea47d44ec
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sun Feb 3 22:20:02 2013 +0100
- up to 0.6.6; libcdio build fix
qmmp-cdio.patch | 23 +++++++++++++++++++++++
qmmp.spec | 13 +++++++++----
2 files changed, 32 insertions(+), 4 deletions(-)
---
diff --git a/qmmp.spec b/qmmp.spec
index 8fb76e5..7b40787 100644
--- a/qmmp.spec
+++ b/qmmp.spec
@@ -5,18 +5,19 @@ Summary: XMMS like audio player written in Qt
Summary(hu.UTF-8): XMMS-szerű Qt alapú audio-lejátszó
Summary(pl.UTF-8): Odtwarzacz muzyki w stylu XMMS napisany w Qt
Name: qmmp
-Version: 0.6.4
-Release: 2
+Version: 0.6.6
+Release: 1
License: GPL v2
Group: X11/Applications/Multimedia
Source0: http://qmmp.googlecode.com/files/%{name}-%{version}.tar.bz2
-# Source0-md5: 134e9b5187e73f0fd333b7b6c9e8672b
+# Source0-md5: 0131a9bf7b98737c1a6fd6e1a897e2b2
+Patch0: %{name}-cdio.patch
URL: http://code.google.com/p/qmmp/
+BuildRequires: Qt3Support-devel
BuildRequires: QtCore-devel >= 4.3
BuildRequires: QtGui-devel >= 4.3
BuildRequires: QtNetwork-devel
BuildRequires: QtOpenGL-devel
-BuildRequires: Qt3Support-devel
BuildRequires: alsa-lib-devel >= 1.0.1
BuildRequires: cmake
BuildRequires: curl-devel >= 7.16
@@ -81,6 +82,7 @@ Pliki nagłówkowe qmmp
%prep
%setup -q
+%patch0 -p1
%build
install -d build
@@ -123,6 +125,7 @@ rm -rf $RPM_BUILD_ROOT
%{_desktopdir}/qmmp.desktop
%{_desktopdir}/qmmp_cue.desktop
%{_desktopdir}/qmmp_enqueue.desktop
+%{_desktopdir}/qmmp_dir.desktop
%dir %{_datadir}/qmmp
%dir %{_datadir}/qmmp/images
%{_datadir}/qmmp/images/*.png
@@ -135,3 +138,5 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/qmmpui
%attr(755,root,root) %{_libdir}/libqmmp.so
%attr(755,root,root) %{_libdir}/libqmmpui.so
+%{_pkgconfigdir}/qmmp.pc
+%{_pkgconfigdir}/qmmpui.pc
diff --git a/qmmp-cdio.patch b/qmmp-cdio.patch
new file mode 100644
index 0000000..b524bba
--- /dev/null
+++ b/qmmp-cdio.patch
@@ -0,0 +1,23 @@
+Index: qmmp/src/plugins/Input/cdaudio/decoder_cdaudio.cpp
+===================================================================
+--- qmmp/src/plugins/Input/cdaudio/decoder_cdaudio.cpp (wersja 3171)
++++ qmmp/src/plugins/Input/cdaudio/decoder_cdaudio.cpp (wersja 3172)
+@@ -1,5 +1,5 @@
+ /***************************************************************************
+- * Copyright (C) 2009-2012 by Ilya Kotov *
++ * Copyright (C) 2009-2013 by Ilya Kotov *
+ * forkotov02 at hotmail.ru *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+@@ -25,7 +25,11 @@
+ #include <QFileInfo>
+ #include <QDir>
+ #include <cdio/cdio.h>
++#if LIBCDIO_VERSION_NUM <= 83
+ #include <cdio/cdda.h>
++#else
++#include <cdio/paranoia/cdda.h>
++#endif
+ #include <cdio/audio.h>
+ #include <cdio/cd_types.h>
+ #include <cdio/logging.h>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qmmp.git/commitdiff/f9fed23a831d7a8789fd4255c330307ea47d44ec
More information about the pld-cvs-commit
mailing list