libev.patch

2.1.0-libev.patch (text/plain), 8.49 KB, created by Roger on 2011-11-17 15:14:36 UTC

Description: allow dvbstreamer to build with libev4
 The configure script expects ev_loop to be a symbol in libev, which
 is no longer the case in version 4. This patch replaces the lib check
 with a header declaration check.
 .
 The important part of the patch is that affecting configure.in; the
 configure script was regenerated with autoreconf.
Author: Stephen Kitt <[e-mail]>
Last-Update: 2011-03-21
Bug: http://bugs.debian.org/618786
Index: dvbstreamer-2.1.0/configure
===================================================================
--- dvbstreamer-2.1.0.orig/configure    2011-03-21 09:51:02.000000000 +0000
+++ dvbstreamer-2.1.0/configure 2011-03-21 09:51:58.000000000 +0000
@@ -1976,6 +1976,52 @@
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

 } # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+# ---------------------------------------------
+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+# accordingly.
+ac_fn_c_check_decl ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  as_decl_name=`echo $2|sed 's/ *(.*//'`
+  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if eval "test \"\${$3+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+#ifndef $as_decl_name
+#ifdef __cplusplus
+  (void) $as_decl_use;
+#else
+  (void) $as_decl_name;
+#endif
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_decl
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
@@ -6302,13 +6348,13 @@
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:6305: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:6351: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6308: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:6354: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6311: output\"" >&5)
+  (eval echo "\"\$as_me:6357: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -7510,7 +7556,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7513 "configure"' > conftest.$ac_ext
+  echo '#line 7559 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9081,11 +9127,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9084: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9130: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9088: \$? = $ac_status" >&5
+   echo "$as_me:9134: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9420,11 +9466,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9423: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9469: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9427: \$? = $ac_status" >&5
+   echo "$as_me:9473: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9525,11 +9571,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9528: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9574: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9532: \$? = $ac_status" >&5
+   echo "$as_me:9578: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9580,11 +9626,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9583: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9629: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9587: \$? = $ac_status" >&5
+   echo "$as_me:9633: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11964,7 +12010,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11967 "configure"
+#line 12013 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@@ -12060,7 +12106,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12063 "configure"
+#line 12109 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@@ -12786,53 +12832,15 @@
 fi


-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ev_loop in -lev" >&5
-$as_echo_n "checking for ev_loop in -lev... " >&6; }
-if test "${ac_cv_lib_ev_ev_loop+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lev  $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 ev_loop ();
-int
-main ()
-{
-return ev_loop ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_ev_ev_loop=yes
-else
-  ac_cv_lib_ev_ev_loop=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_ev_ev_loop" >&5
-$as_echo "$ac_cv_lib_ev_ev_loop" >&6; }
-if test "x$ac_cv_lib_ev_ev_loop" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBEV 1
-_ACEOF
-
-  LIBS="-lev $LIBS"
+as_ac_Symbol=`$as_echo "ac_cv_have_decl_ev_loop()" | $as_tr_sh`
+ac_fn_c_check_decl "$LINENO" "ev_loop()" "$as_ac_Symbol" "#include <ev.h>
+"
+if eval test \"x\$"$as_ac_Symbol"\" = x"yes"; then :

 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 $? "libev not found
+as_fn_error $? "libev doesn't provide ev_loop
 See \`config.log' for more details" "$LINENO" 5 ; }
 fi

Index: dvbstreamer-2.1.0/configure.in
===================================================================
--- dvbstreamer-2.1.0.orig/configure.in 2011-03-21 09:43:18.000000000 +0000
+++ dvbstreamer-2.1.0/configure.in      2011-03-21 09:45:17.000000000 +0000
@@ -188,7 +188,8 @@
 dnl Check for libev
 dnl ---------------------------------------------------------------------------
 AC_CHECK_HEADER([ev.h], [], [AC_MSG_FAILURE([libev header file not found])])
-AC_CHECK_LIB([ev], [ev_loop], [], [AC_MSG_FAILURE([libev not found])])
+AC_CHECK_DECL([ev_loop()], [], [AC_MSG_FAILURE([libev doesn't provide ev_loop])], [[#include <ev.h>]])
+dnl AC_CHECK_LIB([ev], [ev_loop], [], [AC_MSG_FAILURE([libev not found])])
 LIBS=""

 dnl ---------------------------------------------------------------------------