Index: multimedia/vlc/Makefile =================================================================== RCS file: /e/cvsync/cvsync/pkgsrc/multimedia/vlc/Makefile,v retrieving revision 1.111 diff -u -r1.111 Makefile --- multimedia/vlc/Makefile 22 Apr 2011 13:42:03 -0000 1.111 +++ multimedia/vlc/Makefile 6 May 2011 22:46:46 -0000 @@ -2,7 +2,7 @@ # DISTNAME= vlc-${VLC_VERSION} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vlc/} \ http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/ Index: multimedia/vlc/PLIST =================================================================== RCS file: /e/cvsync/cvsync/pkgsrc/multimedia/vlc/PLIST,v retrieving revision 1.41 diff -u -r1.41 PLIST --- multimedia/vlc/PLIST 6 Apr 2011 08:14:21 -0000 1.41 +++ multimedia/vlc/PLIST 6 May 2011 22:31:08 -0000 @@ -105,7 +105,7 @@ lib/vlc/plugins/access/libdvdread_plugin.la lib/vlc/plugins/access/libfilesystem_plugin.la lib/vlc/plugins/access/librtp_plugin.la -${PLIST.x11}lib/vlc/plugins/access/libxcb_screen_plugin.la +${PLIST.x11xcb}lib/vlc/plugins/access/libxcb_screen_plugin.la lib/vlc/plugins/access/libzip_plugin.la lib/vlc/plugins/access_output/libaccess_output_dummy_plugin.la lib/vlc/plugins/access_output/libaccess_output_file_plugin.la @@ -167,7 +167,7 @@ lib/vlc/plugins/codec/libx264_plugin.la ${PLIST.dbus}lib/vlc/plugins/control/libdbus_plugin.la lib/vlc/plugins/control/libgestures_plugin.la -${PLIST.x11}lib/vlc/plugins/control/libglobalhotkeys_plugin.la +${PLIST.x11xcb}lib/vlc/plugins/control/libglobalhotkeys_plugin.la lib/vlc/plugins/control/libhotkeys_plugin.la lib/vlc/plugins/control/libmotion_plugin.la lib/vlc/plugins/control/libnetsync_plugin.la @@ -229,9 +229,9 @@ lib/vlc/plugins/misc/libstats_plugin.la ${PLIST.dbus}lib/vlc/plugins/misc/libtelepathy_plugin.la lib/vlc/plugins/misc/libvod_rtsp_plugin.la -${PLIST.x11}lib/vlc/plugins/misc/libxdg_screensaver_plugin.la +${PLIST.x11xcb}lib/vlc/plugins/misc/libxdg_screensaver_plugin.la lib/vlc/plugins/misc/libxml_plugin.la -${PLIST.x11}lib/vlc/plugins/misc/libxscreensaver_plugin.la +${PLIST.x11xcb}lib/vlc/plugins/misc/libxscreensaver_plugin.la lib/vlc/plugins/misc/libxtag_plugin.la lib/vlc/plugins/mmx/libi420_rgb_mmx_plugin.la lib/vlc/plugins/mmx/libi420_yuy2_mmx_plugin.la @@ -259,7 +259,7 @@ lib/vlc/plugins/services_discovery/libmediadirs_plugin.la lib/vlc/plugins/services_discovery/libpodcast_plugin.la lib/vlc/plugins/services_discovery/libsap_plugin.la -${PLIST.x11}lib/vlc/plugins/services_discovery/libxcb_apps_plugin.la +${PLIST.x11xcb}lib/vlc/plugins/services_discovery/libxcb_apps_plugin.la lib/vlc/plugins/sse2/libi420_rgb_sse2_plugin.la lib/vlc/plugins/sse2/libi420_yuy2_sse2_plugin.la lib/vlc/plugins/sse2/libi422_yuy2_sse2_plugin.la @@ -318,7 +318,7 @@ lib/vlc/plugins/video_filter/libmotiondetect_plugin.la lib/vlc/plugins/video_filter/libnoise_plugin.la ${PLIST.x11}lib/vlc/plugins/video_filter/libosdmenu_plugin.la -${PLIST.x11}lib/vlc/plugins/video_filter/libpanoramix_plugin.la +${PLIST.x11xcb}lib/vlc/plugins/video_filter/libpanoramix_plugin.la lib/vlc/plugins/video_filter/libpostproc_plugin.la lib/vlc/plugins/video_filter/libpsychedelic_plugin.la lib/vlc/plugins/video_filter/libpuzzle_plugin.la @@ -339,10 +339,10 @@ ${PLIST.x11}lib/vlc/plugins/video_output/libsnapshot_plugin.la lib/vlc/plugins/video_output/libvmem_plugin.la lib/vlc/plugins/video_output/libvout_wrapper_plugin.la -${PLIST.x11}lib/vlc/plugins/video_output/libxcb_glx_plugin.la -${PLIST.x11}lib/vlc/plugins/video_output/libxcb_window_plugin.la -${PLIST.x11}lib/vlc/plugins/video_output/libxcb_x11_plugin.la -${PLIST.x11}lib/vlc/plugins/video_output/libxcb_xv_plugin.la +${PLIST.x11xcb}lib/vlc/plugins/video_output/libxcb_glx_plugin.la +${PLIST.x11xcb}lib/vlc/plugins/video_output/libxcb_window_plugin.la +${PLIST.x11xcb}lib/vlc/plugins/video_output/libxcb_x11_plugin.la +${PLIST.x11xcb}lib/vlc/plugins/video_output/libxcb_xv_plugin.la lib/vlc/plugins/video_output/libyuv_plugin.la lib/vlc/plugins/visualization/libvisual_plugin.la lib/vlc/vlc-cache-gen Index: multimedia/vlc/options.mk =================================================================== RCS file: /e/cvsync/cvsync/pkgsrc/multimedia/vlc/options.mk,v retrieving revision 1.21 diff -u -r1.21 options.mk --- multimedia/vlc/options.mk 6 Apr 2011 08:14:21 -0000 1.21 +++ multimedia/vlc/options.mk 6 May 2011 22:45:49 -0000 @@ -1,8 +1,9 @@ # $NetBSD: options.mk,v 1.21 2011/04/06 08:14:21 sborrill Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.vlc -PKG_SUPPORTED_OPTIONS= debug faad dbus hal skins sdl pulseaudio x11 gnome -PKG_SUGGESTED_OPTIONS= x11 +PKG_SUPPORTED_OPTIONS= debug faad dbus hal skins sdl pulseaudio x11 gnome x11xcb +PKG_SUGGESTED_OPTIONS= x11 x11xcb +# x11xcb needs x11 set also (not automatic) .include "../../mk/bsd.options.mk" @@ -104,8 +105,6 @@ .include "../../x11/libXdamage/buildlink3.mk" .include "../../x11/libXinerama/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" -.include "../../x11/libxcb/buildlink3.mk" -.include "../../x11/xcb-util/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" .include "../../x11/qt4-libs/buildlink3.mk" @@ -122,6 +121,14 @@ --disable-snapshot .endif +.if !empty(PKG_OPTIONS:Mx11xcb) +.include "../../x11/libxcb/buildlink3.mk" +.include "../../x11/xcb-util/buildlink3.mk" +PLIST.x11xcb= yes +.else +CONFIGURE_ARGS+= --disable-xcb +.endif + ## FAAD support (faad is non-redistributable) .if !empty(PKG_OPTIONS:Mfaad)