Make sdl and x11 options (like multimedia/vlc).

N.B. skins and wxwidgets options will be forced off if x11 option is
disabled.
For backwards compatibilty, enable sdl and x11 by default.

3 files changed, 44 insertions, 25 deletions

diff --git a/multimedia/vlc08/Makefile b/multimedia/vlc08/Makefile
index 22a90eda29d..6c85f5642d0 100644
--- a/multimedia/vlc08/Makefile
+++ b/multimedia/vlc08/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2009/01/29 11:32:05 sborrill Exp $
+# $NetBSD: Makefile,v 1.15 2009/01/30 13:35:26 sborrill Exp $
 #
 
 DISTNAME=		vlc-${VLC_VER}
@@ -105,12 +105,9 @@ CONFIGURE_ARGS+=	x_libraries=${PREFIX}/lib
 .include "../../audio/libmad/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../converters/fribidi/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/SDL_image/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../misc/libcdio/buildlink3.mk"
 .include "../../multimedia/ffmpeg/buildlink3.mk"
 .include "../../multimedia/libdvdplay/buildlink3.mk"
@@ -122,10 +119,6 @@ CONFIGURE_ARGS+=	x_libraries=${PREFIX}/lib
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../multimedia/x264-devel/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/libXv/buildlink3.mk"
-.include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/libXdamage/buildlink3.mk"
-.include "../../x11/libdrm/buildlink3.mk"
 
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/multimedia/vlc08/PLIST b/multimedia/vlc08/PLIST
index d87ffb7ffef..5efc61c6be2 100644
--- a/multimedia/vlc08/PLIST
+++ b/multimedia/vlc08/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2008/09/12 14:47:39 sborrill Exp $
+@comment $NetBSD: PLIST,v 1.10 2009/01/30 13:35:26 sborrill Exp $
 ${PLIST.skins}bin/svlc
 bin/vlc
 bin/vlc-config
@@ -26,7 +26,7 @@ ${PLIST.cdda}lib/vlc/access/libcdda_plugin.so
 lib/vlc/access/libcddax_plugin.so
 lib/vlc/access/libdvdnav_plugin.so
 lib/vlc/access/libdvdread_plugin.so
-lib/vlc/access/libscreen_plugin.so
+${PLIST.x11}lib/vlc/access/libscreen_plugin.so
 ${PLIST.vcd}lib/vlc/access/libvcd_plugin.so
 lib/vlc/access_filter/libaccess_filter_dump_plugin.so
 lib/vlc/access_filter/libaccess_filter_record_plugin.so
@@ -67,7 +67,7 @@ lib/vlc/audio_mixer/libfloat32_mixer_plugin.so
 lib/vlc/audio_mixer/libspdif_mixer_plugin.so
 lib/vlc/audio_mixer/libtrivial_mixer_plugin.so
 lib/vlc/audio_output/libaout_file_plugin.so
-lib/vlc/audio_output/libaout_sdl_plugin.so
+${PLIST.sdl}lib/vlc/audio_output/libaout_sdl_plugin.so
 ${PLIST.arts}lib/vlc/audio_output/libarts_plugin.so
 lib/vlc/audio_output/liboss_plugin.so
 lib/vlc/codec/liba52_plugin.so
@@ -85,9 +85,9 @@ lib/vlc/codec/libflacdec_plugin.so
 lib/vlc/codec/liblibmpeg2_plugin.so
 lib/vlc/codec/liblpcm_plugin.so
 lib/vlc/codec/libmpeg_audio_plugin.so
-lib/vlc/codec/libpng_plugin.so
+${PLIST.x11}lib/vlc/codec/libpng_plugin.so
 lib/vlc/codec/librawvideo_plugin.so
-lib/vlc/codec/libsdl_image_plugin.so
+${PLIST.sdl}lib/vlc/codec/libsdl_image_plugin.so
 lib/vlc/codec/libspudec_plugin.so
 lib/vlc/codec/libsubsdec_plugin.so
 lib/vlc/codec/libsvcdsub_plugin.so
@@ -149,7 +149,7 @@ lib/vlc/libmemcpymmxext.a
 lib/vlc/libmux_ts.a
 lib/vlc/misc/libdummy_plugin.so
 lib/vlc/misc/libexport_plugin.so
-lib/vlc/misc/libfreetype_plugin.so
+${PLIST.x11}lib/vlc/misc/libfreetype_plugin.so
 lib/vlc/misc/libgrowl_plugin.so
 lib/vlc/misc/libipv4_plugin.so
 lib/vlc/misc/libipv6_plugin.so
