Update to VLC 1.1.12

Most of the bits from Brad, a minor runtime fix by me. Tested on amd64, i386, macppc OK dhill@, rpointel@, sthen@, jasper@
2011-11-16 13:33:15 +00:00 · 2011-11-16 13:33:15 +00:00 · 7ccc4d7c1c
commit 7ccc4d7c1c
parent 4036c0a4b7
49 changed files with 734 additions and 2004 deletions
--- a/x11/vlc/Makefile
+++ b/x11/vlc/Makefile
@ -1,21 +1,22 @@
-# $OpenBSD: Makefile,v 1.136 2011/10/21 18:20:14 espie Exp $
+# $OpenBSD: Makefile,v 1.137 2011/11/16 13:33:15 phessler Exp $

 SHARED_ONLY=	Yes

 COMMENT-main=	VideoLAN client; multimedia player
+COMMENT-jack=	JACK audio output module for VLC
+COMMENT-web=	Mozilla plugin for embedded media playback

-V=		1.0.6
+V=		1.1.12
 DISTNAME=	vlc-${V}
 PKGNAME-main=	${DISTNAME}
-REVISION-main=	34
-REVISION-jack=	6
-REVISION-web=	8
+PKGNAME-jack=	vlc-jack-${V}
+PKGNAME-web=	vlc-web-${V}
 CATEGORIES=	x11
 MASTER_SITES=	http://download.videolan.org/pub/videolan/vlc/${V}/
 EXTRACT_SUFX=	.tar.bz2

-SHARED_LIBS=	vlc		0.0 \
-		vlccore		0.0
+SHARED_LIBS=	vlc	1.0 \
+		vlccore	1.0

 HOMEPAGE=	http://www.videolan.org/vlc/

@ -27,11 +28,27 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

+WANTLIB+=	dbus-1 m
+WANTLIB-main=	GL ICE lib/qt4/QtGui SM SDL SDL_image X11 X11-xcb Xau \
+		Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama \
+		Xrandr Xrender Xxf86vm ass atk-1.0 avcodec avformat avutil \
+		bz2 c cairo cddb drm dvbpsi dvdnav dvdread ebml enca expat \
+		ffi fontconfig freetype fribidi gdk-x11-2.0 gdk_pixbuf-2.0 \
+		gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gsm gthread-2.0 \
+		gtk-x11-2.0 jpeg matroska modman mp3lame notify orc-0.4 \
+		ogg pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 \
+		png postproc proxy pthread-stubs pthread stdc++ \
+		schroedinger-1.0>=2.0 sndio speex swscale tag tiff \
+		theoradec theoraenc usbhid vorbis vorbisenc vpx x264 \
+		xcb-keysyms xcb-randr xcb-render xcb-shm xcb-xv xcb \
+		xml2 z  ${WANTLIB}
+WANTLIB-jack=	jack vlccore ${WANTLIB}
+WANTLIB-web=	stdc++ vlc vlccore ${WANTLIB}
+
 MODULES=	devel/gettext \
 		x11/qt4
 LIB_DEPENDS+=	x11/dbus
-LIB_DEPENDS-main=${LIB_DEPENDS} \
-		audio/faad \
+LIB_DEPENDS-main= ${LIB_DEPENDS} \
 		audio/libcddb \
 		audio/libvorbis \
 		audio/speex \
@ -39,10 +56,12 @@ LIB_DEPENDS-main=${LIB_DEPENDS} \
 		devel/fribidi \
 		devel/libdvdread \
 		devel/libnotify>=0.7.2 \
+		devel/sdl \
 		devel/sdl-image \
-		graphics/ffmpeg>=20080620p10 \
+		graphics/ffmpeg>=20110408 \
 		graphics/libdvbpsi \
 		graphics/png \
+		multimedia/libass \
 		multimedia/libdvdnav \
 		multimedia/libmatroska \
 		multimedia/schroedinger>=1.0.10 \
@ -50,105 +69,105 @@ LIB_DEPENDS-main=${LIB_DEPENDS} \
 		net/libproxy \
 		textproc/libebml \
 		textproc/libxml \
+		x11/gtk+2 \
 		x11/qt4
-RUN_DEPENDS=	devel/desktop-file-utils
-
-WANTLIB-main=	GL GLU ICE lib/qt4/QtGui SM SDL SDL_image X11 Xau \
-		Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrender Xv \
-		Xxf86vm avcodec avformat avutil bz2 c cddb dbus-1 \
-		drm dvbpsi dvdnav dvdread ebml expat faad fontconfig \
-		freetype fribidi gdk_pixbuf-2.0 gio-2.0 glib-2.0 \
-		gmodule-2.0 gobject-2.0 gsm gthread-2.0 jpeg m \
-		matroska modman mp3lame notify orc-0.4 ogg pcre \
-		png postproc proxy pthread-stubs pthread stdc++ \
-		schroedinger-1.0>=2.0 sndio speex swscale tag tiff \
-		theoradec theoraenc usbhid vorbis vorbisenc vpx x264 \
-		xcb-keysyms xcb xml2 z ${WANTLIB}
+LIB_DEPENDS-jack= ${LIB_DEPENDS} \
+		${BUILD_PKGPATH} \
+		audio/jack
+LIB_DEPENDS-web=${LIB_DEPENDS} \
+		${BUILD_PKGPATH} \
+		devel/nspr
+RUN_DEPENDS-main= devel/desktop-file-utils
+RUN_DEPENDS-jack= ${BUILD_PKGPATH}
+RUN_DEPENDS-web= ${BUILD_PKGPATH}

 CPPFLAGS=	-I${X11BASE}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng

 USE_GMAKE=	Yes
 USE_LIBTOOL=	Yes
 CONFIGURE_STYLE= autoconf
-AUTOCONF_VERSION= 2.65
+AUTOCONF_VERSION= 2.68
 MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/autotools
 CONFIGURE_ARGS+=--disable-a52 \
 		--disable-alsa \
 		--disable-altivec \
 		--disable-bonjour \
-		--disable-cmml \
+		--disable-caca \
+		--disable-dc1394 \
 		--disable-dca \
-		--disable-fluidsynth \
+		--disable-dirac \
+		--disable-dv \
 		--disable-dvb \
+		--disable-flac \
 		--disable-fluidsynth \
 		--disable-gme \
+		--disable-gnomevfs \
 		--disable-gnutls \
-		--disable-hal \
+		--disable-goom \
+		--disable-hd1000v \
 		--disable-kate \
 		--disable-libgcrypt \
 		--disable-libmpeg2 \
 		--disable-libtar \
+		--disable-libv4l \
 		--disable-libv4l2 \
+		--disable-libva \
 		--disable-live555 \
 		--disable-lua \
 		--disable-mad \
 		--disable-mod \
 		--disable-mpc \
 		--disable-mtp \
+		--disable-neon \
 		--disable-oss \
+		--disable-osso_screensaver \
+		--disable-portaudio \
+		--disable-projectm \
 		--disable-pulse \
 		--disable-remoteosd \
+		--disable-shout \
 		--disable-skins2 \
 		--disable-smb \
+		--disable-sqlite \
+		--disable-svg \
+		--disable-theora \
 		--disable-tiger \
+		--disable-twolame \
 		--disable-udev \
 		--disable-upnp \
 		--disable-zvbi \
-		--enable-dvdread \
-		--enable-faad \
 		--enable-real \
 		--enable-realrtsp \
-		--enable-release \
 		--without-contrib \
 		--without-tuning
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
-		PKG_CONFIG_PATH="${LOCALBASE}/lib/qt4/pkgconfig" \
-		LOCALBASE=${LOCALBASE}
-
-MULTI_PACKAGES=-main -web -jack
+		PKG_CONFIG_PATH="${LOCALBASE}/lib/qt4/pkgconfig"

 PSEUDO_FLAVORS=	no_web no_jack
 FLAVOR?=

-.include <bsd.port.arch.mk>
+MULTI_PACKAGES=	-main

-COMMENT-web=	Mozilla plugin for embedded media playback
-PKGNAME-web=	vlc-web-${V}
-LIB_DEPENDS-web=${LIB_DEPENDS} \
-		${BUILD_PKGPATH} \
-		devel/nspr
-RUN_DEPENDS-web=${BUILD_PKGPATH}
-WANTLIB-web=	ICE SM X11 Xau Xdmcp Xt Xpm m nspr4 plc4 plds4 \
-		pthread-stubs stdc++ vlc vlccore xcb dbus-1 \
-		${WANTLIB}
+.if !${FLAVOR:L:Mno_jack}
+MULTI_PACKAGES+=-jack
+.endif
+
+.if !${FLAVOR:L:Mno_web}
+MULTI_PACKAGES+=-web
+.endif
+
+.include <bsd.port.arch.mk>

 .if ${BUILD_PACKAGES:M-web}
 BUILD_DEPENDS+=	devel/xulrunner/1.9,-devel>=1.9
-CONFIGURE_ARGS+=--enable-mozilla --with-mozilla-sdk-path=${LOCALBASE}/xulrunner1.9
+CONFIGURE_ARGS+=--enable-mozilla \
+		--with-mozilla-sdk-path=${LOCALBASE}/xulrunner1.9
 CONFIGURE_ENV+=	with_mozilla_pkg="libxul"
 CPPFLAGS+=	-I${LOCALBASE}/include/nspr -I${LOCALBASE}/xulrunner1.9/include -DOPENBSD
 PORTPATH=	${WRKDIR}/bin:/usr/bin:/bin:/usr/sbin:/sbin:${DEPBASE}/bin:${LOCALBASE}/bin:${X11BASE}/bin:${LOCALBASE}/xulrunner1.9
 .endif

-COMMENT-jack=	jackd audio output module for VLC
-PKGNAME-jack=vlc-jack-${V}
-LIB_DEPENDS-jack=${LIB_DEPENDS} \
-		 ${BUILD_PKGPATH} \
-		 audio/jack
-RUN_DEPENDS-jack=${BUILD_PKGPATH}
-WANTLIB-jack=	${WANTLIB} m jack vlccore dbus-1
-
 .if ${BUILD_PACKAGES:M-jack}
 CONFIGURE_ARGS+=--enable-jack
 .endif
@ -167,14 +186,8 @@ PKG_ARGS+=-Di386=0

 pre-configure:
 	@perl -pi -e 's/grep -v /grep -av /' ${WRKSRC}/src/Makefile.in
-	@find ${WRKSRC} -name 'Makefile.in' -exec perl -pi -e 's/-export-symbol-regex/-export-symbols-regex/' {} \;

 post-install:
-.for _img in 16x16 32x32 48x48 128x128
-	${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/${_img}/apps
-	${INSTALL_DATA} ${WRKBUILD}/share/vlc${_img}.png \
-	    ${PREFIX}/share/icons/hicolor/${_img}/apps/vlc.png
-.endfor
 .if ${BUILD_PACKAGES:M-web}
 	@rm ${PREFIX}/lib/mozilla/plugins/libvlcplugin.a
 .endif
--- a/x11/vlc/distinfo
+++ b/x11/vlc/distinfo
@ -1,5 +1,5 @@
-MD5 (vlc-1.0.6.tar.bz2) = JGo4ZewDf49XV+9rlzqA/A==
-RMD160 (vlc-1.0.6.tar.bz2) = IYXrQYdI8qrfzl5ht6neZqYu8tE=
-SHA1 (vlc-1.0.6.tar.bz2) = g0NGqEpx2RVEC3dB4EtuAt5FF4Y=
-SHA256 (vlc-1.0.6.tar.bz2) = 9SGTPnoQIXRtjs3myqL50bQxh6suE99qvAdUDkFeGEI=
-SIZE (vlc-1.0.6.tar.bz2) = 22149704
+MD5 (vlc-1.1.12.tar.bz2) = kd4a0wjJR+NTgPnXR/9XEw==
+RMD160 (vlc-1.1.12.tar.bz2) = EXUwq8i9PzjZIzt6fJGjqqF6+Hw=
+SHA1 (vlc-1.1.12.tar.bz2) = s53mZxGjN0bOEvFqUOQdPe97FFI=
+SHA256 (vlc-1.1.12.tar.bz2) = bcUNJ9JaD6tVtm+a46pAAQgtLYa5awSRqNqzVCO+Gmg=
+SIZE (vlc-1.1.12.tar.bz2) = 26220996
--- a/x11/vlc/patches/patch-configure_ac
+++ b/x11/vlc/patches/patch-configure_ac
@ -1,7 +1,7 @@
-$OpenBSD: patch-configure_ac,v 1.19 2011/07/01 11:10:53 sthen Exp $
--- configure.ac.orig	Sun Apr 18 09:03:54 2010
-+++ configure.ac	Thu Jun 30 20:32:15 2011
-@@ -193,9 +193,9 @@ case "${host_os}" in
+$OpenBSD: patch-configure_ac,v 1.20 2011/11/16 13:33:15 phessler Exp $
+--- configure.ac.orig	Thu Oct  6 14:02:25 2011
+++ configure.ac	Sun Nov 13 15:25:53 2011
+@@ -184,20 +184,14 @@ case "${host_os}" in
     ;;
   *bsd*)
     SYS="${host_os}"
@ -12,7 +12,18 @@ $OpenBSD: patch-configure_ac,v 1.19 2011/07/01 11:10:53 sthen Exp $
         CPPFLAGS_save="${CPPFLAGS_save} -I/usr/local/include"
         CPPFLAGS="${CPPFLAGS_save}"
         LDFLAGS_save="${LDFLAGS_save} -L/usr/local/lib"
-@@ -826,6 +826,20 @@ if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
+         LDFLAGS="${LDFLAGS_save}"
+         ;;
+-      openbsd*)
+-        CPPFLAGS_save="${CPPFLAGS_save} -I/usr/local/include -I/usr/X11R6/include"
+-        CPPFLAGS="${CPPFLAGS_save}"
+-        LDFLAGS_save="${LDFLAGS_save} -L/usr/local/lib -L/usr/X11R6/lib/"
+-        LDFLAGS="${LDFLAGS_save}"
+-        ;;
+     esac
+     ;;
+   darwin*)
+@@ -785,6 +779,20 @@ if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
 dnl Check for pthreads - borrowed from XMMS
 THREAD_LIB=error
 if test "${THREAD_LIB}" = "error"; then
@ -33,35 +44,73 @@ $OpenBSD: patch-configure_ac,v 1.19 2011/07/01 11:10:53 sthen Exp $
   AC_CHECK_LIB(pthread,main,THREAD_LIB="-lpthread")
 fi
 if test "${THREAD_LIB}" = "error"; then
