update to 1.1.6, from Makoto Fujiwara per pkgsrc-wip

This is a new major branch, too many changes to list here.
(the options need testing and cleanup)

8 files changed, 265 insertions, 83 deletions

diff --git a/multimedia/vlc/patches/patch-aa b/multimedia/vlc/patches/patch-aa
index ebcd89edbab..3fd727d5542 100644
--- a/multimedia/vlc/patches/patch-aa
+++ b/multimedia/vlc/patches/patch-aa
@@ -1,30 +1,28 @@
-$NetBSD: patch-aa,v 1.13 2010/07/03 14:24:26 wiz Exp $
+$NetBSD: patch-aa,v 1.14 2011/01/24 18:54:04 drochner Exp $
 
-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))
diff --git a/multimedia/vlc/patches/patch-ab b/multimedia/vlc/patches/patch-ab
index b9a7e845f73..52e5502690b 100644
--- a/multimedia/vlc/patches/patch-ab
+++ b/multimedia/vlc/patches/patch-ab
@@ -1,24 +1,35 @@
-$NetBSD: patch-ab,v 1.6 2010/06/20 15:58:06 wiz Exp $
+$NetBSD: patch-ab,v 1.7 2011/01/24 18:54:04 drochner Exp $
 
-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])])
+       ])
diff --git a/multimedia/vlc/patches/patch-ap b/multimedia/vlc/patches/patch-ap
new file mode 100644
index 00000000000..d4ef19d3ff5
--- /dev/null
+++ b/multimedia/vlc/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.1 2011/01/24 18:54:04 drochner Exp $
+
+--- 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)
+     {
diff --git a/multimedia/vlc/patches/patch-ar b/multimedia/vlc/patches/patch-ar
new file mode 100644
index 00000000000..52012658754
--- /dev/null
+++ b/multimedia/vlc/patches/patch-ar
@@ -0,0 +1,34 @@
+$NetBSD: patch-ar,v 1.1 2011/01/24 18:54:04 drochner Exp $
+
+--- modules/misc/inhibit/xdg.c.orig	2010-11-26 22:32:46.000000000 +0000
++++ modules/misc/inhibit/xdg.c
+@@ -26,7 +26,11 @@
+ #include <vlc_plugin.h>
+ #include <vlc_inhibit.h>
+ #include <assert.h>
++#ifdef _POSIX_SPAWN
++# if (_POSIX_SPAWN >= 0)
+ #include <spawn.h>
++# endif
++#endif
+ #include <sys/wait.h>
+ 
+ static int Open (vlc_object_t *);
+@@ -137,6 +141,8 @@ static void *Thread (void *data)
+         pid_t pid;
+ 
+         vlc_mutex_unlock (&p_sys->lock);
++#ifdef _POSIX_SPAWN
++# if (_POSIX_SPAWN >= 0)
+         if (!posix_spawnp (&pid, "xdg-screensaver", NULL, NULL, argv, environ))
+         {
+             int status;
+@@ -146,6 +152,8 @@ static void *Thread (void *data)
+             while (waitpid (pid, &status, 0) == -1);
+         }
+         else/* We don't handle the error, but busy looping would be worse :( */
++# endif
++#endif
+             msg_Warn (ih, "could not start xdg-screensaver");
+ 
+         vlc_mutex_lock (&p_sys->lock);
diff --git a/multimedia/vlc/patches/patch-as b/multimedia/vlc/patches/patch-as
new file mode 100644
index 00000000000..d5c7feb56f1
--- /dev/null
+++ b/multimedia/vlc/patches/patch-as
@@ -0,0 +1,110 @@
+$NetBSD: patch-as,v 1.1 2011/01/24 18:54:04 drochner Exp $
+
+--- modules/misc/inhibit/xscreensaver.c~	2010-04-13 09:22:27.000000000 +0900
++++ modules/misc/inhibit/xscreensaver.c	2011-01-08 23:03:09.000000000 +0900
+@@ -39,7 +39,9 @@
+ #include <sys/wait.h>
+ #include <fcntl.h>
+ #include <signal.h>
++#ifdef _POSIX_SPAWN 
+ #include <spawn.h>
++#endif
+ 
+ /*****************************************************************************
+  * Local prototypes
+@@ -53,12 +55,16 @@
+ struct vlc_inhibit_sys
+ {
+     vlc_timer_t timer;
++#ifdef _POSIX_SPAWN
+     posix_spawn_file_actions_t actions;
+     posix_spawnattr_t attr;
+     int nullfd;
++#endif
+ };
+ 
++#ifdef _POSIX_SPAWN 
+ extern char **environ;
++#endif
+ 
+ /*****************************************************************************
+  * Module descriptor
+@@ -88,6 +94,7 @@
+     }
+     p_ih->inhibit = Inhibit;
+ 
++#ifdef _POSIX_SPAWN 
+     int fd = vlc_open ("/dev/null", O_WRONLY);
+     posix_spawn_file_actions_init (&p_sys->actions);
+     if (fd != -1)
+@@ -103,6 +110,7 @@
+     sigemptyset (&set);
+     posix_spawnattr_setsigmask (&p_sys->attr, &set);
+    
++#endif
+     return VLC_SUCCESS;
+ }
+ 
+@@ -115,10 +123,12 @@
+     vlc_inhibit_sys_t *p_sys = p_ih->p_sys;
+ 
+     vlc_timer_destroy( p_sys->timer );
++#ifdef _POSIX_SPAWN
+     if (p_sys->nullfd != -1)
+         close (p_sys->nullfd);
+     posix_spawnattr_destroy (&p_sys->attr);
+     posix_spawn_file_actions_destroy (&p_sys->actions);
++#endif
+     free( p_sys );
+ }
+ 
+@@ -131,15 +141,49 @@
+ /*****************************************************************************
+  * Execute: Spawns a process using execv()
+  *****************************************************************************/
++#ifdef _POSIX_SPAWN 
+ static void Execute (vlc_inhibit_t *p_ih, const char *const *argv)
++# else
++static void Execute (vlc_inhibit_t *p_ih, const char *const *ppsz_args)
++#endif
+ {
++#ifdef _POSIX_SPAWN
+     vlc_inhibit_sys_t *p_sys = p_ih->p_sys;
+     pid_t pid;
+ 
+     if (posix_spawnp (&pid, argv[0], &p_sys->actions, &p_sys->attr,
+                       (char **)argv, environ) == 0)
++#else
++      pid_t pid = fork();
++      switch ( pid )
++#endif
+     {
++#ifdef _POSIX_SPAWN
+         while (waitpid (pid, NULL, 0) != pid);
++#else
++        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;
++#endif
+     }
+ }
+ 
diff --git a/multimedia/vlc/patches/patch-at b/multimedia/vlc/patches/patch-at
new file mode 100644
index 00000000000..938da885547
--- /dev/null
+++ b/multimedia/vlc/patches/patch-at
@@ -0,0 +1,13 @@
+$NetBSD: patch-at,v 1.1 2011/01/24 18:54:04 drochner Exp $
+
+--- bin/override.c.orig	2011-01-24 11:11:26.000000000 +0000
++++ bin/override.c
+@@ -27,7 +27,7 @@
+ 
+ void vlc_enable_override (void);
+ 
+-#if defined (__GNUC__) /* typeof and statement-expression */ \
++#if 0 && defined (__GNUC__) /* typeof and statement-expression */ \
+  && (defined (__ELF__) && !defined (__sun__))
+ /* Solaris crashes on printf("%s", NULL); which is legal, but annoying. */
+ 
diff --git a/multimedia/vlc/patches/patch-configure b/multimedia/vlc/patches/patch-configure
index 2ee84c6e783..adf3093a75e 100644
--- a/multimedia/vlc/patches/patch-configure
+++ b/multimedia/vlc/patches/patch-configure
@@ -1,25 +1,49 @@
-$NetBSD: patch-configure,v 1.5 2010/06/20 15:58:06 wiz Exp $
+$NetBSD: patch-configure,v 1.6 2011/01/24 18:54:04 drochner Exp $
 
-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
diff --git a/multimedia/vlc/patches/patch-v4l2 b/multimedia/vlc/patches/patch-v4l2
deleted file mode 100644
index 9aae2acd958..00000000000
--- a/multimedia/vlc/patches/patch-v4l2
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-v4l2,v 1.3 2010/06/20 15:58:06 wiz Exp $
-
-http://trac.videolan.org/vlc/ticket/3761
-
---- modules/access/v4l2.c.orig	2009-05-22 01:06:04.000000000 +0200
-+++ modules/access/v4l2.c
-@@ -48,7 +48,13 @@
- #include <sys/ioctl.h>
- #include <sys/mman.h>
- 
--#include <linux/videodev2.h>
-+#if defined(HAVE_LINUX_VIDEODEV2_H)
-+#   include <linux/videodev2.h>
-+#elif defined(HAVE_SYS_VIDEOIO_H)
-+#   include <sys/videoio.h>
-+#else
-+#   error "No Video4Linux2 headers found."
-+#endif
- 
- #include <poll.h>
-