Author: ankursinha Update of /cvs/free/rpms/mpd/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17106 Modified Files: .cvsignore mpd.spec sources Added Files: mpd-0.18-mpdconf.patch Removed Files: mpd-0.16.7-default-pulseaudio.patch mpd-0.16.8-socket-location.patch Log Message: * Wed Oct 02 2013 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 1:0.18-0.1.git0e0be02 - Update mpdconf.example patch - Update to git checkout from master since 0.17 doesn't use new ffmpeg at all - disable mpcdec support until Fedora package is updated mpd-0.18-mpdconf.patch: mpdconf.example | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) --- NEW FILE mpd-0.18-mpdconf.patch --- diff -ur ../mpd.orig/doc/mpdconf.example ./doc/mpdconf.example --- ../mpd.orig/doc/mpdconf.example 2013-10-02 15:01:57.711017087 +1000 +++ ./doc/mpdconf.example 2013-10-02 15:02:59.995519905 +1000 @@ -81,7 +81,7 @@ #bind_to_address "any" # # And for Unix Socket -#bind_to_address "~/.mpd/socket" +#bind_to_address "/run/mpd/socket" # # This setting is the TCP port that is desired for the daemon to get assigned # to. @@ -274,12 +274,12 @@ # # An example of a pulseaudio output (streaming to a remote pulseaudio server) # -#audio_output { -# type "pulse" -# name "My Pulse Output" +audio_output { + type "pulse" + name "My Pulse Output" ## server "remote_server" # optional ## sink "remote_server_sink" # optional -#} +} # # An example of a winmm output (Windows multimedia API). # Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/mpd/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 23 Feb 2013 18:33:26 -0000 1.16 +++ .cvsignore 2 Oct 2013 07:01:48 -0000 1.17 @@ -1 +1 @@ -mpd-0.17.3.tar.bz2 +mpd-0.18-git-0e0be0243bdf2fe8cbd88bd530ec7b7040b4d9da.tar.gz Index: mpd.spec =================================================================== RCS file: /cvs/free/rpms/mpd/devel/mpd.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- mpd.spec 15 Aug 2013 10:18:26 -0000 1.35 +++ mpd.spec 2 Oct 2013 07:01:48 -0000 1.36 @@ -14,20 +14,28 @@ %global mpd_logfile %{mpd_logdir}/mpd.log %global mpd_statefile %{mpd_homedir}/mpdstate +%global git_commit 0e0be0243bdf2fe8cbd88bd530ec7b7040b4d9da +%global shortcommit %(c=%{git_commit}; echo ${c:0:7}) + Name: mpd Epoch: 1 -Version: 0.17.3 -Release: 4%{?dist} +Version: 0.18 +Release: 0.1.git%{shortcommit}%{?dist} Summary: The Music Player Daemon License: GPLv2+ Group: Applications/Multimedia URL: http://mpd.wikia.com/ -Source0: http://downloads.sourceforge.net/musicpd/%{name}-%{version}.tar.bz2 +#Source0: http://downloads.sourceforge.net/musicpd/%{name}-%{version}.tar.xz +# Used master since the 0.17 branch does not work with new ffmpeg +# Note that the master branch doesn't work with Fedora's version of libmpcdec +# which needs updating. +# https://bugzilla.redhat.com/show_bug.cgi?id=1014468 +# http://bugs.musicpd.org/view.php?id=3814#bugnotes +Source0: %{name}-%{version}-git-%{git_commit}.tar.gz Source1: mpd.logrotate Source2: mpd.tmpfiles.d -Patch0: mpd-0.16.7-default-pulseaudio.patch -Patch1: mpd-0.16.8-socket-location.patch +Patch0: mpd-0.18-mpdconf.patch BuildRequires: alsa-lib-devel BuildRequires: audiofile-devel @@ -45,7 +53,10 @@ BuildRequires: libmad-devel BuildRequires: libmms-devel BuildRequires: libmodplug-devel -BuildRequires: libmpcdec-devel + +# Need new version with SV8 +# BuildRequires: libmpcdec-devel + BuildRequires: libogg-devel BuildRequires: libsamplerate-devel BuildRequires: libshout-devel @@ -56,7 +67,9 @@ BuildRequires: wavpack-devel BuildRequires: zlib-devel BuildRequires: zziplib-devel -BuildRequires: systemd-units +BuildRequires: systemd +BuildRequires: libcdio-paranoia-devel +BuildRequires: opus-devel Requires(pre): shadow-utils Requires(post): systemd Requires(preun): systemd @@ -74,16 +87,17 @@ %prep -%setup -q +%setup -q -n %{name} %patch0 -p0 -%patch1 -p1 %build +./autogen.sh %{configure} \ --with-systemdsystemunitdir=%{_unitdir} \ --enable-bzip2 \ --enable-lastfm \ --enable-mikmod \ + --disable-mpc \ --enable-zzip make %{?_smp_mflags} @@ -160,6 +174,11 @@ %changelog +* Wed Oct 02 2013 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 1:0.18-0.1.git0e0be02 +- Update mpdconf.example patch +- Update to git checkout from master since 0.17 doesn't use new ffmpeg at all +- disable mpcdec support until Fedora package is updated + * Thu Aug 15 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:0.17.3-4 - Rebuilt for FFmpeg 2.0.x Index: sources =================================================================== RCS file: /cvs/free/rpms/mpd/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 23 Feb 2013 18:33:26 -0000 1.16 +++ sources 2 Oct 2013 07:01:48 -0000 1.17 @@ -1 +1 @@ -cfc9dbf54f52569b998677fe1fa79c11 mpd-0.17.3.tar.bz2 +b66d747bcda733a40336e002eb0f7b02 mpd-0.18-git-0e0be0243bdf2fe8cbd88bd530ec7b7040b4d9da.tar.gz --- mpd-0.16.7-default-pulseaudio.patch DELETED --- --- mpd-0.16.8-socket-location.patch DELETED ---