Pullup ticket #2603 - requested by ahoka

vlc: security update

Revisions pulled up:
- multimedia/vlc/Makefile		1.65
- multimedia/vlc/Makefile		1.66
- multimedia/vlc/Makefile		1.67
- multimedia/vlc/PLIST			1.24
- multimedia/vlc/distinfo		1.23
- multimedia/vlc/distinfo		1.24
- multimedia/vlc/options.mk		1.11
---
Module Name:    pkgsrc
Committed By:   ahoka
Date:           Sat Nov  8 19:00:15 UTC 2008

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

Log Message:
Rework dependencies.
Add some missing X11 lib and jpeg.
Add theora support.
---
Module Name:	pkgsrc
Committed By:	ahoka
Date:		Wed Dec  3 16:24:07 UTC 2008

Modified Files:
	pkgsrc/multimedia/vlc: Makefile distinfo

Log Message:
Changes between 0.9.6 and 0.9.8:
- --------------------------------

 * Fixed buffer overflow in Real demuxer (SA-0811, CVE-2008-5276)
 * Bunch of small bugfixes.
---
Module Name:	pkgsrc
Committed By:	ahoka
Date:		Thu Dec  4 14:03:11 UTC 2008

Modified Files:
	pkgsrc/multimedia/vlc: Makefile distinfo

Log Message:
Upstream bumped the version number for some reason,
so follow the new distfile as the old one disappeared.

No new changes were mentioned in the official changelog.

4 files changed, 14 insertions, 8 deletions

diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index af70f904f2c..1aede58bc32 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61.2.3 2008/11/08 23:06:38 tron Exp $
+# $NetBSD: Makefile,v 1.61.2.4 2008/12/04 17:37:19 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.6
+VLC_VERSION=		0.9.8a
 
 MAINTAINER=		ahoka@NetBSD.org
 HOMEPAGE=		http://videolan.org/
@@ -45,6 +45,7 @@ CONFIGURE_ARGS+=	--enable-cddax \
 			--enable-dvdread \
 			--enable-flac \
 			--enable-live555 \
+			--enable-theora
 
 # Build optimalized modules
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
@@ -132,6 +133,7 @@ CHECK_WRKREF_SKIP=	lib/libvlccore.a \
 .include "../../audio/libcddb/buildlink3.mk"
 .include "../../misc/libcdio/buildlink3.mk"
 
+.include "../../graphics/jpeg/buildlink3.mk"
 .include "../../net/liblive/buildlink3.mk"
 .include "../../converters/fribidi/buildlink3.mk"
 .include "../../devel/libebml/buildlink3.mk"
@@ -150,6 +152,7 @@ CHECK_WRKREF_SKIP=	lib/libvlccore.a \
 .include "../../multimedia/libmatroska/buildlink3.mk"
 .include "../../multimedia/libmpeg2/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
+.include "../../multimedia/libtheora/buildlink3.mk"
 .include "../../multimedia/x264-devel/buildlink3.mk"
 
 .include "../../mk/oss.buildlink3.mk"
diff --git a/multimedia/vlc/PLIST b/multimedia/vlc/PLIST
index f1abc9c7a04..e7670866f5a 100644
--- a/multimedia/vlc/PLIST
+++ b/multimedia/vlc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19.2.3 2008/11/08 23:06:38 tron Exp $
+@comment $NetBSD: PLIST,v 1.19.2.4 2008/12/04 17:37:19 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
@@ -178,6 +178,7 @@ lib/vlc/codec/libsvcdsub_plugin.la
 lib/vlc/codec/libt140_plugin.la
 lib/vlc/codec/libtelx_plugin.la
 lib/vlc/codec/libvorbis_plugin.la
+lib/vlc/codec/libtheora_plugin.la
 lib/vlc/codec/libx264_plugin.la
 lib/vlc/control/libgestures_plugin.la
 lib/vlc/control/libhotkeys_plugin.la
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index d348a1372dd..aca76d0f066 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.19.2.3 2008/11/08 23:06:38 tron Exp $
+$NetBSD: distinfo,v 1.19.2.4 2008/12/04 17:37:19 tron Exp $
 
-SHA1 (vlc-0.9.6.tar.bz2) = b56b0ed4152ec841a2145caab5f6710ba9ed0d88
-RMD160 (vlc-0.9.6.tar.bz2) = 7cc3d8b1506469c759780d23ffcdc826a88e4288
-Size (vlc-0.9.6.tar.bz2) = 16981922 bytes
+SHA1 (vlc-0.9.8a.tar.bz2) = 1d68f4e4ef77ffc9cb63de70a610a3969bffd873
+RMD160 (vlc-0.9.8a.tar.bz2) = a9b57d9c6d99c5e3384914003afec974d1996f59
+Size (vlc-0.9.8a.tar.bz2) = 17032727 bytes
 SHA1 (patch-configure) = 0b69157981409067b42385ee5c81fc422f3842a2
 SHA1 (patch-v4l2) = 54504b7e3bc41522db5c90983319c0c1ce1f3c8f
diff --git a/multimedia/vlc/options.mk b/multimedia/vlc/options.mk
index 7e4c628d1f9..747e05c2421 100644
--- a/multimedia/vlc/options.mk
+++ b/multimedia/vlc/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8.2.2 2008/11/04 12:46:36 tron Exp $
+# $NetBSD: options.mk,v 1.8.2.3 2008/12/04 17:37:19 tron Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.vlc
 PKG_SUPPORTED_OPTIONS=		debug faad arts dbus skins sdl esound x11 gnome
@@ -75,9 +75,11 @@ CONFIGURE_ARGS+=	--disable-skins2
 DEPENDS+= dejavu-ttf>=2.0:../../fonts/dejavu-ttf
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../x11/libXv/buildlink3.mk"
+.include "../../x11/libXvMC/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
 .include "../../x11/libXdamage/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"