On Wed, Aug 22, 2012 at 09:48:49AM +0200, David Coppa wrote: > On Tue, Aug 21, 2012 at 11:46 PM, Landry Breuil <lan...@openbsd.org> wrote: > > On Tue, Aug 21, 2012 at 11:23:16PM +0200, Landry Breuil wrote: > >> On Tue, Aug 21, 2012 at 10:33:40PM +0200, David Coppa wrote: > >> > On Tue, Aug 21, 2012 at 7:09 PM, Landry Breuil <lan...@openbsd.org> > >> > wrote: > >> > > On Fri, Jul 13, 2012 at 11:20:41AM +0200, David Coppa wrote: > >> > >> On Fri, Jul 13, 2012 at 11:25 AM, Edd Barrett <vex...@gmail.com> > >> > >> wrote: > >> > >> > On Fri, Jul 13, 2012 at 09:15:46AM +0200, David Coppa wrote: > >> > >> >> Hi, > >> > >> >> > >> > >> >> The diff below updates audio/mpd to the latest version. > >> > >> > > >> > >> > Hmm. > >> > >> > > >> > >> > I get only crackles *unless* the volume is set to 100% on my > >> > >> > Thinkpad x61. > >> > >> > > >> > >> > azalia0 at pci0 dev 27 function 0 "Intel 82801H HD Audio" rev 0x03: > >> > >> > msi > >> > >> > azalia0: codecs: Analog Devices AD1984, Conexant/0x2bfa, using > >> > >> > Analog Devices AD1984 > >> > >> > audio0 at azalia0 > >> > >> > > >> > >> > I just downgraded to the in-tree version and can confirm that this > >> > >> > is a new bug. > >> > >> > This did not occur using the older version. > >> > >> > >> > >> Fuck. > >> > >> So forget it for now. This will not make release. I will revamp it for > >> > >> further investigations later... > >> > > > >> > > 0.17.1 was released... bump ? :) > >> > > > >> > > Landry > >> > > >> > Christopher (Zimmermann) did it already: > >> > > >> > https://github.com/jasperla/openbsd-wip/tree/master/audio/mpd > >> > > >> > Please test it, especially you, Edd, who saw regressions... > >> > >> Works fine for me on i386 with basic default conf & > >> > >> azalia0 at pci0 dev 27 function 0 "Intel 82801GB HD Audio" rev 0x02: msi > >> azalia0: codecs: Realtek ALC888 > >> > >> Will test it on my usual macppc setup with httpd output as soon as i get > >> to update it.. > > > > Still seems to run fine on ppc with libao/http output with > > > > aoa0 at macobio0 offset 0x10000: irq 30,1,2 > > audio0 at aoa0 > > > > Will let it run for the coming weeks.. > > Well, I think I can commit this after all... > > Are you ok?
Yes, but i'd rather make sure edd doesnt see his regression, and other users confirm it still works for them. Here's the cvs diff i ended up with. Landry
? gstreamer-plugins-bad-0.10.23p1.tgz Index: Makefile =================================================================== RCS file: /cvs/ports/audio/mpd/Makefile,v retrieving revision 1.47 diff -u -r1.47 Makefile --- Makefile 13 Jul 2012 14:10:36 -0000 1.47 +++ Makefile 22 Aug 2012 09:00:32 -0000 @@ -1,8 +1,7 @@ # $OpenBSD: Makefile,v 1.47 2012/07/13 14:10:36 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 <dco...@openbsd.org> Index: distinfo =================================================================== RCS file: /cvs/ports/audio/mpd/distinfo,v retrieving revision 1.14 diff -u -r1.14 distinfo --- distinfo 10 Apr 2012 15:12:54 -0000 1.14 +++ distinfo 22 Aug 2012 09:00:32 -0000 @@ -1,5 +1,5 @@ -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 +MD5 (mpd-0.17.1.tar.gz) = pTvkJWRgeLwXGBsEQpCiJg== +RMD160 (mpd-0.17.1.tar.gz) = +GFcfhH+iB8XRnNHdJe8iowGGsY= +SHA1 (mpd-0.17.1.tar.gz) = I47r46cymuj5Rcw4Z4gzVnDjI58= +SHA256 (mpd-0.17.1.tar.gz) = sGNTOxWl67fO3pHBC7sdDKm9o6aJTe3nmhDsNoo/SV4= +SIZE (mpd-0.17.1.tar.gz) = 694940 Index: patches/patch-Makefile_in =================================================================== RCS file: /cvs/ports/audio/mpd/patches/patch-Makefile_in,v retrieving revision 1.6 diff -u -r1.6 patch-Makefile_in --- patches/patch-Makefile_in 10 Apr 2012 15:12:54 -0000 1.6 +++ patches/patch-Makefile_in 22 Aug 2012 09:00:32 -0000 @@ -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) +--- 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 Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/audio/mpd/patches/patch-configure,v retrieving revision 1.16 diff -u -r1.16 patch-configure --- patches/patch-configure 10 Apr 2012 15:12:54 -0000 1.16 +++ patches/patch-configure 22 Aug 2012 09:00:32 -0000 @@ -2,27 +2,27 @@ 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 @@ 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 Index: patches/patch-doc_mpdconf_example =================================================================== RCS file: /cvs/ports/audio/mpd/patches/patch-doc_mpdconf_example,v retrieving revision 1.8 diff -u -r1.8 patch-doc_mpdconf_example --- patches/patch-doc_mpdconf_example 30 Oct 2011 11:46:19 -0000 1.8 +++ patches/patch-doc_mpdconf_example 22 Aug 2012 09:00:32 -0000 @@ -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 +--- 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 @@ # 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 #}
