Skip to content

M
mpd
Commit 5e2af49e authored by Led's avatar Led
Browse files
Options

0.14-alt0.1

parent 902d23f7
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 121 deletions
.gear/rules
View file @ 5e2af49e
tar: @version@:.
diff: @version@:. @version@-alt:. name=@name@-@version@-alt.patch
copy: *.conf *.in *.logrotate *.patch
tar: @version@-beta3:. name=@name@-@version@_beta3
diff: @version@-beta3:. @version@-beta3-alt:. name=@name@-@version@-@release@.patch
copy: *.conf *.in *.logrotate
.gear/tags/859916974bd2fbfc90374b2227c16876a560cbe6 deleted 100644 → 0
View file @ 902d23f7
object 5fb60cf1658ae2e2bab0b8f2a272e3cbfed38396
type commit
tag 0.13.2-alt
tagger Led <led@altlinux.org> 1226286502 +0200
.gear/tags/9b05052e5538f462ebcd34e190d4f6e4d7621a36 0 → 100644
View file @ 5e2af49e
object 423947a7c326415b569f100fd381bcf5c4458228
type commit
tag 0.14-beta3
tagger Led <led@altlinux.org> 1229888183 +0200
.gear/tags/a7668e315a3c413e07e899f9bd8c58ace7ad5711 deleted 100644 → 0
View file @ 902d23f7
object e0d031b59f3b6359ae7de26bdb2f23279cff7dc9
type commit
tag 0.13.2
tagger Led <led@altlinux.org> 1226282106 +0200
.gear/tags/baf68b645fe14b1e7c285573ce6f01e7bcb2ebf1 0 → 100644
View file @ 5e2af49e
object 9d8117a4e999618c554ba34139116dfbe872e510
type commit
tag 0.14-beta3-alt
tagger Led <led@altlinux.org> 1229894281 +0200
.gear/tags/list
View file @ 5e2af49e
a7668e315a3c413e07e899f9bd8c58ace7ad5711 0.13.2
859916974bd2fbfc90374b2227c16876a560cbe6 0.13.2-alt
9b05052e5538f462ebcd34e190d4f6e4d7621a36 0.14-beta3
baf68b645fe14b1e7c285573ce6f01e7bcb2ebf1 0.14-beta3-alt
mpd-0.13.0-configure.patch deleted 100644 → 0
View file @ 902d23f7
diff -urN mpd-0.13.0.orig/configure.ac mpd-0.13.0/configure.ac
--- mpd-0.13.0.orig/configure.ac 2007-05-28 16:19:32 +0300
+++ mpd-0.13.0/configure.ac 2007-09-13 17:29:48 +0300
@@ -81,7 +81,14 @@
AC_ARG_ENABLE(id3,[ --disable-id3 disable id3 support (default: enable)],[enable_id3=$enableval],[enable_id3=yes])
AC_ARG_ENABLE(lsr,[ --disable-lsr disable libsamplerate support (default: enable)],[enable_lsr=$enableval],[enable_lsr=yes])
-AC_ARG_WITH(tremor,[[ --with-tremor[=PFX] Use Tremor(vorbisidec) integer Ogg-Vorbis decoder (with optional prefix)]], use_tremor=yes; test x$withval != xyes && tremor_prefix="$withval",)
+AC_ARG_WITH(tremor,[[ --with-tremor[=PFX] Use Tremor(vorbisidec) integer Ogg-Vorbis decoder (with optional prefix)]],
+ if test "x$withval" = xyes -o "x$withval" = xno; then
+ use_tremor="$withval"
+ else
+ use_tremor=yes
+ tremor_prefix="$withval"
+ fi
+,)
AC_ARG_WITH(tremor-libraries,[ --with-tremor-libraries=DIR Directory where Tremor library is installed (optional)], tremor_libraries="$withval", tremor_libraries="")
AC_ARG_WITH(tremor-includes,[ --with-tremor-includes=DIR Directory where Tremor header files are installed (optional)], tremor_includes="$withval", tremor_includes="")
@@ -170,7 +177,7 @@
fi
if test x$enable_shout = xyes; then
- XIPH_PATH_SHOUT([AC_DEFINE(HAVE_SHOUT, 1, [Define to enable libshout support]) MPD_LIBS="$MPD_LIBS $SHOUT_LIBS" MPD_CFLAGS="$MPD_CFLAGS $SHOUT_CFLAGS"], enable_shout=no)
+ XIPH_PATH_SHOUT([AC_DEFINE(HAVE_SHOUT, 1, [Define to enable libshout support]) MPD_LIBS="$MPD_LIBS $SHOUT_LIBS" MPD_CFLAGS="$MPD_CFLAGS $SHOUT_CFLAGS $SHOUT_CPPFLAGS"], enable_shout=no)
fi
if test x$enable_oss = xyes; then
mpd-0.13.2-alt-encoding_output_fix.patch deleted 100644 → 0
View file @ 902d23f7
diff -urN mpd-0.13.2.orig/src/directory.c mpd-0.13.2/src/directory.c
--- mpd-0.13.2.orig/src/directory.c 2008-01-27 00:16:46 +0200
+++ mpd-0.13.2/src/directory.c 2008-07-06 02:15:11 +0300
@@ -296,7 +296,7 @@
void *song;
if (findInList(directory->songs, shortname, &song)) {
- LOG("removing: %s\n", getSongUrl((Song *) song));
+ LOG("removing: %s\n", utf8ToFsCharset(getSongUrl((Song *) song)));
deleteFromList(directory->songs, shortname);
}
}
@@ -338,7 +338,7 @@
addToDirectory(directory, shortname, name);
return DIRECTORY_RETURN_UPDATE;
} else if (st.st_mtime != ((Song *) song)->mtime) {
- LOG("updating %s\n", name);
+ LOG("updating %s\n", utf8ToFsCharset(name));
if (updateSongInfo((Song *) song) < 0) {
removeSongFromDirectory(directory, shortname);
}
@@ -407,14 +407,14 @@
tmpNode = node->nextNode;
if (findInList(entList, node->key, &name)) {
if (!isDir((char *)name)) {
- LOG("removing directory: %s\n", (char *)name);
+ LOG("removing directory: %s\n", utf8ToFsCharset((char *)name));
deleteFromList(directory->subDirectories,
node->key);
ret = 1;
}
} else {
LOG("removing directory: %s/%s\n",
- getDirectoryPath(directory), node->key);
+ utf8ToFsCharset(getDirectoryPath(directory)), utf8ToFsCharset(node->key));
deleteFromList(directory->subDirectories, node->key);
ret = 1;
}
@@ -547,7 +547,7 @@
}
/* if updateDirectory fails, means we should delete it */
else {
- LOG("removing directory: %s\n", path);
+ LOG("removing directory: %s\n", utf8ToFsCharset(path));
deleteFromList(parentDirectory->subDirectories,
shortname);
ret = 1;
@@ -799,7 +799,7 @@
SONG_TYPE_FILE, directory);
if (!song)
return -1;
- LOG("added %s\n", name);
+ LOG("added %s\n", utf8ToFsCharset(name));
return 1;
} else if (S_ISDIR(st.st_mode)) {
return addSubDirectoryToDirectory(directory, shortname, name,
mpd.spec
View file @ 5e2af49e
%def_disable debug
%def_disable prof
%def_disable werror
%def_enable ao
%def_enable shout
%def_enable shout_ogg
%def_enable shout_mp3
%def_enable iconv
%def_enable tcp
%def_enable un
%def_enable curl
%def_disable ipv6
%def_disable sun
%def_enable oss
%def_enable alsa
%def_enable jack
%def_enable pulse
%def_enable fifo
%def_enable mvp
%def_enable oggvorbis
%def_enable oggflac
%def_enable flac
%def_enable mp3
%def_enable lame
%def_enable aac
%def_enable audiofile
%def_enable mod
%def_enable faad
%def_enable mpc
%def_enable ffmpeg
%def_enable wavpack
%def_enable id3
%def_enable lsr
%def_without tremor
# auto|avahi|bonjour|no
%define zeroconf avahi
%define mpd_user _mpd
%define mpd_group _mpd
#----------------------------------------------------------------------
%define subst_enable_to() %{expand:%%{?_enable_%{1}:--enable-%{2}}} %{expand:%%{?_disable_%{1}:--disable-%{2}}}
%define set_disable() %{expand:%%force_disable %{1}} %{expand:%%undefine _enable_%{1}}
%define rpmver_ge() %{expand:%%if %%(rpmvercmp %%{get_version %{1}} %{2}) >= 0}
%if_with tremor
%set_disable shout
......@@ -35,27 +48,24 @@
%define Name MPD
Name: mpd
Version: 0.13.2
Release: alt3
Version: 0.14
%define prerel _beta3
Release: alt0.1
Summary: Music Player Daemon (%Name) allows remote access for playing music and managing playlists.
License: %gpl2plus
Group: Sound
URL: http://musicpd.org
Source0: %url/uploads/files/%name-%version.tar
Source0: %url/uploads/files/%name-%version%prerel.tar
Source1: %name.conf
Source2: %name.sys.conf.in
Source3: %name.init.in
Source4: %name.logrotate
Patch0: %name-0.13.0-configure.patch
Patch1: %name-0.13.2-alt-encoding_output_fix.patch
Patch2: %name-0.13.2-alt.patch
BuildPreReq: rpm-utils
# Automatically added by buildreq on Tue Sep 11 2007
#BuildRequires: gcc-c++ glibc-devel-static jackit-devel libalsa-devel libao-devel libaudiofile-devel libavahi-devel libfaad-devel libflac-devel libid3tag-devel libmad-devel libmikmod-devel libmpcdec-devel libpulseaudio-devel libsamplerate-devel libshout2-devel zlib-devel
BuildRequires: zlib-devel rpm-build-licenses
Patch: %name-%version-%release.patch
Packager: Led <led@altlinux.ru>
BuildRequires(pre): rpm-build-licenses
BuildRequires: xmlto zlib-devel
%{?_enable_curl:BuildRequires: libcurl-devel}
%{?_enable_alsa:BuildRequires: libalsa-devel >= 0.9.0}
%{?_enable_jack:BuildRequires: jackit-devel}
%{?_enable_ao:BuildRequires: libao-devel}
......@@ -67,7 +77,10 @@ BuildRequires: zlib-devel rpm-build-licenses
%{?_enable_oggflac:BuildRequires: liboggflac-devel}
%{?_enable_id3:BuildRequires: libid3tag-devel}
%{?_enable_mp3:BuildRequires: libmad-devel}
%{?_enable_lame:BuildRequires: liblame-devel}
%{?_enable_mpc:BuildRequires: libmpcdec-devel}
%{?_enable_ffmpeg:BuildRequires: libavformat-devel}
%{?_enable_wavpack:BuildRequires: libwavpack-devel}
%{?_enable_pulse:BuildRequires: libpulseaudio-devel}
%{?_enable_oggvorbis:BuildRequires: libvorbis-devel}
%{?_enable_lsr:BuildRequires: libsamplerate-devel}
......@@ -85,13 +98,9 @@ console junkie, like frontend options, or restart X often.
%prep
%setup
%patch0 -p1
%patch1 -p1
%patch2 -p1
%rpmver_ge libflac-devel 1.1.3
subst 's/AM_PATH_LIBOGGFLAC/AM_PATH_LIBFLAC/' configure.ac
%endif
%setup -n %name-%version%prerel
%patch -p1
[ $(rpmvercmp %{get_version libflac-devel} 1.1.3) -lt 0 ] || subst 's/AM_PATH_LIBOGGFLAC/AM_PATH_LIBFLAC/' configure.ac
%build
......@@ -101,30 +110,42 @@ subst 's/AM_PATH_LIBOGGFLAC/AM_PATH_LIBFLAC/' configure.ac
%ifarch x86_64
--with-pic \
%endif
%{subst_enable debug} \
%{subst_enable_to prof gprof} \
%{subst_enable werror} \
%{subst_with tremor} \
%{subst_enable ao} \
%{subst_enable shout} \
%{subst_enable shout_ogg} \
%{subst_enable shout_mp3} \
%{subst_enable iconv} \
%{subst_enable tcp} \
%{subst_enable un} \
%{subst_enable curl} \
%{subst_enable ipv6} \
%{subst_enable sun} \
%{subst_enable oss} \
%{subst_enable alsa} \
%{subst_enable jack} \
%{subst_enable pulse} \
%{subst_enable fifo} \
%{subst_enable mvp} \
%{subst_enable oggvorbis} \
%{subst_enable flac} \
%{subst_enable oggflac} \
%{subst_enable mp3} \
%{subst_enable lame} \
%{subst_enable aac} \
%{subst_enable audiofile} \
%{subst_enable mod} \
%{subst_enable mpc} \
%{subst_enable ffmpeg} \
%{subst_enable wavpack} \
%{subst_enable id3} \
%{subst_enable lsr} \
--with-zeroconf=%zeroconf
%make_build
bzip2 --best --keep --force ChangeLog
bzip2 --best --keep --force NEWS
%install
......@@ -154,7 +175,7 @@ install -D -m 0644 %SOURCE4 %buildroot%_sysconfdir/logrotate.d/%name
%files
%doc AUTHORS ChangeLog.* README TODO UPGRADING doc/{%{name}conf.example,COMMANDS}
%doc AUTHORS NEWS.* README TODO UPGRADING doc/{%{name}conf.example,protocol.html}
%config(noreplace) %_sysconfdir/%name.conf
%config(noreplace) %_sysconfdir/%name.sys.conf
%config(noreplace) %_sysconfdir/logrotate.d/*
......@@ -169,6 +190,15 @@ install -D -m 0644 %SOURCE4 %buildroot%_sysconfdir/logrotate.d/%name
%changelog
* Sun Dec 21 2008 Led <led@altlinux.ru> 0.14-alt0.1
- 0.14-beta3:
+ new plugins: fifo, null, ffmpeg, aac, wavpack
+ new commands: addid, idle
+ support connecting via unix domain socket
+ 24 bit audio support
+ allow authenticated local users to add any local file to the
playlist
* Sun Aug 10 2008 Led <led@altlinux.ru> 0.13.2-alt3
- fixed spec
- added %name-0.13.2-alt.patch
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment