[SCM] vlc/squeeze-backports: Workaround ncurses detection on Squeeze

[edwardw-guest at users.alioth.debian.org]

The following commit has been merged in the squeeze-backports branch:
commit 7dafd1550f168bae7c9edc4ad95e59594fe79aee
Author: Edward Wang <edward.c.wang at compdigitec.com>
Date:   Mon Oct 15 22:52:23 2012 -0400

    Workaround ncurses detection on Squeeze

diff --git a/debian/patches/series b/debian/patches/series
index 8c33a45..685d05f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+workaround-ncurses-squeeze.patch
 v4l-kfreebsd.patch
 link-vlc-cache-gen-with-c++.patch
 link-vlc-with-c++.patch
diff --git a/debian/patches/workaround-ncurses-squeeze.patch b/debian/patches/workaround-ncurses-squeeze.patch
new file mode 100644
index 0000000..97027bc
--- /dev/null
+++ b/debian/patches/workaround-ncurses-squeeze.patch
@@ -0,0 +1,51 @@
+From: Edward Wang <edward.c.wang at compdigitec.com>
+
+Index: pkg-multimedia-vlc/configure.ac
+===================================================================
+--- pkg-multimedia-vlc.orig/configure.ac	2012-10-15 22:49:58.879818619 -0400
++++ pkg-multimedia-vlc/configure.ac	2012-10-15 22:50:44.214769829 -0400
+@@ -3801,19 +3801,31 @@
+ dnl  ncurses module
+ dnl
+ AC_ARG_ENABLE(ncurses,
+-[AS_HELP_STRING([--disable-ncurses],[ncurses text-based interface (default auto)])])
+-AS_IF([test "${enable_ncurses}" != "no"] ,[
+-  PKG_CHECK_MODULES([NCURSES], [ncursesw], [
+-    VLC_ADD_PLUGIN([ncurses])
+-    VLC_ADD_CFLAGS([ncurses],[${NCURSES_CFLAGS}])
+-    VLC_ADD_LIBS([ncurses],[${NCURSES_LIBS}])
+-    ALIASES="${ALIASES} nvlc"
+-  ], [
+-    AS_IF([test -n "${enable_ncurses}"], [
+-      AC_MSG_ERROR([${NCURSES_PKG_ERRORS}.])
+-    ])
+-  ])
+-])
++  [  --disable-ncurses       ncurses interface support (default disabled)],
++  [if test "${enable_ncurses}" != "no"; then
++    AC_CHECK_HEADER(ncurses.h,
++      [AC_CHECK_LIB(ncursesw, mvprintw,
++        [VLC_ADD_PLUGIN([ncurses])
++        VLC_ADD_LIBS([ncurses],[-lncursesw])
++        ALIASES="${ALIASES} nvlc"
++        AC_CHECK_LIB(ncursesw, tgetent, [],
++          AC_CHECK_LIB(tinfow, tgetent, [VLC_ADD_LIBS([ncurses],[-ltinfow])],
++            [AC_CHECK_LIB(tinfo, tgetent, [VLC_ADD_LIBS([ncurses],[-ltinfo])],
++              [AS_IF([test "${enable_ncurses}" = "yes"],
++                [AC_MSG_ERROR([tgetent not found in ncursesw tinfow tinfo]
++               )])])
++            ]
++          )
++        )
++        ],
++          [AS_IF([test "${enable_ncurses}" = "yes"], [
++            AC_MSG_ERROR([libncursesw not found])])]
++        )],
++        [AS_IF([test "${enable_ncurses}" = "yes"], [
++          AC_MSG_ERROR([ncurses.h not found])])]
++        )
++  fi]
++)
+ 
+ dnl
+ dnl  XOSD plugin

-- 
VLC media player packaging