Pullup ticket #2572 - requested by ahooka

vlc: security update

Revisions pulled up:
- multimedia/vlc/Makefile	1.63
- multimedia/vlc/PLIST		1.21-1.22
- multimedia/vlc/distinfo	1.21
- multimedia/vlc/options.mk	1.10
---
Module Name:    pkgsrc
Committed By:   ahoka
Date:           Wed Oct 29 00:41:44 UTC 2008

Modified Files:
        pkgsrc/multimedia/vlc: PLIST

Log Message:
Remove duplicate elements from PLIST ruining -x11 builds.
---
Module Name:	pkgsrc
Committed By:	ahoka
Date:		Sat Nov  1 22:14:13 UTC 2008

Modified Files:
	pkgsrc/multimedia/vlc: Makefile PLIST distinfo options.mk

Log Message:
This update is also fixing a minor PLIST issue.

Changes between 0.9.4 and 0.9.5:
- --------------------------------
Security updates:
 * Fixed buffer overflow in TiVo demuxer (SA-0809, CVE-2008-4686, CVE-2008-4654)
 * Fixed libpng CVE-2008-3964 in Win32 and MacOS builds

Features:
 * Closed Caption EIA 608/708 parsing enabled for libmpeg2

Various bugfixes:
 * Fixed various potential crashes and memleaks
 * Fixed issues with reading from files (especially non-local)

Windows port:
 * Fix bug where interface was "eating" some media keys
 * Fix some crashes in DirectShow access

Qt Interface:
 * Fix bug when the resetting of preferences didn't reset the dialog states
 * Right-click menu to select playlist columns reenabled
 * Various fixed in playlist

Access:
 * MMAP module is now deactivated by default

Translations:
 * Update of Brazillian, Swedish translation

4 files changed, 16 insertions, 20 deletions

diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 0b0cd670610..f29de963977 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61.2.1 2008/10/21 21:51:03 tron Exp $
+# $NetBSD: Makefile,v 1.61.2.2 2008/11/04 12:46:36 tron Exp $
 #
 
 DISTNAME=		vlc-${VLC_VERSION}
@@ -6,7 +6,7 @@ CATEGORIES=		multimedia
 MASTER_SITES=		http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
 EXTRACT_SUFX=		.tar.bz2
 
-VLC_VERSION=		0.9.4
+VLC_VERSION=		0.9.5
 
 MAINTAINER=		ahoka@NetBSD.org
 HOMEPAGE=		http://videolan.org/
@@ -45,7 +45,6 @@ CONFIGURE_ARGS+=	--enable-cddax \
 			--enable-flac \
 			--enable-lame \
 			--enable-live555 \
-			--enable-snapshot
 
 # Build optimalized modules
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
diff --git a/multimedia/vlc/PLIST b/multimedia/vlc/PLIST
index 76a070b8368..0db8b64fdd4 100644
--- a/multimedia/vlc/PLIST
+++ b/multimedia/vlc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19.2.1 2008/10/21 21:51:03 tron Exp $
+@comment $NetBSD: PLIST,v 1.19.2.2 2008/11/04 12:46:36 tron Exp $
 ${PLIST.faad}lib/vlc/codec/libfaad_plugin.la
 ${PLIST.dbus}lib/vlc/control/libdbus_plugin.la
 ${PLIST.dbus}lib/vlc/misc/libinhibit_plugin.la
@@ -12,6 +12,10 @@ ${PLIST.x11}lib/vlc/video_filter/libosdmenu_plugin.la
 ${PLIST.x11}lib/vlc/video_filter/libpanoramix_plugin.la
 ${PLIST.x11}lib/vlc/video_output/libx11_plugin.la
 ${PLIST.x11}lib/vlc/video_output/libxvideo_plugin.la
+${PLIST.x11}lib/vlc/video_output/libglx_plugin.la
+${PLIST.x11}lib/vlc/video_output/libopengl_plugin.la
+${PLIST.x11}lib/vlc/misc/libosd_parser_plugin.la
+${PLIST.x11}lib/vlc/access/libscreen_plugin.la
 ${PLIST.sdl}lib/vlc/codec/libsdl_image_plugin.la
 ${PLIST.sdl}lib/vlc/audio_output/libaout_sdl_plugin.la
 ${PLIST.sdl}lib/vlc/video_output/libvout_sdl_plugin.la
@@ -114,7 +118,6 @@ lib/vlc/access/libaccess_udp_plugin.la
 lib/vlc/access/libcddax_plugin.la
 lib/vlc/access/libdvdnav_plugin.la
 lib/vlc/access/libdvdread_plugin.la
-lib/vlc/access/libscreen_plugin.la
 lib/vlc/access_filter/libaccess_filter_bandwidth_plugin.la
 lib/vlc/access_filter/libaccess_filter_dump_plugin.la
 lib/vlc/access_filter/libaccess_filter_record_plugin.la
