aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Changes6
-rw-r--r--Makefile.in66
-rw-r--r--common/commands.c2
-rw-r--r--config.h.in2
-rwxr-xr-xconfigure799
-rw-r--r--configure.ac9
-rw-r--r--console/record.c4
-rw-r--r--console/showqt.c7
-rw-r--r--console/v4l-info.c41
-rw-r--r--debian/changelog7
-rw-r--r--debian/control4
-rw-r--r--frequencies/Index.map2
-rw-r--r--frequencies/README20
-rw-r--r--frequencies/oirt-h.list65
-rw-r--r--frequencies/oirt-sl-sh.list4
-rw-r--r--frequencies/secam-russia.list4
-rw-r--r--libng/plugins/Subdir.mk2
-rw-r--r--libng/plugins/drv0-v4l2.c7
-rw-r--r--libng/plugins/drv1-v4l.c2
-rw-r--r--mk/compile.mk68
-rw-r--r--x11/motv.c2
-rw-r--r--xawtv.spec2
22 files changed, 587 insertions, 538 deletions
diff --git a/Changes b/Changes
index 9c5fbff..5abd2cf 100644
--- a/Changes
+++ b/Changes
@@ -1,4 +1,10 @@
+3.79 => 3.80
+============
+
+ * misc small compile fixes and bugfixes.
+
+
3.78 => 3.79
============
diff --git a/Makefile.in b/Makefile.in
index e096ccf..b6c7ad1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -92,7 +92,7 @@ Makefile: $(srcdir)/Makefile.in $(srcdir)/configure
$(srcdir)/configure
$(srcdir)/configure: $(srcdir)/configure.ac
- (cd $(srcdir); autoconf && autoheader)
+ (cd $(srcdir); autoconf && autoheader && rm -rf autom4te.cache)
install:: all
$(INSTALL_DIR) $(bindir)
@@ -102,7 +102,7 @@ clean::
find . -name \*.o -print | xargs rm -f
find . -name \*.a -print | xargs rm -f
find . -name \*.dep -print | xargs rm -f
- rm -f .deps.*
+ rm -f $(depfiles)
distclean:: clean
-rm -f Makefile Make.config
@@ -119,64 +119,14 @@ realclean:: distclean
#########################################################
# some rules ...
-tmpdep = $*.dep
-depfile = .deps.$(subst /,_,$*)
-
-compile_c = $(CC) $(CFLAGS) -Wp,-MD,$(tmpdep) -c -o $@ $<
-compile_cc = $(CXX) $(CXXFLAGS) -Wp,-MD,$(tmpdep) -c -o $@ $<
-fixup_deps = sed -e "s|.*\.o:|$@::|" < $(tmpdep) > $(depfile) && rm -f $(tmpdep)
-
-link_app = $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
-link_so = $(CC) $(LDFLAGS) -shared -Wl,-soname,$(@F) -o $@ $^ $(LDLIBS)
-ar_lib = rm -f $@ && ar -r $@ $^ && ranlib $@
-
-# non-verbose output
-VERBOSE = no
-ifeq ($(VERBOSE),yes)
-echo_compile_c = echo $(compile_c)
-echo_compile_cc = echo $(compile_cc)
-echo_link_app = echo $(link_app)
-echo_link_so = echo $(link_so)
-echo_ar_lib = echo $(ar_lib)
-else
-echo_compile_c = echo "compile " $@
-echo_compile_cc = echo "compile " $@
-echo_link_app = echo "link " $@
-echo_link_so = echo "link " $@
-echo_ar_lib = echo "archive " $@
-endif
-
-.SUFFIXES: .c .cc .h .o .so .in .ad
-# .bdf .pcf.gz
-
-.c.o:
- @$(echo_compile_c)
- @$(compile_c)
- @$(fixup_deps)
-
-.cc.o:
- @$(echo_compile_cc)
- @$(compile_cc)
- @$(fixup_deps)
-
-.o.so:
- @$(echo_link_so)
- @$(link_so)
-
-%: %.o
- @$(echo_link_app)
- @$(link_app)
-
-.in.h:
+include $(srcdir)/mk/compile.mk
+
+%.h: %.in
perl $(srcdir)/scripts/html.pl < $< > $@
-.ad.h:
+%.h: %.ad
perl $(srcdir)/scripts/fallback.pl < $< > $@
-#.bdf.pcf.gz:
-# bdftopcf -o $*.pcf $<
-# gzip $*.pcf
-
#########################################################
# include stuff
@@ -196,8 +146,8 @@ include $(srcdir)/scripts/Subdir.mk
include $(srcdir)/vbistuff/Subdir.mk
include $(srcdir)/x11/Subdir.mk
-# dependences
--include .deps.*
+# dependencies
+-include $(depfiles)
#########################################################
diff --git a/common/commands.c b/common/commands.c
index ab4df5e..aa13501 100644
--- a/common/commands.c
+++ b/common/commands.c
@@ -10,9 +10,9 @@
#include <errno.h>
#include <math.h>
#include <stdarg.h>
-#include <time.h>
#include <fcntl.h>
#include <pthread.h>
+#include <sys/time.h>
#include <sys/socket.h>
#include <netinet/in.h>
diff --git a/config.h.in b/config.h.in
index 0c42bd4..f5b6ffb 100644
--- a/config.h.in
+++ b/config.h.in
@@ -69,7 +69,7 @@
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
-/* "have opv6" */
+/* "have ipv6" */
#undef HAVE_SOCKADDR_STORAGE
/* Define to 1 if you have the <soundcard.h> header file. */
diff --git a/configure b/configure
index 19395c5..83e11fe 100755
--- a/configure
+++ b/configure
@@ -1,19 +1,11 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.53.
+# Generated by GNU Autoconf 2.54.
#
# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
- as_expr=expr
-else
- as_expr=false
-fi
-
-
## --------------------- ##
## M4sh Initialization. ##
## --------------------- ##
@@ -22,11 +14,13 @@ fi
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
set -o posix
fi
-# NLS nuisances.
# Support unset when possible.
if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
as_unset=unset
@@ -34,34 +28,39 @@ else
as_unset=false
fi
-(set +x; test -n "`(LANG=C; export LANG) 2>&1`") &&
- { $as_unset LANG || test "${LANG+set}" != set; } ||
- { LANG=C; export LANG; }
-(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") &&
- { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } ||
- { LC_ALL=C; export LC_ALL; }
-(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") &&
- { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } ||
- { LC_TIME=C; export LC_TIME; }
-(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") &&
- { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } ||
- { LC_CTYPE=C; export LC_CTYPE; }
-(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") &&
- { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } ||
- { LANGUAGE=C; export LANGUAGE; }
-(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") &&
- { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } ||
- { LC_COLLATE=C; export LC_COLLATE; }
-(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") &&
- { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } ||
- { LC_NUMERIC=C; export LC_NUMERIC; }
-(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") &&
- { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } ||
- { LC_MESSAGES=C; export LC_MESSAGES; }
+
+# Work around bugs in pre-3.0 UWIN ksh.
+$as_unset ENV MAIL MAILPATH
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+for as_var in LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES LC_TIME
+do
+ if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+ eval $as_var=C; export $as_var
+ else
+ $as_unset $as_var
+ fi
+done
+
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1; then
+ as_expr=expr
+else
+ as_expr=false
+fi
+
+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+ as_basename=basename
+else
+ as_basename=false
+fi
# Name of the executable.
-as_me=`(basename "$0") 2>/dev/null ||
+as_me=`$as_basename "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)$' \| \
@@ -72,6 +71,7 @@ echo X/"$0" |
/^X\/\(\/\).*/{ s//\1/; q; }
s/.*/./; q'`
+
# PATH needs CR, and LINENO needs CR and PATH.
# Avoid depending upon Character Ranges.
as_cr_letters='abcdefghijklmnopqrstuvwxyz'
@@ -85,7 +85,7 @@ if test "${PATH_SEPARATOR+set}" != set; then
echo "#! /bin/sh" >conftest.sh
echo "exit 0" >>conftest.sh
chmod +x conftest.sh
- if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
+ if (PATH="/nonexistent;."; conftest.sh) >/dev/null 2>&1; then
PATH_SEPARATOR=';'
else
PATH_SEPARATOR=:
@@ -138,6 +138,8 @@ do
as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
test "x$as_lineno_1" != "x$as_lineno_2" &&
test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
+ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
CONFIG_SHELL=$as_dir/$as_base
export CONFIG_SHELL
exec "$CONFIG_SHELL" "$0" ${1+"$@"}
@@ -210,6 +212,12 @@ else
fi
rm -f conf$$ conf$$.exe conf$$.file
+if mkdir -p . 2>/dev/null; then
+ as_mkdir_p=:
+else
+ as_mkdir_p=false
+fi
+
as_executable_p="test -f"
# Sed expression to map a string onto a valid CPP name.
@@ -226,7 +234,7 @@ as_nl='
IFS=" $as_nl"
# CDPATH.
-$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; }
+$as_unset CDPATH
# Name of the host.
@@ -240,6 +248,7 @@ exec 6>&1
# Initializations.
#
ac_default_prefix=/usr/local
+ac_config_libobj_dir=.
cross_compiling=no
subdirs=
MFLAGS=
@@ -296,6 +305,8 @@ ac_includes_default="\
# include <unistd.h>
#endif"
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA DEPEND FOUND_AALIB FOUND_ALSA FOUND_DV FOUND_LQT FOUND_MOTIF FOUND_OS FOUND_X11 FOUND_GL FOUND_ZVBI EGREP DLFLAGS LIBPTHREAD LIBOSS LIBCURSES X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS x_includes x_libraries ATHENA FSLIB SUBS TOOLS LDLIBS LIBALSA LIRC LIBZVBI AALIBS LIBDV QTLIBS LIBGL VERSION x11conf resdir USE_MMX LIBOBJS LTLIBOBJS'
+ac_subst_files=''
# Initialize some variables set by options.
ac_init_help=
@@ -719,6 +730,9 @@ if test ! -r $srcdir/$ac_unique_file; then
{ (exit 1); exit 1; }; }
fi
fi
+(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+ { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+ { (exit 1); exit 1; }; }
srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
ac_env_build_alias_set=${build_alias+set}
ac_env_build_alias_value=$build_alias
@@ -843,6 +857,7 @@ Optional Features:
--enable-alsa enable alsa support
--enable-zvbi enable vbi support (via libzvbi)
--enable-gl enable opengl support
+ --enable-dv enable dvlib support
--enable-mmx enable mmx support
Optional Packages:
@@ -940,7 +955,7 @@ This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by $as_me, which was
-generated by GNU Autoconf 2.53. Invocation command line was
+generated by GNU Autoconf 2.54. Invocation command line was
$ $0 $@
@@ -1006,12 +1021,9 @@ do
*" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
- case " $ac_configure_args " in
- *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
- *) ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
- ac_sep=" " ;;
- esac
+ ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
# Get rid of the leading space.
+ ac_sep=" "
done
# When interrupted or exit'd, cleanup temporary files, and complete
@@ -1023,6 +1035,7 @@ trap 'exit_status=$?
# Save into config.log some information that might help in debugging.
{
echo
+
cat <<\_ASBOX
## ---------------- ##
## Cache variables. ##
@@ -1045,6 +1058,35 @@ _ASBOX
esac;
}
echo
+
+ cat <<\_ASBOX
+## ----------------- ##
+## Output variables. ##
+## ----------------- ##
+_ASBOX
+ echo
+ for ac_var in $ac_subst_vars
+ do
+ eval ac_val=$`echo $ac_var`
+ echo "$ac_var='"'"'$ac_val'"'"'"
+ done | sort
+ echo
+
+ if test -n "$ac_subst_files"; then
+ cat <<\_ASBOX
+## ------------- ##
+## Output files. ##
+## ------------- ##
+_ASBOX
+ echo
+ for ac_var in $ac_subst_files
+ do
+ eval ac_val=$`echo $ac_var`
+ echo "$ac_var='"'"'$ac_val'"'"'"
+ done | sort
+ echo
+ fi
+
if test -s confdefs.h; then
cat <<\_ASBOX
## ----------- ##
@@ -1052,7 +1094,7 @@ _ASBOX
## ----------- ##
_ASBOX
echo
- sed "/^$/d" confdefs.h
+ sed "/^$/d" confdefs.h | sort
echo
fi
test "$ac_signal" != 0 &&
@@ -1209,7 +1251,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-ac_config_headers="$ac_config_headers config.h"
+
+ ac_config_headers="$ac_config_headers config.h"
@@ -1254,9 +1297,14 @@ if test "${enable_zvbi+set}" = set; then
enableval="$enable_zvbi"
fi;
-# Check whether --enable-zvbi or --disable-zvbi was given.
-if test "${enable_zvbi+set}" = set; then
- enableval="$enable_zvbi"
+# Check whether --enable-gl or --disable-gl was given.
+if test "${enable_gl+set}" = set; then
+ enableval="$enable_gl"
+
+fi;
+# Check whether --enable-dv or --disable-dv was given.
+if test "${enable_dv+set}" = set; then
+ enableval="$enable_dv"
fi;
# Check whether --enable-mmx or --disable-mmx was given.
@@ -1471,9 +1519,7 @@ if test $ac_prog_rejected = yes; then
# However, it has the same basename, so the bogon will be chosen
# first if we set CC to just the basename; use the full file name.
shift
- set dummy "$as_dir/$ac_word" ${1+"$@"}
- shift
- ac_cv_prog_CC="$@"
+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
fi
fi
fi
@@ -1606,12 +1652,6 @@ cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -1640,11 +1680,10 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
# Be careful to initialize this variable, since it used to be cached.
# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
ac_cv_exeext=
-for ac_file in `ls a_out.exe a.exe conftest.exe 2>/dev/null;
- ls a.out conftest 2>/dev/null;
- ls a.* conftest.* 2>/dev/null`; do
+for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.*; do
+ test -f "$ac_file" || continue
case $ac_file in
- *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb | *.xSYM ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
a.out ) # We found the default executable, but exeext='' is most
# certainly right.
break;;
@@ -1658,8 +1697,10 @@ done
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables" >&5
-echo "$as_me: error: C compiler cannot create executables" >&2;}
+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+check \`config.log' for details." >&5
+echo "$as_me: error: C compiler cannot create executables
+check \`config.log' for details." >&2;}
{ (exit 77); exit 77; }; }
fi
@@ -1716,9 +1757,10 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
# work properly (i.e., refer to `conftest.exe'), while it won't with
# `rm'.
-for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
+for ac_file in conftest.exe conftest conftest.*; do
+ test -f "$ac_file" || continue
case $ac_file in
- *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
export ac_cv_exeext
break;;
@@ -1747,12 +1789,6 @@ else
#line $LINENO "configure"
#include "confdefs.h"
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -1769,7 +1805,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(exit $ac_status); }; then
for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
break;;
esac
@@ -1797,12 +1833,6 @@ else
#line $LINENO "configure"
#include "confdefs.h"
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -1851,12 +1881,6 @@ else
#line $LINENO "configure"
#include "confdefs.h"
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -1902,6 +1926,97 @@ else
CFLAGS=
fi
fi
+echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
+echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+if test "${ac_cv_prog_cc_stdc+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_prog_cc_stdc=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+#include "confdefs.h"
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+ char **p;
+ int i;
+{
+ return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+ char *s;
+ va_list v;
+ va_start (v,p);
+ s = g (p, va_arg (v,int));
+ va_end (v);
+ return s;
+}
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
+ ;
+ return 0;
+}
+_ACEOF
+# Don't try gcc -ansi; that turns off useful extensions and
+# breaks some systems' header files.
+# AIX -qlanglvl=ansi
+# Ultrix and OSF/1 -std1
+# HP-UX 10.20 and later -Ae
+# HP-UX older versions -Aa -D_HPUX_SOURCE
+# SVR4 -Xc -D__EXTENSIONS__
+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+ CC="$ac_save_CC $ac_arg"
+ rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_prog_cc_stdc=$ac_arg
+break
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext
+done
+rm -f conftest.$ac_ext conftest.$ac_objext
+CC=$ac_save_CC
+
+fi
+
+case "x$ac_cv_prog_cc_stdc" in
+ x|xno)
+ echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6 ;;
+ *)
+ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+ CC="$CC $ac_cv_prog_cc_stdc" ;;
+esac
+
# Some people use a C++ compiler to compile C. Since we use `exit',
# in C++ we need to declare it. In case someone uses the same compiler
# for both compiling C and C++ we need to have the C++ compiler decide
@@ -1937,12 +2052,6 @@ do
#include "confdefs.h"
#include <stdlib.h>
$ac_declaration
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -1974,12 +2083,6 @@ rm -f conftest.$ac_objext conftest.$ac_ext
#line $LINENO "configure"
#include "confdefs.h"
$ac_declaration
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -2147,12 +2250,6 @@ else
#line $LINENO "configure"
#include "confdefs.h"
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -2201,12 +2298,6 @@ else
#line $LINENO "configure"
#include "confdefs.h"
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -2266,12 +2357,6 @@ do
#include "confdefs.h"
#include <stdlib.h>
$ac_declaration
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -2303,12 +2388,6 @@ rm -f conftest.$ac_objext conftest.$ac_ext
#line $LINENO "configure"
#include "confdefs.h"
$ac_declaration
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -2383,7 +2462,7 @@ _ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
- egrep -v '^ *\+' conftest.er1 >conftest.err
+ grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2416,7 +2495,7 @@ _ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
- egrep -v '^ *\+' conftest.er1 >conftest.err
+ grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2474,7 +2553,7 @@ _ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
- egrep -v '^ *\+' conftest.er1 >conftest.err
+ grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2507,7 +2586,7 @@ _ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
- egrep -v '^ *\+' conftest.er1 >conftest.err
+ grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2730,6 +2809,7 @@ case "`uname -s`" in
echo $ECHO_N "checking if xawtv will build on \`uname -s\`... $ECHO_C" >&6
echo "$as_me:$LINENO: result: maybe" >&5
echo "${ECHO_T}maybe" >&6
+ FOUND_OS="unknown"
;;
esac
@@ -2737,6 +2817,21 @@ esac
+echo "$as_me:$LINENO: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+if test "${ac_cv_prog_egrep+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+ then ac_cv_prog_egrep='grep -E'
+ else ac_cv_prog_egrep='egrep'
+ fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+ EGREP=$ac_cv_prog_egrep
+
+
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
@@ -2744,7 +2839,7 @@ cat >conftest.$ac_ext <<_ACEOF
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "sockaddr_storage" >/dev/null 2>&1; then
+ $EGREP "sockaddr_storage" >/dev/null 2>&1; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_SOCKADDR_STORAGE 1
@@ -2770,7 +2865,7 @@ _ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
- egrep -v '^ *\+' conftest.er1 >conftest.err
+ grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2801,7 +2896,7 @@ if test $ac_cv_header_stdc = yes; then
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "memchr" >/dev/null 2>&1; then
+ $EGREP "memchr" >/dev/null 2>&1; then
:
else
ac_cv_header_stdc=no
@@ -2819,7 +2914,7 @@ if test $ac_cv_header_stdc = yes; then
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "free" >/dev/null 2>&1; then
+ $EGREP "free" >/dev/null 2>&1; then
:
else
ac_cv_header_stdc=no
@@ -2878,7 +2973,7 @@ cat conftest.$ac_ext >&5
( exit $ac_status )
ac_cv_header_stdc=no
fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
fi
@@ -3013,7 +3108,7 @@ _ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
- egrep -v '^ *\+' conftest.er1 >conftest.err
+ grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3102,12 +3197,6 @@ extern "C"
char $ac_func ();
char (*f) ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -3176,12 +3265,6 @@ extern "C"
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char dlopen ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -3247,12 +3330,6 @@ extern "C"
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char pthread_create ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -3307,12 +3384,6 @@ extern "C"
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char pthread_create ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -3361,12 +3432,6 @@ cat >conftest.$ac_ext <<_ACEOF
#include "confdefs.h"
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -3420,12 +3485,6 @@ extern "C"
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char initscr ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -3480,12 +3539,6 @@ extern "C"
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char initscr ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -3639,7 +3692,7 @@ _ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
- egrep -v '^ *\+' conftest.er1 >conftest.err
+ grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3678,12 +3731,6 @@ if test "$ac_x_libraries" = no; then
#line $LINENO "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -3781,12 +3828,6 @@ echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
#line $LINENO "configure"
#include "confdefs.h"
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -3824,12 +3865,6 @@ echo "${ECHO_T}no" >&6
#line $LINENO "configure"
#include "confdefs.h"
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -3892,12 +3927,6 @@ extern "C"
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char XOpenDisplay ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -3940,12 +3969,6 @@ extern "C"
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char dnet_ntoa ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -4000,12 +4023,6 @@ extern "C"
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char dnet_ntoa ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -4074,12 +4091,6 @@ extern "C"
char gethostbyname ();
char (*f) ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -4138,12 +4149,6 @@ extern "C"
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char gethostbyname ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -4198,12 +4203,6 @@ extern "C"
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char gethostbyname ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -4246,7 +4245,7 @@ fi
# socket/setsockopt and other routines are undefined under SCO ODT
# 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary
# on later versions), says Simon Leinen: it contains gethostby*
- # variants that don't use the nameserver (or something). -lsocket
+ # variants that don't use the name server (or something). -lsocket
# must be given before -lnsl if both are needed. We assume that
# if connect needs -lnsl, so does gethostbyname.
echo "$as_me:$LINENO: checking for connect" >&5
@@ -4269,12 +4268,6 @@ extern "C"
char connect ();
char (*f) ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -4333,12 +4326,6 @@ extern "C"
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char connect ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -4397,12 +4384,6 @@ extern "C"
char remove ();
char (*f) ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -4461,12 +4442,6 @@ extern "C"
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char remove ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -4525,12 +4500,6 @@ extern "C"
char shmat ();
char (*f) ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -4589,12 +4558,6 @@ extern "C"
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char shmat ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -4660,12 +4623,6 @@ extern "C"
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char IceConnectionNumber ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -4743,12 +4700,6 @@ extern "C"
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char jpeg_start_compress ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -4812,12 +4763,6 @@ extern "C"
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char snd_seq_open ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -4882,12 +4827,6 @@ extern "C"
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char lirc_init ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -4952,12 +4891,6 @@ extern "C"
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char vbi_capture_fd ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -5022,12 +4955,6 @@ extern "C"
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char aa_autoinit ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -5094,12 +5021,6 @@ extern "C"
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char dv_decoder_new ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -5162,12 +5083,6 @@ extern "C"
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char lqt_query_registry ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -5236,12 +5151,6 @@ extern "C"
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char XF86DGAQueryExtension ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -5301,12 +5210,6 @@ extern "C"
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char XF86VidModeQueryExtension ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -5366,12 +5269,6 @@ extern "C"
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char DPMSQueryExtension ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -5431,12 +5328,6 @@ extern "C"
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char DPMSQueryExtension ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -5495,12 +5386,6 @@ extern "C"
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char XineramaQueryExtension ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -5565,12 +5450,6 @@ extern "C"
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char XvQueryExtension ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -5634,12 +5513,6 @@ extern "C"
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char XmStringGenerate ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -5700,12 +5573,6 @@ extern "C"
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char glXChooseVisual ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
int
main ()
{
@@ -5796,7 +5663,7 @@ fi
echo "$as_me:$LINENO: result: $USE_MMX" >&5
echo "${ECHO_T}$USE_MMX" >&6
-ac_config_files="$ac_config_files Makefile xawtv.spec"
+ ac_config_files="$ac_config_files Makefile xawtv.spec"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -5807,7 +5674,7 @@ cat >confcache <<\_ACEOF
# config.status only pays attention to the cache file if you give it
# the --recheck option to rerun configure.
#
-# `ac_cv_env_foo' variables (set or unset) will be overriden when
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
# loading this file, other *unset* `ac_cv_foo' will be assigned the
# following values.
@@ -5873,6 +5740,21 @@ fi
DEFS=-DHAVE_CONFIG_H
+ac_libobjs=
+ac_ltlibobjs=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+ # 1. Remove the extension, and $U if already installed.
+ ac_i=`echo "$ac_i" |
+ sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
+ # 2. Add them.
+ ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
+ ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
@@ -5891,7 +5773,6 @@ SHELL=\${CONFIG_SHELL-$SHELL}
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-
## --------------------- ##
## M4sh Initialization. ##
## --------------------- ##
@@ -5900,11 +5781,13 @@ cat >>$CONFIG_STATUS <<\_ACEOF
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
set -o posix
fi
-# NLS nuisances.
# Support unset when possible.
if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
as_unset=unset
@@ -5912,34 +5795,39 @@ else
as_unset=false
fi
-(set +x; test -n "`(LANG=C; export LANG) 2>&1`") &&
- { $as_unset LANG || test "${LANG+set}" != set; } ||
- { LANG=C; export LANG; }
-(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") &&
- { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } ||
- { LC_ALL=C; export LC_ALL; }
-(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") &&
- { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } ||
- { LC_TIME=C; export LC_TIME; }
-(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") &&
- { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } ||
- { LC_CTYPE=C; export LC_CTYPE; }
-(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") &&
- { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } ||
- { LANGUAGE=C; export LANGUAGE; }
-(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") &&
- { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } ||
- { LC_COLLATE=C; export LC_COLLATE; }
-(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") &&
- { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } ||
- { LC_NUMERIC=C; export LC_NUMERIC; }
-(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") &&
- { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } ||
- { LC_MESSAGES=C; export LC_MESSAGES; }
+
+# Work around bugs in pre-3.0 UWIN ksh.
+$as_unset ENV MAIL MAILPATH
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+for as_var in LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES LC_TIME
+do
+ if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+ eval $as_var=C; export $as_var
+ else
+ $as_unset $as_var
+ fi
+done
+
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1; then
+ as_expr=expr
+else
+ as_expr=false
+fi
+
+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+ as_basename=basename
+else
+ as_basename=false
+fi
# Name of the executable.
-as_me=`(basename "$0") 2>/dev/null ||
+as_me=`$as_basename "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)$' \| \
@@ -5950,6 +5838,7 @@ echo X/"$0" |
/^X\/\(\/\).*/{ s//\1/; q; }
s/.*/./; q'`
+
# PATH needs CR, and LINENO needs CR and PATH.
# Avoid depending upon Character Ranges.
as_cr_letters='abcdefghijklmnopqrstuvwxyz'
@@ -5963,7 +5852,7 @@ if test "${PATH_SEPARATOR+set}" != set; then
echo "#! /bin/sh" >conftest.sh
echo "exit 0" >>conftest.sh
chmod +x conftest.sh
- if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
+ if (PATH="/nonexistent;."; conftest.sh) >/dev/null 2>&1; then
PATH_SEPARATOR=';'
else
PATH_SEPARATOR=:
@@ -6017,6 +5906,8 @@ do
as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
test "x$as_lineno_1" != "x$as_lineno_2" &&
test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
+ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
CONFIG_SHELL=$as_dir/$as_base
export CONFIG_SHELL
exec "$CONFIG_SHELL" "$0" ${1+"$@"}
@@ -6090,6 +5981,12 @@ else
fi
rm -f conf$$ conf$$.exe conf$$.file
+if mkdir -p . 2>/dev/null; then
+ as_mkdir_p=:
+else
+ as_mkdir_p=false
+fi
+
as_executable_p="test -f"
# Sed expression to map a string onto a valid CPP name.
@@ -6106,7 +6003,7 @@ as_nl='
IFS=" $as_nl"
# CDPATH.
-$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; }
+$as_unset CDPATH
exec 6>&1
@@ -6123,7 +6020,7 @@ _ASBOX
cat >&5 <<_CSEOF
This file was extended by $as_me, which was
-generated by GNU Autoconf 2.53. Invocation command line was
+generated by GNU Autoconf 2.54. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -6182,7 +6079,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
config.status
-configured by $0, generated by GNU Autoconf 2.53,
+configured by $0, generated by GNU Autoconf 2.54,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -6203,17 +6100,20 @@ do
--*=*)
ac_option=`expr "x$1" : 'x\([^=]*\)='`
ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
- shift
- set dummy "$ac_option" "$ac_optarg" ${1+"$@"}
- shift
+ ac_shift=:
+ ;;
+ -*)
+ ac_option=$1
+ ac_optarg=$2
+ ac_shift=shift
;;
- -*);;
*) # This is not an option, so the user has probably given explicit
# arguments.
+ ac_option=$1
ac_need_defaults=false;;
esac
- case $1 in
+ case $ac_option in
# Handling of the options.
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
@@ -6236,12 +6136,12 @@ Try \`$0 --help' for more information." >&2;}
--debug | --d* | -d )
debug=: ;;
--file | --fil | --fi | --f )
- shift
- CONFIG_FILES="$CONFIG_FILES $1"
+ $ac_shift
+ CONFIG_FILES="$CONFIG_FILES $ac_optarg"
ac_need_defaults=false;;
--header | --heade | --head | --hea )
- shift
- CONFIG_HEADERS="$CONFIG_HEADERS $1"
+ $ac_shift
+ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
ac_need_defaults=false;;
# This is an error.
@@ -6376,6 +6276,7 @@ s,@FOUND_OS@,$FOUND_OS,;t t
s,@FOUND_X11@,$FOUND_X11,;t t
s,@FOUND_GL@,$FOUND_GL,;t t
s,@FOUND_ZVBI@,$FOUND_ZVBI,;t t
+s,@EGREP@,$EGREP,;t t
s,@DLFLAGS@,$DLFLAGS,;t t
s,@LIBPTHREAD@,$LIBPTHREAD,;t t
s,@LIBOSS@,$LIBOSS,;t t
@@ -6402,6 +6303,8 @@ s,@VERSION@,$VERSION,;t t
s,@x11conf@,$x11conf,;t t
s,@resdir@,$resdir,;t t
s,@USE_MMX@,$USE_MMX,;t t
+s,@LIBOBJS@,$LIBOBJS,;t t
+s,@LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF
_ACEOF
@@ -6472,25 +6375,30 @@ echo X"$ac_file" |
/^X\(\/\/\)$/{ s//\1/; q; }
/^X\(\/\).*/{ s//\1/; q; }
s/.*/./; q'`
- { case "$ac_dir" in
- [\\/]* | ?:[\\/]* ) as_incr_dir=;;
- *) as_incr_dir=.;;
-esac
-as_dummy="$ac_dir"
-for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
- case $as_mkdir_dir in
- # Skip DOS drivespec
- ?:) as_incr_dir=$as_mkdir_dir ;;
- *)
- as_incr_dir=$as_incr_dir/$as_mkdir_dir
- test -d "$as_incr_dir" ||
- mkdir "$as_incr_dir" ||
- { { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create \"$ac_dir\"" >&2;}
- { (exit 1); exit 1; }; }
- ;;
- esac
-done; }
+ { if $as_mkdir_p; then
+ mkdir -p "$ac_dir"
+ else
+ as_dir="$ac_dir"
+ as_dirs=
+ while test ! -d "$as_dir"; do
+ as_dirs="$as_dir $as_dirs"
+ as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+ /^X\(\/\/\)$/{ s//\1/; q; }
+ /^X\(\/\).*/{ s//\1/; q; }
+ s/.*/./; q'`
+ done
+ test ! -n "$as_dirs" || mkdir $as_dirs
+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+ { (exit 1); exit 1; }; }; }
ac_builddir=.
@@ -6710,7 +6618,7 @@ _ACEOF
# Break up conftest.defines because some shells have a limit on the size
# of here documents, and old seds have small limits too (100 cmds).
echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-echo ' if egrep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
+echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
echo ' :' >>$CONFIG_STATUS
rm -f conftest.tail
@@ -6734,7 +6642,7 @@ do
mv conftest.tail conftest.defines
done
rm -f conftest.defines
-echo ' fi # egrep' >>$CONFIG_STATUS
+echo ' fi # grep' >>$CONFIG_STATUS
echo >>$CONFIG_STATUS
# Break up conftest.undefs because some shells have a limit on the size
@@ -6790,25 +6698,30 @@ echo X"$ac_file" |
/^X\(\/\/\)$/{ s//\1/; q; }
/^X\(\/\).*/{ s//\1/; q; }
s/.*/./; q'`
- { case "$ac_dir" in
- [\\/]* | ?:[\\/]* ) as_incr_dir=;;
- *) as_incr_dir=.;;
-esac
-as_dummy="$ac_dir"
-for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
- case $as_mkdir_dir in
- # Skip DOS drivespec
- ?:) as_incr_dir=$as_mkdir_dir ;;
- *)
- as_incr_dir=$as_incr_dir/$as_mkdir_dir
- test -d "$as_incr_dir" ||
- mkdir "$as_incr_dir" ||
- { { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create \"$ac_dir\"" >&2;}
- { (exit 1); exit 1; }; }
- ;;
- esac
-done; }
+ { if $as_mkdir_p; then
+ mkdir -p "$ac_dir"
+ else
+ as_dir="$ac_dir"
+ as_dirs=
+ while test ! -d "$as_dir"; do
+ as_dirs="$as_dir $as_dirs"
+ as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+ /^X\(\/\/\)$/{ s//\1/; q; }
+ /^X\(\/\).*/{ s//\1/; q; }
+ s/.*/./; q'`
+ done
+ test ! -n "$as_dirs" || mkdir $as_dirs
+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+ { (exit 1); exit 1; }; }; }
rm -f $ac_file
mv $tmp/config.h $ac_file
@@ -6848,7 +6761,7 @@ fi
for dir in \
common console debug fonts jwz libvbi vbistuff x11 structs \
- libng libng/plugins libng/contrib-plugins
+ libng libng/plugins libng/contrib-plugins mk
do
test -d $dir && continue
mkdir -p $dir
diff --git a/configure.ac b/configure.ac
index 5033cfb..8a3c6f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,8 +24,10 @@ AC_ARG_ENABLE(alsa,
[ --enable-alsa enable alsa support])
AC_ARG_ENABLE(zvbi,
[ --enable-zvbi enable vbi support (via libzvbi)])
-AC_ARG_ENABLE(zvbi,
+AC_ARG_ENABLE(gl,
[ --enable-gl enable opengl support])
+AC_ARG_ENABLE(dv,
+ [ --enable-dv enable dvlib support])
AC_ARG_ENABLE(mmx,
[ --enable-mmx enable mmx support])
@@ -76,6 +78,7 @@ case "`uname -s`" in
*)
AC_MSG_CHECKING(if xawtv will build on `uname -s`)
AC_MSG_RESULT(maybe)
+ FOUND_OS="unknown"
;;
esac
@@ -83,7 +86,7 @@ esac
dnl ---------------------------------------------------------------------
dnl Checks for functions
-AC_EGREP_HEADER(sockaddr_storage,sys/socket.h,AC_DEFINE(HAVE_SOCKADDR_STORAGE,1,"have opv6"))
+AC_EGREP_HEADER(sockaddr_storage,sys/socket.h,AC_DEFINE(HAVE_SOCKADDR_STORAGE,1,"have ipv6"))
AC_CHECK_HEADERS(getopt.h soundcard.h unistd.h sys/select.h sys/soundcard.h alsa/asoundlib.h linux/joystick.h dev/ic/bt8xx.h machine/ioctl_bt848.h)
AC_CHECK_FUNCS(ftello fseeko getpt getnameinfo getopt_long strcasestr dlopen)
@@ -302,7 +305,7 @@ dnl ---------------------------------------------------------------------
AC_OUTPUT(Makefile xawtv.spec)
for dir in \
common console debug fonts jwz libvbi vbistuff x11 structs \
- libng libng/plugins libng/contrib-plugins
+ libng libng/plugins libng/contrib-plugins mk
do
test -d $dir && continue
mkdir -p $dir
diff --git a/console/record.c b/console/record.c
index c5a686b..5638fc6 100644
--- a/console/record.c
+++ b/console/record.c
@@ -54,7 +54,7 @@ sound_open(int rate)
int frag,afmt,channels,trigger,srate;
if (-1 == (sound_fd = open(audio_dev, O_RDONLY))) {
- fprintf(stderr,"open %s: %s",audio_dev,strerror(errno));
+ fprintf(stderr,"open %s: %s\n",audio_dev,strerror(errno));
exit(1);
}
@@ -192,7 +192,7 @@ mixer_open(char *filename, char *device)
int i, devmask;
if (-1 == (mix = open(filename,O_RDONLY))) {
- fprintf(stderr,"open %s: %s",filename,strerror(errno));
+ fprintf(stderr,"open %s: %s\n",filename,strerror(errno));
exit(1);
}
if (-1 == ioctl(mix,MIXER_READ(SOUND_MIXER_DEVMASK),&devmask)) {
diff --git a/console/showqt.c b/console/showqt.c
index e721bf5..12a9d18 100644
--- a/console/showqt.c
+++ b/console/showqt.c
@@ -11,6 +11,11 @@
#include <inttypes.h>
#include <time.h>
+#ifndef PRId64
+# define PRId64 "lld"
+# define PRIx64 "llx"
+#endif
+
#if BYTE_ORDER == LITTLE_ENDIAN
# define SWAP2(x) (((x>>8) & 0x00ff) |\
((x<<8) & 0xff00))
@@ -568,7 +573,7 @@ static int handle_classic_atom(int fh, off_t pos, off_t size, int depth)
off = 8;
}
printf("0x%08" PRIx64 " 0x%08" PRIx64 " %*s%s\n",
- pos,asize,depth,"",strfcc(a.type));
+ (int64_t)pos,(int64_t)asize,depth,"",strfcc(a.type));
switch (a.type) {
case a_dinf:
case a_edts:
diff --git a/console/v4l-info.c b/console/v4l-info.c
index 299e63f..0f184b2 100644
--- a/console/v4l-info.c
+++ b/console/v4l-info.c
@@ -7,6 +7,7 @@
#include <inttypes.h>
#include <ctype.h>
+#include <sys/time.h>
#include <sys/ioctl.h>
#include "videodev.h"
@@ -35,7 +36,7 @@ static int dump_v4l(int fd, int tab)
if (-1 == ioctl(fd,VIDIOCGCAP,&capability))
return -1;
printf(" VIDIOCGCAP\n");
- print_struct(stderr,desc_video_capability,&capability,"",tab);
+ print_struct(stdout,desc_video_capability,&capability,"",tab);
printf("\n");
printf("channels\n");
@@ -47,7 +48,7 @@ static int dump_v4l(int fd, int tab)
continue;
}
printf(" VIDIOCGCHAN(%d)\n",i);
- print_struct(stderr,desc_video_channel,&channel,"",tab);
+ print_struct(stdout,desc_video_channel,&channel,"",tab);
}
printf("\n");
@@ -57,7 +58,7 @@ static int dump_v4l(int fd, int tab)
perror("ioctl VIDIOCGTUNER");
} else {
printf(" VIDIOCGTUNER\n");
- print_struct(stderr,desc_video_tuner,&tuner,"",tab);
+ print_struct(stdout,desc_video_tuner,&tuner,"",tab);
}
printf("\n");
@@ -67,7 +68,7 @@ static int dump_v4l(int fd, int tab)
perror("ioctl VIDIOCGAUDIO");
} else {
printf(" VIDIOCGAUDIO\n");
- print_struct(stderr,desc_video_audio,&audio,"",tab);
+ print_struct(stdout,desc_video_audio,&audio,"",tab);
}
printf("\n");
@@ -77,7 +78,7 @@ static int dump_v4l(int fd, int tab)
perror("ioctl VIDIOCGPICT");
} else {
printf(" VIDIOCGPICT\n");
- print_struct(stderr,desc_video_picture,&picture,"",tab);
+ print_struct(stdout,desc_video_picture,&picture,"",tab);
}
printf("\n");
@@ -87,7 +88,7 @@ static int dump_v4l(int fd, int tab)
perror("ioctl VIDIOCGFBUF");
} else {
printf(" VIDIOCGFBUF\n");
- print_struct(stderr,desc_video_buffer,&buffer,"",tab);
+ print_struct(stdout,desc_video_buffer,&buffer,"",tab);
}
printf("\n");
@@ -97,7 +98,7 @@ static int dump_v4l(int fd, int tab)
perror("ioctl VIDIOCGWIN");
} else {
printf(" VIDIOCGWIN\n");
- print_struct(stderr,desc_video_window,&window,"",tab);
+ print_struct(stdout,desc_video_window,&window,"",tab);
}
printf("\n");
@@ -124,7 +125,7 @@ static int dump_v4l2(int fd, int tab)
if (-1 == ioctl(fd,VIDIOC_QUERYCAP,&capability))
return -1;
printf(" VIDIOC_QUERYCAP\n");
- print_struct(stderr,desc_v4l2_capability,&capability,"",tab);
+ print_struct(stdout,desc_v4l2_capability,&capability,"",tab);
printf("\n");
printf("standards\n");
@@ -134,7 +135,7 @@ static int dump_v4l2(int fd, int tab)
if (-1 == ioctl(fd,VIDIOC_ENUMSTD,&standard))
break;
printf(" VIDIOC_ENUMSTD(%d)\n",i);
- print_struct(stderr,desc_v4l2_standard,&standard,"",tab);
+ print_struct(stdout,desc_v4l2_standard,&standard,"",tab);
}
printf("\n");
@@ -145,7 +146,7 @@ static int dump_v4l2(int fd, int tab)
if (-1 == ioctl(fd,VIDIOC_ENUMINPUT,&input))
break;
printf(" VIDIOC_ENUMINPUT(%d)\n",i);
- print_struct(stderr,desc_v4l2_input,&input,"",tab);
+ print_struct(stdout,desc_v4l2_input,&input,"",tab);
}
printf("\n");
@@ -157,7 +158,7 @@ static int dump_v4l2(int fd, int tab)
if (-1 == ioctl(fd,VIDIOC_G_TUNER,&tuner))
break;
printf(" VIDIOC_G_TUNER(%d)\n",i);
- print_struct(stderr,desc_v4l2_tuner,&tuner,"",tab);
+ print_struct(stdout,desc_v4l2_tuner,&tuner,"",tab);
}
printf("\n");
}
@@ -171,7 +172,7 @@ static int dump_v4l2(int fd, int tab)
if (-1 == ioctl(fd,VIDIOC_ENUM_FMT,&fmtdesc))
break;
printf(" VIDIOC_ENUM_FMT(%d,VIDEO_CAPTURE)\n",i);
- print_struct(stderr,desc_v4l2_fmtdesc,&fmtdesc,"",tab);
+ print_struct(stdout,desc_v4l2_fmtdesc,&fmtdesc,"",tab);
}
memset(&format,0,sizeof(format));
format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
@@ -179,7 +180,7 @@ static int dump_v4l2(int fd, int tab)
perror("VIDIOC_G_FMT(VIDEO_CAPTURE)");
} else {
printf(" VIDIOC_G_FMT(VIDEO_CAPTURE)\n");
- print_struct(stderr,desc_v4l2_format,&format,"",tab);
+ print_struct(stdout,desc_v4l2_format,&format,"",tab);
}
printf("\n");
}
@@ -193,7 +194,7 @@ static int dump_v4l2(int fd, int tab)
if (-1 == ioctl(fd,VIDIOC_ENUM_FMT,&fmtdesc))
break;
printf(" VIDIOC_ENUM_FMT(%d,VIDEO_OVERLAY)\n",i);
- print_struct(stderr,desc_v4l2_fmtdesc,&fmtdesc,"",tab);
+ print_struct(stdout,desc_v4l2_fmtdesc,&fmtdesc,"",tab);
}
memset(&format,0,sizeof(format));
format.type = V4L2_BUF_TYPE_VIDEO_OVERLAY;
@@ -201,14 +202,14 @@ static int dump_v4l2(int fd, int tab)
perror("VIDIOC_G_FMT(VIDEO_OVERLAY)");
} else {
printf(" VIDIOC_G_FMT(VIDEO_OVERLAY)\n");
- print_struct(stderr,desc_v4l2_format,&format,"",tab);
+ print_struct(stdout,desc_v4l2_format,&format,"",tab);
}
memset(&fbuf,0,sizeof(fbuf));
if (-1 == ioctl(fd,VIDIOC_G_FBUF,&fbuf)) {
perror("VIDIOC_G_FBUF");
} else {
printf(" VIDIOC_G_FBUF\n");
- print_struct(stderr,desc_v4l2_framebuffer,&fbuf,"",tab);
+ print_struct(stdout,desc_v4l2_framebuffer,&fbuf,"",tab);
}
printf("\n");
}
@@ -222,7 +223,7 @@ static int dump_v4l2(int fd, int tab)
if (-1 == ioctl(fd,VIDIOC_ENUM_FMT,&fmtdesc))
break;
printf(" VIDIOC_ENUM_FMT(%d,VBI_CAPTURE)\n",i);
- print_struct(stderr,desc_v4l2_fmtdesc,&fmtdesc,"",tab);
+ print_struct(stdout,desc_v4l2_fmtdesc,&fmtdesc,"",tab);
}
memset(&format,0,sizeof(format));
format.type = V4L2_BUF_TYPE_VBI_CAPTURE;
@@ -230,7 +231,7 @@ static int dump_v4l2(int fd, int tab)
perror("VIDIOC_G_FMT(VBI_CAPTURE)");
} else {
printf(" VIDIOC_G_FMT(VBI_CAPTURE)\n");
- print_struct(stderr,desc_v4l2_format,&format,"",tab);
+ print_struct(stdout,desc_v4l2_format,&format,"",tab);
}
printf("\n");
}
@@ -244,7 +245,7 @@ static int dump_v4l2(int fd, int tab)
if (qctrl.flags & V4L2_CTRL_FLAG_DISABLED)
continue;
printf(" VIDIOC_QUERYCTRL(BASE+%d)\n",i);
- print_struct(stderr,desc_v4l2_queryctrl,&qctrl,"",tab);
+ print_struct(stdout,desc_v4l2_queryctrl,&qctrl,"",tab);
}
for (i = 0;; i++) {
memset(&qctrl,0,sizeof(qctrl));
@@ -254,7 +255,7 @@ static int dump_v4l2(int fd, int tab)
if (qctrl.flags & V4L2_CTRL_FLAG_DISABLED)
continue;
printf(" VIDIOC_QUERYCTRL(PRIVATE_BASE+%d)\n",i);
- print_struct(stderr,desc_v4l2_queryctrl,&qctrl,"",tab);
+ print_struct(stdout,desc_v4l2_queryctrl,&qctrl,"",tab);
}
return 0;
}
diff --git a/debian/changelog b/debian/changelog
index ca7709b..d8dde3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xawtv (3.80) unstable; urgency=low
+
+ * new release.
+ * fixed build dependencies (closes: #169570).
+
+ -- Gerd Knorr <kraxel@debian.org> Wed, 27 Nov 2002 13:07:56 +0100
+
xawtv (3.79) unstable; urgency=low
* new release (closes: #168896, #168694)
diff --git a/debian/control b/debian/control
index 18b6086..6cea323 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,9 @@
Source: xawtv
Section: graphics
Priority: extra
-Build-Depends: libjpeg-dev, libncurses5-dev, xlibs-dev (>= 4.0.1), liblircclient-dev, debhelper, xutils, xbase-clients, aalib1-dev, libasound2-dev, libzvbi-dev (>= 0.2.1), libquicktime-dev
+Build-Depends: libjpeg-dev, libncurses5-dev, xlibs-dev (>= 4.0.1), liblircclient-dev, debhelper, xutils, xbase-clients, aalib1-dev, libasound2-dev, libzvbi-dev (>= 0.2.1), libquicktime-dev, libxaw7-dev
Maintainer: Gerd Knorr <kraxel@debian.org>
-Standards-Version: 3.5.2
+Standards-Version: 3.5.7.1
Package: xawtv
Section: x11
diff --git a/frequencies/Index.map b/frequencies/Index.map
index 283c217..73f5b07 100644
--- a/frequencies/Index.map
+++ b/frequencies/Index.map
@@ -49,3 +49,5 @@ file = ntsc-cable-ca.list
[australia-optus]
file = pal-australia-optus.list
+[russia]
+file = secam-russia.list
diff --git a/frequencies/README b/frequencies/README
new file mode 100644
index 0000000..0add61e
--- /dev/null
+++ b/frequencies/README
@@ -0,0 +1,20 @@
+
+About adding new lists here ...
+
+ (1) Check that there isn't already a list which works for you. Often
+ the same frequency lists are used in multiple countries, so you
+ can try if one of some other country near to you works.
+
+ (2) A reason for tuning not working (or not fully working, i.e. fails
+ for some frequency ranges) also might be that the tuner
+ configuration of the device driver isn't correct. Try to fix
+ your setup first instead of trying to create a new list which is
+ bug-compatible to your broken setup.
+
+ (3) There are some lists for common stuff. The UHF channels are in
+ uhf.list for example. You can simply #include these. That will
+ save you some typing work and also makes the lists more readable.
+
+ (4) Giving some reference (URL to your cable provider for example) for
+ the new list highly increases the chance of getting this included.
+
diff --git a/frequencies/oirt-h.list b/frequencies/oirt-h.list
new file mode 100644
index 0000000..574e43c
--- /dev/null
+++ b/frequencies/oirt-h.list
@@ -0,0 +1,65 @@
+[S19]
+freq = 295250
+
+[S20]
+freq = 303250
+
+[S21]
+freq = 311250
+
+[S22]
+freq = 319250
+
+[S23]
+freq = 327250
+
+[S24]
+freq = 335250
+
+[S25]
+freq = 343250
+
+[S26]
+freq = 351250
+
+[S27]
+freq = 359250
+
+[S28]
+freq = 367250
+
+[S29]
+freq = 375250
+
+[S30]
+freq = 383250
+
+[S31]
+freq = 391250
+
+[S32]
+freq = 399250
+
+[S33]
+freq = 407250
+
+[S34]
+freq = 415250
+
+[S35]
+freq = 423250
+
+[S36]
+freq = 431250
+
+[S37]
+freq = 439250
+
+[S38]
+freq = 447250
+
+[S39]
+freq = 455250
+
+[S40]
+freq = 463250
diff --git a/frequencies/oirt-sl-sh.list b/frequencies/oirt-sl-sh.list
index 9b054d2..75940e5 100644
--- a/frequencies/oirt-sl-sh.list
+++ b/frequencies/oirt-sl-sh.list
@@ -45,7 +45,3 @@ freq = 279250
[SR18]
freq = 287250
-
-[SR19]
-freq = 295250
-
diff --git a/frequencies/secam-russia.list b/frequencies/secam-russia.list
new file mode 100644
index 0000000..900a894
--- /dev/null
+++ b/frequencies/secam-russia.list
@@ -0,0 +1,4 @@
+#include "oirt-i-iii.list"
+#include "oirt-sl-sh.list"
+#include "oirt-h.list"
+#include "uhf.list"
diff --git a/libng/plugins/Subdir.mk b/libng/plugins/Subdir.mk
index fc0f7b6..3e9943c 100644
--- a/libng/plugins/Subdir.mk
+++ b/libng/plugins/Subdir.mk
@@ -54,7 +54,7 @@ clean::
libng/plugins/conv-mjpeg.so: libng/plugins/conv-mjpeg.o
libng/plugins/drv0-bsd.so: libng/plugins/drv0-bsd.o
-libng/plugins/drv0-v4l2-new.so: libng/plugins/drv0-v4l2-new.o
+libng/plugins/drv0-v4l2-old.so: libng/plugins/drv0-v4l2-old.o
libng/plugins/flt-debug.so: libng/plugins/flt-debug.o
libng/plugins/flt-disor.so: libng/plugins/flt-disor.o
libng/plugins/flt-gamma.so: libng/plugins/flt-gamma.o
diff --git a/libng/plugins/drv0-v4l2.c b/libng/plugins/drv0-v4l2.c
index d1b3d8f..6d7b73b 100644
--- a/libng/plugins/drv0-v4l2.c
+++ b/libng/plugins/drv0-v4l2.c
@@ -971,6 +971,13 @@ v4l2_getimage(void *handle)
buf = ng_malloc_video_buf(&h->fmt_me,size);
if (h->cap.capabilities & V4L2_CAP_READWRITE) {
rc = read(h->fd,buf->data,size);
+ if (-1 == rc && EBUSY == errno && h->ov_on) {
+ h->ov_on = 0;
+ xioctl(h->fd, VIDIOC_OVERLAY, &h->ov_on, 0);
+ rc = read(h->fd,buf->data,size);
+ h->ov_on = 1;
+ xioctl(h->fd, VIDIOC_OVERLAY, &h->ov_on, 0);
+ }
if (rc != size) {
if (-1 == rc) {
perror("v4l2: read");
diff --git a/libng/plugins/drv1-v4l.c b/libng/plugins/drv1-v4l.c
index dec74d1..19da489 100644
--- a/libng/plugins/drv1-v4l.c
+++ b/libng/plugins/drv1-v4l.c
@@ -804,7 +804,7 @@ v4l_overlay(void *handle, struct ng_video_fmt *fmt, int x, int y,
if (aspect)
ng_ratio_fixup(&h->win.width,&h->win.height,&h->win.x,&h->win.y);
-#if 1
+#if 0
/* pass aligned values -- the driver does'nt get it right yet */
h->win.width &= ~3;
h->win.height &= ~3;
diff --git a/mk/compile.mk b/mk/compile.mk
new file mode 100644
index 0000000..a281e00
--- /dev/null
+++ b/mk/compile.mk
@@ -0,0 +1,68 @@
+#
+# some rules to compile stuff ...
+#
+# (c) 2002 Gerd Knorr <kraxel@bytesex.org>
+#
+# main features:
+# * autodependencies via "cpp -MD"
+# * fancy, non-verbose output
+#
+# This file is public domain. No warranty. If it breaks you keep
+# both pieces.
+#
+########################################################################
+
+# verbose yes/no
+verbose ?= no
+
+# dependency files
+tmpdep = mk/$(subst /,_,$*).tmp
+depfile = mk/$(subst /,_,$*).dep
+depfiles = mk/*.dep
+
+compile_c = $(CC) $(CFLAGS) -Wp,-MD,$(tmpdep) -c -o $@ $<
+compile_cc = $(CXX) $(CXXFLAGS) -Wp,-MD,$(tmpdep) -c -o $@ $<
+fixup_deps = sed -e "s|.*\.o:|$@::|" < $(tmpdep) > $(depfile) && rm -f $(tmpdep)
+
+link_app = $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+link_so = $(CC) $(LDFLAGS) -shared -Wl,-soname,$(@F) -o $@ $^ $(LDLIBS)
+ar_lib = rm -f $@ && ar -r $@ $^ && ranlib $@
+
+# non-verbose output
+ifeq ($(verbose),no)
+ echo_compile_c = echo " CC " $@
+ echo_compile_cc = echo " CXX " $@
+ echo_link_app = echo " LD " $@
+ echo_link_so = echo " LD " $@
+ echo_ar_lib = echo " AR " $@
+else
+ echo_compile_c = echo $(compile_c)
+ echo_compile_cc = echo $(compile_cc)
+ echo_link_app = echo $(link_app)
+ echo_link_so = echo $(link_so)
+ echo_ar_lib = echo $(ar_lib)
+endif
+
+%.o: %.c
+ @$(echo_compile_c)
+ @$(compile_c)
+ @$(fixup_deps)
+
+%.o: %.cc
+ @$(echo_compile_cc)
+ @$(compile_cc)
+ @$(fixup_deps)
+
+%.o: %.cpp
+ @$(echo_compile_cc)
+ @$(compile_cc)
+ @$(fixup_deps)
+
+
+%.so: %.o
+ @$(echo_link_so)
+ @$(link_so)
+
+%: %.o
+ @$(echo_link_app)
+ @$(link_app)
diff --git a/x11/motv.c b/x11/motv.c
index 883d3d0..1c1dfb8 100644
--- a/x11/motv.c
+++ b/x11/motv.c
@@ -1388,6 +1388,7 @@ create_control(void)
XtVaCreateManagedWidget("launch",xmCascadeButtonWidgetClass,menu,
XmNsubMenuId,launch_menu,NULL);
+#ifdef HAVE_ZVBI
/* menu - tools / subtitles */
smenu = XmCreatePulldownMenu(menu,"subM",NULL,0);
XtVaCreateManagedWidget("sub",xmCascadeButtonWidgetClass,menu,
@@ -1402,6 +1403,7 @@ create_control(void)
XtAddCallback(push,XmNactivateCallback,action_cb,"Vtx(start,777)");
push = XtVaCreateManagedWidget("s_888",xmPushButtonWidgetClass,smenu,NULL);
XtAddCallback(push,XmNactivateCallback,action_cb,"Vtx(start,888)");
+#endif
/* menu - internal options */
opt_menu = menu = XmCreatePulldownMenu(menubar,"optionsM",NULL,0);
diff --git a/xawtv.spec b/xawtv.spec
index f1cfaae..b932f02 100644
--- a/xawtv.spec
+++ b/xawtv.spec
@@ -1,7 +1,7 @@
Name: xawtv
Group: Applications/Multimedia
Autoreqprov: on
-Version: 3.79
+Version: 3.80
Release: 0
License: GPL
Summary: v4l applications

Privacy Policy