Update to mpd-0.17.1

Tested by landry@, edd@ and Abel Abraham Camarillo Ojeda.
This commit is contained in:
dcoppa 2012-08-23 14:28:19 +00:00
parent dd86f0535c
commit a7c8b0c261
5 changed files with 35 additions and 40 deletions

View File

@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.47 2012/07/13 14:10:36 dcoppa Exp $
# $OpenBSD: Makefile,v 1.48 2012/08/23 14:28:19 dcoppa Exp $
COMMENT = Music Player Daemon
DISTNAME = mpd-0.16.8
REVISION = 1
DISTNAME = mpd-0.17.1
CATEGORIES = audio
HOMEPAGE = http://www.musicpd.org/
MAINTAINER = David Coppa <dcoppa@openbsd.org>
@ -13,8 +12,10 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB += c m pthread ogg z stdc++ sndio curl glib-2.0 gthread-2.0
WANTLIB += audiofile ao samplerate sndfile FLAC id3tag mad mikmod
WANTLIB = FLAC ao audiofile c cdio cdio_cdda cdio_paranoia \
curl glib-2.0 gthread-2.0 id3tag m mad \
mikmod ogg pthread samplerate sndfile sndio \
stdc++ z
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=musicpd/}
@ -22,6 +23,7 @@ MODULES = devel/gettext
LIB_DEPENDS = devel/libaudiofile \
audio/libao \
audio/libcdio \
audio/libsamplerate \
audio/flac \
audio/libid3tag \
@ -36,9 +38,9 @@ FLAVOR ?=
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += --bindir=${PREFIX}/sbin \
--disable-alsa \
--disable-cue \
--disable-ffmpeg \
--disable-gme \
--disable-inotify \
--disable-jack \
--disable-libwrap \
--disable-mms \
@ -46,12 +48,17 @@ CONFIGURE_ARGS += --bindir=${PREFIX}/sbin \
--disable-mpg123 \
--disable-oss \
--disable-pulse \
--disable-roar \
--disable-sidplay \
--disable-soundcloud \
--disable-soup \
--disable-sqlite \
--disable-systemd-daemon \
--disable-twolame-encoder \
--disable-wavpack \
--enable-ao \
--enable-audiofile \
--enable-cdio-paranoia \
--enable-curl \
--enable-lsr \
--enable-mad \
@ -59,7 +66,8 @@ CONFIGURE_ARGS += --bindir=${PREFIX}/sbin \
--enable-mpc \
--enable-pipe-output \
--enable-sndfile \
--with-zeroconf=no
--with-zeroconf=no \
--without-systemdsystemunitdir
# OggFLAC and tremor tests, initgroups(3)
CONFIGURE_ENV = LDFLAGS="-L${LOCALBASE}/lib" \
@ -67,7 +75,6 @@ CONFIGURE_ENV = LDFLAGS="-L${LOCALBASE}/lib" \
.if ${FLAVOR:Mtremor}
CONFIGURE_ARGS += --with-tremor \
--disable-oggflac \
--disable-shout \
--disable-vorbis-encoder \
--disable-lame-encoder \

View File