@@ -167,7 +170,6 @@ lib/vlc/codec/libflac_plugin.la
 lib/vlc/codec/liblibmpeg2_plugin.la
 lib/vlc/codec/liblpcm_plugin.la
 lib/vlc/codec/libmpeg_audio_plugin.la
-lib/vlc/codec/libpng_plugin.la
 lib/vlc/codec/librawvideo_plugin.la
 lib/vlc/codec/libspudec_plugin.la
 lib/vlc/codec/libsubsdec_plugin.la
@@ -235,7 +237,6 @@ lib/vlc/misc/libexport_plugin.la
 lib/vlc/misc/libgnutls_plugin.la
 lib/vlc/misc/liblogger_plugin.la
 lib/vlc/misc/libmemcpy_plugin.la
-lib/vlc/misc/libosd_parser_plugin.la
 lib/vlc/misc/libscreensaver_plugin.la
 lib/vlc/misc/libstats_plugin.la
 lib/vlc/misc/libvod_rtsp_plugin.la
@@ -305,8 +306,6 @@ lib/vlc/video_filter/libmosaic_plugin.la
 lib/vlc/video_filter/libmotionblur_plugin.la
 lib/vlc/video_filter/libmotiondetect_plugin.la
 lib/vlc/video_filter/libnoise_plugin.la
-lib/vlc/video_filter/libosdmenu_plugin.la
-lib/vlc/video_filter/libpanoramix_plugin.la
 lib/vlc/video_filter/libpostproc_plugin.la
 lib/vlc/video_filter/libpsychedelic_plugin.la
 lib/vlc/video_filter/libpuzzle_plugin.la
@@ -321,13 +320,9 @@ lib/vlc/video_filter/libswscale_plugin.la
 lib/vlc/video_filter/libtransform_plugin.la
 lib/vlc/video_filter/libwall_plugin.la
 lib/vlc/video_filter/libwave_plugin.la
-lib/vlc/video_output/libglx_plugin.la
 lib/vlc/video_output/libimage_plugin.la
-lib/vlc/video_output/libopengl_plugin.la
 lib/vlc/video_output/libsnapshot_plugin.la
 lib/vlc/video_output/libvmem_plugin.la
-lib/vlc/video_output/libx11_plugin.la
-lib/vlc/video_output/libxvideo_plugin.la
 lib/vlc/visualization/libvisual_plugin.la
 lib/vlc/demux/libmpc_plugin.la
 lib/vlc/misc/libgnutls_plugin.la
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index 8ab1462a5a5..dbe1ec40b02 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.19.2.1 2008/10/21 21:51:03 tron Exp $
+$NetBSD: distinfo,v 1.19.2.2 2008/11/04 12:46:36 tron Exp $
 
-SHA1 (vlc-0.9.4.tar.bz2) = 1325b29268bdcecfb5272433d1fde935171aefed
-RMD160 (vlc-0.9.4.tar.bz2) = 6f02a3cfbe50eb34f58fd1f4b9e6e9881f344152
-Size (vlc-0.9.4.tar.bz2) = 16471217 bytes
+SHA1 (vlc-0.9.5.tar.bz2) = 0f3f315353a09bf769f27bd07e20654b072cd209
+RMD160 (vlc-0.9.5.tar.bz2) = 8ec72d026f6fa086620f63d202d015fa14b4a4d7
+Size (vlc-0.9.5.tar.bz2) = 16457306 bytes
 SHA1 (patch-configure) = 0b69157981409067b42385ee5c81fc422f3842a2
 SHA1 (patch-v4l2) = 54504b7e3bc41522db5c90983319c0c1ce1f3c8f
diff --git a/multimedia/vlc/options.mk b/multimedia/vlc/options.mk
index db193eb0c60..7e4c628d1f9 100644
--- a/multimedia/vlc/options.mk
+++ b/multimedia/vlc/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8.2.1 2008/10/21 21:51:03 tron Exp $
+# $NetBSD: options.mk,v 1.8.2.2 2008/11/04 12:46:36 tron Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.vlc
 PKG_SUPPORTED_OPTIONS=		debug faad arts dbus skins sdl esound x11 gnome
@@ -83,12 +83,14 @@ DEPENDS+= dejavu-ttf>=2.0:../../fonts/dejavu-ttf
 .include "../../x11/qt4-libs/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-qt4 \
 			--enable-x11 \
-			--enable-glx
+			--enable-glx \
+			--enable-snapshot
 PLIST.x11=		yes
 .else
 CONFIGURE_ARGS+=	--disable-x11 \
 			--disable-qt4 \
-			--disable-glx
+			--disable-glx \
+			--disable-snapshot
 .endif
 
 ## FAAD support (faad is non-redistributable)