From 4faed76628ddd91503016625caee301a2ed0a4be Mon Sep 17 00:00:00 2001 From: Juergen Lock <nox@FreeBSD.org> Date: Mon, 21 Jul 2014 20:19:49 +0000 Subject: [PATCH] Update to 2.1.5 - changelog is here: https://www.videolan.org/developers/vlc-branch/NEWS --- multimedia/vlc/Makefile | 3 +-- multimedia/vlc/distinfo | 4 ++-- ...4 => patch-c1622c2c6e0e15a38fef723086ca8bf75a75b46b-2.1.5} | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) rename multimedia/vlc/files/{patch-c1622c2c6e0e15a38fef723086ca8bf75a75b46b-2.1.4 => patch-c1622c2c6e0e15a38fef723086ca8bf75a75b46b-2.1.5} (91%) diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index b982c224c7ba..2f9d8b1543b9 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= vlc -DISTVERSION= 2.1.4 -PORTREVISION= 10 +DISTVERSION= 2.1.5 PORTEPOCH= 4 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \ diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo index 47b9fe3f109a..a2b2c2c5c1d0 100644 --- a/multimedia/vlc/distinfo +++ b/multimedia/vlc/distinfo @@ -1,2 +1,2 @@ -SHA256 (vlc-2.1.4.tar.xz) = 3e566c7525478167e18cc53dc75d621e4af91eb40aabb6231e47db25d682d5d3 -SIZE (vlc-2.1.4.tar.xz) = 19560884 +SHA256 (vlc-2.1.5.tar.xz) = 6f6566ab6cd90d381395b7f0e401060b044cd3843e50ceb252b558a88e5d1f72 +SIZE (vlc-2.1.5.tar.xz) = 19574208 diff --git a/multimedia/vlc/files/patch-c1622c2c6e0e15a38fef723086ca8bf75a75b46b-2.1.4 b/multimedia/vlc/files/patch-c1622c2c6e0e15a38fef723086ca8bf75a75b46b-2.1.5 similarity index 91% rename from multimedia/vlc/files/patch-c1622c2c6e0e15a38fef723086ca8bf75a75b46b-2.1.4 rename to multimedia/vlc/files/patch-c1622c2c6e0e15a38fef723086ca8bf75a75b46b-2.1.5 index 0a3c04c7ad82..f3cff00fb26b 100644 --- a/multimedia/vlc/files/patch-c1622c2c6e0e15a38fef723086ca8bf75a75b46b-2.1.4 +++ b/multimedia/vlc/files/patch-c1622c2c6e0e15a38fef723086ca8bf75a75b46b-2.1.5 @@ -12,7 +12,7 @@ Backported from: #ifndef SNDCTL_DSP_HALT # define SNDCTL_DSP_HALT SNDCTL_DSP_RESET -@@ -210,6 +211,22 @@ static int Start (audio_output_t *aout, +@@ -209,6 +210,22 @@ static int Start (audio_output_t *aout, } aout_FormatPrepare (fmt); @@ -32,6 +32,6 @@ Backported from: + msg_Err (aout, "cannot set 0x%08x fragment: %s", frag, + strerror_r(errno, buf, sizeof(buf) - 1)); + + sys->fd = fd; VolumeSync (aout); sys->starting = true; - sys->format = *fmt;