Add options.mk with options for wxwidgets and skins2 user interfaces

(wxwidgets on by default with skins2 disable for compatibility). N.B. If
skins2 is enabled and wxwidgets disabled, vlc will work fine, but there will
be no dialog provider so you won't be able to alter the playlist.

Add libdvdpsi and enable support for it - this is required for mpeg-ts
streams (i.e. default network streams).

Bump PKGREVISION

3 files changed, 37 insertions, 8 deletions

diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 2aa1eee8831..7c85837d989 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2007/06/22 14:13:16 lkundrak Exp $
+# $NetBSD: Makefile,v 1.46 2007/10/31 15:35:30 sborrill Exp $
 #
 
 DISTNAME=		vlc-${VLC_VER}
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		multimedia
 MASTER_SITES=		http://download.videolan.org/pub/videolan/vlc/${VLC_VER}/
 EXTRACT_SUFX=		.tar.bz2
@@ -22,19 +22,20 @@ VLC_VER=		0.8.5
 
 .include "../../mk/bsd.prefs.mk"
 
+.include "options.mk"
+
 .if ${OPSYS} == "NetBSD"
 CONFIGURE_ARGS+=	--disable-vcd
 .endif
+BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.0
 BUILDLINK_API_DEPENDS.vcdimager+=	vcdimager>=0.7.20nb1
 BUILDLINK_API_DEPENDS.ffmpeg+=	ffmpeg>=0.4.8nb1 # Postprocess fix
 
-CONFIGURE_ARGS+=	--disable-skins2
 CONFIGURE_ARGS+=	--disable-speex # needs unstable 1.1.x branch
 CONFIGURE_ARGS+=	--disable-gtk
 CONFIGURE_ARGS+=	--disable-gnomevfs
 CONFIGURE_ARGS+=	--disable-gnutls
 CONFIGURE_ARGS+=	--disable-smb
-CONFIGURE_ARGS+=	--disable-dvbpsi
 CONFIGURE_ARGS+=	--disable-mod
 CONFIGURE_ARGS+=	--disable-mpc
 CONFIGURE_ARGS+=	--disable-dts
@@ -115,6 +116,7 @@ CONFIGURE_ARGS+=	x_libraries=${PREFIX}/lib
 .include "../../misc/libcdio/buildlink3.mk"
 .include "../../multimedia/ffmpeg/buildlink3.mk"
 .include "../../multimedia/libdvdplay/buildlink3.mk"
+.include "../../multimedia/libdvbpsi/buildlink3.mk"
 .include "../../multimedia/libdvdnav/buildlink3.mk"
 .include "../../multimedia/libdvdread/buildlink3.mk"
 .include "../../multimedia/libmatroska/buildlink3.mk"
@@ -123,7 +125,6 @@ CONFIGURE_ARGS+=	x_libraries=${PREFIX}/lib
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/libXv/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/wxGTK/buildlink3.mk"
 
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/multimedia/vlc/PLIST b/multimedia/vlc/PLIST
index 02b9f1b1baa..608e3ce50e8 100644
--- a/multimedia/vlc/PLIST
+++ b/multimedia/vlc/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.7 2006/09/26 07:27:19 martti Exp $
+@comment $NetBSD: PLIST,v 1.8 2007/10/31 15:35:30 sborrill Exp $
 bin/vlc
+${COND_SKINS}bin/svlc
 bin/vlc-config
-bin/wxvlc
+${COND_WXWIDGETS}bin/wxvlc
 include/vlc/aout.h
 include/vlc/decoder.h
 include/vlc/input.h
@@ -123,12 +124,14 @@ lib/vlc/demux/librawdv_plugin.so
 lib/vlc/demux/libreal_plugin.so
 lib/vlc/demux/libsgimb_plugin.so
 lib/vlc/demux/libsubtitle_plugin.so
+lib/vlc/demux/libts_plugin.so
 lib/vlc/demux/libty_plugin.so
 lib/vlc/demux/libvobsub_plugin.so
 lib/vlc/demux/libvoc_plugin.so
 lib/vlc/demux/libwav_plugin.so
 lib/vlc/demux/libxa_plugin.so
-lib/vlc/gui/libwxwidgets_plugin.so
+${COND_SKINS}lib/vlc/gui/libskins2_plugin.so
+${COND_WXWIDGETS}lib/vlc/gui/libwxwidgets_plugin.so
 lib/vlc/libffmpeg.a
 lib/vlc/libi420_rgb_mmx.a
 lib/vlc/libi420_ymga_mmx.a
@@ -138,6 +141,7 @@ lib/vlc/libmemcpy3dn.a
 lib/vlc/libmemcpymmx.a
 lib/vlc/libmemcpymmxext.a
 lib/vlc/libmkv.a
+lib/vlc/libmux_ts.a
 lib/vlc/libstream_out_switcher.a
 lib/vlc/misc/libdummy_plugin.so
 lib/vlc/misc/libexport_plugin.so
diff --git a/multimedia/vlc/options.mk b/multimedia/vlc/options.mk
new file mode 100644
index 00000000000..0af897ca621
--- /dev/null
+++ b/multimedia/vlc/options.mk
@@ -0,0 +1,24 @@
+# $NetBSD: options.mk,v 1.1 2007/10/31 15:35:30 sborrill Exp $
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.vlc
+PKG_SUPPORTED_OPTIONS=		skins wxwidgets
+PKG_SUGGESTED_OPTIONS=		wxwidgets
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mskins)
+CONFIGURE_ARGS+=	--enable-skins
+PLIST_SUBST+=		COND_SKINS=
+.else
+CONFIGURE_ARGS+=	--disable-skins
+PLIST_SUBST+=		COND_SKINS="@comment "
+.endif
+
+.if !empty(PKG_OPTIONS:Mwxwidgets)
+.include "../../x11/wxGTK/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-wxwidgets
+PLIST_SUBST+=		COND_WXWIDGETS=
+.else
+CONFIGURE_ARGS+=	--disable-wxwidgets
+PLIST_SUBST+=		COND_WXWIDGETS="@comment "
+.endif