- update mpd to 0.12.2

- add a tremor flavor, and add it to audio/Makefile

from Tobias Ulmer <tobiasu@tmux.org> (MAINTAINER)

discussed with bernd@ naddy@
ok bernd@
This commit is contained in:
jasper 2007-05-20 13:05:27 +00:00
parent d901191f11
commit 4278131d4f
5 changed files with 56 additions and 86 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.171 2007/05/17 21:28:53 jasper Exp $
# $OpenBSD: Makefile,v 1.172 2007/05/20 13:05:27 jasper Exp $
# $FreeBSD: Makefile,v 1.40 1997/11/16 22:49:20 fenner Exp $
SUBDIR += abcde
@ -79,6 +79,7 @@
SUBDIR += mp3splt
SUBDIR += mpc
SUBDIR += mpd
SUBDIR += mpd,tremor
SUBDIR += mpegaudio
SUBDIR += mpg123
SUBDIR += mpg123,esd

View File

@ -1,12 +1,9 @@
# $OpenBSD: Makefile,v 1.4 2006/11/05 14:42:56 bernd Exp $
# $OpenBSD: Makefile,v 1.5 2007/05/20 13:05:27 jasper Exp $
COMMENT= "music player daemon"
DISTNAME= mpd-0.12.1
COMMENT= "Music Player Daemon"
DISTNAME= mpd-0.12.2
CATEGORIES= audio
HOMEPAGE= http://www.musicpd.org/
MAINTAINER= Tobias Ulmer <tobiasu@tmux.org>
# GPL
@ -15,38 +12,51 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m pthread theora z
WANTLIB= c m pthread z
MASTER_SITES= ${HOMEPAGE}uploads/files/
MODULES= converters/libiconv
LIB_DEPENDS= vorbis,vorbisfile,vorbisenc::audio/libvorbis \
audiofile::devel/libaudiofile \
ao.>=3::audio/libao \
LIB_DEPENDS= audiofile::devel/libaudiofile \
ao::audio/libao \
faad::audio/faad \
id3tag.>=3::audio/libid3tag \
mad.>=2::audio/libmad \
ogg.>=5::audio/libogg \
OggFLAC.>=3,FLAC.>=7::audio/flac \
mikmod.>=2::audio/libmikmod \
mpcdec.>=1::audio/libmpcdec \
shout.>=5::net/libshout \
speex.>=4::audio/speex
id3tag::audio/libid3tag \
mad::audio/libmad \
mikmod::audio/libmikmod \
mpcdec::audio/libmpcdec
USE_LIBTOOL= Yes
FLAVORS= tremor
FLAVOR?=
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --enable-ao \
--enable-mod \
--enable-shout \
CONFIGURE_ARGS+= --enable-ao \
--disable-alsa \
--disable-oss \
--disable-pulse \
--disable-sun \
--disable-oss \
--disable-pulse \
--disable-sun \
--enable-mod \
--bindir=${PREFIX}/sbin
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
# OggFLAC and tremor tests
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
.if ${FLAVOR:L:Mtremor}
CONFIGURE_ARGS+= --with-tremor \
--disable-oggflac \
--disable-shout
LIB_DEPENDS+= vorbisidec::audio/tremor \
FLAC::audio/flac
.else
WANTLIB+= theora
LIB_DEPENDS+= vorbis,vorbisfile,vorbisenc::audio/libvorbis \
ogg::audio/libogg \
OggFLAC,FLAC::audio/flac \
speex::audio/speex \
shout::net/libshout
.endif
USE_LIBTOOL= Yes
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mpd

View File

@ -1,5 +1,5 @@
MD5 (mpd-0.12.1.tar.gz) = 3ABcZHkYdLeGTwwo1HRTTw==
RMD160 (mpd-0.12.1.tar.gz) = eZGXLQXrILT60aPsJCfFJUIR59A=
SHA1 (mpd-0.12.1.tar.gz) = rSCAheFz+YwaEJgDCZ+bpZvCvHY=
SHA256 (mpd-0.12.1.tar.gz) = KCqysS0MeSTxvJaHb/OxU34Hu+AqEqI7LSVrgPlKZ8c=
SIZE (mpd-0.12.1.tar.gz) = 533315
MD5 (mpd-0.12.2.tar.gz) = bHJO0u+3D40uOt/DcO/i6g==
RMD160 (mpd-0.12.2.tar.gz) = adqqySs2GaDuzukYFg7RFnxsbGA=
SHA1 (mpd-0.12.2.tar.gz) = eqNafAwOElGxkavYDtf4hMtSGPg=
SHA256 (mpd-0.12.2.tar.gz) = UvJ1AOS9dvLfLS77dsWlYOI2dtgwIaQ6ukqVzwG1RrU=
SIZE (mpd-0.12.2.tar.gz) = 537988

