update to 2.0.4

changes (from the anouncement):
VideoLAN and the VLC development team present the fifth version
of "Twoflower", a major update that fixes a lot of regressions, issues
and security issues in this branch.
It introduces Opus support, improves Youtube, Vimeo streams
and Blu-Ray dics support. It also fixes many issues in playback, notably
on Ogg and MKV playback and audio device selections and a hundred of
other bugs.

pkgsrc note: opus and bluray are not supported yet

4 files changed, 21 insertions, 31 deletions

diff --git a/multimedia/vlc2/Makefile b/multimedia/vlc2/Makefile
index 22a2becd4f0..f7e778731ec 100644
--- a/multimedia/vlc2/Makefile
+++ b/multimedia/vlc2/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.17 2012/10/08 23:02:13 adam Exp $
+# $NetBSD: Makefile,v 1.18 2012/10/19 17:48:06 drochner Exp $
 #
 
 DISTNAME=		vlc-${VLC_VERSION}
-PKGREVISION=		9
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vlc/} \
 			http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
 EXTRACT_SUFX=		.tar.xz
 
-VLC_VERSION=		2.0.3
+VLC_VERSION=		2.0.4
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.videolan.org/
@@ -39,7 +38,7 @@ CONFIGURE_ARGS+=	--disable-smb
 CONFIGURE_ARGS+=	--enable-dvdread \
 			--enable-flac \
 			--enable-theora \
-			--enable-lua=no
+			--disable-lua
 
 # Build optimalized modules
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
@@ -140,6 +139,7 @@ BUILDLINK_API_DEPENDS.libX11+=	libX11>=1.3.5
 # needs x264_encoder_delayed_frames
 BUILDLINK_API_DEPENDS.x264-devel+= x264-devel>=20100201
 .include "../../multimedia/x264-devel/buildlink3.mk"
+#.include "../../lang/lua/buildlink3.mk"
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/oss.buildlink3.mk"
diff --git a/multimedia/vlc2/PLIST b/multimedia/vlc2/PLIST
index 3bd3f8bac3f..5c93231c3a2 100644
--- a/multimedia/vlc2/PLIST
+++ b/multimedia/vlc2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2012/07/24 18:40:42 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/10/19 17:48:06 drochner Exp $
 bin/cvlc
 ${PLIST.x11}bin/qvlc
 bin/rvlc
@@ -375,18 +375,18 @@ lib/vlc/vlc-cache-gen
 man/man1/vlc-wrapper.1
 man/man1/vlc.1
 share/applications/vlc.desktop
-share/doc/vlc/LICENSE
-share/doc/vlc/QtVLC.pro
 share/doc/vlc/bugreport-howto.txt
 share/doc/vlc/fortunes.txt
-share/doc/vlc/gtk_player.c
 share/doc/vlc/intf-vcd.txt
-share/doc/vlc/libvlc_DVD_ripper.c
-share/doc/vlc/main.cpp
-share/doc/vlc/player.cpp
-share/doc/vlc/player.h
-share/doc/vlc/vlc-thumb.c
-share/doc/vlc/wx_player.cpp
+share/doc/vlc/libvlc/QtPlayer/LICENSE
+share/doc/vlc/libvlc/QtPlayer/QtVLC.pro
+share/doc/vlc/libvlc/QtPlayer/main.cpp
+share/doc/vlc/libvlc/QtPlayer/player.cpp
+share/doc/vlc/libvlc/QtPlayer/player.h
+share/doc/vlc/libvlc/gtk_player.c
+share/doc/vlc/libvlc/libvlc_DVD_ripper.c
+share/doc/vlc/libvlc/vlc-thumb.c
+share/doc/vlc/libvlc/wx_player.cpp
 share/icons/hicolor/128x128/apps/vlc-xmas.png
 share/icons/hicolor/128x128/apps/vlc.png
 share/icons/hicolor/16x16/apps/vlc.png
