svn commit: r332777 - in head/multimedia/vlc: . files

[William Grzybowski]

Author: wg
Date: Mon Nov  4 20:37:23 2013
New Revision: 332777
URL: http://svnweb.freebsd.org/changeset/ports/332777

Log:
  multimedia/vlc: fix seek error with OSS

Added:
  head/multimedia/vlc/files/patch-oss2   (contents, props changed)
Modified:
  head/multimedia/vlc/Makefile

Modified: head/multimedia/vlc/Makefile
==============================================================================
--- head/multimedia/vlc/Makefile	Mon Nov  4 20:34:21 2013	(r332776)
+++ head/multimedia/vlc/Makefile	Mon Nov  4 20:37:23 2013	(r332777)
@@ -3,7 +3,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	2.1.0
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	4
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \

Added: head/multimedia/vlc/files/patch-oss2
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/vlc/files/patch-oss2	Mon Nov  4 20:37:23 2013	(r332777)
@@ -0,0 +1,17 @@
+Use SNDCTL_DSP_HALT ioctl instead, for some reason SNDCTL_DSP_HALT_OUTPUT
+does not seem to be flushing properly.
+
+https://trac.videolan.org/vlc/ticket/9760
+diff --git modules/audio_output/oss.c modules/audio_output/oss.c
+index 8dc4a4a..940718f 100644
+--- modules/audio_output/oss.c
++++ modules/audio_output/oss.c
+@@ -281,7 +282,7 @@ static void Flush (audio_output_t *aout, bool wait)
+ 
+     if (wait)
+         return; /* drain is implicit with OSS */
+-    ioctl (fd, SNDCTL_DSP_HALT_OUTPUT, NULL);
++    ioctl (fd, SNDCTL_DSP_HALT, NULL);
+ }
+ 
+ static int VolumeSync (audio_output_t *aout)