ports/169767: audio/alsa-plugins: desync with oss plugin

[Jan Beich-2]

>Number:         169767
>Category:       ports
>Synopsis:       audio/alsa-plugins: desync with oss plugin
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:      
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 10 16:50:03 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Jan Beich
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:

tested on www/firefox from freebsd-gecko@ repo
>Description:
When trying to play WebM video on YouTube using Firefox built with ALSA
option ON the video goes in fast-forward mode while audio plays normally.
>How-To-Repeat:
>Fix:
Remove FreeBSD-specific patch. www/chromium seems to work fine without it.

Noticed after looking at pkgsrc patches.
>Release-Note:
>Audit-Trail:
>Unformatted:
_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs
To unsubscribe, send any mail to "[hidden email]"

[Edwin Groothuis-2]

Synopsis: audio/alsa-plugins: desync with oss plugin

State-Changed-From-To: open->feedback
State-Changed-By: edwin
State-Changed-When: Tue Jul 10 16:50:14 UTC 2012
State-Changed-Why:
Awaiting maintainers feedback (via the GNATS Auto Assign Tool)

http://www.freebsd.org/cgi/query-pr.cgi?pr=169767
_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs
To unsubscribe, send any mail to "[hidden email]"

[Edwin Groothuis-2]

The following reply was made to PR ports/169767; it has been noted by GNATS.

From: Edwin Groothuis <[hidden email]>
To: [hidden email]
Cc: [hidden email]
Subject: Re: ports/169767: audio/alsa-plugins: desync with oss plugin
Date: Tue, 10 Jul 2012 16:50:12 UT

 Maintainer of audio/alsa-plugins,
 
 Please note that PR ports/169767 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/169767
 
 --
 Edwin Groothuis via the GNATS Auto Assign Tool
 [hidden email]
_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs
To unsubscribe, send any mail to "[hidden email]"

[Jan Beich-2]

The following reply was made to PR ports/169767; it has been noted by GNATS.

