Restore disable-v4l2 and posix_memalign checks (to fix compilation)

patches/0001-Android-add-compatibility-pthread_cancel.patch

 From 47101cb6e74e6cdfdb3ab3debb8cccafb93d6e93 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jean-Philippe=20Andr=C3=A9?= <jpeg@videolan.org>
 Date: Thu, 2 Jun 2011 15:15:57 +0200
-Subject: [PATCH 1/6] Android: add compatibility pthread_cancel
+Subject: [PATCH 1/7] Android: add compatibility pthread_cancel
 
 Original-code: c1ee19f63a6c6773400e98a9265b0a7e49fd528c
                7884ed8d407647a1523afb8be6a2859477d54fd7

patches/0002-Android-use-a-custom-poll-fixes-HTTP-playback.patch

 From 139e917595bf81ece7292d968372fb871d1f33da Mon Sep 17 00:00:00 2001
 From: Dominique Martinet <asmadeus@codewreck.org>
 Date: Thu, 2 Jun 2011 12:50:50 +0200
-Subject: [PATCH 2/6] Android: use a custom poll(), fixes HTTP playback
+Subject: [PATCH 2/7] Android: use a custom poll(), fixes HTTP playback
 
 Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
 ---

patches/0003-Push-messages-to-Android-stack.patch

 From 054afb010cefa90f3ad8d50c23959be7375475b8 Mon Sep 17 00:00:00 2001
 From: Jean-Baptiste Kempf <jb@videolan.org>
 Date: Sun, 31 Jul 2011 00:20:40 +0200
-Subject: [PATCH 3/6] Push messages to Android stack
+Subject: [PATCH 3/7] Push messages to Android stack
 
 Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
 ---

patches/0004-Old-contribs-compile-live-on-Android.patch

 From 8f0b9e2db10319c82c5b6595f96c6768b9627ca7 Mon Sep 17 00:00:00 2001
 From: Jean-Baptiste Kempf <jb@videolan.org>
 Date: Sun, 31 Jul 2011 00:05:21 +0200
-Subject: [PATCH 4/6] Old contribs: compile live on Android
+Subject: [PATCH 4/7] Old contribs: compile live on Android
 
 Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
 ---

patches/0005-i420-RGB-convertor-in-NEON.patch

 From 67d037e3d1c3fc06edd651ba4738d68a9b5d2b72 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=A9bastien=20Toque?= <xilasz@gmail.com>
 Date: Mon, 5 Sep 2011 22:25:10 +0200
-Subject: [PATCH 5/6] i420->RGB convertor in NEON
+Subject: [PATCH 5/7] i420->RGB convertor in NEON
 
 ---
  modules/arm_neon/Modules.am    |    8 ++

patches/0006-Implement-rw_locks.patch

 From 7962bff5eb8d3d54abdfcb554284e9654ce1f839 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?R=C3=A9mi=20Duraffort?= <ivoire@videolan.org>
 Date: Sun, 7 Nov 2010 19:11:51 +0100
-Subject: [PATCH 6/6] Implement rw_locks.
+Subject: [PATCH 6/7] Implement rw_locks.
 
 [funman]
 add static initializer, use #ifdef __ANDROID__, remove windows function call

patches/0007-Restore-disable-v4l2-and-posix_memalign-checks-to-fi.patch

+From 5f7e1fad78553ac8e3aa2851155dae830556c80a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Toque?= <xilasz@gmail.com>
+Date: Tue, 6 Sep 2011 21:08:58 +0200
+Subject: [PATCH 7/7] Restore disable-v4l2 and posix_memalign checks (to fix compilation)
+
+---
+ configure.ac         |   10 +++++++---
+ include/vlc_common.h |    4 ++++
+ 2 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 85e2a39..9807e37 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -567,7 +567,7 @@ need_libc=false
+ 
+ dnl Check for usual libc functions
+ AC_CHECK_DECLS([nanosleep],,,[#include <time.h>])
+-AC_CHECK_FUNCS([daemon fcntl fstatvfs fork getenv getpwuid_r if_nameindex if_nametoindex isatty lstat memalign mmap openat pread posix_fadvise posix_madvise setlocale stricmp strnicmp uselocale])
++AC_CHECK_FUNCS([daemon fcntl fstatvfs fork getenv getpwuid_r if_nameindex if_nametoindex isatty lstat memalign mmap openat pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp uselocale])
+ AC_REPLACE_FUNCS([asprintf atof atoll dirfd fdopendir flockfile fsync getdelim getpid gmtime_r lldiv localtime_r nrand48 rewind setenv strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab tdestroy vasprintf])
+ AC_CHECK_FUNCS(fdatasync,,
+   [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
+@@ -1955,13 +1955,17 @@ fi
+ dnl
+ dnl  Video4Linux 2
+ dnl
++AC_ARG_ENABLE(v4l2, [AS_HELP_STRING([--disable-v4l2],
++    [disable Video4Linux2 support (default auto)])])
+ AC_ARG_ENABLE(libv4l2, [AS_HELP_STRING([--disable-libv4l2],
+   [disable userspace V4L2 library (default auto)])])
+ AC_ARG_ENABLE(pvr, [AS_HELP_STRING([--enable-pvr],
+   [support PVR V4L2 cards (default disabled)])])
+ have_v4l2="no"
+-AC_CHECK_HEADERS([linux/videodev2.h sys/videoio.h], [
+-  have_v4l2="yes"
++AS_IF([test "${enable_v4l2}" != "no"], [
++  AC_CHECK_HEADERS([linux/videodev2.h sys/videoio.h], [
++    have_v4l2="yes"
++  ])
+ ])
+ AS_IF([test "$have_v4l2" = "yes"], [
+   AS_IF([test "${enable_libv4l2}" != "no"], [
+diff --git a/include/vlc_common.h b/include/vlc_common.h
+index 08fd006..2134729 100644
+--- a/include/vlc_common.h
++++ b/include/vlc_common.h
+@@ -891,10 +891,14 @@ VLC_API bool vlc_ureduce( unsigned *, unsigned *, uint64_t, uint64_t, uint64_t )
+ #else
+ static inline void *vlc_memalign(size_t align, size_t size)
+ {
++#if defined(HAVE_POSIX_MEMALIGN)
+     void *base;
+     if (unlikely(posix_memalign(&base, align, size)))
+         base = NULL;
+     return base;
++#else
++    return memalign(align, size);
++#endif
+ }
+ # define vlc_free(base) free(base)
+ #endif
+-- 
+1.7.4.1
+