diff --git a/x11/vlc/Makefile b/x11/vlc/Makefile index 3f10726c3cf..e9356958843 100644 --- a/x11/vlc/Makefile +++ b/x11/vlc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.162 2013/01/03 03:05:47 brad Exp $ +# $OpenBSD: Makefile,v 1.163 2013/01/03 03:18:21 brad Exp $ SHARED_ONLY= Yes @@ -8,7 +8,7 @@ COMMENT-jack= JACK audio output module for VLC V= 2.0.5 DISTNAME= vlc-${V} PKGNAME-main= ${DISTNAME} -REVISION-main= 1 +REVISION-main= 2 PKGNAME-jack= vlc-jack-${V} REVISION-jack= 1 CATEGORIES= x11 @@ -39,8 +39,8 @@ WANTLIB-main= GL ICE lib/qt4/QtGui QtCore SM SDL SDL_image X11 Xcomposite \ nettle notify opus orc-0.4 ogg p11-kit pango-1.0 pangocairo-1.0 \ pangoft2-1.0 pcre pixman-1 png postproc pthread-stubs \ samplerate schroedinger-1.0>=2.0 sndio speex speexdsp \ - sqlite3 swscale tag tar tasn1 tiff usbhid vorbis vorbisenc \ - webp x264 xcb-composite xcb-keysyms xcb-randr xcb-render \ + swscale tag tar tasn1 tiff usbhid vorbis vorbisenc webp \ + x264 xcb-composite xcb-keysyms xcb-randr xcb-render \ xcb-shape xcb-shm xcb-xfixes xcb-xv xcb xml2 z ${WANTLIB-common} WANTLIB-jack= jack vlccore ${WANTLIB-common} @@ -143,7 +143,6 @@ CONFIGURE_ARGS+=--disable-a52 \ --disable-upnp \ --disable-v4l2 \ --disable-zvbi \ - --enable-media-library \ --enable-real \ --enable-realrtsp \ --without-contrib \ diff --git a/x11/vlc/pkg/PLIST-main b/x11/vlc/pkg/PLIST-main index 3ee25d43e00..27ca52a7afd 100644 --- a/x11/vlc/pkg/PLIST-main +++ b/x11/vlc/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.29 2012/12/16 21:26:22 brad Exp $ +@comment $OpenBSD: PLIST-main,v 1.30 2013/01/03 03:18:21 brad Exp $ @pkgpath x11/vlc %%amd64%% %%i386%% @@ -251,8 +251,6 @@ lib/vlc/plugins/demux/libxa_plugin.so lib/vlc/plugins/gui/ lib/vlc/plugins/gui/libqt4_plugin.so lib/vlc/plugins/gui/libskins2_plugin.so -lib/vlc/plugins/media_library/ -lib/vlc/plugins/media_library/libmedia_library_plugin.so lib/vlc/plugins/meta_engine/ lib/vlc/plugins/meta_engine/libfolder_plugin.so lib/vlc/plugins/meta_engine/libtaglib_plugin.so @@ -264,7 +262,6 @@ lib/vlc/plugins/misc/libinhibit_plugin.so lib/vlc/plugins/misc/liblogger_plugin.so lib/vlc/plugins/misc/libmemcpy_plugin.so lib/vlc/plugins/misc/libosd_parser_plugin.so -lib/vlc/plugins/misc/libsqlite_plugin.so lib/vlc/plugins/misc/libstats_plugin.so lib/vlc/plugins/misc/libvod_rtsp_plugin.so lib/vlc/plugins/misc/libxdg_screensaver_plugin.so