- up to 0.17.4

- updated source url
- ffmpeg-float.patch applied upstream
- --enable-cue is no longer valid

diff --git a/ffmpeg-float.patch b/ffmpeg-float.patch
deleted file mode 100644 (file)
index 8ec0b9c..0000000
--- a/ffmpeg-float.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 1105e61f292fd61a6316a4b83439dbaa29c102fd Mon Sep 17 00:00:00 2001
-From: Brice Jaglin <bjaglin@free.fr>
-Date: Wed, 16 Jan 2013 17:02:58 +0000
-Subject: decoder/ffmpeg: support float planar audio
-
----
-diff --git a/src/decoder/ffmpeg_decoder_plugin.c b/src/decoder/ffmpeg_decoder_plugin.c
-index 72a5ff3..4c4cb2b 100644
---- a/src/decoder/ffmpeg_decoder_plugin.c
-+++ b/src/decoder/ffmpeg_decoder_plugin.c
-@@ -395,6 +395,11 @@ ffmpeg_sample_format(enum AVSampleFormat sample_fmt)
- #endif
-               return SAMPLE_FORMAT_S32;
- 
-+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,17,0)
-+      case AV_SAMPLE_FMT_FLTP:
-+              return SAMPLE_FORMAT_FLOAT;
-+#endif
-+
-       default:
-               break;
-       }
---
-cgit v0.9.0.3-66-g3205

diff --git a/mpd.spec b/mpd.spec
index ab0e240fc89a43f29467ec4b6704babf5f90573a..1a81c1e48aca76ed78b4d6ef1e91449f97864d76 100644 (file)
--- a/mpd.spec
+++ b/mpd.spec
@@ -10,18 +10,17 @@ 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.3
+Version:       0.17.4
 Release:       1
 License:       GPL v2+
 Group:         Applications/Multimedia
-Source0:       http://downloads.sourceforge.net/musicpd/%{name}-%{version}.tar.bz2
-# Source0-md5: cfc9dbf54f52569b998677fe1fa79c11
+Source0:       http://www.musicpd.org/download/mpd/0.17/%{name}-%{version}.tar.xz
+# Source0-md5: ab408a61f49f215ce77ed0cf1deed6e1
 Source1:       %{name}.conf
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig
 Source4:       %{name}.tmpfiles
 Patch0:                %{name}-cdio.patch
-Patch1:                ffmpeg-float.patch
 URL:           http://www.musicpd.org/
 BuildRequires: OpenAL-devel
 BuildRequires: alsa-lib-devel >= 0.9.0
@@ -126,7 +125,6 @@ Dokumentacja do Music Player Daemon (MPD).
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 # ac_cv_* hacks to avoid unwanted linking
@@ -141,7 +139,6 @@ GME_CFLAGS="-I/usr/include/gme" GME_LIBS="-lgme" \
        --enable-ao \
        %{?with_audiofile:--enable-audiofile} \
        --enable-bzip2 \
-       --enable-cue \
        --enable-curl \
        --enable-documentation \
        --enable-ffmpeg \