From: Jan Beich <[hidden email]>
To: [hidden email]
Cc:  
Subject: Re: ports/169767: audio/alsa-plugins: desync with oss plugin
Date: Tue, 10 Jul 2012 10:43:35 -0700

 --=-=-=
 Content-Type: text/plain
 Content-Disposition: inline
 
 Here is more easy way to test.
 
 
 --=-=-=
 Content-Type: text/x-patch
 Content-Disposition: attachment; filename=vanilla.diff
 
 Index: audio/alsa-plugins/Makefile
 ===================================================================
 RCS file: /a/.csup/ports/audio/alsa-plugins/Makefile,v
 retrieving revision 1.5
 diff -u -p -r1.5 Makefile
 --- audio/alsa-plugins/Makefile 7 May 2012 15:23:52 -0000 1.5
 +++ audio/alsa-plugins/Makefile 10 Jul 2012 17:40:53 -0000
 @@ -25,6 +25,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
  OPTIONS= JACK "JACK audio support (requires SAMPLERATE)" Off \
  LAVC "libavcodec support" Off \
  SAMPLERATE "libsamplerate support" Off \
 + FREEBSD_PATCH "FreeBSD-specific OSS plugin" Off \
  PULSE "PulseAudio support" Off \
  SPEEX "Speex support" Off
 
 @@ -76,6 +77,7 @@ CONFIGURE_ARGS+= --without-speex
  PLIST_SUB+= SPEEX="@comment "
  .endif
 
 +.if defined(WITH_FREEBSD_PATCH)
  .if ${OSVERSION} > 900036 \
       || ${OSVERSION} > 802503 && ${OSVERSION} < 900000 \
       || ${OSVERSION} > 704000 && ${OSVERSION} < 800000
 @@ -83,6 +85,7 @@ EXTRA_PATCHES+= ${FILESDIR}/alsa-plugins
  .else # ${OSVERSION} <= 704000
  EXTRA_PATCHES+= ${FILESDIR}/alsa-plugins.patch
  .endif
 +.endif
 
  post-patch: .SILENT
  ${REINPLACE_CMD} -e '/LIBS/s/-ldl//g' \
 Index: audio/alsa-plugins/files/alsa-plugins-getiptrfix.patch
 ===================================================================
 RCS file: /a/.csup/ports/audio/alsa-plugins/files/alsa-plugins-getiptrfix.patch,v
 retrieving revision 1.1
 diff -u -p -r1.1 alsa-plugins-getiptrfix.patch
 --- audio/alsa-plugins/files/alsa-plugins-getiptrfix.patch 7 May 2012 15:23:52 -0000 1.1
 +++ audio/alsa-plugins/files/alsa-plugins-getiptrfix.patch 10 Jul 2012 17:31:11 -0000
 @@ -1,29 +1,5 @@
 ---- jack/pcm_jack.c.orig 2009-09-16 04:33:36.000000000 +0800
 -+++ jack/pcm_jack.c 2009-09-16 04:33:55.000000000 +0800
 -@@ -20,7 +20,9 @@
 -  *
 -  */
 -
 -+#ifndef __FreeBSD__
 - #include <byteswap.h>
 -+#endif
 - #include <sys/shm.h>
 - #include <sys/types.h>
 - #include <sys/socket.h>
  --- oss/ctl_oss.c.orig 2009-08-31 21:09:41.000000000 +0800
  +++ oss/ctl_oss.c 2009-09-15 01:07:51.000000000 +0800
 -@@ -26,7 +26,11 @@
 - #include <sys/ioctl.h>
 - #include <alsa/asoundlib.h>
 - #include <alsa/control_external.h>
 -+#ifdef __FreeBSD__
 -+#include <sys/soundcard.h>
 -+#else
 - #include <linux/soundcard.h>
 -+#endif
 -
 - typedef struct snd_ctl_oss {
 - snd_ctl_ext_t ext;
  @@ -362,7 +366,9 @@
   {
    snd_config_iterator_t it, next;
 @@ -66,15 +42,12 @@
    oss->ext.private_data = oss;
  --- oss/pcm_oss.c.orig 2010-04-16 14:11:10.000000000 +0300
  +++ oss/pcm_oss.c 2012-02-14 19:27:15.833934348 +0200
 -@@ -22,17 +22,55 @@
 - #include <sys/ioctl.h>
 +@@ -27,16 +27,52 @@
   #include <alsa/asoundlib.h>
   #include <alsa/pcm_external.h>
 + #include <linux/soundcard.h>
  +#ifdef __FreeBSD__
  +#include <sys/param.h>
 -+#include <sys/soundcard.h>
 -+#else
 - #include <linux/soundcard.h>
  +#endif
  +
  +#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
 Index: audio/alsa-plugins/files/alsa-plugins.patch
 ===================================================================
 RCS file: /a/.csup/ports/audio/alsa-plugins/files/alsa-plugins.patch,v
 retrieving revision 1.1
 diff -u -p -r1.1 alsa-plugins.patch
 --- audio/alsa-plugins/files/alsa-plugins.patch 7 May 2012 15:23:52 -0000 1.1
 +++ audio/alsa-plugins/files/alsa-plugins.patch 10 Jul 2012 17:25:24 -0000
 @@ -1,29 +1,5 @@
 ---- jack/pcm_jack.c.orig 2009-09-16 04:33:36.000000000 +0800
 -+++ jack/pcm_jack.c 2009-09-16 04:33:55.000000000 +0800
 -@@ -20,7 +20,9 @@
 -  *
 -  */
 -
 -+#ifndef __FreeBSD__
 - #include <byteswap.h>
 -+#endif
 - #include <sys/shm.h>
 - #include <sys/types.h>
 - #include <sys/socket.h>
  --- oss/ctl_oss.c.orig 2009-08-31 21:09:41.000000000 +0800
  +++ oss/ctl_oss.c 2009-09-15 01:07:51.000000000 +0800
 -@@ -26,7 +26,11 @@
 - #include <sys/ioctl.h>
 - #include <alsa/asoundlib.h>
 - #include <alsa/control_external.h>
 -+#ifdef __FreeBSD__
 -+#include <sys/soundcard.h>
 -+#else
 - #include <linux/soundcard.h>
 -+#endif
 -
 - typedef struct snd_ctl_oss {
 - snd_ctl_ext_t ext;
  @@ -362,7 +366,9 @@
   {
    snd_config_iterator_t it, next;
 Index: audio/alsa-plugins/files/patch-jack-pcm_jack.c
 ===================================================================
 RCS file: audio/alsa-plugins/files/patch-jack-pcm_jack.c
 diff -N audio/alsa-plugins/files/patch-jack-pcm_jack.c
 --- /dev/null 1 Jan 1970 00:00:00 -0000
 +++ audio/alsa-plugins/files/patch-jack-pcm_jack.c 10 Jul 2012 17:22:40 -0000
 @@ -0,0 +1,12 @@
 +--- jack/pcm_jack.c.orig 2009-09-16 04:33:36.000000000 +0800
 ++++ jack/pcm_jack.c 2009-09-16 04:33:55.000000000 +0800
 +@@ -20,7 +20,9 @@
 +  *
 +  */
 +
 ++#ifndef __FreeBSD__
 + #include <byteswap.h>
 ++#endif
 + #include <sys/shm.h>
 + #include <sys/types.h>
 + #include <sys/socket.h>
 Index: audio/alsa-plugins/files/patch-oss-ctl_oss.c
 ===================================================================
 RCS file: audio/alsa-plugins/files/patch-oss-ctl_oss.c
 diff -N audio/alsa-plugins/files/patch-oss-ctl_oss.c
 --- /dev/null 1 Jan 1970 00:00:00 -0000
 +++ audio/alsa-plugins/files/patch-oss-ctl_oss.c 10 Jul 2012 17:21:00 -0000
 @@ -0,0 +1,16 @@
 +$NetBSD: patch-ab,v 1.1.1.1 2008/12/19 04:03:22 jmcneill Exp $
 +
 +--- oss/ctl_oss.c.orig 2008-10-29 08:42:13.000000000 -0400
 ++++ oss/ctl_oss.c
 +@@ -26,7 +26,11 @@
 + #include <sys/ioctl.h>
 + #include <alsa/asoundlib.h>
 + #include <alsa/control_external.h>
 ++#ifdef __linux__
 + #include <linux/soundcard.h>
 ++#else
 ++#include <sys/soundcard.h>
 ++#endif
 +
 + typedef struct snd_ctl_oss {
 + snd_ctl_ext_t ext;
 Index: audio/alsa-plugins/files/patch-oss-pcm_oss.c
 ===================================================================
 RCS file: audio/alsa-plugins/files/patch-oss-pcm_oss.c
 diff -N audio/alsa-plugins/files/patch-oss-pcm_oss.c
 --- /dev/null 1 Jan 1970 00:00:00 -0000
 +++ audio/alsa-plugins/files/patch-oss-pcm_oss.c 10 Jul 2012 17:30:39 -0000
 @@ -0,0 +1,31 @@
 +$NetBSD: patch-ac,v 1.1.1.1 2008/12/19 04:03:22 jmcneill Exp $
 +
 +--- oss/pcm_oss.c.orig 2008-10-29 08:42:13.000000000 -0400
 ++++ oss/pcm_oss.c
 +@@ -22,4 +22,8 @@
 + #include <sys/ioctl.h>
 + #include <alsa/asoundlib.h>
 + #include <alsa/pcm_external.h>
 ++#ifdef __linux__
 + #include <linux/soundcard.h>
 ++#else
 ++#include <sys/soundcard.h>
 ++#endif
 +@@ -116,7 +120,7 @@ static int oss_drain(snd_pcm_ioplug_t *i
 + snd_pcm_oss_t *oss = io->private_data;
 +
 + if (io->stream == SND_PCM_STREAM_PLAYBACK)
 +- ioctl(oss->fd, SNDCTL_DSP_SYNC);
 ++ ioctl(oss->fd, SNDCTL_DSP_SYNC, NULL);
 + return 0;
 + }
 +
 +@@ -125,7 +129,7 @@ static int oss_prepare(snd_pcm_ioplug_t
 + snd_pcm_oss_t *oss = io->private_data;
 + int tmp;
 +
 +- ioctl(oss->fd, SNDCTL_DSP_RESET);
 ++ ioctl(oss->fd, SNDCTL_DSP_RESET, NULL);
 +
 + tmp = io->channels;
 + if (ioctl(oss->fd, SNDCTL_DSP_CHANNELS, &tmp) < 0) {
 
 --=-=-=--
_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs
To unsubscribe, send any mail to "[hidden email]"

[Jan Beich-2]

The following reply was made to PR ports/169767; it has been noted by GNATS.

From: Jan Beich <[hidden email]>
To: Aragon Gouveia <[hidden email]>
Cc: [hidden email]
Subject: Re: ports/169767: audio/alsa-plugins: desync with oss plugin
Date: Tue, 10 Jul 2012 23:17:07 +0100

 --=-=-=
 Content-Type: text/plain
 
 Hmm, the issue stems from ports/165247 applied wrong.
 
 
 --=-=-=
 Content-Type: text/x-patch
 Content-Disposition: attachment; filename=swap.diff
 
 Index: audio/alsa-plugins/Makefile
 ===================================================================
 RCS file: /a/.csup/ports/audio/alsa-plugins/Makefile,v
 retrieving revision 1.5
 diff -u -p -r1.5 Makefile
 --- audio/alsa-plugins/Makefile 7 May 2012 15:23:52 -0000 1.5
 +++ audio/alsa-plugins/Makefile 10 Jul 2012 22:12:12 -0000
 @@ -79,9 +79,9 @@ PLIST_SUB+= SPEEX="@comment "
  .if ${OSVERSION} > 900036 \
       || ${OSVERSION} > 802503 && ${OSVERSION} < 900000 \
       || ${OSVERSION} > 704000 && ${OSVERSION} < 800000
 -EXTRA_PATCHES+= ${FILESDIR}/alsa-plugins-getiptrfix.patch
 -.else # ${OSVERSION} <= 704000
  EXTRA_PATCHES+= ${FILESDIR}/alsa-plugins.patch
 +.else # ${OSVERSION} <= 704000
 +EXTRA_PATCHES+= ${FILESDIR}/alsa-plugins-getiptrfix.patch
  .endif
 
  post-patch: .SILENT
 
 --=-=-=--
_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs
To unsubscribe, send any mail to "[hidden email]"

[Jan Beich-2]

The following reply was made to PR ports/169767; it has been noted by GNATS.

From: Jan Beich <[hidden email]>
To: Aragon Gouveia <[hidden email]>
Cc: [hidden email]
Subject: Re: ports/169767: audio/alsa-plugins: desync with oss plugin
Date: Tue, 10 Jul 2012 12:43:06 -1000

 Jan Beich <[hidden email]> writes:
 
 > Hmm, the issue stems from ports/165247 applied wrong.
 
 Oops, I read it wrong, ignore any patches. Still this PR is about
 regression from ports/165247. I've just tested with
 
   $ cvs up -D2012/05/06 audio/alsa-plugins
   $ make install
 
 and it works OK there.
_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs
To unsubscribe, send any mail to "[hidden email]"

[Aragon Gouveia]

The following reply was made to PR ports/169767; it has been noted by GNATS.

From: Aragon Gouveia <[hidden email]>
To: Jan Beich <[hidden email]>
Cc: [hidden email]
Subject: Re: ports/169767: audio/alsa-plugins: desync with oss plugin
Date: Thu, 12 Jul 2012 14:10:49 +0200

 I'm not able to troubleshoot this problem now, and if no one else can,
 may I suggest, in the interest of having a stable port, that it be
 rolled back to the previous version?
 
 Keeping in mind that the previous version received no reports of broken
 behaviour.  Andriy's PR ports/165247 was an enhancement that maybe just
 needs deeper review.
 
 
_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs
To unsubscribe, send any mail to "[hidden email]"