Package: dvbstreamer
Version: 2.1.0-2
Followup-For: Bug #646135
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch
In Debian sid, the attached patch can be applied to achieve the following:
* no_ncurses.patch: Don't look for or link against ncurses; it isn't
even used. (Closes: #646135)
* debian/control: Because the majority of dvbstreamer's source is
GPLv2, we must use libreadline-gplv2-dev as a build-dependency.
Thanks for considering the patch.
-- System Information:
Debian Release: wheezy/sid
APT prefers oneiric-updates
APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500,
'oneiric-proposed'), (500, 'oneiric')
Architecture: amd64 (x86_64)
Kernel: Linux 3.0.0-12-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru dvbstreamer-2.1.0/debian/control dvbstreamer-2.1.0/debian/control
--- dvbstreamer-2.1.0/debian/control 2011-05-21 17:01:52.000000000 -0400
+++ dvbstreamer-2.1.0/debian/control 2011-10-28 18:45:51.000000000 -0400
@@ -4,7 +4,8 @@
XSBC-Original-Maintainer: A Mennucc1 <mennu...@debian.org>
Build-Depends: dpkg-dev (>= 1.14.27), debhelper (>= 7), quilt (>= 0.46-4.1),
autoconf, autotools-dev, automake, libtool, cdbs, libev-dev,
- libreadline-dev, sqlite3, libsqlite3-dev, libyaml-dev, libltdl-dev, zlib1g-dev
+ libreadline-gplv2-dev, sqlite3, libsqlite3-dev, libyaml-dev, libltdl-dev,
+ zlib1g-dev
Standards-Version: 3.8.3
Section: video
Homepage: http://dvbstreamer.sf.net/
diff -Nru dvbstreamer-2.1.0/debian/patches/no_ncurses.patch dvbstreamer-2.1.0/debian/patches/no_ncurses.patch
--- dvbstreamer-2.1.0/debian/patches/no_ncurses.patch 1969-12-31 19:00:00.000000000 -0500
+++ dvbstreamer-2.1.0/debian/patches/no_ncurses.patch 2011-10-28 19:08:27.000000000 -0400
@@ -0,0 +1,88 @@
+Index: dvbstreamer-2.1.0/configure.in
+===================================================================
+--- dvbstreamer-2.1.0.orig/configure.in 2011-10-28 19:00:59.000000000 -0400
++++ dvbstreamer-2.1.0/configure.in 2011-10-28 19:00:59.000000000 -0400
+@@ -149,14 +149,6 @@
+ dnl ---------------------------------------------------------------------------
+ AC_CHECK_HEADER([readline/readline.h], [], [AC_MSG_FAILURE([readline header file not found])])
+
+-AC_CHECK_LIB([readline], [readline], [READLINE_TERMCAP="-lncurses"],
+- [AC_CHECK_LIB([readline], [readline], [READLINE_TERMCAP="-ltermcap"],
+- [AC_MSG_FAILURE([readline not found])],
+- [-ltermcap])],
+- [-lncurses])
+-
+-AC_SUBST(READLINE_TERMCAP)
+-
+ LIBS=""
+
+ dnl ---------------------------------------------------------------------------
+Index: dvbstreamer-2.1.0/configure
+===================================================================
+--- dvbstreamer-2.1.0.orig/configure 2011-10-28 19:07:04.000000000 -0400
++++ dvbstreamer-2.1.0/configure 2011-10-28 19:08:25.000000000 -0400
+@@ -12537,7 +12537,7 @@
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lreadline -lncurses $LIBS"
++LIBS="-lreadline $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+@@ -12567,55 +12567,6 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5
+ $as_echo "$ac_cv_lib_readline_readline" >&6; }
+-if test "x$ac_cv_lib_readline_readline" = x""yes; then :
+- READLINE_TERMCAP="-lncurses"
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
+-$as_echo_n "checking for readline in -lreadline... " >&6; }
+-if test "${ac_cv_lib_readline_readline+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lreadline -ltermcap $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char readline ();
+-int
+-main ()
+-{
+-return readline ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- ac_cv_lib_readline_readline=yes
+-else
+- ac_cv_lib_readline_readline=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5
+-$as_echo "$ac_cv_lib_readline_readline" >&6; }
+-if test "x$ac_cv_lib_readline_readline" = x""yes; then :
+- READLINE_TERMCAP="-ltermcap"
+-else
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "readline not found
+-See \`config.log' for more details" "$LINENO" 5 ; }
+-fi
+-
+-fi
+
+
+
diff -Nru dvbstreamer-2.1.0/debian/patches/series dvbstreamer-2.1.0/debian/patches/series
--- dvbstreamer-2.1.0/debian/patches/series 2011-03-23 09:38:46.000000000 -0400
+++ dvbstreamer-2.1.0/debian/patches/series 2011-10-28 18:52:39.000000000 -0400
@@ -2,3 +2,4 @@
#autostuff.patch
usr_share_doc_in.patch
libev.patch
+no_ncurses.patch
