[packages/mpd] - rel 4; fixed libcdio build

arekm arekm at pld-linux.org
Sun Feb 3 22:29:48 CET 2013


commit 362076bc25c54f5c343b4a1a2b274aefd686c6d7
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Feb 3 22:29:45 2013 +0100

    - rel 4; fixed libcdio build

 mpd-cdio.patch | 15 +++++++++++++++
 mpd.spec       |  4 +++-
 2 files changed, 18 insertions(+), 1 deletion(-)
---
diff --git a/mpd.spec b/mpd.spec
index 144cbfa..270b044 100644
--- a/mpd.spec
+++ b/mpd.spec
@@ -11,7 +11,7 @@ Summary(hu.UTF-8):	Music Player Daemon
 Summary(pl.UTF-8):	Music Player Daemon - demon odtwarzający muzykę
 Name:		mpd
 Version:	0.17.2
-Release:	3
+Release:	4
 License:	GPL v2+
 Group:		Applications/Multimedia
 Source0:	http://downloads.sourceforge.net/musicpd/%{name}-%{version}.tar.bz2
@@ -20,6 +20,7 @@ Source1:	%{name}.conf
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
 Source4:	%{name}.tmpfiles
+Patch0:		%{name}-cdio.patch
 URL:		http://www.musicpd.org/
 BuildRequires:	OpenAL-devel
 BuildRequires:	alsa-lib-devel >= 0.9.0
@@ -123,6 +124,7 @@ Dokumentacja do Music Player Daemon (MPD).
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 # ac_cv_* hacks to avoid unwanted linking
diff --git a/mpd-cdio.patch b/mpd-cdio.patch
new file mode 100644
index 0000000..c10ec51
--- /dev/null
+++ b/mpd-cdio.patch
@@ -0,0 +1,15 @@
+--- mpd-0.17.2/src/input/cdio_paranoia_input_plugin.c~	2012-09-30 12:22:57.000000000 +0200
++++ mpd-0.17.2/src/input/cdio_paranoia_input_plugin.c	2013-02-03 22:28:42.169606736 +0100
+@@ -35,7 +35,12 @@
+ #include <glib.h>
+ #include <assert.h>
+ 
++#include <cdio/cdio.h> 
++#if LIBCDIO_VERSION_NUM <= 83
+ #include <cdio/paranoia.h>
++#else
++#include <cdio/paranoia/paranoia.h>
++#endif
+ #include <cdio/cd_types.h>
+ 
+ struct input_cdio_paranoia {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mpd.git/commitdiff/362076bc25c54f5c343b4a1a2b274aefd686c6d7



More information about the pld-cvs-commit mailing list