Hello community,
here is the log from the commit of package xawtv
checked in at Thu Aug 17 18:25:47 CEST 2006.
--------
--- xawtv/xawtv.changes 2006-05-19 16:47:11.000000000 +0200
+++ xawtv/xawtv.changes 2006-08-17 13:19:33.000000000 +0200
@@ -1,0 +2,9 @@
+Thu Aug 17 13:16:49 CEST 2006 - cthiel@suse.de
+
+- update to version 3.95
+ * misc minor fixes collected over time.
+ * make it build with gcc4.
+- drop xawtv-gcc4.patch
+- fix build with X.Org 7.1
+
+-------------------------------------------------------------------
Old:
----
xawtv-3.94.tar.bz2
xawtv-gcc4.patch
New:
----
xawtv-3.95.patch
xawtv-3.95.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xawtv.spec ++++++
--- /var/tmp/diff_new_pack.qO20aG/_old 2006-08-17 18:25:29.000000000 +0200
+++ /var/tmp/diff_new_pack.qO20aG/_new 2006-08-17 18:25:29.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package xawtv (Version 3.94)
+# spec file for package xawtv (Version 3.95)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,19 +11,19 @@
# norootforbuild
Name: xawtv
-BuildRequires: aalib-devel alsa-devel freeglut-devel gcc-c++ gtk1-compat-devel libdrm-devel libjpeg-devel libquicktime-devel lirc openmotif openmotif-devel recode slang-devel update-desktop-files zvbi-devel
+BuildRequires: aalib-devel alsa-devel freeglut-devel gcc-c++ gtk1-compat-devel libdrm-devel libjpeg-devel libquicktime-devel lirc openmotif openmotif-devel recode slang-devel update-desktop-files xorg-x11-devel zvbi-devel
URL: http://bytesex.org/xawtv/
License: GPL
Group: Hardware/TV
Requires: v4l-conf, tv-common, tv-fonts, pia
Conflicts: xaw3dd
Autoreqprov: on
-Version: 3.94
-Release: 21
+Version: 3.95
+Release: 1
Summary: Video4Linux TV application (Athena)
Source: http://dl.bytesex.org/releases/xawtv/%{name}-%{version}.tar.bz2
Source1: motv.desktop
-Patch: xawtv-gcc4.patch
+Patch: xawtv-3.95.patch
Patch1: xawtv-strip.patch
Patch2: xawtv-pagemask.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -44,7 +44,7 @@
Summary: Video4Linux TV application (Motif)
Group: Hardware/TV
Requires: v4l-conf, tv-common, tv-fonts, pia
-Provides: xawtv:/usr/X11R6/bin/motv
+Provides: xawtv:%{_bindir}/motv
%description -n motv
motv is a X11 application for watching TV with your Linux box. It
@@ -79,7 +79,7 @@
%package -n v4l-conf
Summary: Video4linux Configuration Tool
Group: Hardware/TV
-Provides: xawtv:/usr/X11R6/bin/v4l-conf
+Provides: xawtv:%{_bindir}/v4l-conf
%description -n v4l-conf
This is a small utility used to configure video4linux device drivers
@@ -95,7 +95,7 @@
Summary: video4linux terminal / command line utilities
Group: Hardware/TV
Requires: v4l-conf, tv-common
-Provides: xawtv:/usr/X11R6/bin/v4lctl
+Provides: xawtv:%{_bindir}/v4lctl
%description -n v4l-tools
This package includes a bunch of command line utilities: v4lctl to
@@ -148,14 +148,14 @@
%patch2
%build
+autoreconf -fi
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-./configure --prefix=/usr/X11R6
+%{configure}
make
%install
make DESTDIR="%{buildroot}" SUID_ROOT="" install
-gzip -v %{buildroot}/usr/X11R6/man/man*/*
-gzip -v %{buildroot}/usr/X11R6/man/*/man*/*
+gzip -v %{buildroot}%{_mandir}/man*/*
%suse_update_desktop_file -i xawtv AudioVideo TV
%suse_update_desktop_file -i motv AudioVideo TV
@@ -164,145 +164,124 @@
%doc COPYING
%doc Changes TODO README README.*
%doc contrib/frequencies* contrib/vdr.config
-%dir /usr/X11R6/man/es
-%dir /usr/X11R6/man/fr
-%dir /usr/X11R6/man/*/man1
-/usr/X11R6/bin/xawtv
-/usr/X11R6/man/man1/xawtv.1.gz
-/usr/X11R6/man/*/man1/xawtv.1.gz
-/usr/X11R6/lib/X11/app-defaults/Xawtv
-/usr/X11R6/bin/rootv
-/usr/X11R6/man/man1/rootv.1.gz
-/usr/X11R6/man/*/man1/rootv.1.gz
+%{_bindir}/xawtv
+%{_bindir}/rootv
+%{_mandir}/man1/xawtv.1.gz
+%{_mandir}/*/man1/xawtv.1.gz
+%{_mandir}/man1/rootv.1.gz
+%{_mandir}/*/man1/rootv.1.gz
+%{_datadir}/X11/app-defaults/Xawtv
%if %suse_version >= 900
-/usr/share/applications/xawtv.desktop
-/usr/share/pixmaps/xawtv.png
+%{_datadir}/applications/xawtv.desktop
+%{_datadir}/pixmaps/xawtv.png
%endif
%files -n motv
%defattr(-,root,root)
%doc COPYING
%doc Changes TODO README README.*
-/usr/X11R6/bin/motv
-/usr/X11R6/man/man1/motv.1.gz
-#/usr/X11R6/man/*/man1/motv.1.gz
-/usr/X11R6/lib/X11/app-defaults/MoTV
-%dir /usr/X11R6/lib/X11/de
-%dir /usr/X11R6/lib/X11/de_DE.UTF-8
-%dir /usr/X11R6/lib/X11/fr
-%dir /usr/X11R6/lib/X11/it
-/usr/X11R6/lib/X11/*/app-defaults
-/usr/X11R6/bin/mtt
-/usr/X11R6/man/man1/mtt.1.gz
-#/usr/X11R6/man/*/man1/mtt.1.gz
-/usr/X11R6/lib/X11/app-defaults/mtt
+%dir %{_datadir}/X11/de
+%dir %{_datadir}/X11/de_DE.UTF-8
+%dir %{_datadir}/X11/fr
+%dir %{_datadir}/X11/it
+%{_bindir}/motv
+%{_mandir}/man1/motv.1.gz
+%{_datadir}/X11/app-defaults/MoTV
+%{_datadir}/X11/*/app-defaults
+%{_bindir}/mtt
+%{_mandir}/man1/mtt.1.gz
+%{_datadir}/X11/app-defaults/mtt
%if %suse_version >= 900
-/usr/share/applications/motv.desktop
+%{_datadir}/applications/motv.desktop
%endif
%files -n tv-common
%defattr(-,root,root)
%doc COPYING
-%dir /usr/X11R6/man/es
-%dir /usr/X11R6/man/fr
-%dir /usr/X11R6/man/*/man1
-%dir /usr/X11R6/man/*/man5
-/usr/X11R6/bin/subtitles
-/usr/X11R6/man/man1/subtitles.1.gz
-/usr/X11R6/man/*/man1/subtitles.1.gz
-/usr/X11R6/bin/xawtv-remote
-/usr/X11R6/man/man1/xawtv-remote.1.gz
-/usr/X11R6/man/*/man1/xawtv-remote.1.gz
-/usr/X11R6/bin/propwatch
-/usr/X11R6/man/man1/propwatch.1.gz
-#/usr/X11R6/man/*/man1/propwatch.1.gz
-/usr/X11R6/man/man5/xawtvrc.5.gz
-/usr/X11R6/man/*/man5/xawtvrc.5.gz
-/usr/X11R6/lib/xawtv
-/usr/X11R6/share/xawtv
+%{_bindir}/subtitles
+%{_mandir}/man1/subtitles.1.gz
+%{_mandir}/*/man1/subtitles.1.gz
+%{_bindir}/xawtv-remote
+%{_mandir}/man1/xawtv-remote.1.gz
+%{_mandir}/*/man1/xawtv-remote.1.gz
+%{_bindir}/propwatch
+%{_mandir}/man1/propwatch.1.gz
+%{_mandir}/man5/xawtvrc.5.gz
+%{_mandir}/*/man5/xawtvrc.5.gz
+%{_libdir}/xawtv
+%{_datadir}/xawtv
%files -n v4l-conf
%defattr(-,root,root)
%doc COPYING
-%verify(not mode) %attr(4750,root,video) /usr/X11R6/bin/v4l-conf
-%dir /usr/X11R6/man/es
-%dir /usr/X11R6/man/fr
-%dir /usr/X11R6/man/*/man8
-/usr/X11R6/man/man8/v4l-conf.8.gz
-/usr/X11R6/man/*/man8/v4l-conf.8.gz
+%verify(not mode) %attr(4750,root,video) %{_bindir}/v4l-conf
+%{_mandir}/man8/v4l-conf.8.gz
+%{_mandir}/*/man8/v4l-conf.8.gz
%files -n v4l-tools
%defattr(-,root,root)
%doc COPYING
-%dir /usr/X11R6/man/es
-%dir /usr/X11R6/man/fr
-%dir /usr/X11R6/man/*/man1
-/usr/X11R6/bin/radio
-/usr/X11R6/man/man1/radio.1.gz
-#/usr/X11R6/man/*/man1/radio.1.gz
-/usr/X11R6/bin/fbtv
-/usr/X11R6/man/man1/fbtv.1.gz
-/usr/X11R6/man/*/man1/fbtv.1.gz
-/usr/X11R6/bin/ttv
-/usr/X11R6/man/man1/ttv.1.gz
-/usr/X11R6/man/*/man1/ttv.1.gz
-/usr/X11R6/bin/streamer
-/usr/X11R6/man/man1/streamer.1.gz
-/usr/X11R6/man/*/man1/streamer.1.gz
-/usr/X11R6/bin/v4lctl
-/usr/X11R6/man/man1/v4lctl.1.gz
-/usr/X11R6/man/*/man1/v4lctl.1.gz
-/usr/X11R6/bin/record
-/usr/X11R6/man/man1/record.1.gz
-#/usr/X11R6/man/*/man1/record.1.gz
-/usr/X11R6/bin/dump-mixers
-/usr/X11R6/man/man1/dump-mixers.1.gz
-#/usr/X11R6/man/*/man1/dump-mixers.1.gz
-/usr/X11R6/bin/showriff
-/usr/X11R6/man/man1/showriff.1.gz
-#/usr/X11R6/man/*/man1/showriff.1.gz
-/usr/X11R6/bin/showqt
-#/usr/X11R6/man/man1/showqt.1.gz
-#/usr/X11R6/man/*/man1/showqt.1.gz
-/usr/X11R6/bin/scantv
-/usr/X11R6/man/man1/scantv.1.gz
-/usr/X11R6/man/*/man1/scantv.1.gz
-/usr/X11R6/bin/ntsc-cc
-/usr/X11R6/man/man1/ntsc-cc.1.gz
-#/usr/X11R6/man/*/man1/ntsc-cc.1.gz
-/usr/X11R6/bin/webcam
-/usr/X11R6/man/man1/webcam.1.gz
-#/usr/X11R6/man/*/man1/webcam.1.gz
-/usr/X11R6/bin/v4l-info
-/usr/X11R6/man/man1/v4l-info.1.gz
-#/usr/X11R6/man/*/man1/v4l-info.1.gz
+%{_bindir}/radio
+%{_mandir}/man1/radio.1.gz
+%{_bindir}/fbtv
+%{_mandir}/man1/fbtv.1.gz
+%{_mandir}/*/man1/fbtv.1.gz
+%{_bindir}/ttv
+%{_mandir}/man1/ttv.1.gz
+%{_mandir}/*/man1/ttv.1.gz
+%{_bindir}/streamer
+%{_mandir}/man1/streamer.1.gz
+%{_mandir}/*/man1/streamer.1.gz
+%{_bindir}/v4lctl
+%{_mandir}/man1/v4lctl.1.gz
+%{_mandir}/*/man1/v4lctl.1.gz
+%{_bindir}/record
+%{_mandir}/man1/record.1.gz
+%{_bindir}/dump-mixers
+%{_mandir}/man1/dump-mixers.1.gz
+%{_bindir}/showriff
+%{_mandir}/man1/showriff.1.gz
+%{_bindir}/showqt
+%{_bindir}/scantv
+%{_mandir}/man1/scantv.1.gz
+%{_mandir}/*/man1/scantv.1.gz
+%{_bindir}/ntsc-cc
+%{_mandir}/man1/ntsc-cc.1.gz
+%{_bindir}/webcam
+%{_mandir}/man1/webcam.1.gz
+%{_bindir}/v4l-info
+%{_mandir}/man1/v4l-info.1.gz
%files -n alevtd
%defattr(-,root,root)
%doc COPYING
-/usr/X11R6/bin/alevtd
-/usr/X11R6/man/man1/alevtd.1.gz
-#/usr/X11R6/man/*/man1/alevtd.1.gz
+%{_bindir}/alevtd
+%{_mandir}/man1/alevtd.1.gz
%files -n pia
%defattr(-,root,root)
%doc COPYING
%doc Changes TODO README README.*
-/usr/X11R6/bin/pia
-/usr/X11R6/man/man1/pia.1.gz
-#/usr/X11R6/man/*/man1/pia.1.gz
+%{_bindir}/pia
+%{_mandir}/man1/pia.1.gz
%post -n v4l-conf
%run_permissions
%verifyscript
-%verify_permissions -e /usr/X11R6/bin/v4l-conf
+%verify_permissions -e %{_bindir}/v4l-conf
%clean
test "%{buildroot}" != "" -a "%{buildroot}" != "/" &&\
rm -rf "%{buildroot}"
%changelog -n xawtv
+* Thu Aug 17 2006 - cthiel@suse.de
+- update to version 3.95
+ * misc minor fixes collected over time.
+ * make it build with gcc4.
+- drop xawtv-gcc4.patch
+- fix build with X.Org 7.1
* Fri May 19 2006 - ro@suse.de
- fix build on ppc64
* Wed Jan 25 2006 - mls@suse.de
++++++ xawtv-gcc4.patch -> xawtv-3.95.patch ++++++
--- xawtv/xawtv-gcc4.patch 2006-01-20 18:52:56.000000000 +0100
+++ xawtv/xawtv-3.95.patch 2006-08-17 14:15:47.000000000 +0200
@@ -1,3 +1,35 @@
+--- Makefile.in
++++ Makefile.in
+@@ -29,7 +29,7 @@
+ # for CFLAGS
+ WARN_FLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
+ LFS_FLAGS := -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+-X11_FLAGS := @X_CFLAGS@ @XFT_FLAGS@ -I/usr/X11R6/include/X11/fonts
++X11_FLAGS := @X_CFLAGS@ @XFT_FLAGS@ -I/usr/include/X11/fonts
+ LIB_FLAGS := -I. -I./vbistuff -I./x11 \
+ -I$(srcdir)/jwz -I$(srcdir)/common -I$(srcdir)/console \
+ -I$(srcdir)/x11 -I$(srcdir)/structs \
+@@ -49,7 +49,7 @@
+ VBI_LIBS := @LIBZVBI@
+ GL_LIBS := @LIBGL@
+ DV_LIBS := @LIBDV@
+-FS_LIBS := -L@x_libraries@ @FSLIB@
++FS_LIBS := @X_LIBS@ @FSLIB@
+ DLFLAGS := @DLFLAGS@
+
+ # stuff configure has found
+--- common/channel.c
++++ common/channel.c
+@@ -181,6 +181,9 @@
+ { -1, NULL, },
+ };
+
++extern struct STRTAB booltab[];
++extern struct STRTAB captab[];
++
+ /* just malloc memory for a new channel ... */
+ struct CHANNEL*
+ add_channel(char *name)
--- common/channel.h
+++ common/channel.h
@@ -90,8 +90,5 @@
@@ -9,26 +41,26 @@
-
int str_to_int(char *str, struct STRTAB *tab);
const char* int_to_str(int n, struct STRTAB *tab);
---- console/fbtv.c
-+++ console/fbtv.c
-@@ -187,7 +187,7 @@
-
- #define NKEYTAB (sizeof(keytab)/sizeof(struct KEYTAB))
-
--static char *snapbase;
-+char *snapbase;
- static char default_title[128] = "???";
- static char message[128] = "";
-
---- libng/grab-ng.h
-+++ libng/grab-ng.h
-@@ -120,6 +120,9 @@
- const char *str;
- };
+--- common/commands.c
++++ common/commands.c
+@@ -162,6 +162,9 @@
+
+ static int keypad_state = -1;
+extern struct STRTAB booltab[];
+extern struct STRTAB captab[];
+
- struct OVERLAY_CLIP {
- int x1,x2,y1,y2;
- };
+ /* ----------------------------------------------------------------------- */
+
+ void add_attrs(struct ng_attribute *new)
+--- configure.ac
++++ configure.ac
+@@ -295,7 +295,7 @@
+ AC_SUBST(x11conf)
+
+ AC_MSG_CHECKING(for X11 app-defaults directory)
+-resdir=/usr/X11R6/lib/X11
++resdir=/usr/share/X11
+ if test -d /etc/X11/app-defaults; then
+ resdir=/etc/X11
+ fi
++++++ xawtv-3.94.tar.bz2 -> xawtv-3.95.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xawtv-3.94/Changes new/xawtv-3.95/Changes
--- old/xawtv-3.94/Changes 2004-01-29 14:10:40.000000000 +0100
+++ new/xawtv-3.95/Changes 2005-09-30 14:57:29.000000000 +0200
@@ -1,4 +1,11 @@
+3.95
+====
+
+ * misc minor fixes collected over time.
+ * make it build with gcc4.
+
+
3.91
====
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xawtv-3.94/common/capture.c new/xawtv-3.95/common/capture.c
--- old/xawtv-3.94/common/capture.c 2003-03-27 11:43:53.000000000 +0100
+++ new/xawtv-3.95/common/capture.c 2004-10-12 12:16:34.000000000 +0200
@@ -606,7 +606,7 @@
movie_grab_put_video(struct movie_handle *h, struct ng_video_buf **ret)
{
struct ng_video_buf *buf;
- int expected;
+ int expected,rc;
if (debug > 1)
fprintf(stderr,"grab_put_video\n");
@@ -639,7 +639,7 @@
}
h->frames++;
h->vts = buf->info.ts;
- buf->info.seq = h->seq++;
+ buf->info.seq = h->seq;
/* return a pointer to the frame if requested */
if (NULL != ret) {
@@ -648,13 +648,15 @@
}
/* put into fifo */
- if (h->cthreads) {
- if (0 != fifo_put(&h->cfifo,buf))
- ng_release_video_buf(buf);
- } else {
- if (0 != fifo_put(&h->vfifo,buf))
- ng_release_video_buf(buf);
+ if (h->cthreads)
+ rc = fifo_put(&h->cfifo,buf);
+ else
+ rc = fifo_put(&h->vfifo,buf);
+ if (0 != rc) {
+ ng_release_video_buf(buf);
+ return h->frames;
}
+ h->seq++;
/* feedback */
movie_print_timestamps(h);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xawtv-3.94/common/sound.c new/xawtv-3.95/common/sound.c
--- old/xawtv-3.94/common/sound.c 2003-02-14 15:14:04.000000000 +0100
+++ new/xawtv-3.95/common/sound.c 2005-09-30 12:01:57.000000000 +0200
@@ -13,8 +13,8 @@
oss_levels(struct ng_audio_buf *buf, int *left, int *right)
{
int lmax,rmax,i,level;
- signed char *s = buf->data;
- unsigned char *u = buf->data;
+ signed char *s = (signed char*) buf->data;
+ unsigned char *u = (unsigned char*) buf->data;
lmax = 0;
rmax = 0;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xawtv-3.94/configure new/xawtv-3.95/configure
--- old/xawtv-3.94/configure 2004-08-18 17:48:30.000000000 +0200
+++ new/xawtv-3.95/configure 2005-09-30 12:10:03.000000000 +0200
@@ -972,7 +972,7 @@
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi
- cd "$ac_popdir"
+ cd $ac_popdir
done
fi
@@ -1955,7 +1955,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2013,7 +2014,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2129,7 +2131,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2183,7 +2186,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2228,7 +2232,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2272,7 +2277,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2456,7 +2462,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2514,7 +2521,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2585,7 +2593,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2629,7 +2638,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3154,7 +3164,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3324,7 +3335,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3399,7 +3411,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3589,7 +3602,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3663,7 +3677,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3742,7 +3757,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3810,7 +3826,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3872,7 +3889,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3939,7 +3957,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4007,7 +4026,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4049,12 +4069,9 @@
-
-if test "x$ac_path_x_has_been_run" != xyes; then
- echo "$as_me:$LINENO: checking for X" >&5
+echo "$as_me:$LINENO: checking for X" >&5
echo $ECHO_N "checking for X... $ECHO_C" >&6
-ac_path_x_has_been_run=yes
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
@@ -4147,7 +4164,7 @@
/usr/openwin/share/include'
if test "$ac_x_includes" = no; then
- # Guess where to find include files, by looking for a specified header file.
+ # Guess where to find include files, by looking for Intrinsic.h.
# First, try using that file with no special directory specified.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -4221,7 +4238,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4281,15 +4299,10 @@
# Update the cache value to reflect the command line values.
ac_cv_have_x="have_x=yes \
ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
- # It might be that x_includes is empty (headers are found in the
- # standard search path. Then output the corresponding message
- ac_out_x_includes=$x_includes
- test "x$x_includes" = x && ac_out_x_includes="in standard search path"
- echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5
-echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6
+ echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
+echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
fi
-fi
if test "$no_x" = yes; then
# Not all programs may use this symbol, but it does not hurt to define it.
@@ -4337,7 +4350,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4388,7 +4402,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4464,7 +4479,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4519,7 +4535,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4587,7 +4604,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4695,7 +4713,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4759,7 +4778,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4827,7 +4847,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4931,7 +4952,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4995,7 +5017,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5092,7 +5115,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5156,7 +5180,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5253,7 +5278,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5317,7 +5343,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5396,7 +5423,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5509,7 +5537,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5586,7 +5615,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5664,7 +5694,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5742,7 +5773,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5820,7 +5852,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5900,7 +5933,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5977,7 +6011,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6059,7 +6094,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6132,7 +6168,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6205,7 +6242,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6278,7 +6316,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6350,7 +6389,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6423,7 +6463,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6496,7 +6537,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6574,7 +6616,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6651,7 +6694,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6725,7 +6769,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -7643,6 +7688,11 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
+ if test x"$ac_file" != x-; then
+ { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+ rm -f "$ac_file"
+ fi
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
@@ -7681,12 +7731,6 @@
fi;;
esac
done` || { (exit 1); exit 1; }
-
- if test x"$ac_file" != x-; then
- { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
- rm -f "$ac_file"
- fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xawtv-3.94/console/fbtv.c new/xawtv-3.95/console/fbtv.c
--- old/xawtv-3.94/console/fbtv.c 2004-06-30 14:26:52.000000000 +0200
+++ new/xawtv-3.95/console/fbtv.c 2005-09-30 12:09:22.000000000 +0200
@@ -187,7 +187,6 @@
#define NKEYTAB (sizeof(keytab)/sizeof(struct KEYTAB))
-static char *snapbase;
static char default_title[128] = "???";
static char message[128] = "";
@@ -195,12 +194,23 @@
/* framebuffer stuff */
static void
-linear_palette(int bit)
+linear_palette(int r, int g, int b)
{
- int i, size = 256 >> (8 - bit);
+ int i, size;
+ size = 256 >> (8 - r);
for (i = 0; i < size; i++)
- red[i] = green[i] = blue[i] = (unsigned short)(65535.0
+ red[i] = (unsigned short)(65535.0
+ * pow(i/(size - 1.0), fbgamma));
+
+ size = 256 >> (8 - g);
+ for (i = 0; i < size; i++)
+ green[i] = (unsigned short)(65535.0
+ * pow(i/(size - 1.0), fbgamma));
+
+ size = 256 >> (8 - b);
+ for (i = 0; i < size; i++)
+ blue[i] = (unsigned short)(65535.0
* pow(i/(size - 1.0), fbgamma));
}
@@ -232,7 +242,7 @@
switch (fb_var.bits_per_pixel) {
case 8:
if (gray) {
- linear_palette(8);
+ linear_palette(8,8,8);
x11_native_format = VIDEO_GRAY;
} else {
dither_palette(5,9,5);
@@ -242,7 +252,9 @@
case 15:
case 16:
if (fb_fix.visual == FB_VISUAL_DIRECTCOLOR)
- linear_palette(5);
+ linear_palette(fb_var.red.length,
+ fb_var.green.length,
+ fb_var.blue.length);
#if BYTE_ORDER == BIG_ENDIAN
x11_native_format = (fb_var.green.length == 6) ?
VIDEO_RGB16_BE : VIDEO_RGB15_BE;
@@ -253,7 +265,7 @@
break;
case 24:
if (fb_fix.visual == FB_VISUAL_DIRECTCOLOR)
- linear_palette(8);
+ linear_palette(8,8,8);
#if BYTE_ORDER == BIG_ENDIAN
x11_native_format = VIDEO_RGB24;
#else
@@ -262,7 +274,7 @@
break;
case 32:
if (fb_fix.visual == FB_VISUAL_DIRECTCOLOR)
- linear_palette(8);
+ linear_palette(8,8,8);
#if BYTE_ORDER == BIG_ENDIAN
x11_native_format = VIDEO_RGB32;
#else
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xawtv-3.94/console/ftp.c new/xawtv-3.95/console/ftp.c
--- old/xawtv-3.94/console/ftp.c 2003-02-14 15:14:04.000000000 +0100
+++ new/xawtv-3.95/console/ftp.c 2005-09-30 12:08:48.000000000 +0200
@@ -186,7 +186,7 @@
s->connected = 0;
}
if (NULL != strstr(p,"Not connected")) {
- if (ftp_connected)
+ if (!ftp_connected(s))
fprintf(stderr,"ftp: lost connection\n");
s->connected = 0;
}
@@ -236,7 +236,7 @@
/* login */
ftp_send(s,3,"user",user,pass);
if (230 != ftp_recv(s)) {
- if (!ftp_connected)
+ if (!ftp_connected(s))
continue;
fprintf(stderr,"ftp: login incorrect\n");
exit(1);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xawtv-3.94/console/matrox.c new/xawtv-3.95/console/matrox.c
--- old/xawtv-3.94/console/matrox.c 2003-02-14 15:14:04.000000000 +0100
+++ new/xawtv-3.95/console/matrox.c 2005-02-03 11:40:41.000000000 +0100
@@ -5,6 +5,7 @@
#include