Index: multimedia/vlc/Makefile
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/multimedia/vlc/Makefile,v
retrieving revision 1.100
diff -u -r1.100 Makefile
--- multimedia/vlc/Makefile	23 Dec 2010 11:44:52 -0000	1.100
+++ multimedia/vlc/Makefile	7 Jan 2011 01:26:12 -0000
@@ -2,12 +2,11 @@
 #
 
 DISTNAME=		vlc-${VLC_VERSION}
-PKGREVISION=		5
 CATEGORIES=		multimedia
 MASTER_SITES=		http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
 EXTRACT_SUFX=		.tar.bz2
 
-VLC_VERSION=		1.0.6
+VLC_VERSION=		1.1.5
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.videolan.org/
@@ -94,14 +93,14 @@
 ORIGFNT=		/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf
 DEFAULT_FONT?=		${PREFIX}/lib/X11/fonts/TTF/DejaVuSans.ttf
 DEPENDS+=		dejavu-ttf>=2.26:../../fonts/dejavu-ttf
+# libX11 should be built with xcb enabled
+DEPENDS+=		libX11>=1.3.5:../../x11/libX11
 
 SUBST_CLASSES+=		oss
 SUBST_STAGE.oss=	pre-configure
 SUBST_SED.oss=		-e "s,/dev/dsp,${DEVOSSAUDIO},g"
 SUBST_FILES.oss+=	modules/access/oss.c
 SUBST_FILES.oss+=	modules/audio_output/oss.c