@ -1,5 +1,2 @@
MD5 (mpd-0.16.8.tar.gz) = fwdEYhXTWjFmudGGv9DJTw==
RMD160 (mpd-0.16.8.tar.gz) = B5UvP47xiDMxMUFmKIomm5F+jOw=
SHA1 (mpd-0.16.8.tar.gz) = 1s7p2RrXHYJnneSPr/SakQd8wmw=
SHA256 (mpd-0.16.8.tar.gz) = wSmYf2AsaY84Awv7oLeuLhli77Z+Tdj/Lbl+rrmlzHs=
SIZE (mpd-0.16.8.tar.gz) = 648114
SHA256 (mpd-0.17.1.tar.gz) = sGNTOxWl67fO3pHBC7sdDKm9o6aJTe3nmhDsNoo/SV4=
SIZE (mpd-0.17.1.tar.gz) = 694940

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.6 2012/04/10 15:12:54 dcoppa Exp $
--- Makefile.in.orig Thu Apr 5 03:37:06 2012
+++ Makefile.in Tue Apr 10 17:05:49 2012
@@ -2361,7 +2361,7 @@ SPARSE_CPPFLAGS = $(DEFAULT_INCLUDES) -I$(shell $(CC)
$OpenBSD: patch-Makefile_in,v 1.7 2012/08/23 14:28:19 dcoppa Exp $
--- Makefile.in.orig Wed Aug 1 04:05:15 2012
+++ Makefile.in Tue Aug 21 23:02:12 2012
@@ -2414,7 +2414,7 @@ SPARSE_SRC = $(addprefix $(top_srcdir)/,$(filter %.c,$
# Documentation
#
man_MANS = doc/mpd.1 doc/mpd.conf.5

View File

@ -1,28 +1,28 @@
$OpenBSD: patch-configure,v 1.16 2012/04/10 15:12:54 dcoppa Exp $
$OpenBSD: patch-configure,v 1.17 2012/08/23 14:28:19 dcoppa Exp $
Don't reset CPPFLAGS...stupid configure.
--- configure.orig Thu Apr 5 03:37:06 2012
+++ configure Tue Apr 10 17:05:50 2012
@@ -8844,7 +8844,7 @@ if test x$enable_aac = xyes; then
--- configure.orig Wed Aug 1 04:05:16 2012
+++ configure Tue Aug 21 23:04:08 2012
@@ -9747,7 +9747,7 @@ if test x$enable_aac = xyes; then
oldcppflags=$CPPFLAGS
CFLAGS="$CFLAGS $MPD_CFLAGS $FAAD_CFLAGS -I."
LIBS="$LIBS $MPD_LIBS $FAAD_LIBS"
CFLAGS="$CFLAGS $FAAD_CFLAGS -I."
LIBS="$LIBS $FAAD_LIBS"
- CPPFLAGS=$CFLAGS
+ CPPFLAGS="$CPPFLAGS $CFLAGS"
ac_fn_c_check_header_mongrel "$LINENO" "faad.h" "ac_cv_header_faad_h" "$ac_includes_default"
if test "x$ac_cv_header_faad_h" = xyes; then :
@@ -9098,7 +9098,7 @@ if test x$enable_aac = xyes; then
@@ -10011,7 +10011,7 @@ if test x$enable_aac = xyes; then
oldcppflags=$CPPFLAGS
CFLAGS="$CFLAGS $MPD_CFLAGS $FAAD_CFLAGS -Werror"
LIBS="$LIBS $MPD_LIBS $FAAD_LIBS"
CFLAGS="$CFLAGS $FAAD_CFLAGS -Werror"
LIBS="$LIBS $FAAD_LIBS"
- CPPFLAGS=$CFLAGS
+ CPPFLAGS="$CPPFLAGS $CFLAGS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken libfaad headers" >&5
$as_echo_n "checking for broken libfaad headers... " >&6; }
@@ -9144,7 +9144,7 @@ if test x$enable_aac = xyes; then
@@ -10057,7 +10057,7 @@ if test x$enable_aac = xyes; then
oldcppflags=$CPPFLAGS
CFLAGS="$CFLAGS $FAAD_CFLAGS"
LIBS="$LIBS $FAAD_LIBS $MP4FF_LIBS"
@ -31,12 +31,3 @@ Don't reset CPPFLAGS...stupid configure.
ac_fn_c_check_header_mongrel "$LINENO" "mp4ff.h" "ac_cv_header_mp4ff_h" "$ac_includes_default"
if test "x$ac_cv_header_mp4ff_h" = xyes; then :
@@ -10651,7 +10651,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 $CFLAGS"
ac_fn_c_check_header_mongrel "$LINENO" "mpc/mpcdec.h" "ac_cv_header_mpc_mpcdec_h" "$ac_includes_default"
if test "x$ac_cv_header_mpc_mpcdec_h" = xyes; then :
old_mpcdec=no

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-doc_mpdconf_example,v 1.8 2011/10/30 11:46:19 dcoppa Exp $
--- doc/mpdconf.example.orig Sun Oct 9 13:43:52 2011
+++ doc/mpdconf.example Thu Oct 13 16:42:40 2011
$OpenBSD: patch-doc_mpdconf_example,v 1.9 2012/08/23 14:28:19 dcoppa Exp $
--- doc/mpdconf.example.orig Wed Aug 1 04:04:32 2012
+++ doc/mpdconf.example Tue Aug 21 23:02:12 2012
@@ -10,14 +10,14 @@
# be disabled and audio files will only be accepted over ipc socket (using
# file:// protocol) or streaming files over an accepted protocol.
@ -69,7 +69,7 @@ $OpenBSD: patch-doc_mpdconf_example,v 1.8 2011/10/30 11:46:19 dcoppa Exp $
# This setting is the TCP port that is desired for the daemon to get assigned
# to.
#
@@ -296,6 +298,14 @@ input {
@@ -302,6 +304,14 @@ input {
# name "My Null Output"
# mixer_type "none" # optional
#}