From owner-svn-ports-head@FreeBSD.ORG  Mon Nov  4 20:37:24 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id C530E4BB;
 Mon,  4 Nov 2013 20:37:24 +0000 (UTC) (envelope-from wg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id AD51D2153;
 Mon,  4 Nov 2013 20:37:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA4KbOUC030260;
 Mon, 4 Nov 2013 20:37:24 GMT (envelope-from wg@svn.freebsd.org)
Received: (from wg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA4KbOOa030258;
 Mon, 4 Nov 2013 20:37:24 GMT (envelope-from wg@svn.freebsd.org)
Message-Id: <201311042037.rA4KbOOa030258@svn.freebsd.org>
From: William Grzybowski <wg@FreeBSD.org>
Date: Mon, 4 Nov 2013 20:37:24 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r332777 - in head/multimedia/vlc: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Nov 2013 20:37:24 -0000

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)