From owner-svn-ports-all@FreeBSD.ORG Sun Apr 27 18:20:51 2014 Return-Path: Delivered-To: svn-ports-all@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 ESMTPS id 3923DAC5; Sun, 27 Apr 2014 18:20:51 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0C115125F; Sun, 27 Apr 2014 18:20:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3RIKoJp072921; Sun, 27 Apr 2014 18:20:50 GMT (envelope-from nox@svn.freebsd.org) Received: (from nox@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3RIKooc072919; Sun, 27 Apr 2014 18:20:50 GMT (envelope-from nox@svn.freebsd.org) Message-Id: <201404271820.s3RIKooc072919@svn.freebsd.org> From: Juergen Lock Date: Sun, 27 Apr 2014 18:20:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352445 - 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-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Apr 2014 18:20:51 -0000 Author: nox Date: Sun Apr 27 18:20:50 2014 New Revision: 352445 URL: http://svnweb.freebsd.org/changeset/ports/352445 QAT: https://qat.redports.org/buildarchive/r352445/ Log: - Backport upstream fix for .mkv playback stutter using oss audio. - Bump PORTREVISION. PR: ports/186093 Submitted by: "Marko Cupać" (PR) Obtained from: http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c1622c2c6e0e15a38fef723086ca8bf75a75b46b Added: head/multimedia/vlc/files/patch-c1622c2c6e0e15a38fef723086ca8bf75a75b46b-2.1.4 (contents, props changed) Modified: head/multimedia/vlc/Makefile Modified: head/multimedia/vlc/Makefile ============================================================================== --- head/multimedia/vlc/Makefile Sun Apr 27 18:17:37 2014 (r352444) +++ head/multimedia/vlc/Makefile Sun Apr 27 18:20:50 2014 (r352445) @@ -3,6 +3,7 @@ PORTNAME= vlc DISTVERSION= 2.1.4 +PORTREVISION= 1 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-c1622c2c6e0e15a38fef723086ca8bf75a75b46b-2.1.4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/vlc/files/patch-c1622c2c6e0e15a38fef723086ca8bf75a75b46b-2.1.4 Sun Apr 27 18:20:50 2014 (r352445) @@ -0,0 +1,37 @@ +Backported from: + + http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c1622c2c6e0e15a38fef723086ca8bf75a75b46b + +--- modules/audio_output/oss.c.orig ++++ modules/audio_output/oss.c +@@ -37,6 +37,7 @@ + #else + # include + #endif ++#include + + #ifndef SNDCTL_DSP_HALT + # define SNDCTL_DSP_HALT SNDCTL_DSP_RESET +@@ -210,6 +211,22 @@ static int Start (audio_output_t *aout, + } + aout_FormatPrepare (fmt); + ++ /* Select timing */ ++ unsigned bytes; ++ char buf[1024]; ++ ++ if (spdif) ++ bytes = AOUT_SPDIF_SIZE; ++ else ++ bytes = fmt->i_rate / (CLOCK_FREQ / AOUT_MIN_PREPARE_TIME) ++ * fmt->i_bytes_per_frame; ++ ++ int frag = (AOUT_MAX_ADVANCE_TIME / AOUT_MIN_PREPARE_TIME) << 16 ++ | (32 - clz32(bytes - 1)); ++ if (ioctl (fd, SNDCTL_DSP_SETFRAGMENT, &frag) < 0) ++ msg_Err (aout, "cannot set 0x%08x fragment: %s", frag, ++ strerror_r(errno, buf, sizeof(buf) - 1)); ++ + VolumeSync (aout); + sys->starting = true; + sys->format = *fmt;