View File

@ -1,57 +1,11 @@
$OpenBSD: patch-configure,v 1.3 2006/11/05 14:42:56 bernd Exp $
--- configure.orig Wed Oct 11 01:57:30 2006
+++ configure Fri Oct 27 20:00:53 2006
@@ -23301,7 +23301,7 @@ if test x$enable_iconv = xyes; then
oldcppflags=$CPPFLAGS
CFLAGS="$CFLAGS $MPD_CFLAGS $ICONV_CFLAGS"
LIBS="$LIBS $MPD_LIBS $ICONV_LIBS"
- CPPFLAGS=$CFLAGS
+ CPPFLAGS=$CPPFLAGS
if test "${ac_cv_header_iconv_h+set}" = set; then
echo "$as_me:$LINENO: checking for iconv.h" >&5
echo $ECHO_N "checking for iconv.h... $ECHO_C" >&6
@@ -23548,7 +23548,7 @@ if test x$enable_id3 = xyes; then
oldcppflags=$CPPFLAGS
CFLAGS="$CFLAGS $MPD_CFLAGS $ID3TAG_CFLAGS"
LIBS="$LIBS $MPD_LIBS $ID3TAG_LIBS"
- CPPFLAGS=$CFLAGS
+ CPPFLAGS=$CPPFLAGS
for ac_header in id3tag.h
do
@@ -23815,7 +23815,7 @@ if test x$enable_mp3 = xyes; then
oldcppflags=$CPPFLAGS
CFLAGS="$CFLAGS $MPD_CFLAGS $MAD_CFLAGS"
LIBS="$LIBS $MPD_LIBS $MAD_LIBS"
- CPPFLAGS=$CFLAGS
+ CPPFLAGS=$CPPFLAGS
for ac_header in mad.h
do
@@ -24080,7 +24080,7 @@ if test x$enable_mpc = xyes; then
oldcppflags=$CPPFLAGS
CFLAGS="$CFLAGS $MPD_CFLAGS $MPCDEC_CFLAGS -I."
LIBS="$LIBS $MPD_LIBS $MPCDEC_LIBS"
- CPPFLAGS=$CFLAGS
+ CPPFLAGS=$CPPFLAGS
if test "${ac_cv_header_mpcdec_mpcdec_h+set}" = set; then
echo "$as_me:$LINENO: checking for mpcdec/mpcdec.h" >&5
echo $ECHO_N "checking for mpcdec/mpcdec.h... $ECHO_C" >&6
@@ -24332,7 +24332,7 @@ if test x$enable_aac = xyes; then
oldcppflags=$CPPFLAGS
CFLAGS="$CFLAGS $MPD_CFLAGS $FAAD_CFLAGS -I."
LIBS="$LIBS $MPD_LIBS $FAAD_LIBS"
- CPPFLAGS=$CFLAGS
+ CPPFLAGS=$CPPFLAGS
if test "${ac_cv_header_faad_h+set}" = set; then
echo "$as_me:$LINENO: checking for faad.h" >&5
echo $ECHO_N "checking for faad.h... $ECHO_C" >&6
@@ -26179,7 +26179,7 @@ fi;
--- configure.orig Fri Apr 20 22:42:09 2007
+++ configure Fri Apr 20 22:43:20 2007
@@ -28410,7 +28410,7 @@
LIBOGGFLAC_LIBS="-L$libdir"
fi
- LIBOGGFLAC_LIBS="$LIBOGGFLAC_LIBS -lOggFLAC -lFLAC -lm"
+ LIBOGGFLAC_LIBS="$LIBOGGFLAC_LIBS -lOggFLAC -logg -lFLAC -lm"
+ LIBOGGFLAC_LIBS="$LIBOGGFLAC_LIBS -lOggFLAC -lFLAC -logg -lm"
if test "x$libOggFLAC_includes" != "x" ; then
LIBOGGFLAC_CFLAGS="-I$libOggFLAC_includes"

View File

@ -1,6 +1,11 @@
Music Player Daemon allows remote access for playing music (mp3,
ogg, flac, aac, mod and wav files) and managing playlists. MPD is
designed for integrating a computer into a stereo system that
provides control for music playback over a local network.
It also makes a great desktop music player and has serveral
frontend options.
provides control for music playback over a local network. It also
makes a great desktop music player and has serveral frontend options.
Flavors
tremor: Use the tremor integer-only ogg decoder. This disables
use of flac files in ogg containers and the network
streaming functionality.