@@ -397,6 +397,7 @@ share/icons/hicolor/32x32/apps/vlc.png
 share/icons/hicolor/32x32/apps/vlc.xpm
 share/icons/hicolor/48x48/apps/vlc-xmas.png
 share/icons/hicolor/48x48/apps/vlc.png
+share/kde/apps/solid/actions/vlc-openbd.desktop
 share/kde/apps/solid/actions/vlc-opencda.desktop
 share/kde/apps/solid/actions/vlc-opendvd.desktop
 share/kde/apps/solid/actions/vlc-openvcd.desktop
@@ -408,6 +409,7 @@ 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/bn_IN/LC_MESSAGES/vlc.mo
 share/locale/br/LC_MESSAGES/vlc.mo
 share/locale/ca/LC_MESSAGES/vlc.mo
 share/locale/cgg/LC_MESSAGES/vlc.mo
@@ -429,6 +431,7 @@ share/locale/fur/LC_MESSAGES/vlc.mo
 share/locale/ga/LC_MESSAGES/vlc.mo
 share/locale/gd/LC_MESSAGES/vlc.mo
 share/locale/gl/LC_MESSAGES/vlc.mo
+share/locale/gu/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
diff --git a/multimedia/vlc2/distinfo b/multimedia/vlc2/distinfo
index 7760bd130ef..a9ebf249afb 100644
--- a/multimedia/vlc2/distinfo
+++ b/multimedia/vlc2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2012/10/11 15:29:39 drochner Exp $
+$NetBSD: distinfo,v 1.11 2012/10/19 17:48:06 drochner Exp $
 
-SHA1 (vlc-2.0.3.tar.xz) = 9f161d997eae613bc6431bcb2459e1aefad8d529
-RMD160 (vlc-2.0.3.tar.xz) = 7d4498c21676a9221ef0b632cb454584c9986e16
-Size (vlc-2.0.3.tar.xz) = 18268208 bytes
+SHA1 (vlc-2.0.4.tar.xz) = 4d9ec642593a5bac282f0793d9c78140b28523f9
+RMD160 (vlc-2.0.4.tar.xz) = 44789a7ba921f282514039e84e760bd97a57eba8
+Size (vlc-2.0.4.tar.xz) = 18518272 bytes
 SHA1 (patch-aa) = 46003ac47b0b0ab97f481cbd755d48f624b0fa87
 SHA1 (patch-ab) = 7833e9d1e023f53dd1125af5049eb9d74b733905
 SHA1 (patch-ac) = 9cdb4bdad7f8e6a09e35b5a1142350d47d77f270
@@ -23,4 +23,3 @@ SHA1 (patch-modules_access_rtp_Modules.am) = 14aea82ffab2fcfa5b0916ac2e86363d1ef
 SHA1 (patch-modules_audio__output_pulse.c) = 941ee669e62c9d757fc096c74a2aec58cf265b15
 SHA1 (patch-modules_misc_gnutls.c) = 7ab9df9f8b31ea7a7c8e302876d0e6c4e6882c30
 SHA1 (patch-skins-aa) = 9477b095b3e0a1120397c6c9f7102a50c1a63d2b
-SHA1 (patch-skins-ab) = bf8b3e33db5389dbf04dfedf1d2f1d120afed66a
diff --git a/multimedia/vlc2/patches/patch-skins-ab b/multimedia/vlc2/patches/patch-skins-ab
deleted file mode 100644
index c1904c25f69..00000000000
--- a/multimedia/vlc2/patches/patch-skins-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-skins-ab,v 1.1.1.1 2012/02/21 12:49:43 drochner Exp $
-
---- modules/gui/skins2/x11/x11_window.cpp.orig	2011-12-08 18:00:26.000000000 +0000
-+++ modules/gui/skins2/x11/x11_window.cpp
-@@ -36,6 +36,7 @@
- #include "x11_factory.hpp"
- 
- #include <assert.h>
-+#include <limits.h> /* for _POSIX_HOST_NAME_MAX */
- 
- X11Window::X11Window( intf_thread_t *pIntf, GenericWindow &rWindow,
-                       X11Display &rDisplay, bool dragDrop, bool playOnDrop,