[packages/mpd] - up to 0.18.3 - mpd now uses libmpcdec SV8 for mpc decoding

[atler]

commit 735ff9d778694e457862163634d24cd628454761
Author: Jan Palus <jan.palus at gmail.com>
Date:   Fri Nov 8 15:33:32 2013 +0100

    - up to 0.18.3
    - mpd now uses libmpcdec SV8 for mpc decoding

 mpd-cdio.patch    |  4 ++--
 mpd-ffmpeg2.patch | 19 -------------------
 mpd-mpcsv8.patch  | 12 ++++++++++++
 mpd.spec          | 15 ++++++++++-----
 4 files changed, 24 insertions(+), 26 deletions(-)
---
diff --git a/mpd.spec b/mpd.spec
index 8356163..638dd4b 100644
--- a/mpd.spec
+++ b/mpd.spec
@@ -10,22 +10,23 @@ Summary:	Music Player Daemon
 Summary(hu.UTF-8):	Music Player Daemon
 Summary(pl.UTF-8):	Music Player Daemon - demon odtwarzający muzykę
 Name:		mpd
-Version:	0.17.6
+Version:	0.18.3
 Release:	1
 License:	GPL v2+
 Group:		Applications/Multimedia
-Source0:	http://www.musicpd.org/download/mpd/0.17/%{name}-%{version}.tar.xz
-# Source0-md5:	d0da6a6a1d9cf1e8710b6082f6ef7849
+Source0:	http://www.musicpd.org/download/mpd/0.18/%{name}-%{version}.tar.xz
+# Source0-md5:	7e6b823465c69a3e963c72096dfec636
 Source1:	%{name}.conf
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
 Source4:	%{name}.tmpfiles
 Patch0:		%{name}-cdio.patch
-Patch1:		%{name}-ffmpeg2.patch
+Patch1:		%{name}-mpcsv8.patch
 URL:		http://www.musicpd.org/
 BuildRequires:	OpenAL-devel
 BuildRequires:	alsa-lib-devel >= 0.9.0
 %{?with_audiofile:BuildRequires:	audiofile-devel >= 0.1.7}
+BuildRequires:	autoconf >= 2.60
 BuildRequires:	avahi-glib-devel
 BuildRequires:	bzip2-devel
 BuildRequires:	curl-devel
@@ -46,12 +47,12 @@ BuildRequires:	libmad-devel
 %{?with_mod:BuildRequires:	libmikmod-devel >= 3.1.7}
 BuildRequires:	libmms-devel
 BuildRequires:	libmodplug-devel
-BuildRequires:	libmpcdec-devel
 BuildRequires:	libogg-devel
 BuildRequires:	libsamplerate-devel >= 0.0.15
 BuildRequires:	libshout-devel
 BuildRequires:	libsidplay2-devel >= 2.1.1-5
 BuildRequires:	libvorbis-devel
+BuildRequires:	musepack-devel
 BuildRequires:	pkgconfig >= 1:0.9.0
 %{?with_pulseaudio:BuildRequires:	pulseaudio-devel}
 BuildRequires:	rpmbuild(macros) >= 1.629-2
@@ -129,6 +130,10 @@ Dokumentacja do Music Player Daemon (MPD).
 %patch1 -p1
 
 %build
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 # ac_cv_* hacks to avoid unwanted linking
 GME_CFLAGS="-I/usr/include/gme" GME_LIBS="-lgme" \
 %configure \
diff --git a/mpd-cdio.patch b/mpd-cdio.patch
index c10ec51..066cac4 100644
--- a/mpd-cdio.patch
+++ b/mpd-cdio.patch
@@ -1,5 +1,5 @@
---- 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
+--- mpd-0.17.2/src/input/CdioParanoiaInputPlugin.cxx~	2012-09-30 12:22:57.000000000 +0200
++++ mpd-0.17.2/src/input/CdioParanoiaInputPlugin.cxx	2013-02-03 22:28:42.169606736 +0100
 @@ -35,7 +35,12 @@
  #include <glib.h>
  #include <assert.h>
diff --git a/mpd-ffmpeg2.patch b/mpd-ffmpeg2.patch
deleted file mode 100644
index 07c3e48..0000000
--- a/mpd-ffmpeg2.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fix build with FFmpeg 2.0.
-
-Upstream status: Better patch sent and merged upstream.
-
-Index: mpd-0.17.4/src/decoder/ffmpeg_decoder_plugin.c
-===================================================================
---- mpd-0.17.4.orig/src/decoder/ffmpeg_decoder_plugin.c
-+++ mpd-0.17.4/src/decoder/ffmpeg_decoder_plugin.c
-@@ -47,6 +47,10 @@
- #undef G_LOG_DOMAIN
- #define G_LOG_DOMAIN "ffmpeg"
- 
-+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
-+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
-+#endif
-+
- static GLogLevelFlags
- level_ffmpeg_to_glib(int level)
- {
diff --git a/mpd-mpcsv8.patch b/mpd-mpcsv8.patch
new file mode 100644
index 0000000..f1f414f
--- /dev/null
+++ b/mpd-mpcsv8.patch
@@ -0,0 +1,12 @@
+diff -urN mpd-0.18.2.orig/configure.ac mpd-0.18.2/configure.ac
+--- mpd-0.18.2.orig/configure.ac	2013-11-08 12:10:16.943635089 +0100
++++ mpd-0.18.2/configure.ac	2013-11-08 12:13:13.986976726 +0100
+@@ -957,7 +957,7 @@
+ 
+ dnl --------------------------------- musepack --------------------------------
+ 
+-MPD_AUTO_LIB(mpc, MPCDEC, mpcdec, main, [-lmpcdec], [],
++MPD_AUTO_LIB(mpc, MPCDEC, mpcdecsv8, main, [-lmpcdecsv8], [],
+ 	[mpcdec], [libmpcdec not found])
+ if test x$enable_mpc = xyes; then
+ 	AC_DEFINE(HAVE_MPCDEC, 1, [Define to use libmpcdec for MPC decoding])
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mpd.git/commitdiff/735ff9d778694e457862163634d24cd628454761