@@ -204,7 +204,7 @@ lib/vlc/video_filter/libmarq_plugin.so
 lib/vlc/video_filter/libmosaic_plugin.so
 lib/vlc/video_filter/libmotionblur_plugin.so
 lib/vlc/video_filter/libmotiondetect_plugin.so
-lib/vlc/video_filter/libosdmenu_plugin.so
+${PLIST.x11}lib/vlc/video_filter/libosdmenu_plugin.so
 lib/vlc/video_filter/librss_plugin.so
 lib/vlc/video_filter/librv32_plugin.so
 lib/vlc/video_filter/libscale_plugin.so
@@ -212,12 +212,12 @@ lib/vlc/video_filter/libtime_plugin.so
 lib/vlc/video_filter/libtransform_plugin.so
 lib/vlc/video_filter/libwall_plugin.so
 ${PLIST.fb}lib/vlc/video_output/libfb_plugin.so
-lib/vlc/video_output/libglx_plugin.so
+${PLIST.x11}lib/vlc/video_output/libglx_plugin.so
 lib/vlc/video_output/libimage_plugin.so
-lib/vlc/video_output/libopengl_plugin.so
-lib/vlc/video_output/libvout_sdl_plugin.so
-lib/vlc/video_output/libx11_plugin.so
-lib/vlc/video_output/libxvideo_plugin.so
+${PLIST.x11}lib/vlc/video_output/libopengl_plugin.so
+${PLIST.sdl}lib/vlc/video_output/libvout_sdl_plugin.so
+${PLIST.x11}lib/vlc/video_output/libx11_plugin.so
+${PLIST.x11}lib/vlc/video_output/libxvideo_plugin.so
 lib/vlc/visualization/libvisual_plugin.so
 man/man1/vlc-config.1
 man/man1/vlc.1
diff --git a/multimedia/vlc08/options.mk b/multimedia/vlc08/options.mk
index 9b57eb7246e..eb809744068 100644
--- a/multimedia/vlc08/options.mk
+++ b/multimedia/vlc08/options.mk
@@ -1,21 +1,21 @@
-# $NetBSD: options.mk,v 1.2 2008/09/22 20:21:04 joerg Exp $
+# $NetBSD: options.mk,v 1.3 2009/01/30 13:35:26 sborrill Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.vlc
-PKG_SUPPORTED_OPTIONS=		skins wxwidgets faad arts
-PKG_SUGGESTED_OPTIONS=		wxwidgets faad
+PKG_SUPPORTED_OPTIONS=		skins wxwidgets faad arts sdl x11
+PKG_SUGGESTED_OPTIONS=		wxwidgets faad x11 sdl
 
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=		${PKG_SUPPORTED_OPTIONS}
 
-.if !empty(PKG_OPTIONS:Mskins)
+.if !empty(PKG_OPTIONS:Mskins) && !empty(PKG_OPTIONS:Mx11)
 CONFIGURE_ARGS+=	--enable-skins2
 PLIST.skins=		yes
 .else
 CONFIGURE_ARGS+=	--disable-skins2
 .endif
 
-.if !empty(PKG_OPTIONS:Mwxwidgets)
+.if !empty(PKG_OPTIONS:Mwxwidgets) && !empty(PKG_OPTIONS:Mx11)
 .include "../../x11/wxGTK26/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-wxwidgets
 PLIST.wxwidgets=	yes
@@ -38,3 +38,29 @@ PLIST.arts=		yes
 .else
 CONFIGURE_ARGS+=	--disable-arts
 .endif
+
+## SDL backend support
+
+.if !empty(PKG_OPTIONS:Msdl)
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../graphics/SDL_image/buildlink3.mk"
+PLIST.sdl=		yes
+.else
+CONFIGURE_ARGS+=	--disable-sdl
+CONFIGURE_ARGS+=	--disable-sdl-image
+.endif
+
+.if !empty(PKG_OPTIONS:Mx11)
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../x11/libXv/buildlink3.mk"
+.include "../../x11/libXxf86vm/buildlink3.mk"
+.include "../../x11/libXdamage/buildlink3.mk"
+.include "../../x11/libdrm/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-x11
+CONFIGURE_ARGS+=	--enable-freetype
+PLIST.x11=		yes
+.else
+CONFIGURE_ARGS+=	--disable-x11
+CONFIGURE_ARGS+=	--disable-freetype
+.endif
+