-@@ -872,13 +886,17 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[
+@@ -1001,65 +1009,6 @@ CFLAGS="${CFLAGS_save}"
+ RDC_PROG_CC_WFLAGS([all extra sign-compare undef pointer-arith bad-function-cast write-strings missing-prototypes volatile-register-var error-implicit-function-declaration])
+ RDC_PROG_CC_FLAGS([-pipe])
 
- dnl Check for headers
- AC_CHECK_HEADERS(getopt.h strings.h locale.h xlocale.h)
-AC_CHECK_HEADERS(fcntl.h sys/types.h sys/time.h sys/times.h sys/ioctl.h sys/stat.h sys/mount.h)
-+AC_CHECK_HEADERS(fcntl.h sys/types.h sys/time.h sys/times.h sys/ioctl.h sys/stat.h)
- AC_CHECK_HEADERS([arpa/inet.h netinet/in.h netinet/udplite.h sys/eventfd.h])
- AC_CHECK_HEADERS([net/if.h], [], [],
-   [
-     #include <sys/types.h>
-     #include <sys/socket.h>
-   ])
-+AC_CHECK_HEADERS([sys/mount.h], [], [],
-+  [
-+    #include <sys/param.h>
-+  ])
- if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
- AC_CHECK_HEADERS(machine/param.h sys/shm.h)
- AC_CHECK_HEADERS([linux/version.h linux/dccp.h])
-@@ -2525,7 +2543,7 @@ then
-   fi
- 
-   CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l2}"
-  AC_CHECK_HEADERS(linux/videodev2.h, [
-+  AC_CHECK_HEADERS(linux/videodev2.h sys/videoio.h, [
-     VLC_ADD_PLUGIN([v4l2])
-   ],[])
-   CPPFLAGS="${CPPFLAGS_save}"
-@@ -3753,14 +3771,14 @@ AC_ARG_ENABLE(png,
+-dnl Check for various optimization flags
+-AC_CACHE_CHECK([if \$CC accepts -Os],
+-    [ac_cv_c_os],
+-    [CFLAGS="${CFLAGS_save} -Os"
+-     AC_TRY_COMPILE([],,ac_cv_c_os=yes, ac_cv_c_os=no)])
+-if test "${ac_cv_c_os}" != "no"; then
+-    CFLAGS_OPTIM_SIZE="${CFLAGS_OPTIM_SIZE} -Os"
+-else
+-    AC_CACHE_CHECK([if \$CC accepts -O],
+-        [ac_cv_c_o],
+-        [CFLAGS="${CFLAGS_save} -O"
+-         AC_TRY_COMPILE([],,ac_cv_c_o=yes, ac_cv_c_o=no)])
+-    if test "${ac_cv_c_o}" != "no"; then
+-        if test "${ac_cv_c_o3}" = "no"; then
+-            CFLAGS_OPTIM_SIZE="${CFLAGS_OPTIM_SIZE} -O"
+-        fi
+-    fi
+-fi
+-
+-AC_CACHE_CHECK([if \$CC accepts -O4],
+-    [ac_cv_c_o4],
+-    [CFLAGS="${CFLAGS_save} -O4"
+-     AC_TRY_COMPILE([],,ac_cv_c_o4=yes, ac_cv_c_o4=no)])
+-if test "${ac_cv_c_o4}" != "no" -a "x${enable_debug}" = "xno"; then
+-    CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -O4"
+-else
+-    AC_CACHE_CHECK([if \$CC accepts -O3],
+-        [ac_cv_c_o3],
+-        [CFLAGS="${CFLAGS_save} -O3"
+-         AC_TRY_COMPILE([],,ac_cv_c_o3=yes, ac_cv_c_o3=no)])
+-    if test "${ac_cv_c_o3}" != "no" -a "x${enable_debug}" = "xno"; then
+-        CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -O3"
+-    else
+-        AC_CACHE_CHECK([if \$CC accepts -O2],
+-            [ac_cv_c_o2],
+-            [CFLAGS="${CFLAGS_save} -O2"
+-             AC_TRY_COMPILE([],,ac_cv_c_o2=yes, ac_cv_c_o2=no)])
+-        if test "${ac_cv_c_o2}" != "no"; then
+-            CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -O2"
+-        else
+-            AC_CACHE_CHECK([if \$CC accepts -O],
+-                [ac_cv_c_o],
+-                [CFLAGS="${CFLAGS_save} -O"
+-                 AC_TRY_COMPILE([],,ac_cv_c_o=yes, ac_cv_c_o=no)])
+-            if test "${ac_cv_c_o}" != "no"; then
+-                CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -O"
+-            fi
+-        fi
+-    fi
+-fi
+-
+-AC_CACHE_CHECK([if \$CC accepts -O0],
+-    [ac_cv_c_o0],
+-    [CFLAGS="${CFLAGS_save} -O0"
+-     AC_TRY_COMPILE([],,ac_cv_c_o0=yes, ac_cv_c_o0=no)])
+-if test "${ac_cv_c_o0}" != "no"; then
+-    CFLAGS_NOOPTIM="${CFLAGS_NOOPTIM} -O0"
+-fi
+-
+ dnl Check for -ffast-math
+ AC_CACHE_CHECK([if \$CC accepts -ffast-math],
+     [ac_cv_c_fast_math],
+@@ -3074,11 +3023,11 @@ AC_ARG_ENABLE(png,
   [  --enable-png            PNG support (default enabled)])
 if test "${enable_png}" != "no"; then
 AC_CHECK_HEADERS(png.h, [
@ -70,21 +119,9 @@ $OpenBSD: patch-configure_ac,v 1.19 2011/07/01 11:10:53 sthen Exp $
   AC_CHECK_LIB(png, png_set_rows, [
 -    VLC_ADD_LIBS([png],[-lpng -lz])
 +    VLC_ADD_LIBS([png],[-lpng -lm -lz])
-     VLC_ADD_PLUGIN([png])
-     VLC_ADD_PLUGIN([osdmenu])
-     VLC_ADD_PLUGIN([osd_parser])
-     AC_DEFINE(HAVE_LIBPNG, 1, [Define if you have the PNG library: libpng])],
+     VLC_ADD_PLUGIN([png osdmenu osd_parser])],
 -    [],[-lz])
 +    [],[-lm -lz])
     LDFLAGS="${LDFLAGS_save}"
   ])
 fi
-@@ -5746,7 +5764,7 @@ then
-     PLUGINS_BINDINGS="${PLUGINS_BINDINGS} mozilla"
-     VLC_ADD_CPPFLAGS([mozilla],[-DXPCOM_GLUE -DHAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX -I${real_mozilla_sdk} -I${real_mozilla_sdk}/include -I${real_mozilla_sdk}/embedstring/include -I${real_mozilla_sdk}/xpcom/include -I${real_mozilla_sdk}/nspr/include -I${real_mozilla_sdk}/string/include -I${real_mozilla_sdk}/plugin/include -I${real_mozilla_sdk}/java/include])
-     if ${need_xpcom_libs}; then
-       VLC_ADD_LIBS([mozilla],[-L${real_mozilla_sdk}/embedstring/bin -L${real_mozilla_sdk}/xpcom/bin -L${real_mozilla_sdk}/nspr/bin -L${real_mozilla_sdk}/string/bin -L${real_mozilla_sdk}/lib -lnspr4 -lplds4 -lplc4 -lxpcomglue])
-+       VLC_ADD_LIBS([mozilla],[-L${real_mozilla_sdk}/embedstring/bin -L${real_mozilla_sdk}/xpcom/bin -L${real_mozilla_sdk}/nspr/bin -L${real_mozilla_sdk}/string/bin -L${real_mozilla_sdk}/lib -lnspr4 -lplds4 -lplc4 ${LOCALBASE}/xulrunner1.9/libxpcomglue.a -L${X11BASE}/lib -lXt -lX11 -lSM -lICE -lXpm])
-       if test "${SYS}" = "mingw32"; then
-         dnl latest gecko sdk does not have embedstring
-         if test -d "${real_mozilla_sdk}/embedstring/bin"
--- a/x11/vlc/patches/patch-include_vlc_common_h
+++ b/x11/vlc/patches/patch-include_vlc_common_h
@ -1,16 +0,0 @@
-$OpenBSD: patch-include_vlc_common_h,v 1.1 2010/05/05 08:43:35 edd Exp $
--- include/vlc_common.h.orig	Fri Apr 30 15:50:36 2010
-+++ include/vlc_common.h	Fri Apr 30 15:52:16 2010
-@@ -79,7 +79,11 @@
- #   else
- #     define LIBVLC_FORMAT(x,y) __attribute__ ((format(printf,x,y)))
- #   endif
-#   define LIBVLC_USED __attribute__ ((warn_unused_result))
-+#   if __GNUC__ > 3 || (__GNUC__ == 3 && (__GNUC_MINOR__ >= 4))
-+#     define LIBVLC_USED __attribute__ ((warn_unused_result))
-+#   else
-+#     define LIBVLC_USED
-+#   endif
- #else
- #   define LIBVLC_FORMAT(x,y)
- #   define LIBVLC_USED
--- a/x11/vlc/patches/patch-include_vlc_config_h
+++ b/x11/vlc/patches/patch-include_vlc_config_h
@ -1,17 +0,0 @@
-$OpenBSD: patch-include_vlc_config_h,v 1.6 2010/05/05 08:43:35 edd Exp $
--- include/vlc_config.h.orig	Fri May  8 20:10:47 2009
-+++ include/vlc_config.h	Sat May 16 08:47:18 2009
-@@ -86,8 +86,13 @@
- 
- /* DVD and VCD devices */
- #if !defined( WIN32 ) && !defined( UNDER_CE )
-+#if defined(__OpenBSD__)
-+#   define CD_DEVICE      "/dev/cd0c"
-+#   define DVD_DEVICE     "/dev/cd0c"
-+#else
- #   define CD_DEVICE      "/dev/cdrom"
- #   define DVD_DEVICE     "/dev/dvd"
-+#endif
- #else
- #   define CD_DEVICE      "D:"
- #   define DVD_DEVICE     NULL
--- a/x11/vlc/patches/patch-modules_access_mms_mmstu_c
+++ b/x11/vlc/patches/patch-modules_access_mms_mmstu_c
@ -1,15 +0,0 @@
-$OpenBSD: patch-modules_access_mms_mmstu_c,v 1.3 2011/05/08 16:20:16 dcoppa Exp $
-
-Fix a potential crash.
-
--- modules/access/mms/mmstu.c.orig	Fri May  6 18:26:32 2011
-+++ modules/access/mms/mmstu.c	Fri May  6 18:26:58 2011
-@@ -643,7 +643,7 @@ static int MMSOpen( access_t  *p_access, vlc_url_t *p_
- 
-     /* media file path shouldn't start with / character */
-     mediapath = p_url->psz_path;
-    if ( *mediapath == '/' )
-+    if ( mediapath && *mediapath == '/' )
-     {
-         mediapath++;
-     }
--- a/x11/vlc/patches/patch-modules_access_v4l2_c
+++ b/x11/vlc/patches/patch-modules_access_v4l2_c
@ -1,22 +1,7 @@
-$OpenBSD: patch-modules_access_v4l2_c,v 1.3 2010/09/12 22:35:01 jakemsr Exp $
--- modules/access/v4l2.c.orig	Sun Mar  7 10:38:01 2010
-+++ modules/access/v4l2.c	Mon Aug 30 17:38:54 2010
-@@ -49,7 +49,13 @@
- #include <sys/ioctl.h>
- #include <sys/mman.h>
- 
-#include <linux/videodev2.h>
-+#ifdef HAVE_SYS_VIDEOIO_H
-+#   include <sys/videoio.h>
-+#elif defined (HAVE_SYS_VIDEODEV2_H)
-+#   include <sys/videodev2.h>
-+#else
-+#   include <linux/videodev2.h>
-+#endif
- 
- #include <poll.h>
- 
-@@ -1655,8 +1661,8 @@ static float GetMaxFrameRate( demux_t *p_demux, int i_
+$OpenBSD: patch-modules_access_v4l2_c,v 1.4 2011/11/16 13:33:15 phessler Exp $
+--- modules/access/v4l2.c.orig	Sun Jan 23 11:05:21 2011
+++ modules/access/v4l2.c	Thu Apr 28 21:47:48 2011
+@@ -1675,8 +1675,8 @@ static float GetMaxFrameRate( demux_t *p_demux, int i_
                 float f_fps_max = -1;
                 do
                 {
@ -27,7 +12,7 @@ $OpenBSD: patch-modules_access_v4l2_c,v 1.3 2010/09/12 22:35:01 jakemsr Exp $
                     if( f_fps > f_fps_max ) f_fps_max = f_fps;
                     frmival.index++;
                 } while( v4l2_ioctl( i_fd, VIDIOC_ENUM_FRAMEINTERVALS,
-@@ -1665,10 +1671,10 @@ static float GetMaxFrameRate( demux_t *p_demux, int i_
+@@ -1685,10 +1685,10 @@ static float GetMaxFrameRate( demux_t *p_demux, int i_
             }
             case V4L2_FRMSIZE_TYPE_STEPWISE:
             case V4L2_FRMIVAL_TYPE_CONTINUOUS:
@ -42,7 +27,7 @@ $OpenBSD: patch-modules_access_v4l2_c,v 1.3 2010/09/12 22:35:01 jakemsr Exp $
         }
     }
 #endif
-@@ -1697,21 +1703,21 @@ static float GetAbsoluteMaxFrameRate( demux_t *p_demux
+@@ -1717,21 +1717,21 @@ static float GetAbsoluteMaxFrameRate( demux_t *p_demux
                     frmsize.index++;
                     float f_fps = GetMaxFrameRate( p_demux, i_fd,
                                                    i_pixel_format,
@ -72,7 +57,7 @@ $OpenBSD: patch-modules_access_v4l2_c,v 1.3 2010/09/12 22:35:01 jakemsr Exp $
                 {
                     float f_fps = GetMaxFrameRate( p_demux, i_fd,
                                                    i_pixel_format,
-@@ -1725,8 +1731,8 @@ static float GetAbsoluteMaxFrameRate( demux_t *p_demux
+@@ -1745,8 +1745,8 @@ static float GetAbsoluteMaxFrameRate( demux_t *p_demux
                 msg_Err( p_demux, "GetAbsoluteMaxFrameRate implementation for V4L2_FRMSIZE_TYPE_CONTINUOUS isn't correct" );
                  f_fps_max = GetMaxFrameRate( p_demux, i_fd,
                                               i_pixel_format,
@ -83,7 +68,7 @@ $OpenBSD: patch-modules_access_v4l2_c,v 1.3 2010/09/12 22:35:01 jakemsr Exp $
                 break;
         }
     }
-@@ -1758,26 +1764,26 @@ static void GetMaxDimensions( demux_t *p_demux, int i_
+@@ -1778,26 +1778,26 @@ static void GetMaxDimensions( demux_t *p_demux, int i_
                     frmsize.index++;
                     float f_fps = GetMaxFrameRate( p_demux, i_fd,
                                                    i_pixel_format,
@ -121,7 +106,7 @@ $OpenBSD: patch-modules_access_v4l2_c,v 1.3 2010/09/12 22:35:01 jakemsr Exp $
                 {
                     float f_fps = GetMaxFrameRate( p_demux, i_fd,
                                                    i_pixel_format,
-@@ -1795,13 +1801,13 @@ static void GetMaxDimensions( demux_t *p_demux, int i_
+@@ -1815,13 +1815,13 @@ static void GetMaxDimensions( demux_t *p_demux, int i_
                 msg_Err( p_demux, "GetMaxDimension implementation for V4L2_FRMSIZE_TYPE_CONTINUOUS isn't correct" );
                 float f_fps = GetMaxFrameRate( p_demux, i_fd,
                                                i_pixel_format,
@ -140,7 +125,7 @@ $OpenBSD: patch-modules_access_v4l2_c,v 1.3 2010/09/12 22:35:01 jakemsr Exp $
                 }
                 break;
         }
-@@ -2212,27 +2218,27 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sy
+@@ -2249,27 +2249,27 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sy
                 do
                 {
                     msg_Dbg( p_obj, "    supported frame interval: %d/%d",
@ -180,7 +165,7 @@ $OpenBSD: patch-modules_access_v4l2_c,v 1.3 2010/09/12 22:35:01 jakemsr Exp $
                 break;
         }
     }
-@@ -2681,22 +2687,22 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_
+@@ -2718,22 +2718,22 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_
                                 {
                                     msg_Dbg( p_obj,
                 "    device supports size %dx%d",
@ -209,7 +194,7 @@ $OpenBSD: patch-modules_access_v4l2_c,v 1.3 2010/09/12 22:35:01 jakemsr Exp $
                                 break;
                         }
                     }
-@@ -3231,7 +3237,7 @@ static int Control( vlc_object_t *p_obj, demux_sys_t *
+@@ -3268,7 +3268,7 @@ static int Control( vlc_object_t *p_obj, demux_sys_t *
 
     if( i_value >= queryctrl.minimum && i_value <= queryctrl.maximum )
     {
@ -218,7 +203,7 @@ $OpenBSD: patch-modules_access_v4l2_c,v 1.3 2010/09/12 22:35:01 jakemsr Exp $
         if( v4l2_ioctl( i_fd, VIDIOC_S_EXT_CTRLS, &ext_controls ) < 0 )
         {
             control.value = i_value;
-@@ -3246,7 +3252,7 @@ static int Control( vlc_object_t *p_obj, demux_sys_t *
+@@ -3283,7 +3283,7 @@ static int Control( vlc_object_t *p_obj, demux_sys_t *
         else
         {
             i_ret = v4l2_ioctl( i_fd, VIDIOC_G_EXT_CTRLS, &ext_controls );
--- a/x11/vlc/patches/patch-modules_codec_cdg_c
+++ b/x11/vlc/patches/patch-modules_codec_cdg_c
@ -1,32 +0,0 @@
-$OpenBSD: patch-modules_codec_cdg_c,v 1.2 2011/04/12 22:40:20 sthen Exp $
-
-Fix multiple heap-based buffer overflows. CVE-2011-0021
-
--- modules/codec/cdg.c.orig	Wed Jan 12 22:04:27 2011
-+++ modules/codec/cdg.c	Wed Jan 12 22:06:35 2011
-@@ -255,7 +255,13 @@ static int DecodeTileBlock( decoder_sys_t *p_cdg, cons
-         for( x = 0; x < 6; x++ )
-         {
-             const int idx = ( p_data[4+y] >> (5-x) ) & 0x01;
-            uint8_t *p = &p_cdg->p_screen[(sy+y)*CDG_SCREEN_PITCH+(sx+x)];
-+
-+            int index = (sy+y)*CDG_SCREEN_PITCH+(sx+x);
-+            if( index >= CDG_SCREEN_PITCH*CDG_SCREEN_HEIGHT )
-+                return 0;
-+
-+            uint8_t *p = &p_cdg->p_screen[index];
-+
-             if( doXor )
-                 *p ^= p_color[idx];
-             else
-@@ -320,8 +326,8 @@ static int DecodeScroll( decoder_sys_t *p_cdg, const u
- 
-             if( b_copy )
-             {
-                dy = ( dy + CDG_SCREEN_HEIGHT ) % CDG_SCREEN_HEIGHT;
-                dy = ( dy + CDG_SCREEN_WIDTH  ) % CDG_SCREEN_WIDTH;
-+                dy %= CDG_SCREEN_HEIGHT;
-+                dx %= CDG_SCREEN_WIDTH;
-             }
-             else
-             {
--- a/x11/vlc/patches/patch-modules_codec_faad_c
+++ b/x11/vlc/patches/patch-modules_codec_faad_c
@ -1,39 +0,0 @@
-$OpenBSD: patch-modules_codec_faad_c,v 1.6 2010/05/05 08:43:35 edd Exp $
--- modules/codec/faad.c.orig	Tue Oct 20 16:30:34 2009
-+++ modules/codec/faad.c	Sat Nov 28 16:25:46 2009
-@@ -149,7 +149,7 @@ static int Open( vlc_object_t *p_this )
-     if( p_dec->fmt_in.i_extra > 0 )
-     {
-         /* We have a decoder config so init the handle */
-        unsigned long i_rate;
-+        unsigned int i_rate;
-         unsigned char i_channels;
- 
-         if( faacDecInit2( p_sys->hfaad, p_dec->fmt_in.p_extra,
-@@ -257,7 +257,7 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, b
-     if( p_dec->fmt_out.audio.i_rate == 0 && p_dec->fmt_in.i_extra > 0 )
-     {
-         /* We have a decoder config so init the handle */
-        unsigned long i_rate;
-+        unsigned int i_rate;
-         unsigned char i_channels;
- 
-         if( faacDecInit2( p_sys->hfaad, p_dec->fmt_in.p_extra,
-@@ -276,7 +276,7 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, b
- 
-     if( p_dec->fmt_out.audio.i_rate == 0 && p_sys->i_buffer )
-     {
-        unsigned long i_rate;
-+        unsigned int i_rate;
-         unsigned char i_channels;
- 
-         /* Init faad with the first frame */
-@@ -379,7 +379,7 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, b
-             const char *psz_ext = (frame.sbr && frame.ps) ? "SBR+PS" :
-                                     frame.sbr ? "SBR" : "PS";
- 
-            msg_Dbg( p_dec, "AAC %s (channels: %u, samplerate: %lu)",
-+            msg_Dbg( p_dec, "AAC %s (channels: %u, samplerate: %u)",
-                     psz_ext, frame.channels, frame.samplerate );
- 
-             if( !p_dec->p_description )
--- a/x11/vlc/patches/patch-modules_codec_png_c
+++ b/x11/vlc/patches/patch-modules_codec_png_c
@ -1,24 +0,0 @@
-$OpenBSD: patch-modules_codec_png_c,v 1.1 2011/07/08 20:38:02 naddy Exp $
-
-Fix build with png-1.5.
-
--- modules/codec/png.c.orig	Tue Jul  5 12:28:47 2011
-+++ modules/codec/png.c	Tue Jul  5 12:29:21 2011
-@@ -155,7 +155,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block
-     p_info = png_create_info_struct( p_png );
-     if( p_info == NULL )
-     {
-        png_destroy_read_struct( &p_png, png_infopp_NULL, png_infopp_NULL );
-+        png_destroy_read_struct( &p_png, NULL, NULL );
-         block_Release( p_block ); *pp_block = NULL;
-         return NULL;
-     }
-@@ -163,7 +163,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block
-     p_end_info = png_create_info_struct( p_png );
-     if( p_end_info == NULL )
-     {
-        png_destroy_read_struct( &p_png, &p_info, png_infopp_NULL );
-+        png_destroy_read_struct( &p_png, &p_info, NULL );
-         block_Release( p_block ); *pp_block = NULL;
-         return NULL;
-     }
--- a/x11/vlc/patches/patch-modules_codec_subtitles_subsdec_c
+++ b/x11/vlc/patches/patch-modules_codec_subtitles_subsdec_c
@ -1,13 +0,0 @@
-$OpenBSD: patch-modules_codec_subtitles_subsdec_c,v 1.1 2011/01/22 09:10:22 ajacoutot Exp $
--- modules/codec/subtitles/subsdec.c.orig	Wed Jan 19 20:21:31 2011
-+++ modules/codec/subtitles/subsdec.c	Wed Jan 19 20:26:07 2011
-@@ -618,6 +618,9 @@ static char *StripTags( char *psz_subtitle )
-             *psz_text++ = *psz_subtitle;
-         }
- 
-+        /* Security fix: Account for the case where input ends early */
-+        if( *psz_subtitle == '\0' ) break;
-+
-         psz_subtitle++;
-     }
-     *psz_text = '\0';
--- a/x11/vlc/patches/patch-modules_codec_subtitles_subsusf_c
+++ b/x11/vlc/patches/patch-modules_codec_subtitles_subsusf_c
@ -1,13 +0,0 @@
-$OpenBSD: patch-modules_codec_subtitles_subsusf_c,v 1.1 2011/01/22 09:10:22 ajacoutot Exp $
--- modules/codec/subtitles/subsusf.c.orig	Wed Jan 19 20:23:11 2011
-+++ modules/codec/subtitles/subsusf.c	Wed Jan 19 20:25:36 2011
-@@ -1084,6 +1084,9 @@ static char *StripTags( char *psz_subtitle )
-             *psz_text++ = *psz_subtitle;
-         }
- 
-+        /* Security fix: Account for the case where input ends early */
-+        if( *psz_subtitle == '\0' ) break;
-+
-         psz_subtitle++;
-     }
-     *psz_text = '\0';
--- a/x11/vlc/patches/patch-modules_demux_avi_avi_c
+++ b/x11/vlc/patches/patch-modules_demux_avi_avi_c
@ -1,18 +0,0 @@
-$OpenBSD: patch-modules_demux_avi_avi_c,v 1.1 2011/05/08 16:20:16 dcoppa Exp $
-
-Don't free uninitialized ES format descriptor for DV muxed in AVI.
-
--- modules/demux/avi/avi.c.orig	Thu May  5 20:34:10 2011
-+++ modules/demux/avi/avi.c	Thu May  5 20:34:42 2011
-@@ -643,7 +643,10 @@ static int Open( vlc_object_t * p_this )
-         if( tk->p_out_muxed == NULL )
-             tk->p_es = es_out_Add( p_demux->out, &fmt );
-         TAB_APPEND( p_sys->i_track, p_sys->track, tk );
-        es_format_Clean( &fmt );
-+        if(!p_sys->b_muxed )
-+        {
-+            es_format_Clean( &fmt );
-+        }
-     }
- 
-     if( p_sys->i_track <= 0 )
--- a/x11/vlc/patches/patch-modules_demux_avi_libavi_c
+++ b/x11/vlc/patches/patch-modules_demux_avi_libavi_c
@ -1,25 +0,0 @@
-$OpenBSD: patch-modules_demux_avi_libavi_c,v 1.1 2011/07/17 06:35:42 ajacoutot Exp $
-
-Fix heap-based buffer overflow. CVE-2011-2588
-
--- modules/demux/avi/libavi.c.orig	Wed Jul 13 17:14:50 2011
-+++ modules/demux/avi/libavi.c	Wed Jul 13 17:16:43 2011
-@@ -379,7 +379,8 @@ static int AVI_ChunkRead_strf( stream_t *s, avi_chunk_
-         case( AVIFOURCC_vids ):
-             p_strh->strh.i_samplesize = 0; /* XXX for ffmpeg avi file */
-             p_chk->strf.vids.i_cat = VIDEO_ES;
-            p_chk->strf.vids.p_bih = malloc( p_chk->common.i_chunk_size );
-+            p_chk->strf.vids.p_bih = malloc( __MAX( p_chk->common.i_chunk_size,
-+                                         sizeof( *p_chk->strf.vids.p_bih ) ) );
-             AVI_READ4BYTES( p_chk->strf.vids.p_bih->biSize );
-             AVI_READ4BYTES( p_chk->strf.vids.p_bih->biWidth );
-             AVI_READ4BYTES( p_chk->strf.vids.p_bih->biHeight );
-@@ -395,7 +396,7 @@ static int AVI_ChunkRead_strf( stream_t *s, avi_chunk_
-             {
-                 p_chk->strf.vids.p_bih->biSize = p_chk->common.i_chunk_size;
-             }
-            if( p_chk->common.i_chunk_size - sizeof(BITMAPINFOHEADER) > 0 )
-+            if( p_chk->common.i_chunk_size > sizeof(BITMAPINFOHEADER) )
-             {
-                 memcpy( &p_chk->strf.vids.p_bih[1],
-                         p_buff + 8 + sizeof(BITMAPINFOHEADER), /* 8=fourrc+size */
--- a/x11/vlc/patches/patch-modules_demux_mkv_Makefile_in
+++ b/x11/vlc/patches/patch-modules_demux_mkv_Makefile_in
@ -1,7 +1,7 @@
-$OpenBSD: patch-modules_demux_mkv_Makefile_in,v 1.1 2010/05/05 08:43:35 edd Exp $
--- modules/demux/mkv/Makefile.in.orig	Sun Jan 24 16:28:44 2010
-+++ modules/demux/mkv/Makefile.in	Sun Jan 31 22:17:13 2010
-@@ -738,7 +738,7 @@ libmkv_plugin_la_CFLAGS = $(AM_CFLAGS)
+$OpenBSD: patch-modules_demux_mkv_Makefile_in,v 1.2 2011/11/16 13:33:15 phessler Exp $
+--- modules/demux/mkv/Makefile.in.orig	Thu Oct  6 20:04:44 2011
+++ modules/demux/mkv/Makefile.in	Sun Nov 13 11:53:42 2011
+@@ -711,7 +711,7 @@ libmkv_plugin_la_CFLAGS = $(AM_CFLAGS)
 libmkv_plugin_la_CXXFLAGS = $(AM_CXXFLAGS)
 libmkv_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS)
 # Set LIBADD and DEPENDENCIES manually:
--- a/x11/vlc/patches/patch-modules_demux_mkv_demux_cpp
+++ b/x11/vlc/patches/patch-modules_demux_mkv_demux_cpp
@ -1,15 +0,0 @@
-$OpenBSD: patch-modules_demux_mkv_demux_cpp,v 1.2 2011/04/12 22:40:20 sthen Exp $
-
-Insufficient input validation in MKV demuxer. CVE-2011-0531
-
--- modules/demux/mkv/demux.cpp.orig	Tue Feb  1 20:03:12 2011
-+++ modules/demux/mkv/demux.cpp	Tue Feb  1 20:03:46 2011
-@@ -94,7 +94,7 @@ matroska_stream_c *demux_sys_t::AnalyseAllSegmentsFoun
- 
-     while (p_l0 != 0)
-     {
-        if (EbmlId(*p_l0) == KaxSegment::ClassInfos.GlobalId)
-+        if ( MKV_IS_ID( p_l0, KaxSegment) )
-         {
-             EbmlParser  *ep;
-             matroska_segment_c *p_segment1 = new matroska_segment_c( *this, *p_estream );
--- a/x11/vlc/patches/patch-modules_demux_mkv_matroska_segment_cpp
+++ b/x11/vlc/patches/patch-modules_demux_mkv_matroska_segment_cpp
@ -1,19 +0,0 @@
-$OpenBSD: patch-modules_demux_mkv_matroska_segment_cpp,v 1.1 2011/03/12 21:19:13 jakemsr Exp $
--- modules/demux/mkv/matroska_segment.cpp.orig	Sun Feb 27 01:59:13 2011
-+++ modules/demux/mkv/matroska_segment.cpp	Sun Feb 27 02:05:29 2011
-@@ -215,6 +215,7 @@ void matroska_segment_c::LoadTags( KaxTags *tags )
-                     }
-                     ep->Up();
-                 }
-+#if 0 // not valid anymore
-                 else if( MKV_IS_ID( el, KaxTagGeneral ) )
-                 {
-                     msg_Dbg( &sys.demuxer, "|   + General" );
-@@ -283,6 +284,7 @@ void matroska_segment_c::LoadTags( KaxTags *tags )
-                 {
-                     msg_Dbg( &sys.demuxer, "|   + Multi Title" );
-                 }
-+#endif
-                 else
-                 {
-                     msg_Dbg( &sys.demuxer, "|   + LoadTag Unknown (%s)", typeid( *el ).name() );
--- a/x11/vlc/patches/patch-modules_demux_mkv_matroska_segment_parse_cpp
+++ b/x11/vlc/patches/patch-modules_demux_mkv_matroska_segment_parse_cpp
@ -1,15 +0,0 @@
-$OpenBSD: patch-modules_demux_mkv_matroska_segment_parse_cpp,v 1.2 2011/04/12 22:40:20 sthen Exp $
-
-Insufficient input validation in MKV demuxer. CVE-2011-0531
-
--- modules/demux/mkv/matroska_segment_parse.cpp.orig	Tue Feb  1 20:03:56 2011
-+++ modules/demux/mkv/matroska_segment_parse.cpp	Tue Feb  1 20:04:53 2011
-@@ -538,7 +538,7 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntr
-                     tk->f_fps = float( vfps );
-                     msg_Dbg( &sys.demuxer, "   |   |   |   + fps=%f", float( vfps ) );
-                 }
-                else if( EbmlId( *l ) == KaxVideoDisplayUnit::ClassInfos.GlobalId )
-+                else if( MKV_IS_ID( l, KaxVideoDisplayUnit ) )
-                 {
-                     KaxVideoDisplayUnit &vdmode = *(KaxVideoDisplayUnit*)l;
- 
--- a/x11/vlc/patches/patch-modules_demux_mkv_mkv_hpp
+++ b/x11/vlc/patches/patch-modules_demux_mkv_mkv_hpp
@ -1,24 +0,0 @@
-$OpenBSD: patch-modules_demux_mkv_mkv_hpp,v 1.3 2011/04/12 22:40:20 sthen Exp $
-
-Insufficient input validation in MKV demuxer. CVE-2011-0531
-
--- modules/demux/mkv/mkv.hpp.orig	Thu Apr 15 12:52:46 2010
-+++ modules/demux/mkv/mkv.hpp	Sun Feb 27 02:00:13 2011
-@@ -93,7 +93,7 @@
- #include "matroska/KaxSegment.h"
- #include "matroska/KaxTag.h"
- #include "matroska/KaxTags.h"
-#include "matroska/KaxTagMulti.h"
-+//#include "matroska/KaxTagMulti.h"
- #include "matroska/KaxTracks.h"
- #include "matroska/KaxTrackAudio.h"
- #include "matroska/KaxTrackVideo.h"
-@@ -130,7 +130,7 @@ extern "C" {
- #endif
- 
- 
-#define MKV_IS_ID( el, C ) ( EbmlId( (*el) ) == C::ClassInfos.GlobalId )
-+#define MKV_IS_ID( el, C ) ( el != NULL && typeid( *el ) == typeid( C ) )
- 
- 
- using namespace LIBMATROSKA_NAMESPACE;
--- a/x11/vlc/patches/patch-modules_demux_mp4_libmp4_c
+++ b/x11/vlc/patches/patch-modules_demux_mp4_libmp4_c
@ -1,15 +0,0 @@
-$OpenBSD: patch-modules_demux_mp4_libmp4_c,v 1.3 2011/04/25 09:32:42 sthen Exp $
-
-Fix heap-based buffer overflow. CVE-2011-1684
-
--- modules/demux/mp4/libmp4.c.orig	Sat Apr  9 21:52:45 2011
-+++ modules/demux/mp4/libmp4.c	Sat Apr  9 21:54:23 2011
-@@ -2167,7 +2167,7 @@ static int MP4_ReadBox_frma( stream_t *p_stream, MP4_B
- 
- static int MP4_ReadBox_skcr( stream_t *p_stream, MP4_Box_t *p_box )
- {
-    MP4_READBOX_ENTER( MP4_Box_data_frma_t );
-+    MP4_READBOX_ENTER( MP4_Box_data_skcr_t );
- 
-     MP4_GET4BYTES( p_box->data.p_skcr->i_init );
-     MP4_GET4BYTES( p_box->data.p_skcr->i_encr );
--- a/x11/vlc/patches/patch-modules_demux_playlist_xspf_c
+++ b/x11/vlc/patches/patch-modules_demux_playlist_xspf_c
@ -1,38 +0,0 @@
-$OpenBSD: patch-modules_demux_playlist_xspf_c,v 1.1 2011/06/13 23:51:12 sthen Exp $
-
-Fix heap corruption / integer overflow in playlist parser. CVE-2011-2194
-
--- modules/demux/playlist/xspf.c.orig	Thu Apr 15 12:53:01 2010
-+++ modules/demux/playlist/xspf.c	Fri Jun 10 18:27:22 2011
-@@ -517,7 +517,8 @@ static bool parse_track_node COMPLEX_INTERFACE
-                     }
-                     free( psz_uri );
- 
-                    if( p_demux->p_sys->i_track_id < 0 )
-+                    if( p_demux->p_sys->i_track_id < 0
-+                     || p_demux->p_sys->i_track_id >= (SIZE_MAX / sizeof(p_new_input)) )
-                     {
-                         input_item_AddSubItem( p_input_item, p_new_input );
-                         vlc_gc_decref( p_new_input );
-@@ -531,11 +532,21 @@ static bool parse_track_node COMPLEX_INTERFACE
-                         pp = realloc( p_demux->p_sys->pp_tracklist,
-                             (p_demux->p_sys->i_track_id + 1) * sizeof(*pp) );
-                         if( !pp )
-+                        {
-+                            vlc_gc_decref( p_new_input );
-                             return false;
-+                        }
-                         p_demux->p_sys->pp_tracklist = pp;
-                         while( p_demux->p_sys->i_track_id >=
-                                p_demux->p_sys->i_tracklist_entries )
-                             pp[p_demux->p_sys->i_tracklist_entries++] = NULL;
-+                    }
-+                    else if( p_demux->p_sys->pp_tracklist[p_demux->p_sys->i_track_id] != NULL )
-+                    {
-+                        msg_Err( p_demux, "track ID %d collision",
-+                                 p_demux->p_sys->i_track_id );
-+                        vlc_gc_decref( p_new_input );
-+                        return false;
-                     }
- 
-                     p_demux->p_sys->pp_tracklist[
--- a/x11/vlc/patches/patch-modules_demux_real_c
+++ b/x11/vlc/patches/patch-modules_demux_real_c
@ -1,74 +0,0 @@
-$OpenBSD: patch-modules_demux_real_c,v 1.2 2011/04/12 22:40:20 sthen Exp $
-
- Fix heap buffer overflow. CVE-2010-3907
- Fix potential division by 0.
-
--- modules/demux/real.c.orig	Sun Mar  7 13:38:01 2010
-+++ modules/demux/real.c	Thu Dec 30 22:43:22 2010
-@@ -247,11 +247,8 @@ static void Close( vlc_object_t *p_this )
-             if( tk->p_subpackets[ j ] )
-                 block_Release( tk->p_subpackets[ j ] );
-         }
-        if( tk->i_subpackets )
-        {
-            free( tk->p_subpackets );
-            free( tk->p_subpackets_timecode );
-        }
-+        free( tk->p_subpackets );
-+        free( tk->p_subpackets_timecode );
-         free( tk );
-     }
-     if( p_sys->i_track > 0 )
-@@ -631,6 +628,11 @@ static void DemuxAudioMethod1( demux_t *p_demux, real_
- 
-         for( int i = 0; i < i_num; i++ )
-         {
-+            int i_index = tk->i_subpacket_h * i +
-+                          ((tk->i_subpacket_h + 1) / 2) * (y&1) + (y>>1);
-+            if( i_index >= tk->i_subpackets )
-+                return;
-+
-             block_t *p_block = block_New( p_demux, tk->i_subpacket_size );
-             if( !p_block )
-                 return;
-@@ -643,9 +645,6 @@ static void DemuxAudioMethod1( demux_t *p_demux, real_
- 
-             p_buf += tk->i_subpacket_size;
- 
-            int i_index = tk->i_subpacket_h * i +
-                          ((tk->i_subpacket_h + 1) / 2) * (y&1) + (y>>1);
-
-             if( tk->p_subpackets[i_index] != NULL )
-             {
-                 msg_Dbg(p_demux, "p_subpackets[ %d ] not null!",  i_index );
-@@ -665,14 +664,16 @@ static void DemuxAudioMethod1( demux_t *p_demux, real_
- 
-         for( int i = 0; i < tk->i_subpacket_h / 2; i++ )
-         {
-+            int i_index = (i * 2 * tk->i_frame_size / tk->i_coded_frame_size) + y;
-+            if( i_index >= tk->i_subpackets )
-+                return;
-+
-             block_t *p_block = block_New( p_demux, tk->i_coded_frame_size);
-             if( !p_block )
-                 return;
-             if( &p_buf[tk->i_coded_frame_size] > &p_sys->buffer[p_sys->i_buffer] )
-                 return;
- 
-            int i_index = (i * 2 * tk->i_frame_size / tk->i_coded_frame_size) + y;
-
-             memcpy( p_block->p_buffer, p_buf, tk->i_coded_frame_size );
-             p_block->i_dts =
-             p_block->i_pts = i_index == 0 ? i_pts : 0;
-@@ -1455,6 +1456,11 @@ static int CodecAudioParse( demux_t *p_demux, int i_tk
-         break;
- 
-     case VLC_FOURCC('2','8','_','8'):
-+        if( i_coded_frame_size <= 0 )
-+        {
-+            es_format_Clean( &fmt );
-+            return VLC_EGENERIC;
-+        }
-         fmt.audio.i_blockalign = i_coded_frame_size;
-         break;
- 
--- a/x11/vlc/patches/patch-modules_gui_ncurses_c
+++ b/x11/vlc/patches/patch-modules_gui_ncurses_c
@ -1,12 +0,0 @@
-$OpenBSD: patch-modules_gui_ncurses_c,v 1.4 2010/05/05 08:43:35 edd Exp $
--- modules/gui/ncurses.c.orig	Fri May  8 20:10:50 2009
-+++ modules/gui/ncurses.c	Sat May 16 08:56:36 2009
-@@ -123,7 +123,7 @@ static void start_color_and_pairs ( intf_thread_t * );
- vlc_module_begin ()
-     set_shortname( "Ncurses" )
-     set_description( N_("Ncurses interface") )
-    set_capability( "interface", 10 )
-+    set_capability( "interface", 21 )
-     set_category( CAT_INTERFACE )
-     set_subcategory( SUBCAT_INTERFACE_MAIN )
-     set_callbacks( Open, Close )
--- a/x11/vlc/patches/patch-modules_gui_pda_pda_c
+++ b/x11/vlc/patches/patch-modules_gui_pda_pda_c
@ -1,12 +0,0 @@
-$OpenBSD: patch-modules_gui_pda_pda_c,v 1.2 2010/05/05 08:43:35 edd Exp $
--- modules/gui/pda/pda.c.orig	Thu May 14 12:58:13 2009
-+++ modules/gui/pda/pda.c	Mon Jun  8 02:01:59 2009
-@@ -178,7 +178,7 @@ static void Run( intf_thread_t *p_intf )
- 
-     /* Set the title of the main window */
-     gtk_window_set_title( GTK_WINDOW(p_intf->p_sys->p_window),
-                          VOUT_TITLE " (PDA Linux interface)");
-+                          VOUT_TITLE " (PDA interface)");
- 
-     /* Get the notebook object */
-     p_intf->p_sys->p_notebook = GTK_NOTEBOOK( gtk_object_get_data(
--- a/x11/vlc/patches/patch-modules_gui_pda_pda_callbacks_c
+++ b/x11/vlc/patches/patch-modules_gui_pda_pda_callbacks_c
@ -1,12 +0,0 @@
-$OpenBSD: patch-modules_gui_pda_pda_callbacks_c,v 1.4 2010/05/05 08:43:35 edd Exp $
--- modules/gui/pda/pda_callbacks.c.orig	Fri May  8 20:10:50 2009
-+++ modules/gui/pda/pda_callbacks.c	Sat May 16 08:47:18 2009
-@@ -1032,7 +1032,7 @@ void onAddTranscodeToPlaylist(GtkButton *button, gpoin
-     pl_Release( p_intf );
- 
-     /* Get all the options. */
-    i_pos = snprintf( &mrl[0], VLC_MAX_MRL, "sout");
-+    i_pos = snprintf( &mrl[0], 6, "sout");
-     mrl[6] = '\0';
-     /* option 1 */
-     i_pos = snprintf( &ppsz_options[i_options][0], VLC_MAX_MRL, "sout='#transcode{");
--- a/x11/vlc/patches/patch-modules_gui_qt4_Makefile_in
+++ b/x11/vlc/patches/patch-modules_gui_qt4_Makefile_in
@ -1,7 +1,7 @@
-$OpenBSD: patch-modules_gui_qt4_Makefile_in,v 1.1 2010/05/05 08:43:35 edd Exp $
--- modules/gui/qt4/Makefile.in.orig	Sun Jan 24 16:28:46 2010
-+++ modules/gui/qt4/Makefile.in	Sun Jan 31 22:17:13 2010
-@@ -1082,7 +1082,7 @@ libqt4_plugin_la_CFLAGS = $(AM_CFLAGS)
+$OpenBSD: patch-modules_gui_qt4_Makefile_in,v 1.2 2011/11/16 13:33:15 phessler Exp $
+--- modules/gui/qt4/Makefile.in.orig	Thu Oct  6 20:04:47 2011
+++ modules/gui/qt4/Makefile.in	Sun Nov 13 11:53:42 2011
+@@ -1125,7 +1125,7 @@ libqt4_plugin_la_CFLAGS = $(AM_CFLAGS)
 libqt4_plugin_la_CXXFLAGS = $(AM_CXXFLAGS)
 libqt4_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS)
 # Set LIBADD and DEPENDENCIES manually:
--- a/x11/vlc/patches/patch-modules_meta_engine_taglib_cpp
+++ b/x11/vlc/patches/patch-modules_meta_engine_taglib_cpp
@ -1,33 +0,0 @@
-$OpenBSD: patch-modules_meta_engine_taglib_cpp,v 1.2 2011/04/12 22:40:20 sthen Exp $
-
-Fix insufficient input validation. CVE-2010-2937
-
--- modules/meta_engine/taglib.cpp.orig	Tue Sep 28 19:24:18 2010
-+++ modules/meta_engine/taglib.cpp	Tue Sep 28 19:25:44 2010
-@@ -120,6 +120,8 @@ static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_
-     {
-         ID3v2::UniqueFileIdentifierFrame* p_ufid =
-                 dynamic_cast<ID3v2::UniqueFileIdentifierFrame*>(*iter);
-+        if( !p_ufid )
-+            continue;
-         const char *owner = p_ufid->owner().toCString();
-         if (!strcmp( owner, "http://musicbrainz.org" ))
-         {
-@@ -140,6 +142,8 @@ static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_
-     {
-         ID3v2::UserTextIdentificationFrame* p_txxx =
-                 dynamic_cast<ID3v2::UserTextIdentificationFrame*>(*iter);
-+        if( !p_txxx )
-+            continue;
-         vlc_meta_AddExtra( p_meta, p_txxx->description().toCString( true ),
-                            p_txxx->fieldList().toString().toCString( true ) );
-     }
-@@ -196,6 +200,8 @@ static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_
-     {
-         ID3v2::AttachedPictureFrame* p_apic =
-             dynamic_cast<ID3v2::AttachedPictureFrame*>(*iter);
-+        if( !p_apic )
-+            continue;
-         input_attachment_t *p_attachment;
- 
-         const char *psz_mime;
--- a/x11/vlc/patches/patch-modules_misc_freetype_c
+++ b/x11/vlc/patches/patch-modules_misc_freetype_c
@ -1,13 +0,0 @@
-$OpenBSD: patch-modules_misc_freetype_c,v 1.2 2010/05/05 08:43:35 edd Exp $
--- modules/misc/freetype.c.orig	Fri Sep 18 12:37:45 2009
-+++ modules/misc/freetype.c	Wed Oct 14 20:50:39 2009
-@@ -63,6 +63,9 @@
- #elif defined( WIN32 )
- #define DEFAULT_FONT "" /* Default font found at run-time */
- #define FC_DEFAULT_FONT "Arial"
-+#elif defined(__OpenBSD__)
-+#define DEFAULT_FONT "/usr/X11R6/lib/X11/fonts/TTF/Vera.ttf"
-+#define FC_DEFAULT_FONT "Vera"
- #else
- #define DEFAULT_FONT "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf"
- #define FC_DEFAULT_FONT "Serif Bold"
--- a/x11/vlc/patches/patch-modules_misc_inhibit_xdg_c
+++ b/x11/vlc/patches/patch-modules_misc_inhibit_xdg_c
@ -0,0 +1,77 @@
+$OpenBSD: patch-modules_misc_inhibit_xdg_c,v 1.1 2011/11/16 13:33:15 phessler Exp $
+
+Missing posix_spawnp and family.
+
+--- modules/misc/inhibit/xdg.c.orig	Sun Nov 13 13:12:04 2011
+++ modules/misc/inhibit/xdg.c	Sun Nov 13 13:15:22 2011
+@@ -26,7 +26,6 @@
+ #include <vlc_plugin.h>
+ #include <vlc_inhibit.h>
+ #include <assert.h>
+-#include <spawn.h>
+ #include <sys/wait.h>
+ 
+ static int Open (vlc_object_t *);
+@@ -46,7 +45,6 @@ struct vlc_inhibit_sys
+     vlc_thread_t thread;
+     vlc_cond_t update, inactive;
+     vlc_mutex_t lock;
+-    posix_spawnattr_t attr;
+     bool suspend, suspended;
+ };
+ 
+@@ -66,18 +64,6 @@ static int Open (vlc_object_t *obj)
+     vlc_mutex_init (&p_sys->lock);
+     vlc_cond_init (&p_sys->update);
+     vlc_cond_init (&p_sys->inactive);
+-    posix_spawnattr_init (&p_sys->attr);
+-    /* Reset signal handlers to default and clear mask in the child process */
+-    {
+-        sigset_t set;
+-
+-        sigemptyset (&set);
+-        posix_spawnattr_setsigmask (&p_sys->attr, &set);
+-        sigaddset (&set, SIGPIPE);
+-        posix_spawnattr_setsigdefault (&p_sys->attr, &set);
+-        posix_spawnattr_setflags (&p_sys->attr, POSIX_SPAWN_SETSIGDEF
+-                                              | POSIX_SPAWN_SETSIGMASK);
+-    }
+     p_sys->suspend = false;
+     p_sys->suspended = false;
+ 
+@@ -105,7 +91,6 @@ static void Close (vlc_object_t *obj)
+ 
+     vlc_cancel (p_sys->thread);
+     vlc_join (p_sys->thread, NULL);
+-    posix_spawnattr_destroy (&p_sys->attr);
+     vlc_cond_destroy (&p_sys->inactive);
+     vlc_cond_destroy (&p_sys->update);
+     vlc_mutex_destroy (&p_sys->lock);
+@@ -142,26 +127,10 @@ static void *Thread (void *data)
+             vlc_cond_wait (&p_sys->update, &p_sys->lock);
+ 
+         int canc = vlc_savecancel ();
+-        char *argv[4] = {
+-            (char *)"xdg-screensaver",
+-            (char *)(p_sys->suspend ? "suspend" : "resume"),
+-            id,
+-            NULL,
+-        };
+-        pid_t pid;
+ 
+         vlc_mutex_unlock (&p_sys->lock);
+-        if (!posix_spawnp (&pid, "xdg-screensaver", NULL, &p_sys->attr,
+-                           argv, environ))
+-        {
+-            int status;
+ 
+-            msg_Dbg (ih, "started xdg-screensaver (PID = %d)", (int)pid);
+-            /* Wait for command to complete */
+-            while (waitpid (pid, &status, 0) == -1);
+-        }
+-        else/* We don't handle the error, but busy looping would be worse :( */
+-            msg_Warn (ih, "could not start xdg-screensaver");
+        msg_Warn (ih, "could not start xdg-screensaver");
+ 
+         vlc_mutex_lock (&p_sys->lock);
+         p_sys->suspended = p_sys->suspend;
--- a/x11/vlc/patches/patch-modules_misc_inhibit_xscreensaver_c
+++ b/x11/vlc/patches/patch-modules_misc_inhibit_xscreensaver_c
@ -0,0 +1,104 @@
+$OpenBSD: patch-modules_misc_inhibit_xscreensaver_c,v 1.1 2011/11/16 13:33:15 phessler Exp $
+
+Missing posix_spawnp and family.
+
+--- modules/misc/inhibit/xscreensaver.c.orig	Fri Jun 24 18:46:11 2011
+++ modules/misc/inhibit/xscreensaver.c	Fri Jun 24 18:52:22 2011
+@@ -39,7 +39,6 @@
+ #include <sys/wait.h>
+ #include <fcntl.h>
+ #include <signal.h>
+-#include <spawn.h>
+ 
+ /*****************************************************************************
+  * Local prototypes
+@@ -53,13 +52,8 @@ static void Inhibit( vlc_inhibit_t *, bool );
+ struct vlc_inhibit_sys
+ {
+     vlc_timer_t timer;
+-    posix_spawn_file_actions_t actions;
+-    posix_spawnattr_t attr;
+-    int nullfd;
+ };
+ 
+-extern char **environ;
+-
+ /*****************************************************************************
+  * Module descriptor
+  *****************************************************************************/
+@@ -88,21 +82,6 @@ static int Activate( vlc_object_t *p_this )
+     }
+     p_ih->inhibit = Inhibit;
+ 
+-    int fd = vlc_open ("/dev/null", O_WRONLY);
+-    posix_spawn_file_actions_init (&p_sys->actions);
+-    if (fd != -1)
+-    {
+-        posix_spawn_file_actions_adddup2 (&p_sys->actions, fd, 1);
+-        posix_spawn_file_actions_adddup2 (&p_sys->actions, fd, 2);
+-        posix_spawn_file_actions_addclose (&p_sys->actions, fd);
+-    }
+-    p_sys->nullfd = fd;
+-
+-    sigset_t set;
+-    posix_spawnattr_init (&p_sys->attr);
+-    sigemptyset (&set);
+-    posix_spawnattr_setsigmask (&p_sys->attr, &set);
+-   
+     return VLC_SUCCESS;
+ }
+ 
+@@ -115,10 +94,6 @@ static void Deactivate( vlc_object_t *p_this )
+     vlc_inhibit_sys_t *p_sys = p_ih->p_sys;
+ 
+     vlc_timer_destroy( p_sys->timer );
+-    if (p_sys->nullfd != -1)
+-        close (p_sys->nullfd);
+-    posix_spawnattr_destroy (&p_sys->attr);
+-    posix_spawn_file_actions_destroy (&p_sys->actions);
+     free( p_sys );
+ }
+ 
+@@ -131,16 +106,35 @@ static void Inhibit( vlc_inhibit_t *p_ih, bool suspend
+ /*****************************************************************************
+  * Execute: Spawns a process using execv()
+  *****************************************************************************/
+-static void Execute (vlc_inhibit_t *p_ih, const char *const *argv)
+static void Execute (vlc_inhibit_t *p_ih, const char *const *ppsz_args)
+ {
+-    vlc_inhibit_sys_t *p_sys = p_ih->p_sys;
+-    pid_t pid;
+    pid_t pid = fork();
+ 
+-    if (posix_spawnp (&pid, argv[0], &p_sys->actions, &p_sys->attr,
+-                      (char **)argv, environ) == 0)
+    switch( pid )
+     {
+-        while (waitpid (pid, NULL, 0) != pid);
+-    }
+        case 0:     /* we're the child */
+        {
+            sigset_t set;
+            sigemptyset (&set);
+            pthread_sigmask (SIG_SETMASK, &set, NULL);
+
+            /* We don't want output */
+            if( ( freopen( "/dev/null", "w", stdout ) != NULL )
+             && ( freopen( "/dev/null", "w", stderr ) != NULL ) )
+                execv( ppsz_args[0] , (char *const *)ppsz_args );
+            /* If the file we want to execute doesn't exist we exit() */
+            exit( EXIT_FAILURE );
+        }
+        case -1:    /* we're the error */
+            msg_Dbg( p_ih, "Couldn't fork() while launching %s",
+                     ppsz_args[0] );
+            break;
+        default:    /* we're the parent */
+            /* Wait for the child to exit.
+             * We will not deadlock because we ran "/bin/sh &" */
+            while( waitpid( pid, NULL, 0 ) != pid);
+            break;
+     }
+ }
+ 
+ /*****************************************************************************
--- a/x11/vlc/patches/patch-modules_misc_notify_notify_c
+++ b/x11/vlc/patches/patch-modules_misc_notify_notify_c
@ -1,16 +0,0 @@
-$OpenBSD: patch-modules_misc_notify_notify_c,v 1.1 2011/04/21 07:07:26 ajacoutot Exp $
-
-Fix with libnotify>=0.7
-(notify_notification_new has lost its widget argument)
-
--- modules/misc/notify/notify.c.orig	Tue Apr 19 15:29:17 2011
-+++ modules/misc/notify/notify.c	Tue Apr 19 15:29:31 2011
-@@ -309,7 +309,7 @@ static int Notify( vlc_object_t *p_this, const char *p
-     }
- 
-     notification = notify_notification_new( _("Now Playing"),
-                                            psz_temp, NULL, NULL );
-+                                            psz_temp, NULL );
-     notify_notification_set_timeout( notification,
-                                      config_GetInt(p_this, "notify-timeout") );
-     notify_notification_set_urgency( notification, NOTIFY_URGENCY_LOW );
--- a/x11/vlc/patches/patch-projects_mozilla_control_npolibvlc_cpp
+++ b/x11/vlc/patches/patch-projects_mozilla_control_npolibvlc_cpp
@ -1,21 +0,0 @@
-$OpenBSD: patch-projects_mozilla_control_npolibvlc_cpp,v 1.1 2010/06/17 07:42:16 dcoppa Exp $
--- projects/mozilla/control/npolibvlc.cpp.orig	Sun Mar  7 19:38:03 2010
-+++ projects/mozilla/control/npolibvlc.cpp	Sat Jun 12 22:45:02 2010
-@@ -949,7 +949,7 @@ LibvlcPlaylistNPObject::invoke(int index, const NPVari
- void LibvlcPlaylistNPObject::parseOptions(const NPString &nps,
-                                          int *i_options, char*** ppsz_options)
- {
-    if( nps.utf8length )
-+    if( nps.UTF8Length )
-     {
-         char *s = stringValue(nps);
-         char *val = s;
-@@ -961,7 +961,7 @@ void LibvlcPlaylistNPObject::parseOptions(const NPStri
-             {
-                 int nOptions = 0;
- 
-                char *end = val + nps.utf8length;
-+                char *end = val + nps.UTF8Length;
-                 while( val < end )
-                 {
-                     // skip leading blanks
--- a/x11/vlc/patches/patch-projects_mozilla_control_nporuntime_cpp
+++ b/x11/vlc/patches/patch-projects_mozilla_control_nporuntime_cpp
@ -1,18 +0,0 @@
-$OpenBSD: patch-projects_mozilla_control_nporuntime_cpp,v 1.1 2010/06/17 07:42:16 dcoppa Exp $
--- projects/mozilla/control/nporuntime.cpp.orig	Sun Mar  7 19:38:03 2010
-+++ projects/mozilla/control/nporuntime.cpp	Sat Jun 12 22:45:02 2010
-@@ -37,11 +37,11 @@
- 
- char* RuntimeNPObject::stringValue(const NPString &s)
- {
-    NPUTF8 *val = static_cast<NPUTF8*>(malloc((s.utf8length+1) * sizeof(*val)));
-+    NPUTF8 *val = static_cast<NPUTF8*>(malloc((s.UTF8Length+1) * sizeof(*val)));
-     if( val )
-     {
-        strncpy(val, s.utf8characters, s.utf8length);
-        val[s.utf8length] = '\0';
-+        strncpy(val, s.UTF8Characters, s.UTF8Length);
-+        val[s.UTF8Length] = '\0';
-     }
-     return val;
- }
--- a/x11/vlc/patches/patch-projects_mozilla_support_npunix_c
+++ b/x11/vlc/patches/patch-projects_mozilla_support_npunix_c
@ -1,885 +0,0 @@
-$OpenBSD: patch-projects_mozilla_support_npunix_c,v 1.1 2010/06/17 07:42:16 dcoppa Exp $
--- projects/mozilla/support/npunix.c.orig	Sun Mar  7 19:38:03 2010
-+++ projects/mozilla/support/npunix.c	Sat Jun 12 23:34:44 2010
-@@ -1,22 +1,18 @@
- /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-  *
- * Mozilla/Firefox plugin for VLC
- * Copyright (C) 2009, Jean-Paul Saman <jpsaman@videolan.org>
-+ * ***** BEGIN LICENSE BLOCK *****
-+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
-+ * The contents of this file are subject to the Mozilla Public License Version
-+ * 1.1 (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/MPL/
-  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
-  * The Original Code is mozilla.org code.
-  *
-  * The Initial Developer of the Original Code is
-@@ -27,7 +23,19 @@
-  * Contributor(s):
-  *   Stephen Mak <smak@sun.com>
-  *
- */
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either of the GNU General Public License Version 2 or later (the "GPL"),
-+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the MPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the MPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
- 
- /*
-  * npunix.c
-@@ -43,20 +51,12 @@
-  *----------------------------------------------------------------------
-  */
- 
-#include "config.h"
-
- #define XP_UNIX 1
-#define OJI 1
- 
-#include <npapi.h>
-#ifdef HAVE_NPFUNCTIONS_H
-#include <npfunctions.h>
-#else
-#include <npupp.h>
-#endif
-+#include <stdio.h>
-+#include "npapi.h"
-+#include "npfunctions.h"
- 
-#include "../vlcshell.h"
-
- /*
-  * Define PLUGIN_TRACE to have the wrapper functions print
-  * messages to stderr whenever they are called.
-@@ -103,500 +103,226 @@ NPN_Version(int* plugin_major, int* plugin_minor,
- NPError
- NPN_GetValue(NPP instance, NPNVariable variable, void *r_value)
- {
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-    return CallNPN_GetValueProc(gNetscapeFuncs.getvalue,
-                    instance, variable, r_value);
-#else
-     return (*gNetscapeFuncs.getvalue)(instance, variable, r_value);
-#endif
- }
- 
- NPError
- NPN_SetValue(NPP instance, NPPVariable variable, void *value)
- {
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-    return CallNPN_SetValueProc(gNetscapeFuncs.setvalue,
-                    instance, variable, value);
-#else
-     return (*gNetscapeFuncs.setvalue)(instance, variable, value);
-#endif
- }
- 
- NPError
- NPN_GetURL(NPP instance, const char* url, const char* window)
- {
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-    return CallNPN_GetURLProc(gNetscapeFuncs.geturl, instance, url, window);
-#else
-     return (*gNetscapeFuncs.geturl)(instance, url, window);
-#endif
- }
- 
- NPError
- NPN_GetURLNotify(NPP instance, const char* url, const char* window, void* notifyData)
- {
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-    return CallNPN_GetURLNotifyProc(gNetscapeFuncs.geturlnotify, instance, url, window, notifyData);
-#else
-     return (*gNetscapeFuncs.geturlnotify)(instance, url, window, notifyData);
-#endif
- }
- 
- NPError
- NPN_PostURL(NPP instance, const char* url, const char* window,
-          uint32_t len, const char* buf, NPBool file)
- {
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-    return CallNPN_PostURLProc(gNetscapeFuncs.posturl, instance,
-                    url, window, len, buf, file);
-#else
-     return (*gNetscapeFuncs.posturl)(instance, url, window, len, buf, file);
-#endif
- }
- 
- NPError
- NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32_t len,
-                   const char* buf, NPBool file, void* notifyData)
- {
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-    return CallNPN_PostURLNotifyProc(gNetscapeFuncs.posturlnotify,
-            instance, url, window, len, buf, file, notifyData);
-#else
-     return (*gNetscapeFuncs.posturlnotify)(instance, url, window, len, buf, file, notifyData);
-
-#endif
- }
- 
- NPError
- NPN_RequestRead(NPStream* stream, NPByteRange* rangeList)
- {
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-    return CallNPN_RequestReadProc(gNetscapeFuncs.requestread,
-                    stream, rangeList);
-#else
-     return (*gNetscapeFuncs.requestread)(stream, rangeList);
-#endif
- }
- 
- NPError
- NPN_NewStream(NPP instance, NPMIMEType type, const char *window,
-           NPStream** stream_ptr)
- {
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-    return CallNPN_NewStreamProc(gNetscapeFuncs.newstream, instance,
-                    type, window, stream_ptr);
-#else
-     return (*gNetscapeFuncs.newstream)(instance, type, window, stream_ptr);
-#endif
- }
- 
- int32_t
- NPN_Write(NPP instance, NPStream* stream, int32_t len, void* buffer)
- {
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-    return CallNPN_WriteProc(gNetscapeFuncs.write, instance,
-                    stream, len, buffer);
-#else
-     return (*gNetscapeFuncs.write)(instance, stream, len, buffer);
-#endif
- }
- 
- NPError
- NPN_DestroyStream(NPP instance, NPStream* stream, NPError reason)
- {
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-    return CallNPN_DestroyStreamProc(gNetscapeFuncs.destroystream,
-                        instance, stream, reason);
-#else
-     return (*gNetscapeFuncs.destroystream)(instance, stream, reason);
-#endif
- }
- 
- void
- NPN_Status(NPP instance, const char* message)
- {
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-    CallNPN_StatusProc(gNetscapeFuncs.status, instance, message);
-#else
-     (*gNetscapeFuncs.status)(instance, message);
-#endif
- }
- 
- const char*
- NPN_UserAgent(NPP instance)
- {
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-    return CallNPN_UserAgentProc(gNetscapeFuncs.uagent, instance);
-#else
-     return (*gNetscapeFuncs.uagent)(instance);
-#endif
- }
- 
-void *NPN_MemAlloc(uint32_t size)
-+void*
-+NPN_MemAlloc(uint32_t size)
- {
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-    return CallNPN_MemAllocProc(gNetscapeFuncs.memalloc, size);
-#else
-     return (*gNetscapeFuncs.memalloc)(size);
-#endif
- }
- 
- void NPN_MemFree(void* ptr)
- {
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-    CallNPN_MemFreeProc(gNetscapeFuncs.memfree, ptr);
-#else
-     (*gNetscapeFuncs.memfree)(ptr);
-#endif
- }
- 
- uint32_t NPN_MemFlush(uint32_t size)
- {
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-    return CallNPN_MemFlushProc(gNetscapeFuncs.memflush, size);
-#else
-     return (*gNetscapeFuncs.memflush)(size);
-#endif
- }
- 
- void NPN_ReloadPlugins(NPBool reloadPages)
- {
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-    CallNPN_ReloadPluginsProc(gNetscapeFuncs.reloadplugins, reloadPages);
-#else
-     (*gNetscapeFuncs.reloadplugins)(reloadPages);
-#endif
- }
- 
-#ifdef OJI
-JRIEnv* NPN_GetJavaEnv()
-{
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-    return CallNPN_GetJavaEnvProc(gNetscapeFuncs.getJavaEnv);
-#else
-    return (*gNetscapeFuncs.getJavaEnv);
-#endif
-}
-
-jref NPN_GetJavaPeer(NPP instance)
-{
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-    return CallNPN_GetJavaPeerProc(gNetscapeFuncs.getJavaPeer,
-                       instance);
-#else
-    return (*gNetscapeFuncs.getJavaPeer)(instance);
-#endif
-}
-#endif
-
- void
- NPN_InvalidateRect(NPP instance, NPRect *invalidRect)
- {
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-    CallNPN_InvalidateRectProc(gNetscapeFuncs.invalidaterect, instance,
-        invalidRect);
-#else
-     (*gNetscapeFuncs.invalidaterect)(instance, invalidRect);
-#endif
- }
- 
- void
- NPN_InvalidateRegion(NPP instance, NPRegion invalidRegion)
- {
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-    CallNPN_InvalidateRegionProc(gNetscapeFuncs.invalidateregion, instance,
-        invalidRegion);
-#else
-     (*gNetscapeFuncs.invalidateregion)(instance, invalidRegion);
-#endif
- }
- 
- void
- NPN_ForceRedraw(NPP instance)
- {
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-    CallNPN_ForceRedrawProc(gNetscapeFuncs.forceredraw, instance);
-#else
-     (*gNetscapeFuncs.forceredraw)(instance);
-#endif
- }
- 
- void NPN_PushPopupsEnabledState(NPP instance, NPBool enabled)
- {
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-    CallNPN_PushPopupsEnabledStateProc(gNetscapeFuncs.pushpopupsenabledstate,
-        instance, enabled);
-#else
-     (*gNetscapeFuncs.pushpopupsenabledstate)(instance, enabled);
-#endif
- }
- 
- void NPN_PopPopupsEnabledState(NPP instance)
- {
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-    CallNPN_PopPopupsEnabledStateProc(gNetscapeFuncs.poppopupsenabledstate,
-        instance);
-#else
-     (*gNetscapeFuncs.poppopupsenabledstate)(instance);
-#endif
- }
- 
- NPIdentifier NPN_GetStringIdentifier(const NPUTF8 *name)
- {
-    int minor = gNetscapeFuncs.version & 0xFF;
-    if( minor >= 14 )
-    {
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-        return CallNPN_GetStringIdentifierProc(
-                        gNetscapeFuncs.getstringidentifier, name);
-#else
-        return (*gNetscapeFuncs.getstringidentifier)(name);
-#endif
-    }
-    return NULL;
-+    return (*gNetscapeFuncs.getstringidentifier)(name);
- }
- 
- void NPN_GetStringIdentifiers(const NPUTF8 **names, int32_t nameCount,
-                               NPIdentifier *identifiers)
- {
-    int minor = gNetscapeFuncs.version & 0xFF;
-    if( minor >= 14 )
-    {
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-        CallNPN_GetStringIdentifiersProc(gNetscapeFuncs.getstringidentifiers,
-                                         names, nameCount, identifiers);
-#else
-        (*gNetscapeFuncs.getstringidentifiers)(names, nameCount, identifiers);
-#endif
-    }
-+    (*gNetscapeFuncs.getstringidentifiers)(names, nameCount, identifiers);
- }
- 
- NPIdentifier NPN_GetIntIdentifier(int32_t intid)
- {
-    int minor = gNetscapeFuncs.version & 0xFF;
-    if( minor >= 14 )
-    {
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-        return CallNPN_GetIntIdentifierProc(gNetscapeFuncs.getintidentifier, intid);
-#else
-        return (*gNetscapeFuncs.getintidentifier)(intid);
-#endif
-    }
-    return NULL;
-+    return (*gNetscapeFuncs.getintidentifier)(intid);
- }
- 
- bool NPN_IdentifierIsString(NPIdentifier identifier)
- {
-    int minor = gNetscapeFuncs.version & 0xFF;
-    if( minor >= 14 )
-    {
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-        return CallNPN_IdentifierIsStringProc(
-                        gNetscapeFuncs.identifierisstring,
-                        identifier);
-#else
-        return (*gNetscapeFuncs.identifierisstring)(identifier);
-#endif
-    }
-    return false;
-+    return (*gNetscapeFuncs.identifierisstring)(identifier);
- }
- 
- NPUTF8 *NPN_UTF8FromIdentifier(NPIdentifier identifier)
- {
-    int minor = gNetscapeFuncs.version & 0xFF;
-    if( minor >= 14 )
-    {
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-        return CallNPN_UTF8FromIdentifierProc(
-                            gNetscapeFuncs.utf8fromidentifier,
-                            identifier);
-#else
-        return (*gNetscapeFuncs.utf8fromidentifier)(identifier);
-#endif
-    }
-    return NULL;
-+    return (*gNetscapeFuncs.utf8fromidentifier)(identifier);
- }
- 
- int32_t NPN_IntFromIdentifier(NPIdentifier identifier)
- {
-    int minor = gNetscapeFuncs.version & 0xFF;
-    if( minor >= 14 )
-    {
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-        return CallNPN_IntFromIdentifierProc(
-                        gNetscapeFuncs.intfromidentifier,
-                        identifier);
-#else
-        return (*gNetscapeFuncs.intfromidentifier)(identifier);
-#endif
-    }
-    return 0;
-+    return (*gNetscapeFuncs.intfromidentifier)(identifier);
- }
- 
- NPObject *NPN_CreateObject(NPP npp, NPClass *aClass)
- {
-    int minor = gNetscapeFuncs.version & 0xFF;
-    if( minor >= 14 )
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-        return CallNPN_CreateObjectProc(gNetscapeFuncs.createobject, npp, aClass);
-#else
-        return (*gNetscapeFuncs.createobject)(npp, aClass);
-#endif
-    return NULL;
-+    return (*gNetscapeFuncs.createobject)(npp, aClass);
- }
- 
- NPObject *NPN_RetainObject(NPObject *obj)
- {
-    int minor = gNetscapeFuncs.version & 0xFF;
-    if( minor >= 14 )
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-        return CallNPN_RetainObjectProc(gNetscapeFuncs.retainobject, obj);
-#else
-        return (*gNetscapeFuncs.retainobject)(obj);
-#endif
-    return NULL;
-+    return (*gNetscapeFuncs.retainobject)(obj);
- }
- 
- void NPN_ReleaseObject(NPObject *obj)
- {
-    int minor = gNetscapeFuncs.version & 0xFF;
-    if( minor >= 14 )
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-        CallNPN_ReleaseObjectProc(gNetscapeFuncs.releaseobject, obj);
-#else
-        (*gNetscapeFuncs.releaseobject)(obj);
-#endif
-+    (*gNetscapeFuncs.releaseobject)(obj);
- }
- 
- bool NPN_Invoke(NPP npp, NPObject* obj, NPIdentifier methodName,
-                 const NPVariant *args, uint32_t argCount, NPVariant *result)
- {
-    int minor = gNetscapeFuncs.version & 0xFF;
-    if( minor >= 14 )
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-        return CallNPN_InvokeProc(gNetscapeFuncs.invoke, npp, obj, methodName,
-                                  args, argCount, result);
-#else
-        return (*gNetscapeFuncs.invoke)(npp, obj, methodName, args, argCount, result);
-#endif
-    return false;
-+    return (*gNetscapeFuncs.invoke)(npp, obj, methodName, args, argCount, result);
- }
- 
- bool NPN_InvokeDefault(NPP npp, NPObject* obj, const NPVariant *args,
-                        uint32_t argCount, NPVariant *result)
- {
-    int minor = gNetscapeFuncs.version & 0xFF;
-    if( minor >= 14 )
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-        return CallNPN_InvokeDefaultProc(gNetscapeFuncs.invokeDefault, npp, obj,
-                                         args, argCount, result);
-#else
-        return (*gNetscapeFuncs.invokeDefault)(npp, obj, args, argCount, result);
-#endif
-    return false;
-+    return (*gNetscapeFuncs.invokeDefault)(npp, obj, args, argCount, result);
- }
- 
- bool NPN_Evaluate(NPP npp, NPObject* obj, NPString *script,
-                   NPVariant *result)
- {
-    int minor = gNetscapeFuncs.version & 0xFF;
-    if( minor >= 14 )
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-        return CallNPN_EvaluateProc(gNetscapeFuncs.evaluate, npp, obj,
-                                    script, result);
-#else
-        return (*gNetscapeFuncs.evaluate)(npp, obj, script, result);
-#endif
-    return false;
-+    return (*gNetscapeFuncs.evaluate)(npp, obj, script, result);
- }
- 
- bool NPN_GetProperty(NPP npp, NPObject* obj, NPIdentifier propertyName,
-                      NPVariant *result)
- {
-    int minor = gNetscapeFuncs.version & 0xFF;
-    if( minor >= 14 )
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-        return CallNPN_GetPropertyProc(gNetscapeFuncs.getproperty, npp, obj,
-                                       propertyName, result);
-#else
-        return (*gNetscapeFuncs.getproperty)(npp, obj, propertyName, result);
-#endif
-    return false;
-+    return (*gNetscapeFuncs.getproperty)(npp, obj, propertyName, result);
- }
- 
- bool NPN_SetProperty(NPP npp, NPObject* obj, NPIdentifier propertyName,
-                      const NPVariant *value)
- {
-    int minor = gNetscapeFuncs.version & 0xFF;
-    if( minor >= 14 )
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-        return CallNPN_SetPropertyProc(gNetscapeFuncs.setproperty, npp, obj,
-                                       propertyName, value);
-#else
-        return (*gNetscapeFuncs.setproperty)(npp, obj, propertyName, value);
-#endif
-    return false;
-+    return (*gNetscapeFuncs.setproperty)(npp, obj, propertyName, value);
- }
- 
- bool NPN_RemoveProperty(NPP npp, NPObject* obj, NPIdentifier propertyName)
- {
-    int minor = gNetscapeFuncs.version & 0xFF;
-    if( minor >= 14 )
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-        return CallNPN_RemovePropertyProc(gNetscapeFuncs.removeproperty, npp, obj,
-                                          propertyName);
-#else
-        return (*gNetscapeFuncs.removeproperty)(npp, obj, propertyName);
-#endif
-    return false;
-+    return (*gNetscapeFuncs.removeproperty)(npp, obj, propertyName);
- }
- 
- bool NPN_HasProperty(NPP npp, NPObject* obj, NPIdentifier propertyName)
- {
-    int minor = gNetscapeFuncs.version & 0xFF;
-    if( minor >= 14 )
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-        return CallNPN_HasPropertyProc(gNetscapeFuncs.hasproperty, npp, obj,
-                                       propertyName);
-#else
-        return (*gNetscapeFuncs.hasproperty)(npp, obj, propertyName);
-#endif
-    return false;
-+    return (*gNetscapeFuncs.hasproperty)(npp, obj, propertyName);
- }
- 
- bool NPN_HasMethod(NPP npp, NPObject* obj, NPIdentifier methodName)
- {
-    int minor = gNetscapeFuncs.version & 0xFF;
-    if( minor >= 14 )
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-        return CallNPN_HasMethodProc(gNetscapeFuncs.hasmethod, npp,
-                                     obj, methodName);
-#else
-        return (*gNetscapeFuncs.hasmethod)(npp, obj, methodName);
-#endif
-    return false;
-+    return (*gNetscapeFuncs.hasmethod)(npp, obj, methodName);
- }
- 
- void NPN_ReleaseVariantValue(NPVariant *variant)
- {
-    int minor = gNetscapeFuncs.version & 0xFF;
-    if( minor >= 14 )
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-        CallNPN_ReleaseVariantValueProc(gNetscapeFuncs.releasevariantvalue, variant);
-#else
-        (*gNetscapeFuncs.releasevariantvalue)(variant);
-#endif
-+    (*gNetscapeFuncs.releasevariantvalue)(variant);
- }
- 
- void NPN_SetException(NPObject* obj, const NPUTF8 *message)
- {
-    int minor = gNetscapeFuncs.version & 0xFF;
-    if( minor >= 14 )
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-        CallNPN_SetExceptionProc(gNetscapeFuncs.setexception, obj, message);
-#else
-        (*gNetscapeFuncs.setexception)(obj, message);
-#endif
-+    (*gNetscapeFuncs.setexception)(obj, message);
- }
- 
- /***********************************************************************
-@@ -610,28 +336,6 @@ void NPN_SetException(NPObject* obj, const NPUTF8 *mes
-  *
-  ***********************************************************************/
- 
-/* Function prototypes */
-NPError Private_New(NPMIMEType pluginType, NPP instance, uint16_t mode,
-        int16_t argc, char* argn[], char* argv[], NPSavedData* saved);
-NPError Private_Destroy(NPP instance, NPSavedData** save);
-NPError Private_SetWindow(NPP instance, NPWindow* window);
-NPError Private_NewStream(NPP instance, NPMIMEType type, NPStream* stream,
-                          NPBool seekable, uint16_t* stype);
-int32_t Private_WriteReady(NPP instance, NPStream* stream);
-int32_t Private_Write(NPP instance, NPStream* stream, int32_t offset,
-                    int32_t len, void* buffer);
-void Private_StreamAsFile(NPP instance, NPStream* stream, const char* fname);
-NPError Private_DestroyStream(NPP instance, NPStream* stream, NPError reason);
-void Private_URLNotify(NPP instance, const char* url,
-                       NPReason reason, void* notifyData);
-void Private_Print(NPP instance, NPPrint* platformPrint);
-NPError Private_GetValue(NPP instance, NPPVariable variable, void *r_value);
-NPError Private_SetValue(NPP instance, NPPVariable variable, void *r_value);
-#ifdef OJI
-JRIGlobalRef Private_GetJavaClass(void);
-#endif
-
-/* function implementations */
- NPError
- Private_New(NPMIMEType pluginType, NPP instance, uint16_t mode,
-         int16_t argc, char* argn[], char* argv[], NPSavedData* saved)
-@@ -719,33 +423,6 @@ Private_Print(NPP instance, NPPrint* platformPrint)
-     NPP_Print(instance, platformPrint);
- }
- 
-NPError
-Private_GetValue(NPP instance, NPPVariable variable, void *r_value)
-{
-    PLUGINDEBUGSTR("GetValue");
-    return NPP_GetValue(instance, variable, r_value);
-}
-
-NPError
-Private_SetValue(NPP instance, NPPVariable variable, void *r_value)
-{
-    PLUGINDEBUGSTR("SetValue");
-    return NPP_SetValue(instance, variable, r_value);
-}
-
-#ifdef OJI
-JRIGlobalRef
-Private_GetJavaClass(void)
-{
-    jref clazz = NPP_GetJavaClass();
-    if (clazz) {
-    JRIEnv* env = NPN_GetJavaEnv();
-    return JRI_NewGlobalRef(env, clazz);
-    }
-    return NULL;
-}
-#endif
-
- /*********************************************************************** 
-  *
-  * These functions are located automagically by netscape.
-@@ -753,6 +430,17 @@ Private_GetJavaClass(void)
-  ***********************************************************************/
- 
- /*
-+ * NP_GetPluginVersion [optional]
-+ *  - The browser uses the return value to indicate to the user what version of
-+ *    this plugin is installed.
-+ */
-+char *
-+NP_GetPluginVersion(void)
-+{
-+    return "1.0.0.15";
-+}
-+
-+/*
-  * NP_GetMIMEDescription
-  *  - Netscape needs to know about this symbol
-  *  - Netscape uses the return value to identify when an object instance
-@@ -830,12 +518,11 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs*
-          * the whole structure, because the Netscape function table
-          * could actually be bigger than what we expect.
-          */
-        int minor = nsTable->version & 0xFF;
-
-         gNetscapeFuncs.version       = nsTable->version;
-         gNetscapeFuncs.size          = nsTable->size;
-         gNetscapeFuncs.posturl       = nsTable->posturl;
-         gNetscapeFuncs.geturl        = nsTable->geturl;
-+        gNetscapeFuncs.geturlnotify  = nsTable->geturlnotify;
-         gNetscapeFuncs.requestread   = nsTable->requestread;
-         gNetscapeFuncs.newstream     = nsTable->newstream;
-         gNetscapeFuncs.write         = nsTable->write;
-@@ -846,85 +533,69 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs*
-         gNetscapeFuncs.memfree       = nsTable->memfree;
-         gNetscapeFuncs.memflush      = nsTable->memflush;
-         gNetscapeFuncs.reloadplugins = nsTable->reloadplugins;
-#ifdef OJI
-        if( minor >= NPVERS_HAS_LIVECONNECT )
-        {
-            gNetscapeFuncs.getJavaEnv    = nsTable->getJavaEnv;
-            gNetscapeFuncs.getJavaPeer   = nsTable->getJavaPeer;
-        }
-#endif
-         gNetscapeFuncs.getvalue      = nsTable->getvalue;
-         gNetscapeFuncs.setvalue      = nsTable->setvalue;
-+        gNetscapeFuncs.posturlnotify = nsTable->posturlnotify;
- 
-        if( minor >= NPVERS_HAS_NOTIFICATION )
-        {
-            gNetscapeFuncs.geturlnotify  = nsTable->geturlnotify;
-            gNetscapeFuncs.posturlnotify = nsTable->posturlnotify;
-        }
-
-         if (nsTable->size >= ((char *)&nsTable->setexception - (char *)nsTable))
-         {
-            gNetscapeFuncs.invalidaterect = nsTable->invalidaterect;
-            gNetscapeFuncs.invalidateregion = nsTable->invalidateregion;
-            gNetscapeFuncs.forceredraw = nsTable->forceredraw;
-            /* npruntime support */
-            if (minor >= 14)
-            {
-                gNetscapeFuncs.getstringidentifier = nsTable->getstringidentifier;
-                gNetscapeFuncs.getstringidentifiers = nsTable->getstringidentifiers;
-                gNetscapeFuncs.getintidentifier = nsTable->getintidentifier;
-                gNetscapeFuncs.identifierisstring = nsTable->identifierisstring;
-                gNetscapeFuncs.utf8fromidentifier = nsTable->utf8fromidentifier;
-                gNetscapeFuncs.intfromidentifier = nsTable->intfromidentifier;
-                gNetscapeFuncs.createobject = nsTable->createobject;
-                gNetscapeFuncs.retainobject = nsTable->retainobject;
-                gNetscapeFuncs.releaseobject = nsTable->releaseobject;
-                gNetscapeFuncs.invoke = nsTable->invoke;
-                gNetscapeFuncs.invokeDefault = nsTable->invokeDefault;
-                gNetscapeFuncs.evaluate = nsTable->evaluate;
-                gNetscapeFuncs.getproperty = nsTable->getproperty;
-                gNetscapeFuncs.setproperty = nsTable->setproperty;
-                gNetscapeFuncs.removeproperty = nsTable->removeproperty;
-                gNetscapeFuncs.hasproperty = nsTable->hasproperty;
-                gNetscapeFuncs.hasmethod = nsTable->hasmethod;
-                gNetscapeFuncs.releasevariantvalue = nsTable->releasevariantvalue;
-                gNetscapeFuncs.setexception = nsTable->setexception;
-            }
-+          gNetscapeFuncs.invalidaterect = nsTable->invalidaterect;
-+          gNetscapeFuncs.invalidateregion = nsTable->invalidateregion;
-+          gNetscapeFuncs.forceredraw = nsTable->forceredraw;
-+          gNetscapeFuncs.getstringidentifier = nsTable->getstringidentifier;
-+          gNetscapeFuncs.getstringidentifiers = nsTable->getstringidentifiers;
-+          gNetscapeFuncs.getintidentifier = nsTable->getintidentifier;
-+          gNetscapeFuncs.identifierisstring = nsTable->identifierisstring;
-+          gNetscapeFuncs.utf8fromidentifier = nsTable->utf8fromidentifier;
-+          gNetscapeFuncs.intfromidentifier = nsTable->intfromidentifier;
-+          gNetscapeFuncs.createobject = nsTable->createobject;
-+          gNetscapeFuncs.retainobject = nsTable->retainobject;
-+          gNetscapeFuncs.releaseobject = nsTable->releaseobject;
-+          gNetscapeFuncs.invoke = nsTable->invoke;
-+          gNetscapeFuncs.invokeDefault = nsTable->invokeDefault;
-+          gNetscapeFuncs.evaluate = nsTable->evaluate;
-+          gNetscapeFuncs.getproperty = nsTable->getproperty;
-+          gNetscapeFuncs.setproperty = nsTable->setproperty;
-+          gNetscapeFuncs.removeproperty = nsTable->removeproperty;
-+          gNetscapeFuncs.hasproperty = nsTable->hasproperty;
-+          gNetscapeFuncs.hasmethod = nsTable->hasmethod;
-+          gNetscapeFuncs.releasevariantvalue = nsTable->releasevariantvalue;
-+          gNetscapeFuncs.setexception = nsTable->setexception;
-         }
-         else
-         {
-            gNetscapeFuncs.invalidaterect = NULL;
-            gNetscapeFuncs.invalidateregion = NULL;
-            gNetscapeFuncs.forceredraw = NULL;
-            gNetscapeFuncs.getstringidentifier = NULL;
-            gNetscapeFuncs.getstringidentifiers = NULL;
-            gNetscapeFuncs.getintidentifier = NULL;
-            gNetscapeFuncs.identifierisstring = NULL;
-            gNetscapeFuncs.utf8fromidentifier = NULL;
-            gNetscapeFuncs.intfromidentifier = NULL;
-            gNetscapeFuncs.createobject = NULL;
-            gNetscapeFuncs.retainobject = NULL;
-            gNetscapeFuncs.releaseobject = NULL;
-            gNetscapeFuncs.invoke = NULL;
-            gNetscapeFuncs.invokeDefault = NULL;
-            gNetscapeFuncs.evaluate = NULL;
-            gNetscapeFuncs.getproperty = NULL;
-            gNetscapeFuncs.setproperty = NULL;
-            gNetscapeFuncs.removeproperty = NULL;
-            gNetscapeFuncs.hasproperty = NULL;
-            gNetscapeFuncs.releasevariantvalue = NULL;
-            gNetscapeFuncs.setexception = NULL;
-+          gNetscapeFuncs.invalidaterect = NULL;
-+          gNetscapeFuncs.invalidateregion = NULL;
-+          gNetscapeFuncs.forceredraw = NULL;
-+          gNetscapeFuncs.getstringidentifier = NULL;
-+          gNetscapeFuncs.getstringidentifiers = NULL;
-+          gNetscapeFuncs.getintidentifier = NULL;
-+          gNetscapeFuncs.identifierisstring = NULL;
-+          gNetscapeFuncs.utf8fromidentifier = NULL;
-+          gNetscapeFuncs.intfromidentifier = NULL;
-+          gNetscapeFuncs.createobject = NULL;
-+          gNetscapeFuncs.retainobject = NULL;
-+          gNetscapeFuncs.releaseobject = NULL;
-+          gNetscapeFuncs.invoke = NULL;
-+          gNetscapeFuncs.invokeDefault = NULL;
-+          gNetscapeFuncs.evaluate = NULL;
-+          gNetscapeFuncs.getproperty = NULL;
-+          gNetscapeFuncs.setproperty = NULL;
-+          gNetscapeFuncs.removeproperty = NULL;
-+          gNetscapeFuncs.hasproperty = NULL;
-+          gNetscapeFuncs.releasevariantvalue = NULL;
-+          gNetscapeFuncs.setexception = NULL;
-         }
-         if (nsTable->size >=
-             ((char *)&nsTable->poppopupsenabledstate - (char *)nsTable))
-         {
-            gNetscapeFuncs.pushpopupsenabledstate = nsTable->pushpopupsenabledstate;
-            gNetscapeFuncs.poppopupsenabledstate  = nsTable->poppopupsenabledstate;
-+          gNetscapeFuncs.pushpopupsenabledstate = nsTable->pushpopupsenabledstate;
-+          gNetscapeFuncs.poppopupsenabledstate  = nsTable->poppopupsenabledstate;
-         }
-         else
-         {
-            gNetscapeFuncs.pushpopupsenabledstate = NULL;
-            gNetscapeFuncs.poppopupsenabledstate  = NULL;
-+          gNetscapeFuncs.pushpopupsenabledstate = NULL;
-+          gNetscapeFuncs.poppopupsenabledstate  = NULL;
-         }
- 
-         /*
-@@ -935,19 +606,6 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs*
-          */
-         pluginFuncs->version    = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR;
-         pluginFuncs->size       = sizeof(NPPluginFuncs);
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-        pluginFuncs->newp       = NewNPP_NewProc(Private_New);
-        pluginFuncs->destroy    = NewNPP_DestroyProc(Private_Destroy);
-        pluginFuncs->setwindow  = NewNPP_SetWindowProc(Private_SetWindow);
-        pluginFuncs->newstream  = NewNPP_NewStreamProc(Private_NewStream);
-        pluginFuncs->destroystream = NewNPP_DestroyStreamProc(Private_DestroyStream);
-        pluginFuncs->asfile     = NewNPP_StreamAsFileProc(Private_StreamAsFile);
-        pluginFuncs->writeready = NewNPP_WriteReadyProc(Private_WriteReady);
-        pluginFuncs->write      = NewNPP_WriteProc(Private_Write);
-        pluginFuncs->print      = NewNPP_PrintProc(Private_Print);
-        pluginFuncs->getvalue   = NewNPP_GetValueProc(Private_GetValue);
-        pluginFuncs->setvalue   = NewNPP_SetValueProc(Private_SetValue);
-#else
-         pluginFuncs->newp       = (NPP_NewProcPtr)(Private_New);
-         pluginFuncs->destroy    = (NPP_DestroyProcPtr)(Private_Destroy);
-         pluginFuncs->setwindow  = (NPP_SetWindowProcPtr)(Private_SetWindow);
-@@ -957,26 +615,13 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs*
-         pluginFuncs->writeready = (NPP_WriteReadyProcPtr)(Private_WriteReady);
-         pluginFuncs->write      = (NPP_WriteProcPtr)(Private_Write);
-         pluginFuncs->print      = (NPP_PrintProcPtr)(Private_Print);
-        pluginFuncs->getvalue   = (NPP_GetValueProcPtr)(Private_GetValue);
-        pluginFuncs->setvalue   = (NPP_SetValueProcPtr)(Private_SetValue);
-#endif
-+        pluginFuncs->urlnotify  = (NPP_URLNotifyProcPtr)(Private_URLNotify);
-         pluginFuncs->event      = NULL;
-        if( minor >= NPVERS_HAS_NOTIFICATION )
-        {
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
-            pluginFuncs->urlnotify = NewNPP_URLNotifyProc(Private_URLNotify);
-#else
-            pluginFuncs->urlnotify = (NPP_URLNotifyProcPtr)(Private_URLNotify);
-#endif
-        }
-#ifdef OJI
-        if( minor >= NPVERS_HAS_LIVECONNECT )
-            pluginFuncs->javaClass  = Private_GetJavaClass();
-        else
-            pluginFuncs->javaClass = NULL;
-#else
-        pluginFuncs->javaClass = NULL;
-#endif
-+        pluginFuncs->javaClass  = NULL;
-+
-+        // This function is supposedly loaded magically, but that doesn't
-+        // seem to be true.
-+        pluginFuncs->getvalue   = (NPP_GetValueProcPtr)(NP_GetValue);
- 
-         err = NPP_Initialize();
-     }
--- a/x11/vlc/patches/patch-projects_mozilla_vlcplugin_cpp
+++ b/x11/vlc/patches/patch-projects_mozilla_vlcplugin_cpp
@ -1,37 +0,0 @@
-$OpenBSD: patch-projects_mozilla_vlcplugin_cpp,v 1.1 2010/06/17 07:42:16 dcoppa Exp $
--- projects/mozilla/vlcplugin.cpp.orig	Sun Mar  7 19:38:03 2010
-+++ projects/mozilla/vlcplugin.cpp	Sat Jun 12 22:45:02 2010
-@@ -35,6 +35,7 @@
- #include "vlcplugin.h"
- #include "control/npolibvlc.h"
- 
-+#include <cstdlib>
- #include <ctype.h>
- 
- /*****************************************************************************
-@@ -227,8 +228,8 @@ NPError VlcPlugin::init(int argc, char* const argn[], 
-         NPString script;
-         NPVariant result;
- 
-        script.utf8characters = docLocHref;
-        script.utf8length = sizeof(docLocHref)-1;
-+        script.UTF8Characters = docLocHref;
-+        script.UTF8Length = sizeof(docLocHref)-1;
- 
-         if( NPN_Evaluate(p_browser, plugin, &script, &result) )
-         {
-@@ -236,11 +237,11 @@ NPError VlcPlugin::init(int argc, char* const argn[], 
-             {
-                 NPString &location = NPVARIANT_TO_STRING(result);
- 
-                psz_baseURL = (char *) malloc(location.utf8length+1);
-+                psz_baseURL = (char *) malloc(location.UTF8Length+1);
-                 if( psz_baseURL )
-                 {
-                    strncpy(psz_baseURL, location.utf8characters, location.utf8length);
-                    psz_baseURL[location.utf8length] = '\0';
-+                    strncpy(psz_baseURL, location.UTF8Characters, location.UTF8Length);
-+                    psz_baseURL[location.UTF8Length] = '\0';
-                 }
-             }
-             NPN_ReleaseVariantValue(&result);
--- a/x11/vlc/patches/patch-projects_mozilla_vlcplugin_h
+++ b/x11/vlc/patches/patch-projects_mozilla_vlcplugin_h
@ -1,12 +0,0 @@
-$OpenBSD: patch-projects_mozilla_vlcplugin_h,v 1.1 2010/06/17 07:42:16 dcoppa Exp $
--- projects/mozilla/vlcplugin.h.orig	Sun Mar  7 19:38:03 2010
-+++ projects/mozilla/vlcplugin.h	Sat Jun 12 22:45:02 2010
-@@ -30,6 +30,8 @@
- #define __VLCPLUGIN_H__
- 
- #include <vlc/vlc.h>
-+#include <nspr/prtypes.h>
-+#include <nspr/obsolete/protypes.h>
- #include <npapi.h>
- #include "control/nporuntime.h"
- 
--- a/x11/vlc/patches/patch-projects_mozilla_vlcshell_cpp
+++ b/x11/vlc/patches/patch-projects_mozilla_vlcshell_cpp
@ -1,15 +0,0 @@
-$OpenBSD: patch-projects_mozilla_vlcshell_cpp,v 1.1 2010/06/17 07:42:16 dcoppa Exp $
--- projects/mozilla/vlcshell.cpp.orig	Sun Mar  7 19:38:03 2010
-+++ projects/mozilla/vlcshell.cpp	Sat Jun 12 22:52:27 2010
-@@ -265,11 +265,6 @@ NPError NPP_Initialize( void )
-     return NPERR_NO_ERROR;
- }
- 
-jref NPP_GetJavaClass( void )
-{
-    return NULL;
-}
-
- void NPP_Shutdown( void )
- {
-     ;
--- a/x11/vlc/patches/patch-projects_mozilla_vlcshell_h
+++ b/x11/vlc/patches/patch-projects_mozilla_vlcshell_h
@ -1,11 +0,0 @@
-$OpenBSD: patch-projects_mozilla_vlcshell_h,v 1.1 2010/06/17 07:42:16 dcoppa Exp $
--- projects/mozilla/vlcshell.h.orig	Sun Mar  7 19:38:03 2010
-+++ projects/mozilla/vlcshell.h	Sat Jun 12 22:52:43 2010
-@@ -27,7 +27,6 @@
- char * NPP_GetMIMEDescription( void );
- 
- NPError NPP_Initialize( void );
-jref NPP_GetJavaClass( void );
- void NPP_Shutdown( void );
- 
- NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
--- a/x11/vlc/patches/patch-share_Makefile_in
+++ b/x11/vlc/patches/patch-share_Makefile_in
@ -1,11 +1,14 @@
-$OpenBSD: patch-share_Makefile_in,v 1.8 2010/05/05 08:43:35 edd Exp $
--- share/Makefile.in.orig	Wed Apr 21 12:31:40 2010
-+++ share/Makefile.in	Fri Apr 23 16:55:32 2010
-@@ -1262,7 +1262,6 @@ uninstall-am: uninstall-dist_vlcdataDATA \
+$OpenBSD: patch-share_Makefile_in,v 1.9 2011/11/16 13:33:16 phessler Exp $
+--- share/Makefile.in.orig	Thu Oct  6 20:05:00 2011
+++ share/Makefile.in	Sun Nov 13 11:53:42 2011
+@@ -1406,10 +1406,6 @@ uninstall-am: uninstall-dist_appdataDATA uninstall-dis
 
 skins2/default.vlt: $(skins2_default_vlt_FILES)
 	mkdir -p skins2
-	tar cvvzf skins2/default.vlt --exclude .svn -C $(srcdir)/skins2 default/
+-	(cd "$(srcdir)/skins2"; find default -print0 | \
+-		LC_ALL=C sort -z | \
+-		tar cvv --exclude .svn --no-recursion --null -T -) | \
+-	gzip -n > skins2/default.vlt
 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
+ .lua.luac:
+ 	$(AM_V_at)for f in $(EXTRA_DIST); do \
--- a/x11/vlc/patches/patch-src_extras_tdestroy_c
+++ b/x11/vlc/patches/patch-src_extras_tdestroy_c
@ -0,0 +1,13 @@
+$OpenBSD: patch-src_extras_tdestroy_c,v 1.1 2011/11/16 13:33:16 phessler Exp $
+--- src/extras/tdestroy.c.orig	Tue Apr 13 02:22:28 2010
+++ src/extras/tdestroy.c	Sat Nov 12 21:06:10 2011
+@@ -102,8 +102,7 @@ void vlc_tdestroy (void *root, void (*freenode) (void 
+     for (size_t i = 0; i < count; i++)
+     {
+          smallest.node = tab[i];
+-         if (tdelete (smallest.node, &root, cmp_smallest) == NULL)
+-             abort ();
+         tdelete (smallest.node, &root, cmp_smallest);
+     }
+     vlc_mutex_unlock (&smallest.lock);
+     assert (root == NULL);
--- a/x11/vlc/patches/patch-src_libvlc_c
+++ b/x11/vlc/patches/patch-src_libvlc_c
@ -1,29 +0,0 @@
-$OpenBSD: patch-src_libvlc_c,v 1.2 2010/06/17 07:42:16 dcoppa Exp $
--- src/libvlc.c.orig	Sun Mar  7 19:38:03 2010
-+++ src/libvlc.c	Wed May 26 16:42:36 2010
-@@ -906,21 +906,25 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i
-              && config_GetInt( p_libvlc, "started-from-file" ) ) )
-         libvlc_InternalAddIntf( p_libvlc, "dbus,none" );
- 
-+#if 0
-     /* Prevents the power management daemon from suspending the system
-      * when VLC is active */
-     if( config_GetInt( p_libvlc, "inhibit" ) > 0 )
-         libvlc_InternalAddIntf( p_libvlc, "inhibit,none" );
- #endif
-+#endif
- 
-     /*
-      * If needed, load the Xscreensaver interface
-      * Currently, only for X
-      */
- #ifdef HAVE_X11_XLIB_H
-+#if 0
-     if( config_GetInt( p_libvlc, "disable-screensaver" ) )
-     {
-         libvlc_InternalAddIntf( p_libvlc, "screensaver,none" );
-     }
-+#endif
- #endif
- 
-     if( (config_GetInt( p_libvlc, "file-logging" ) > 0) &&
--- a/x11/vlc/patches/patch-src_video_output_video_output_c
+++ b/x11/vlc/patches/patch-src_video_output_video_output_c
@ -1,15 +0,0 @@
-$OpenBSD: patch-src_video_output_video_output_c,v 1.1 2011/03/25 01:07:00 sthen Exp $
-
-Consider too large width/height as invalid. CVE-2010-3275, CVE-2010-3276
-
--- src/video_output/video_output.c.orig	Thu Mar 24 19:05:48 2011
-+++ src/video_output/video_output.c	Thu Mar 24 19:06:23 2011
-@@ -310,7 +310,7 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent,
-     char *psz_parser;
-     char *psz_name;
- 
-    if( i_width <= 0 || i_height <= 0 || i_aspect <= 0 )
-+    if( i_width <= 0 || i_height <= 0 || i_aspect <= 0 || i_width > 8192 || i_height > 8192 )
-         return NULL;
- 
-     vlc_ureduce( &p_fmt->i_sar_num, &p_fmt->i_sar_den,
--- a/x11/vlc/pkg/DESCR-jack
+++ b/x11/vlc/pkg/DESCR-jack
@ -1 +1 @@
-jackd sound server output module for vlc.
+JACK sound server output module for VLC.
--- a/x11/vlc/pkg/DESCR-main
+++ b/x11/vlc/pkg/DESCR-main
@ -1,3 +1,3 @@
 VLC (VideoLAN Client) is a highly portable multimedia player for various
-audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, mp3, ogg, ...) as
+audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, MP3, Ogg, ...) as
 well as DVDs, and various streaming protocols.
--- a/x11/vlc/pkg/DESCR-web
+++ b/x11/vlc/pkg/DESCR-web
@ -1 +1 @@
-Embedded media playback plugin for mozilla.
+Embedded media playback plugin for Mozilla.
--- a/x11/vlc/pkg/PFRAG.amd64-main
+++ b/x11/vlc/pkg/PFRAG.amd64-main
@ -1,11 +1,14 @@
-@comment $OpenBSD: PFRAG.amd64-main,v 1.5 2011/05/06 08:18:54 dcoppa Exp $
-lib/vlc/misc/libmemcpy3dn_plugin.so
-lib/vlc/misc/libmemcpymmx_plugin.so
-lib/vlc/misc/libmemcpymmxext_plugin.so
-lib/vlc/video_chroma/libi420_rgb_mmx_plugin.so
-lib/vlc/video_chroma/libi420_rgb_sse2_plugin.so
-lib/vlc/video_chroma/libi420_ymga_mmx_plugin.so
-lib/vlc/video_chroma/libi420_yuy2_mmx_plugin.so
-lib/vlc/video_chroma/libi420_yuy2_sse2_plugin.so
-lib/vlc/video_chroma/libi422_yuy2_mmx_plugin.so
-lib/vlc/video_chroma/libi422_yuy2_sse2_plugin.so
+@comment $OpenBSD: PFRAG.amd64-main,v 1.6 2011/11/16 13:33:16 phessler Exp $
+lib/vlc/plugins/3dnow/
+lib/vlc/plugins/3dnow/libmemcpy3dn_plugin.so
+lib/vlc/plugins/mmx/
+lib/vlc/plugins/mmx/libi420_rgb_mmx_plugin.so
+lib/vlc/plugins/mmx/libi420_yuy2_mmx_plugin.so
+lib/vlc/plugins/mmx/libi422_yuy2_mmx_plugin.so
+lib/vlc/plugins/mmx/libmemcpymmx_plugin.so
+lib/vlc/plugins/mmxext/
+lib/vlc/plugins/mmxext/libmemcpymmxext_plugin.so
+lib/vlc/plugins/sse2/
+lib/vlc/plugins/sse2/libi420_rgb_sse2_plugin.so
+lib/vlc/plugins/sse2/libi420_yuy2_sse2_plugin.so
+lib/vlc/plugins/sse2/libi422_yuy2_sse2_plugin.so
--- a/x11/vlc/pkg/PFRAG.i386-main
+++ b/x11/vlc/pkg/PFRAG.i386-main
@ -1,8 +1,10 @@
-@comment $OpenBSD: PFRAG.i386-main,v 1.4 2011/05/06 08:18:54 dcoppa Exp $
-lib/vlc/misc/libmemcpy3dn_plugin.so
-lib/vlc/misc/libmemcpymmx_plugin.so
-lib/vlc/misc/libmemcpymmxext_plugin.so
-lib/vlc/video_chroma/libi420_rgb_mmx_plugin.so
-lib/vlc/video_chroma/libi420_ymga_mmx_plugin.so
-lib/vlc/video_chroma/libi420_yuy2_mmx_plugin.so
-lib/vlc/video_chroma/libi422_yuy2_mmx_plugin.so
+@comment $OpenBSD: PFRAG.i386-main,v 1.5 2011/11/16 13:33:16 phessler Exp $
+lib/vlc/plugins/3dnow/
+lib/vlc/plugins/3dnow/libmemcpy3dn_plugin.so
+lib/vlc/plugins/mmx/
+lib/vlc/plugins/mmx/libi420_rgb_mmx_plugin.so
+lib/vlc/plugins/mmx/libi420_yuy2_mmx_plugin.so
+lib/vlc/plugins/mmx/libi422_yuy2_mmx_plugin.so
+lib/vlc/plugins/mmx/libmemcpymmx_plugin.so
+lib/vlc/plugins/mmxext/
+lib/vlc/plugins/mmxext/libmemcpymmxext_plugin.so
--- a/x11/vlc/pkg/PLIST-jack
+++ b/x11/vlc/pkg/PLIST-jack
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-jack,v 1.6 2011/05/06 08:18:54 dcoppa Exp $
+@comment $OpenBSD: PLIST-jack,v 1.7 2011/11/16 13:33:16 phessler Exp $
@pkgpath x11/vlc,-jack,altivec
-lib/vlc/access/libaccess_jack_plugin.so
-lib/vlc/audio_output/libjack_plugin.so
+lib/vlc/plugins/access/libaccess_jack_plugin.so
+lib/vlc/plugins/audio_output/libjack_plugin.so
--- a/x11/vlc/pkg/PLIST-main
+++ b/x11/vlc/pkg/PLIST-main
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.16 2011/05/11 09:08:07 dcoppa Exp $
+@comment $OpenBSD: PLIST-main,v 1.17 2011/11/16 13:33:16 phessler Exp $
@pkgpath x11/vlc
 %%amd64%%
 %%i386%%
@ -16,17 +16,17 @@ include/vlc/libvlc_media_discoverer.h
 include/vlc/libvlc_media_library.h
 include/vlc/libvlc_media_list.h
 include/vlc/libvlc_media_list_player.h
-include/vlc/libvlc_media_list_view.h
 include/vlc/libvlc_media_player.h
 include/vlc/libvlc_structures.h
+include/vlc/libvlc_version.h
 include/vlc/libvlc_vlm.h
-include/vlc/mediacontrol.h
-include/vlc/mediacontrol_structures.h
 include/vlc/plugins/
 include/vlc/plugins/vlc_access.h
 include/vlc/plugins/vlc_acl.h
 include/vlc/plugins/vlc_aout.h
+include/vlc/plugins/vlc_aout_mixer.h
 include/vlc/plugins/vlc_arrays.h
+include/vlc/plugins/vlc_art_finder.h
 include/vlc/plugins/vlc_avcodec.h
 include/vlc/plugins/vlc_bits.h
 include/vlc/plugins/vlc_block.h
@ -37,6 +37,7 @@ include/vlc/plugins/vlc_common.h
 include/vlc/plugins/vlc_config.h
 include/vlc/plugins/vlc_config_cat.h
 include/vlc/plugins/vlc_configuration.h
+include/vlc/plugins/vlc_cpu.h
 include/vlc/plugins/vlc_demux.h
 include/vlc/plugins/vlc_dialog.h
 include/vlc/plugins/vlc_epg.h
@ -44,9 +45,13 @@ include/vlc/plugins/vlc_es.h
 include/vlc/plugins/vlc_es_out.h
 include/vlc/plugins/vlc_events.h
 include/vlc/plugins/vlc_filter.h
+include/vlc/plugins/vlc_fourcc.h
+include/vlc/plugins/vlc_fs.h
 include/vlc/plugins/vlc_gcrypt.h
+include/vlc/plugins/vlc_http.h
 include/vlc/plugins/vlc_httpd.h
 include/vlc/plugins/vlc_image.h
+include/vlc/plugins/vlc_inhibit.h
 include/vlc/plugins/vlc_input.h
 include/vlc/plugins/vlc_input_item.h
 include/vlc/plugins/vlc_main.h
@ -54,21 +59,32 @@ include/vlc/plugins/vlc_md5.h
 include/vlc/plugins/vlc_messages.h
 include/vlc/plugins/vlc_meta.h
 include/vlc/plugins/vlc_modules.h
+include/vlc/plugins/vlc_mouse.h
 include/vlc/plugins/vlc_mtime.h
 include/vlc/plugins/vlc_objects.h
+include/vlc/plugins/vlc_picture.h
+include/vlc/plugins/vlc_picture_fifo.h
+include/vlc/plugins/vlc_picture_pool.h
 include/vlc/plugins/vlc_playlist.h
 include/vlc/plugins/vlc_plugin.h
+include/vlc/plugins/vlc_probe.h
 include/vlc/plugins/vlc_rand.h
 include/vlc/plugins/vlc_services_discovery.h
 include/vlc/plugins/vlc_sout.h
+include/vlc/plugins/vlc_sql.h
 include/vlc/plugins/vlc_stream.h
 include/vlc/plugins/vlc_strings.h
+include/vlc/plugins/vlc_subpicture.h
 include/vlc/plugins/vlc_threads.h
 include/vlc/plugins/vlc_url.h
 include/vlc/plugins/vlc_variables.h
+include/vlc/plugins/vlc_video_splitter.h
 include/vlc/plugins/vlc_vlm.h
 include/vlc/plugins/vlc_vout.h
-include/vlc/plugins/vlc_window.h
+include/vlc/plugins/vlc_vout_display.h
+include/vlc/plugins/vlc_vout_opengl.h
+include/vlc/plugins/vlc_vout_window.h
+include/vlc/plugins/vlc_xlib.h
 include/vlc/plugins/vlc_xml.h
 include/vlc/vlc.h
 lib/libvlc.a
@ -78,281 +94,309 @@ lib/libvlccore.a
 lib/pkgconfig/libvlc.pc
 lib/pkgconfig/vlc-plugin.pc
 lib/vlc/
-lib/vlc/access/
-lib/vlc/access/libaccess_bd_plugin.so
-lib/vlc/access/libaccess_directory_plugin.so
-lib/vlc/access/libaccess_fake_plugin.so
-lib/vlc/access/libaccess_file_plugin.so
-lib/vlc/access/libaccess_ftp_plugin.so
-lib/vlc/access/libaccess_http_plugin.so
-lib/vlc/access/libaccess_mmap_plugin.so
-lib/vlc/access/libaccess_mms_plugin.so
-lib/vlc/access/libaccess_realrtsp_plugin.so
-lib/vlc/access/libaccess_tcp_plugin.so
-lib/vlc/access/libaccess_udp_plugin.so
-lib/vlc/access/libcdda_plugin.so
-lib/vlc/access/libdvdnav_plugin.so
-lib/vlc/access/libdvdread_plugin.so
-lib/vlc/access/libv4l2_plugin.so
-lib/vlc/access/libvcd_plugin.so
-@comment lib/vlc/access/libx11_screen_plugin.so
-lib/vlc/access/libzip_plugin.so
-lib/vlc/access_output/
-lib/vlc/access_output/libaccess_output_dummy_plugin.so
-lib/vlc/access_output/libaccess_output_file_plugin.so
-lib/vlc/access_output/libaccess_output_http_plugin.so
-lib/vlc/access_output/libaccess_output_udp_plugin.so
-lib/vlc/audio_filter/
-lib/vlc/audio_filter/liba52tospdif_plugin.so
-lib/vlc/audio_filter/libaudio_format_plugin.so
-lib/vlc/audio_filter/libbandlimited_resampler_plugin.so
-lib/vlc/audio_filter/libconverter_fixed_plugin.so
-lib/vlc/audio_filter/libconverter_float_plugin.so
-lib/vlc/audio_filter/libdolby_surround_decoder_plugin.so
-lib/vlc/audio_filter/libdtstospdif_plugin.so
-lib/vlc/audio_filter/libequalizer_plugin.so
-lib/vlc/audio_filter/libheadphone_channel_mixer_plugin.so
-lib/vlc/audio_filter/liblinear_resampler_plugin.so
-lib/vlc/audio_filter/libmono_plugin.so
-lib/vlc/audio_filter/libnormvol_plugin.so
-lib/vlc/audio_filter/libparam_eq_plugin.so
-lib/vlc/audio_filter/libscaletempo_plugin.so
-lib/vlc/audio_filter/libsimple_channel_mixer_plugin.so
-lib/vlc/audio_filter/libspatializer_plugin.so
-lib/vlc/audio_filter/libtrivial_channel_mixer_plugin.so
-lib/vlc/audio_filter/libtrivial_resampler_plugin.so
-lib/vlc/audio_filter/libugly_resampler_plugin.so
-lib/vlc/audio_mixer/
-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/
-lib/vlc/audio_output/libaout_file_plugin.so
-lib/vlc/audio_output/libaout_sdl_plugin.so
-lib/vlc/codec/
-lib/vlc/codec/liba52_plugin.so
-lib/vlc/codec/libadpcm_plugin.so
-lib/vlc/codec/libaes3_plugin.so
-lib/vlc/codec/libaraw_plugin.so
-lib/vlc/codec/libavcodec_plugin.so
-lib/vlc/codec/libcc_plugin.so
-lib/vlc/codec/libcdg_plugin.so
-lib/vlc/codec/libcvdsub_plugin.so
-lib/vlc/codec/libdts_plugin.so
-lib/vlc/codec/libdvbsub_plugin.so
-lib/vlc/codec/libfaad_plugin.so
-lib/vlc/codec/libfake_plugin.so
-lib/vlc/codec/libflac_plugin.so
-lib/vlc/codec/libinvmem_plugin.so
-lib/vlc/codec/liblpcm_plugin.so
-lib/vlc/codec/libmpeg_audio_plugin.so
-lib/vlc/codec/libpng_plugin.so
-lib/vlc/codec/librawvideo_plugin.so
-lib/vlc/codec/librealaudio_plugin.so
-lib/vlc/codec/librealvideo_plugin.so
-lib/vlc/codec/libschroedinger_plugin.so
-lib/vlc/codec/libsdl_image_plugin.so
-lib/vlc/codec/libspeex_plugin.so
-lib/vlc/codec/libspudec_plugin.so
-lib/vlc/codec/libsubsdec_plugin.so
-lib/vlc/codec/libsubsusf_plugin.so
-lib/vlc/codec/libsvcdsub_plugin.so
-lib/vlc/codec/libt140_plugin.so
-lib/vlc/codec/libtelx_plugin.so
-lib/vlc/codec/libvorbis_plugin.so
-lib/vlc/codec/libx264_plugin.so
-lib/vlc/control/
-lib/vlc/control/libdbus_plugin.so
-lib/vlc/control/libgestures_plugin.so
-lib/vlc/control/libglobalhotkeys_plugin.so
-lib/vlc/control/libhotkeys_plugin.so
-lib/vlc/control/libhttp_plugin.so
-lib/vlc/control/libmotion_plugin.so
-lib/vlc/control/librc_plugin.so
-lib/vlc/control/libshowintf_plugin.so
-lib/vlc/control/libsignals_plugin.so
-lib/vlc/control/libtelnet_plugin.so
-lib/vlc/demux/
-lib/vlc/demux/libaiff_plugin.so
-lib/vlc/demux/libasf_plugin.so
-lib/vlc/demux/libau_plugin.so
-lib/vlc/demux/libavformat_plugin.so
-lib/vlc/demux/libavi_plugin.so
-lib/vlc/demux/libdemux_cdg_plugin.so
-lib/vlc/demux/libdemuxdump_plugin.so
-lib/vlc/demux/libdirac_plugin.so
-lib/vlc/demux/libes_plugin.so
-lib/vlc/demux/libflacsys_plugin.so
-lib/vlc/demux/libh264_plugin.so
-lib/vlc/demux/libm4v_plugin.so
-lib/vlc/demux/libmjpeg_plugin.so
-lib/vlc/demux/libmkv_plugin.so
-lib/vlc/demux/libmp4_plugin.so
-lib/vlc/demux/libmpgv_plugin.so
-lib/vlc/demux/libnsc_plugin.so
-lib/vlc/demux/libnsv_plugin.so
-lib/vlc/demux/libnuv_plugin.so
-lib/vlc/demux/libogg_plugin.so
-lib/vlc/demux/libplaylist_plugin.so
-lib/vlc/demux/libps_plugin.so
-lib/vlc/demux/libpva_plugin.so
-lib/vlc/demux/librawaud_plugin.so
-lib/vlc/demux/librawdv_plugin.so
-lib/vlc/demux/librawvid_plugin.so
-lib/vlc/demux/libreal_plugin.so
-lib/vlc/demux/libsmf_plugin.so
-lib/vlc/demux/libsubtitle_plugin.so
-lib/vlc/demux/libts_plugin.so
-lib/vlc/demux/libtta_plugin.so
-lib/vlc/demux/libty_plugin.so
-lib/vlc/demux/libvc1_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/
-lib/vlc/gui/libqt4_plugin.so
-lib/vlc/meta_engine/
-lib/vlc/meta_engine/libfolder_plugin.so
-lib/vlc/meta_engine/libtaglib_plugin.so
-lib/vlc/misc/
-lib/vlc/misc/libaudioscrobbler_plugin.so
-lib/vlc/misc/libdummy_plugin.so
-lib/vlc/misc/libexport_plugin.so
-lib/vlc/misc/libfreetype_plugin.so
-lib/vlc/misc/libinhibit_plugin.so
-lib/vlc/misc/liblogger_plugin.so
-lib/vlc/misc/libmemcpy_plugin.so
-lib/vlc/misc/libnotify_plugin.so
-lib/vlc/misc/libosd_parser_plugin.so
-lib/vlc/misc/libscreensaver_plugin.so
-lib/vlc/misc/libstats_plugin.so
-lib/vlc/misc/libtelepathy_plugin.so
-lib/vlc/misc/libvod_rtsp_plugin.so
-lib/vlc/misc/libxml_plugin.so
-lib/vlc/misc/libxtag_plugin.so
-lib/vlc/mux/
-lib/vlc/mux/libmux_asf_plugin.so
-lib/vlc/mux/libmux_avi_plugin.so
-lib/vlc/mux/libmux_dummy_plugin.so
-lib/vlc/mux/libmux_mp4_plugin.so
-lib/vlc/mux/libmux_mpjpeg_plugin.so
-lib/vlc/mux/libmux_ogg_plugin.so
-lib/vlc/mux/libmux_ps_plugin.so
-lib/vlc/mux/libmux_ts_plugin.so
-lib/vlc/mux/libmux_wav_plugin.so
-lib/vlc/packetizer/
-lib/vlc/packetizer/libpacketizer_copy_plugin.so
-lib/vlc/packetizer/libpacketizer_dirac_plugin.so
-lib/vlc/packetizer/libpacketizer_h264_plugin.so
-lib/vlc/packetizer/libpacketizer_mlp_plugin.so
-lib/vlc/packetizer/libpacketizer_mpeg4audio_plugin.so
-lib/vlc/packetizer/libpacketizer_mpeg4video_plugin.so
-lib/vlc/packetizer/libpacketizer_mpegvideo_plugin.so
-lib/vlc/packetizer/libpacketizer_vc1_plugin.so
-lib/vlc/services_discovery/
-lib/vlc/services_discovery/libpodcast_plugin.so
-lib/vlc/services_discovery/libsap_plugin.so
-lib/vlc/services_discovery/libshout_plugin.so
-lib/vlc/stream_filter/
-lib/vlc/stream_filter/libdecomp_plugin.so
-lib/vlc/stream_filter/libstream_filter_rar_plugin.so
-lib/vlc/stream_filter/libstream_filter_record_plugin.so
-lib/vlc/stream_out/
-lib/vlc/stream_out/libstream_out_autodel_plugin.so
-lib/vlc/stream_out/libstream_out_bridge_plugin.so
-lib/vlc/stream_out/libstream_out_description_plugin.so
-lib/vlc/stream_out/libstream_out_display_plugin.so
-lib/vlc/stream_out/libstream_out_dummy_plugin.so
-lib/vlc/stream_out/libstream_out_duplicate_plugin.so
-lib/vlc/stream_out/libstream_out_es_plugin.so
-lib/vlc/stream_out/libstream_out_gather_plugin.so
-lib/vlc/stream_out/libstream_out_mosaic_bridge_plugin.so
-lib/vlc/stream_out/libstream_out_record_plugin.so
-lib/vlc/stream_out/libstream_out_standard_plugin.so
-lib/vlc/stream_out/libstream_out_transcode_plugin.so
-lib/vlc/video_chroma/
-lib/vlc/video_chroma/libgrey_yuv_plugin.so
-lib/vlc/video_chroma/libi420_rgb_plugin.so
-lib/vlc/video_chroma/libi420_ymga_plugin.so
-lib/vlc/video_chroma/libi420_yuy2_plugin.so
-lib/vlc/video_chroma/libi422_i420_plugin.so
-lib/vlc/video_chroma/libi422_yuy2_plugin.so
-lib/vlc/video_chroma/libyuy2_i420_plugin.so
-lib/vlc/video_chroma/libyuy2_i422_plugin.so
-lib/vlc/video_filter/
-lib/vlc/video_filter/libadjust_plugin.so
-lib/vlc/video_filter/libalphamask_plugin.so
-lib/vlc/video_filter/libblend_plugin.so
-lib/vlc/video_filter/libblendbench_plugin.so
-lib/vlc/video_filter/libbluescreen_plugin.so
-lib/vlc/video_filter/libcanvas_plugin.so
-lib/vlc/video_filter/libchain_plugin.so
-lib/vlc/video_filter/libclone_plugin.so
-lib/vlc/video_filter/libcolorthres_plugin.so
-lib/vlc/video_filter/libcrop_plugin.so
-lib/vlc/video_filter/libcroppadd_plugin.so
-lib/vlc/video_filter/libdeinterlace_plugin.so
-lib/vlc/video_filter/libdynamicoverlay_plugin.so
-lib/vlc/video_filter/liberase_plugin.so
-lib/vlc/video_filter/libextract_plugin.so
-lib/vlc/video_filter/libgaussianblur_plugin.so
-lib/vlc/video_filter/libgradient_plugin.so
-lib/vlc/video_filter/libgrain_plugin.so
-lib/vlc/video_filter/libinvert_plugin.so
-lib/vlc/video_filter/liblogo_plugin.so
-lib/vlc/video_filter/libmagnify_plugin.so
-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/libnoise_plugin.so
-lib/vlc/video_filter/libosdmenu_plugin.so
-lib/vlc/video_filter/libpanoramix_plugin.so
-lib/vlc/video_filter/libpostproc_plugin.so
-lib/vlc/video_filter/libpsychedelic_plugin.so
-lib/vlc/video_filter/libpuzzle_plugin.so
-lib/vlc/video_filter/libripple_plugin.so
-lib/vlc/video_filter/librotate_plugin.so
-lib/vlc/video_filter/librss_plugin.so
-lib/vlc/video_filter/librv32_plugin.so
-lib/vlc/video_filter/libscale_plugin.so
-lib/vlc/video_filter/libscene_plugin.so
-lib/vlc/video_filter/libsharpen_plugin.so
-lib/vlc/video_filter/libswscale_plugin.so
-lib/vlc/video_filter/libtransform_plugin.so
-lib/vlc/video_filter/libwall_plugin.so
-lib/vlc/video_filter/libwave_plugin.so
-lib/vlc/video_filter/libyuvp_plugin.so
-lib/vlc/video_output/
-lib/vlc/video_output/libdrawable_plugin.so
-lib/vlc/video_output/libglx_plugin.so
-lib/vlc/video_output/libopengl_plugin.so
-lib/vlc/video_output/libvmem_plugin.so
-lib/vlc/video_output/libvout_sdl_plugin.so
-@comment lib/vlc/video_output/libx11_plugin.so
-lib/vlc/video_output/libxvideo_plugin.so
-lib/vlc/video_output/libyuv_plugin.so
-lib/vlc/visualization/
-lib/vlc/visualization/libvisual_plugin.so
-@man man/man1/vlc-config.1
+lib/vlc/plugins/
+lib/vlc/plugins/access/
+lib/vlc/plugins/access/libaccess_attachment_plugin.so
+lib/vlc/plugins/access/libaccess_avio_plugin.so
+lib/vlc/plugins/access/libaccess_bd_plugin.so
+lib/vlc/plugins/access/libaccess_fake_plugin.so
+lib/vlc/plugins/access/libaccess_ftp_plugin.so
+lib/vlc/plugins/access/libaccess_http_plugin.so
+lib/vlc/plugins/access/libaccess_imem_plugin.so
+lib/vlc/plugins/access/libaccess_mmap_plugin.so
+lib/vlc/plugins/access/libaccess_mms_plugin.so
+lib/vlc/plugins/access/libaccess_realrtsp_plugin.so
+lib/vlc/plugins/access/libaccess_tcp_plugin.so
+lib/vlc/plugins/access/libaccess_udp_plugin.so
+lib/vlc/plugins/access/libcdda_plugin.so
+lib/vlc/plugins/access/libdvdnav_plugin.so
+lib/vlc/plugins/access/libdvdread_plugin.so
+lib/vlc/plugins/access/libfilesystem_plugin.so
+lib/vlc/plugins/access/librtp_plugin.so
+lib/vlc/plugins/access/libv4l2_plugin.so
+lib/vlc/plugins/access/libvcd_plugin.so
+lib/vlc/plugins/access/libxcb_screen_plugin.so
+lib/vlc/plugins/access/libzip_plugin.so
+lib/vlc/plugins/access_output/
+lib/vlc/plugins/access_output/libaccess_output_dummy_plugin.so
+lib/vlc/plugins/access_output/libaccess_output_file_plugin.so
+lib/vlc/plugins/access_output/libaccess_output_http_plugin.so
+lib/vlc/plugins/access_output/libaccess_output_udp_plugin.so
+lib/vlc/plugins/audio_filter/
+lib/vlc/plugins/audio_filter/liba52tospdif_plugin.so
+lib/vlc/plugins/audio_filter/libaudio_format_plugin.so
+lib/vlc/plugins/audio_filter/libaudiobargraph_a_plugin.so
+lib/vlc/plugins/audio_filter/libchorus_flanger_plugin.so
+lib/vlc/plugins/audio_filter/libconverter_fixed_plugin.so
+lib/vlc/plugins/audio_filter/libdolby_surround_decoder_plugin.so
+lib/vlc/plugins/audio_filter/libdtstospdif_plugin.so
+lib/vlc/plugins/audio_filter/libequalizer_plugin.so
+lib/vlc/plugins/audio_filter/libheadphone_channel_mixer_plugin.so
+lib/vlc/plugins/audio_filter/libmono_plugin.so
+lib/vlc/plugins/audio_filter/libnormvol_plugin.so
+lib/vlc/plugins/audio_filter/libparam_eq_plugin.so
+lib/vlc/plugins/audio_filter/libscaletempo_plugin.so
+lib/vlc/plugins/audio_filter/libsimple_channel_mixer_plugin.so
+lib/vlc/plugins/audio_filter/libspatializer_plugin.so
+lib/vlc/plugins/audio_filter/libtrivial_channel_mixer_plugin.so
+lib/vlc/plugins/audio_filter/libugly_resampler_plugin.so
+lib/vlc/plugins/audio_mixer/
+lib/vlc/plugins/audio_mixer/libfloat32_mixer_plugin.so
+lib/vlc/plugins/audio_mixer/libspdif_mixer_plugin.so
+lib/vlc/plugins/audio_mixer/libtrivial_mixer_plugin.so
+lib/vlc/plugins/audio_output/
+lib/vlc/plugins/audio_output/libaout_file_plugin.so
+lib/vlc/plugins/audio_output/libaout_sdl_plugin.so
+lib/vlc/plugins/codec/
+lib/vlc/plugins/codec/liba52_plugin.so
+lib/vlc/plugins/codec/libadpcm_plugin.so
+lib/vlc/plugins/codec/libaes3_plugin.so
+lib/vlc/plugins/codec/libaraw_plugin.so
+lib/vlc/plugins/codec/libavcodec_plugin.so
+lib/vlc/plugins/codec/libcc_plugin.so
+lib/vlc/plugins/codec/libcdg_plugin.so
+lib/vlc/plugins/codec/libcvdsub_plugin.so
+lib/vlc/plugins/codec/libdts_plugin.so
+lib/vlc/plugins/codec/libdvbsub_plugin.so
+lib/vlc/plugins/codec/libfake_plugin.so
+lib/vlc/plugins/codec/libinvmem_plugin.so
+lib/vlc/plugins/codec/liblibass_plugin.so
+lib/vlc/plugins/codec/liblpcm_plugin.so
+lib/vlc/plugins/codec/libmpeg_audio_plugin.so
+lib/vlc/plugins/codec/libpng_plugin.so
+lib/vlc/plugins/codec/librawvideo_plugin.so
+lib/vlc/plugins/codec/librealvideo_plugin.so
+lib/vlc/plugins/codec/libschroedinger_plugin.so
+lib/vlc/plugins/codec/libsdl_image_plugin.so
+lib/vlc/plugins/codec/libspeex_plugin.so
+lib/vlc/plugins/codec/libspudec_plugin.so
+lib/vlc/plugins/codec/libsubsdec_plugin.so
+lib/vlc/plugins/codec/libsubsusf_plugin.so
+lib/vlc/plugins/codec/libsvcdsub_plugin.so
+lib/vlc/plugins/codec/libt140_plugin.so
+lib/vlc/plugins/codec/libtelx_plugin.so
+lib/vlc/plugins/codec/libvorbis_plugin.so
+lib/vlc/plugins/codec/libx264_plugin.so
+lib/vlc/plugins/control/
+lib/vlc/plugins/control/libdbus_plugin.so
+lib/vlc/plugins/control/libgestures_plugin.so
+lib/vlc/plugins/control/libglobalhotkeys_plugin.so
+lib/vlc/plugins/control/libhotkeys_plugin.so
+lib/vlc/plugins/control/libmotion_plugin.so
+lib/vlc/plugins/control/libnetsync_plugin.so
+lib/vlc/plugins/control/liboldhttp_plugin.so
+lib/vlc/plugins/control/liboldrc_plugin.so
+lib/vlc/plugins/control/liboldtelnet_plugin.so
+lib/vlc/plugins/control/libsignals_plugin.so
+lib/vlc/plugins/demux/
+lib/vlc/plugins/demux/libaiff_plugin.so
+lib/vlc/plugins/demux/libasf_plugin.so
+lib/vlc/plugins/demux/libau_plugin.so
+lib/vlc/plugins/demux/libavformat_plugin.so
+lib/vlc/plugins/demux/libavi_plugin.so
+lib/vlc/plugins/demux/libdemux_cdg_plugin.so
+lib/vlc/plugins/demux/libdemuxdump_plugin.so
+lib/vlc/plugins/demux/libdirac_plugin.so
+lib/vlc/plugins/demux/libes_plugin.so
+lib/vlc/plugins/demux/libflacsys_plugin.so
+lib/vlc/plugins/demux/libh264_plugin.so
+lib/vlc/plugins/demux/libmjpeg_plugin.so
+lib/vlc/plugins/demux/libmkv_plugin.so
+lib/vlc/plugins/demux/libmp4_plugin.so
+lib/vlc/plugins/demux/libmpgv_plugin.so
+lib/vlc/plugins/demux/libnsc_plugin.so
+lib/vlc/plugins/demux/libnsv_plugin.so
+lib/vlc/plugins/demux/libnuv_plugin.so
+lib/vlc/plugins/demux/libogg_plugin.so
+lib/vlc/plugins/demux/libplaylist_plugin.so
+lib/vlc/plugins/demux/libps_plugin.so
+lib/vlc/plugins/demux/libpva_plugin.so
+lib/vlc/plugins/demux/librawaud_plugin.so
+lib/vlc/plugins/demux/librawdv_plugin.so
+lib/vlc/plugins/demux/librawvid_plugin.so
+lib/vlc/plugins/demux/libreal_plugin.so
+lib/vlc/plugins/demux/libsmf_plugin.so
+lib/vlc/plugins/demux/libsubtitle_plugin.so
+lib/vlc/plugins/demux/libts_plugin.so
+lib/vlc/plugins/demux/libtta_plugin.so
+lib/vlc/plugins/demux/libty_plugin.so
+lib/vlc/plugins/demux/libvc1_plugin.so
+lib/vlc/plugins/demux/libvobsub_plugin.so
+lib/vlc/plugins/demux/libvoc_plugin.so
+lib/vlc/plugins/demux/libwav_plugin.so
+lib/vlc/plugins/demux/libxa_plugin.so
+lib/vlc/plugins/gui/
+lib/vlc/plugins/gui/libqt4_plugin.so
+lib/vlc/plugins/meta_engine/
+lib/vlc/plugins/meta_engine/libfolder_plugin.so
+lib/vlc/plugins/meta_engine/libtaglib_plugin.so
+lib/vlc/plugins/misc/
+lib/vlc/plugins/misc/libaudioscrobbler_plugin.so
+lib/vlc/plugins/misc/libdummy_plugin.so
+lib/vlc/plugins/misc/libexport_plugin.so
+lib/vlc/plugins/misc/libfreetype_plugin.so
+@comment lib/vlc/plugins/misc/libinhibit_plugin.so
+lib/vlc/plugins/misc/liblogger_plugin.so
+lib/vlc/plugins/misc/libnotify_plugin.so
+lib/vlc/plugins/misc/libosd_parser_plugin.so
+lib/vlc/plugins/misc/libstats_plugin.so
+lib/vlc/plugins/misc/libtelepathy_plugin.so
+lib/vlc/plugins/misc/libvod_rtsp_plugin.so
+@comment lib/vlc/plugins/misc/libxdg_screensaver_plugin.so
+lib/vlc/plugins/misc/libxml_plugin.so
+@comment lib/vlc/plugins/misc/libxscreensaver_plugin.so
+lib/vlc/plugins/misc/libxtag_plugin.so
+lib/vlc/plugins/mux/
+lib/vlc/plugins/mux/libmux_asf_plugin.so
+lib/vlc/plugins/mux/libmux_avi_plugin.so
+lib/vlc/plugins/mux/libmux_dummy_plugin.so
+lib/vlc/plugins/mux/libmux_mp4_plugin.so
+lib/vlc/plugins/mux/libmux_mpjpeg_plugin.so
+lib/vlc/plugins/mux/libmux_ogg_plugin.so
+lib/vlc/plugins/mux/libmux_ps_plugin.so
+lib/vlc/plugins/mux/libmux_ts_plugin.so
+lib/vlc/plugins/mux/libmux_wav_plugin.so
+lib/vlc/plugins/packetizer/
+lib/vlc/plugins/packetizer/libpacketizer_copy_plugin.so
+lib/vlc/plugins/packetizer/libpacketizer_dirac_plugin.so
+lib/vlc/plugins/packetizer/libpacketizer_flac_plugin.so
+lib/vlc/plugins/packetizer/libpacketizer_h264_plugin.so
+lib/vlc/plugins/packetizer/libpacketizer_mlp_plugin.so
+lib/vlc/plugins/packetizer/libpacketizer_mpeg4audio_plugin.so
+lib/vlc/plugins/packetizer/libpacketizer_mpeg4video_plugin.so
+lib/vlc/plugins/packetizer/libpacketizer_mpegvideo_plugin.so
+lib/vlc/plugins/packetizer/libpacketizer_vc1_plugin.so
+lib/vlc/plugins/services_discovery/
+lib/vlc/plugins/services_discovery/libmediadirs_plugin.so
+lib/vlc/plugins/services_discovery/libpodcast_plugin.so
+lib/vlc/plugins/services_discovery/libsap_plugin.so
+lib/vlc/plugins/services_discovery/libxcb_apps_plugin.so
+lib/vlc/plugins/stream_filter/
+lib/vlc/plugins/stream_filter/libdecomp_plugin.so
+lib/vlc/plugins/stream_filter/libstream_filter_rar_plugin.so
+lib/vlc/plugins/stream_filter/libstream_filter_record_plugin.so
+lib/vlc/plugins/stream_out/
+lib/vlc/plugins/stream_out/libstream_out_autodel_plugin.so
+lib/vlc/plugins/stream_out/libstream_out_bridge_plugin.so
+lib/vlc/plugins/stream_out/libstream_out_description_plugin.so
+lib/vlc/plugins/stream_out/libstream_out_display_plugin.so
+lib/vlc/plugins/stream_out/libstream_out_dummy_plugin.so
+lib/vlc/plugins/stream_out/libstream_out_duplicate_plugin.so
+lib/vlc/plugins/stream_out/libstream_out_es_plugin.so
+lib/vlc/plugins/stream_out/libstream_out_gather_plugin.so
+lib/vlc/plugins/stream_out/libstream_out_mosaic_bridge_plugin.so
+lib/vlc/plugins/stream_out/libstream_out_record_plugin.so
+lib/vlc/plugins/stream_out/libstream_out_rtp_plugin.so
+lib/vlc/plugins/stream_out/libstream_out_smem_plugin.so
+lib/vlc/plugins/stream_out/libstream_out_standard_plugin.so
+lib/vlc/plugins/stream_out/libstream_out_transcode_plugin.so
+lib/vlc/plugins/video_chroma/
+lib/vlc/plugins/video_chroma/libgrey_yuv_plugin.so
+lib/vlc/plugins/video_chroma/libi420_rgb_plugin.so
+lib/vlc/plugins/video_chroma/libi420_yuy2_plugin.so
+lib/vlc/plugins/video_chroma/libi422_i420_plugin.so
+lib/vlc/plugins/video_chroma/libi422_yuy2_plugin.so
+lib/vlc/plugins/video_chroma/libyuy2_i420_plugin.so
+lib/vlc/plugins/video_chroma/libyuy2_i422_plugin.so
+lib/vlc/plugins/video_filter/
+lib/vlc/plugins/video_filter/libadjust_plugin.so
+lib/vlc/plugins/video_filter/libalphamask_plugin.so
+lib/vlc/plugins/video_filter/libaudiobargraph_v_plugin.so
+lib/vlc/plugins/video_filter/libball_plugin.so
+lib/vlc/plugins/video_filter/libblend_plugin.so
+lib/vlc/plugins/video_filter/libblendbench_plugin.so
+lib/vlc/plugins/video_filter/libbluescreen_plugin.so
+lib/vlc/plugins/video_filter/libcanvas_plugin.so
+lib/vlc/plugins/video_filter/libchain_plugin.so
+lib/vlc/plugins/video_filter/libclone_plugin.so
+lib/vlc/plugins/video_filter/libcolorthres_plugin.so
+lib/vlc/plugins/video_filter/libcrop_plugin.so
+lib/vlc/plugins/video_filter/libcroppadd_plugin.so
+lib/vlc/plugins/video_filter/libdeinterlace_plugin.so
+lib/vlc/plugins/video_filter/libdynamicoverlay_plugin.so
+lib/vlc/plugins/video_filter/liberase_plugin.so
+lib/vlc/plugins/video_filter/libextract_plugin.so
+lib/vlc/plugins/video_filter/libgaussianblur_plugin.so
+lib/vlc/plugins/video_filter/libgradient_plugin.so
+lib/vlc/plugins/video_filter/libgrain_plugin.so
+lib/vlc/plugins/video_filter/libinvert_plugin.so
+lib/vlc/plugins/video_filter/liblogo_plugin.so
+lib/vlc/plugins/video_filter/libmagnify_plugin.so
+lib/vlc/plugins/video_filter/libmarq_plugin.so
+lib/vlc/plugins/video_filter/libmirror_plugin.so
+lib/vlc/plugins/video_filter/libmosaic_plugin.so
+lib/vlc/plugins/video_filter/libmotionblur_plugin.so
+lib/vlc/plugins/video_filter/libmotiondetect_plugin.so
+lib/vlc/plugins/video_filter/libnoise_plugin.so
+lib/vlc/plugins/video_filter/libpanoramix_plugin.so
+lib/vlc/plugins/video_filter/libpostproc_plugin.so
+lib/vlc/plugins/video_filter/libpsychedelic_plugin.so
+lib/vlc/plugins/video_filter/libpuzzle_plugin.so
+lib/vlc/plugins/video_filter/libripple_plugin.so
+lib/vlc/plugins/video_filter/librotate_plugin.so
+lib/vlc/plugins/video_filter/librss_plugin.so
+lib/vlc/plugins/video_filter/librv32_plugin.so
+lib/vlc/plugins/video_filter/libscale_plugin.so
+lib/vlc/plugins/video_filter/libscene_plugin.so
+lib/vlc/plugins/video_filter/libsharpen_plugin.so
+lib/vlc/plugins/video_filter/libswscale_plugin.so
+lib/vlc/plugins/video_filter/libtransform_plugin.so
+lib/vlc/plugins/video_filter/libvideo_filter_wrapper_plugin.so
+lib/vlc/plugins/video_filter/libwall_plugin.so
+lib/vlc/plugins/video_filter/libwave_plugin.so
+lib/vlc/plugins/video_filter/libyuvp_plugin.so
+lib/vlc/plugins/video_output/
+lib/vlc/plugins/video_output/libvmem_plugin.so
+lib/vlc/plugins/video_output/libvout_sdl_plugin.so
+lib/vlc/plugins/video_output/libvout_wrapper_plugin.so
+lib/vlc/plugins/video_output/libxcb_glx_plugin.so
+lib/vlc/plugins/video_output/libxcb_window_plugin.so
+lib/vlc/plugins/video_output/libxcb_x11_plugin.so
+lib/vlc/plugins/video_output/libxcb_xv_plugin.so
+lib/vlc/plugins/video_output/libyuv_plugin.so
+lib/vlc/plugins/visualization/
+lib/vlc/plugins/visualization/libvisual_plugin.so
+@bin lib/vlc/vlc-cache-gen
+@comment @man man/man1/vlc-config.1
@man man/man1/vlc-wrapper.1
@man man/man1/vlc.1
 share/applications/vlc.desktop
 share/doc/vlc/
 share/doc/vlc/bugreport-howto.txt
 share/doc/vlc/fortunes.txt
-share/doc/vlc/intf-cdda.txt
 share/doc/vlc/intf-vcd.txt
+share/icons/hicolor/128x128/apps/vlc-christmas.png
 share/icons/hicolor/128x128/apps/vlc.png
 share/icons/hicolor/16x16/apps/vlc.png
+share/icons/hicolor/16x16/apps/vlc.xpm
+share/icons/hicolor/256x256/apps/vlc.png
+share/icons/hicolor/32x32/apps/vlc-christmas.xpm
 share/icons/hicolor/32x32/apps/vlc.png
+share/icons/hicolor/32x32/apps/vlc.xpm
+share/icons/hicolor/48x48/apps/vlc-christmas.png
 share/icons/hicolor/48x48/apps/vlc.png
+share/kde4/
+share/kde4/apps/
+share/kde4/apps/solid/
+share/kde4/apps/solid/actions/
+share/kde4/apps/solid/actions/vlc-opencda.desktop
+share/kde4/apps/solid/actions/vlc-opendvd.desktop
+share/kde4/apps/solid/actions/vlc-openvcd.desktop
+share/locale/ach/
+share/locale/ach/LC_MESSAGES/
+share/locale/ach/LC_MESSAGES/vlc.mo
 share/locale/af/LC_MESSAGES/vlc.mo
+share/locale/am/LC_MESSAGES/vlc.mo
 share/locale/ar/LC_MESSAGES/vlc.mo
+share/locale/ast/LC_MESSAGES/vlc.mo
+share/locale/be/LC_MESSAGES/vlc.mo
 share/locale/bg/LC_MESSAGES/vlc.mo
 share/locale/bn/LC_MESSAGES/vlc.mo
+share/locale/br/LC_MESSAGES/vlc.mo
 share/locale/ca/LC_MESSAGES/vlc.mo
+share/locale/cgg/
+share/locale/cgg/LC_MESSAGES/
+share/locale/cgg/LC_MESSAGES/vlc.mo
 share/locale/ckb/
 share/locale/ckb/LC_MESSAGES/
 share/locale/ckb/LC_MESSAGES/vlc.mo
@ -368,17 +412,23 @@ share/locale/es/LC_MESSAGES/vlc.mo
 share/locale/et/LC_MESSAGES/vlc.mo
 share/locale/eu/LC_MESSAGES/vlc.mo
 share/locale/fa/LC_MESSAGES/vlc.mo
+share/locale/ff/
+share/locale/ff/LC_MESSAGES/
+share/locale/ff/LC_MESSAGES/vlc.mo
 share/locale/fi/LC_MESSAGES/vlc.mo
 share/locale/fr/LC_MESSAGES/vlc.mo
 share/locale/fur/
 share/locale/fur/LC_MESSAGES/
 share/locale/fur/LC_MESSAGES/vlc.mo
+share/locale/ga/LC_MESSAGES/vlc.mo
 share/locale/gl/LC_MESSAGES/vlc.mo
 share/locale/he/LC_MESSAGES/vlc.mo
 share/locale/hi/LC_MESSAGES/vlc.mo
 share/locale/hr/LC_MESSAGES/vlc.mo
 share/locale/hu/LC_MESSAGES/vlc.mo
+share/locale/hy/LC_MESSAGES/vlc.mo
 share/locale/id/LC_MESSAGES/vlc.mo
+share/locale/is/LC_MESSAGES/vlc.mo
 share/locale/it/LC_MESSAGES/vlc.mo
 share/locale/ja/LC_MESSAGES/vlc.mo
 share/locale/ka/LC_MESSAGES/vlc.mo
@ -387,6 +437,9 @@ share/locale/km/
 share/locale/km/LC_MESSAGES/
 share/locale/km/LC_MESSAGES/vlc.mo
 share/locale/ko/LC_MESSAGES/vlc.mo
+share/locale/lg/
+share/locale/lg/LC_MESSAGES/
+share/locale/lg/LC_MESSAGES/vlc.mo
 share/locale/lt/LC_MESSAGES/vlc.mo
 share/locale/lv/LC_MESSAGES/vlc.mo
 share/locale/mk/LC_MESSAGES/vlc.mo
@ -408,6 +461,7 @@ share/locale/pt_PT/LC_MESSAGES/
 share/locale/pt_PT/LC_MESSAGES/vlc.mo
 share/locale/ro/LC_MESSAGES/vlc.mo
 share/locale/ru/LC_MESSAGES/vlc.mo
+share/locale/si/LC_MESSAGES/vlc.mo
 share/locale/sk/LC_MESSAGES/vlc.mo
 share/locale/sl/LC_MESSAGES/vlc.mo
 share/locale/sq/LC_MESSAGES/vlc.mo
@ -425,6 +479,7 @@ share/locale/vi/LC_MESSAGES/vlc.mo
 share/locale/wa/LC_MESSAGES/vlc.mo
 share/locale/zh_CN/LC_MESSAGES/vlc.mo
 share/locale/zh_TW/LC_MESSAGES/vlc.mo
+share/locale/zu/LC_MESSAGES/vlc.mo
 share/vlc/
 share/vlc/http/
 share/vlc/http/.hosts
@ -533,15 +588,6 @@ share/vlc/utils/audio-vlc-default.sh
 share/vlc/utils/gnome-vlc-default.sh
 share/vlc/utils/video-vlc-default.sh
 share/vlc/vlc.ico
-share/vlc/vlc128x128-christmas.png
-share/vlc/vlc128x128.png
-share/vlc/vlc16x16.png
-share/vlc/vlc16x16.xpm
-share/vlc/vlc32x32-christmas.xpm
-share/vlc/vlc32x32.png
-share/vlc/vlc32x32.xpm
-share/vlc/vlc48x48-christmas.png
-share/vlc/vlc48x48.png
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true