-SUBST_FILES.oss+=	modules/gui/pda/pda_interface.c
-SUBST_FILES.oss+=	modules/gui/pda/pda.glade
 SUBST_FILES.oss+=	po/*.po
 SUBST_MESSAGE.oss=	Fixing hardcoded audio device.
 
@@ -153,6 +152,7 @@
 .include "../../multimedia/libmpeg2/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../multimedia/libtheora/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 # needs x264_encoder_delayed_frames
 BUILDLINK_API_DEPENDS.x264-devel+= x264-devel>=20090920
 .include "../../multimedia/x264-devel/buildlink3.mk"
Index: multimedia/vlc/distinfo
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/multimedia/vlc/distinfo,v
retrieving revision 1.38
diff -u -r1.38 distinfo
--- multimedia/vlc/distinfo	3 Jul 2010 14:24:26 -0000	1.38
+++ multimedia/vlc/distinfo	7 Jan 2011 01:27:31 -0000
@@ -1,9 +1,10 @@
 $NetBSD: distinfo,v 1.38 2010/07/03 14:24:26 wiz Exp $
 
-SHA1 (vlc-1.0.6.tar.bz2) = 834346a84a71d915440b7741e04b6e02de451786
-RMD160 (vlc-1.0.6.tar.bz2) = 2185eb418748f2aadfce5e61b7a9de66a62ef2d1
-Size (vlc-1.0.6.tar.bz2) = 22149704 bytes
-SHA1 (patch-aa) = 7e3939a647f04661a2eba4fdbb720637dd267334
-SHA1 (patch-ab) = b17a4f0b5c9712d953ae45ff7d8c72ff8f323271
-SHA1 (patch-configure) = 44f3bc76668d9529ce35812d2c194199a0623a09
-SHA1 (patch-v4l2) = 578622c5233f7f5024ab5a3dca8719e1a258a407
+SHA1 (vlc-1.1.5.tar.bz2) = 19f4b3d82afd9cfd2131447d0cc65032e7cb9e5f
+RMD160 (vlc-1.1.5.tar.bz2) = b3ac38109e11e86df6049c7d7af4d484e582c586
+Size (vlc-1.1.5.tar.bz2) = 24111723 bytes
+SHA1 (patch-aa) = 684f7ad6a20ed6b9b8a8be2fc61836e6b471b686
+SHA1 (patch-ab) = 7ed32dc2a2c092083dad3c902848ba44369eac38
+SHA1 (patch-ap) = 423b571ca8a1b740812aea021e331912ba34c868
+SHA1 (patch-aq) = 208b46e150540e1c2392fa110f4f317df363dfff
+SHA1 (patch-configure) = 83f476cc71d795a69f787713a04471e078c0ec52
Index: multimedia/vlc/patches/patch-aa
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/multimedia/vlc/patches/patch-aa,v
retrieving revision 1.13
diff -u -r1.13 patch-aa
--- multimedia/vlc/patches/patch-aa	3 Jul 2010 14:24:26 -0000	1.13
+++ multimedia/vlc/patches/patch-aa	4 Jan 2011 13:06:40 -0000
@@ -1,30 +1,28 @@
-$NetBSD: patch-aa,v 1.13 2010/07/03 14:24:26 wiz Exp $
+$NetBSD$
 
-http://trac.videolan.org/vlc/ticket/3762
-
---- modules/access/file.c.orig	2009-09-18 19:37:45 +0300
-+++ modules/access/file.c	2009-09-26 07:18:35 +0300
-@@ -50,6 +50,9 @@
- #if defined (__linux__)
+--- modules/access/file.c.orig	2010-07-19 01:21:06.000000000 +0900
++++ modules/access/file.c	2011-01-04 22:05:25.000000000 +0900
+@@ -52,6 +52,9 @@
+ #ifdef HAVE_LINUX_MAGIC_H
  #   include <sys/vfs.h>
  #   include <linux/magic.h>
 +#elif defined (HAVE_FSTATVFS)
 +#   include <sys/statvfs.h>
 +#   include <sys/mount.h>
- #elif defined (HAVE_SYS_MOUNT_H)
- #   include <sys/param.h>
- #   include <sys/mount.h>
-@@ -126,7 +129,12 @@ struct access_sys_t
+ #endif
  
+ #if defined( WIN32 )
+@@ -90,7 +93,12 @@
+ #ifndef WIN32
  static bool IsRemote (int fd)
  {
--#ifdef HAVE_FSTATFS
-+#if !defined(__linux__) && defined(HAVE_FSTATVFS)
+-#if defined (HAVE_FSTATVFS) && defined (MNT_LOCAL)
++#if !defined(__linux__) && defined(HAVE_FSTATVFS) && defined (MNT_LOCAL)
 +    struct statvfs s;
 +    if (fstatvfs(fd, &s))
 +        return false;  
 +    return !(s.f_flag & MNT_LOCAL);
 +#elif defined (HAVE_FSTATFS)
-     struct statfs stf;
+     struct statvfs stf;
  
-     if (fstatfs (fd, &stf))
+     if (fstatvfs (fd, &stf))
Index: multimedia/vlc/patches/patch-ab
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/multimedia/vlc/patches/patch-ab,v
retrieving revision 1.6
diff -u -r1.6 patch-ab
--- multimedia/vlc/patches/patch-ab	20 Jun 2010 15:58:06 -0000	1.6
+++ multimedia/vlc/patches/patch-ab	4 Jan 2011 13:49:15 -0000
@@ -1,24 +1,35 @@
-$NetBSD: patch-ab,v 1.6 2010/06/20 15:58:06 wiz Exp $
+$NetBSD$
 
-Fixed in git version ffa6a2fa83452afe6a6ec67c4a3e8a5f1a6aaeef.
-
---- modules/codec/png.c.orig	2010-03-07 18:38:01.000000000 +0000
-+++ modules/codec/png.c
-@@ -155,7 +155,7 @@ static picture_t *DecodeBlock( decoder_t
-     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_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;
-     }
+--- configure.ac.orig	2010-11-12 07:49:28.000000000 +0900
++++ configure.ac	2011-01-04 22:47:39.000000000 +0900
+@@ -2688,13 +2688,13 @@
+            AC_DEFINE(HAVE_AVCODEC_VAAPI, 1, [Define if avcodec has to be built with VAAPI support.])
+            echo "VAAPI acceleration activated"
+         ],[
+-	AS_IF([test "${enable_libva}" == "yes"],
++	AS_IF([test "${enable_libva}" = "yes"],
+ 	      [AC_MSG_ERROR([libva is present but libavcodec/vaapi.h is missing])],
+               [AC_MSG_WARN([libva is present but libavcodec/vaapi.h is missing ])])
+         ])
+         VLC_RESTORE_FLAGS
+       ],[
+-	AS_IF([test "${enable_libva}" == "yes"],
++	AS_IF([test "${enable_libva}" = "yes"],
+               [AC_MSG_ERROR([Could not find required libva.])],
+               [AC_MSG_WARN([libva not found  ])])
+       ])
+@@ -2721,12 +2721,12 @@
+            AC_DEFINE(HAVE_AVCODEC_DXVA2, 1, [Define if avcodec has to be built with DxVA2 support.])
+            echo "DxVA2 acceleration activated"
+         ],[
+-	AS_IF([test "${enable_dxva2}" == "yes"],
++	AS_IF([test "${enable_dxva2}" = "yes"],
+ 	      [AC_MSG_ERROR([dxva2 is present but libavcodec/dxva2.h is missing])],
+               [AC_MSG_WARN([dxva2 is present but libavcodec/dxva2.h is missing ])])
+         ])
+       ],[
+-	AS_IF([test "${enable_dxva2}" == "yes"],
++	AS_IF([test "${enable_dxva2}" = "yes"],
+               [AC_MSG_ERROR([Could not find required dxva2api.h])],
+               [AC_MSG_WARN([dxva2api.h not found])])
+       ])
Index: multimedia/vlc/patches/patch-ap
===================================================================
RCS file: multimedia/vlc/patches/patch-ap
diff -N multimedia/vlc/patches/patch-ap
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ multimedia/vlc/patches/patch-ap	4 Jan 2011 15:30:56 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- bin/override.c.orig	2010-08-09 05:29:21.000000000 +0900
++++ bin/override.c	2011-01-05 00:30:10.000000000 +0900
+@@ -120,7 +120,7 @@
+  *
+  * Some evil libraries modify the environment. We currently ignore the calls as
+  * they could crash the process. This may cause funny behaviour though. */
+-int putenv (char *str)
++int putenv (const char *str)
+ {
+     if (override)
+     {
Index: multimedia/vlc/patches/patch-aq
===================================================================
RCS file: multimedia/vlc/patches/patch-aq
diff -N multimedia/vlc/patches/patch-aq
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ multimedia/vlc/patches/patch-aq	6 Jan 2011 15:25:04 -0000
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- modules/gui/qt4/util/customwidgets.cpp~	2010-07-01 22:09:31.000000000 +0900
++++ modules/gui/qt4/util/customwidgets.cpp	2011-01-07 00:24:42.000000000 +0900
+@@ -392,11 +392,7 @@
+ 
+     if( qtk <= 0xff )
+         /* VLC and X11 use lowercase whereas Qt uses uppercase */
+-#if defined( __STDC_ISO_10646__ ) || defined( _WIN32 )
+         i_vlck = towlower( qtk );
+-#else
+-# error FIXME
+-#endif
+     else
+     {
+         const vlc_qt_key_t *map;
Index: multimedia/vlc/patches/patch-configure
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/multimedia/vlc/patches/patch-configure,v
retrieving revision 1.5
diff -u -r1.5 patch-configure
--- multimedia/vlc/patches/patch-configure	20 Jun 2010 15:58:06 -0000	1.5
+++ multimedia/vlc/patches/patch-configure	4 Jan 2011 13:58:04 -0000
@@ -1,25 +1,49 @@
-$NetBSD: patch-configure,v 1.5 2010/06/20 15:58:06 wiz Exp $
+$NetBSD$
 
-First chunk: http://trac.videolan.org/vlc/ticket/3762
-Second chunk: http://trac.videolan.org/vlc/ticket/3761
-
---- configure.ac.orig	2009-09-19 21:30:21.000000000 +0200
-+++ configure.ac
-@@ -572,7 +572,7 @@ AC_CHECK_FUNCS(fdatasync,,
- ])
- 
- dnl Check for non-standard system calls
--AC_CHECK_FUNCS([vmsplice eventfd fstatfs])
-+AC_CHECK_FUNCS([vmsplice eventfd fstatvfs fstatfs])
- 
- AH_BOTTOM([#include <vlc_fixups.h>])
- 
-@@ -2498,7 +2498,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}"
+--- configure.orig	2010-11-12 08:01:11.000000000 +0900
++++ configure	2011-01-04 22:57:48.000000000 +0900
+@@ -32744,7 +32744,7 @@
+ 	echo "$LIBVA_PKG_ERRORS" >&5
+ 
+ 
+-	if test "${enable_libva}" == "yes"; then :
++	if test "${enable_libva}" = "yes"; then :
+   as_fn_error $? "Could not find required libva." "$LINENO" 5
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libva not found  " >&5
+@@ -32755,7 +32755,7 @@
+      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 
+-	if test "${enable_libva}" == "yes"; then :
++	if test "${enable_libva}" = "yes"; then :
+   as_fn_error $? "Could not find required libva." "$LINENO" 5
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libva not found  " >&5
+@@ -32805,7 +32805,7 @@
+ 
+ else
+ 
+-	if test "${enable_libva}" == "yes"; then :
++	if test "${enable_libva}" = "yes"; then :
+   as_fn_error $? "libva is present but libavcodec/vaapi.h is missing" "$LINENO" 5
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libva is present but libavcodec/vaapi.h is missing " >&5
+@@ -32879,7 +32879,7 @@
+ 
+ else
+ 
+-	if test "${enable_dxva2}" == "yes"; then :
++	if test "${enable_dxva2}" = "yes"; then :
+   as_fn_error $? "dxva2 is present but libavcodec/dxva2.h is missing" "$LINENO" 5
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: dxva2 is present but libavcodec/dxva2.h is missing " >&5
+@@ -32893,7 +32893,7 @@
+ 
+ else
+ 
+-	if test "${enable_dxva2}" == "yes"; then :
++	if test "${enable_dxva2}" = "yes"; then :
+   as_fn_error $? "Could not find required dxva2api.h" "$LINENO" 5
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: dxva2api.h not found" >&5