diff options
| author | William Grzybowski <wg@FreeBSD.org> | 2013-11-18 11:34:38 +0000 |
|---|---|---|
| committer | William Grzybowski <wg@FreeBSD.org> | 2013-11-18 11:34:38 +0000 |
| commit | 762559d87b3db54fff0b193dbb618dfb9f2e5c20 (patch) | |
| tree | beafab5bf10b50846039bb497b3381acf7c39277 /multimedia | |
| parent | a949ab583f05c32bf499c52221e4c95e7d576d18 (diff) | |
| download | ports-762559d87b3db54fff0b193dbb618dfb9f2e5c20.tar.gz ports-762559d87b3db54fff0b193dbb618dfb9f2e5c20.zip | |
Notes
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/vlc/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/vlc/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/vlc/files/patch-oss | 21 | ||||
| -rw-r--r-- | multimedia/vlc/files/patch-oss2 | 17 |
4 files changed, 3 insertions, 42 deletions
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 642025b598b8..84f1e52e2ea9 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= vlc -DISTVERSION= 2.1.0 -PORTREVISION= 6 +DISTVERSION= 2.1.1 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 8aedeb03d6a3..f314cf54a129 100644 --- a/multimedia/vlc/distinfo +++ b/multimedia/vlc/distinfo @@ -1,2 +1,2 @@ -SHA256 (vlc-2.1.0.tar.xz) = d2177daa31786acf1e961b2f63429797a8c62c090e5359bcc7929a1ba5fe41f7 -SIZE (vlc-2.1.0.tar.xz) = 19571224 +SHA256 (vlc-2.1.1.tar.xz) = 339c92cfb939ef6517b42fce7db59e59f259476d79d15b9b39e9d7f2b966b992 +SIZE (vlc-2.1.1.tar.xz) = 19605108 diff --git a/multimedia/vlc/files/patch-oss b/multimedia/vlc/files/patch-oss deleted file mode 100644 index 3ba21f58d409..000000000000 --- a/multimedia/vlc/files/patch-oss +++ /dev/null @@ -1,21 +0,0 @@ -From 0697e180135c34ce2d3aba3684a0970a0420aa70 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> -Date: Sat, 2 Nov 2013 21:58:48 +0200 -Subject: [PATCH] oss: fix corrupt audio format (fixes #9760) - ---- - modules/audio_output/oss.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git modules/audio_output/oss.c modules/audio_output/oss.c -index 8dc4a4a..69c6b60 100644 ---- modules/audio_output/oss.c -+++ modules/audio_output/oss.c -@@ -208,6 +208,7 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt) - fmt->i_original_channels = - fmt->i_physical_channels = channels; - } -+ aout_FormatPrepare (fmt); - - VolumeSync (aout); - sys->starting = true; diff --git a/multimedia/vlc/files/patch-oss2 b/multimedia/vlc/files/patch-oss2 deleted file mode 100644 index 8833eeaa4782..000000000000 --- a/multimedia/vlc/files/patch-oss2 +++ /dev/null @@ -1,17 +0,0 @@ -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) |