- up to 0.16.5

- ffmpeg_sigsegv.patch applied upstream

Changed files:
    mpd-ffmpeg_sigsegv.patch -> 1.2
    mpd.spec -> 1.73

diff --git a/mpd-ffmpeg_sigsegv.patch b/mpd-ffmpeg_sigsegv.patch
deleted file mode 100644 (file)
index a945a0a..0000000
--- a/mpd-ffmpeg_sigsegv.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur mpd-0.16.3.orig/src/decoder/ffmpeg_decoder_plugin.c mpd-0.16.3/src/decoder/ffmpeg_decoder_plugin.c
---- mpd-0.16.3.orig/src/decoder/ffmpeg_decoder_plugin.c        2011-06-04 17:36:33.000000000 +0300
-+++ mpd-0.16.3/src/decoder/ffmpeg_decoder_plugin.c     2011-06-24 18:18:51.840218251 +0300
-@@ -321,7 +321,7 @@
-       }
- 
-       //ffmpeg works with ours "fileops" helper
--      AVFormatContext *format_context;
-+      AVFormatContext *format_context = NULL;
-       if (av_open_input_stream(&format_context, stream->io, input->uri,
-                                input_format, NULL) != 0) {
-               g_warning("Open failed\n");
-@@ -470,7 +470,7 @@
-       if (stream == NULL)
-               return NULL;
- 
--      AVFormatContext *f;
-+      AVFormatContext *f = NULL;
-       if (av_open_input_stream(&f, stream->io, is->uri,
-                                input_format, NULL) != 0) {
-               mpd_ffmpeg_stream_close(stream);

diff --git a/mpd.spec b/mpd.spec
index ec4d25888f18274364f9b6f21ec3fcd038775d41..9a74628ac9970ec1a8404fb0cfcb97565878aca6 100644 (file)
--- a/mpd.spec
+++ b/mpd.spec
@@ -4,23 +4,22 @@
 # Conditional build:
 %bcond_without mod             # enable MOD support
 %bcond_without pulseaudio      # disable PulseAudio support
-%bcond_with            audiofile       # Audiofile support (WAV and others)
+%bcond_without audiofile       # Audiofile support (WAV and others)
 
 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.16.3
-Release:       7
+Version:       0.16.5
+Release:       1
 License:       GPL v2+
 Group:         Applications/Multimedia
 Source0:       http://downloads.sourceforge.net/musicpd/%{name}-%{version}.tar.bz2
-# Source0-md5: 6e708c02b0e8c288aec855eecf441a5a
+# Source0-md5: f7564cff12035f6a1112cce770655df7
 Source1:       %{name}.conf
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig
 URL:           http://www.musicpd.org/
-Patch0:                %{name}-ffmpeg_sigsegv.patch
 BuildRequires: OpenAL-devel
 BuildRequires: alsa-lib-devel >= 0.9.0
 %{?with_audiofile:BuildRequires:       audiofile-devel >= 0.1.7}
@@ -119,7 +118,6 @@ Dokumentacja do Music Player Daemon (MPD).
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 # ac_cv_* hacks to avoid unwanted linking