Hello community,
here is the log from the commit of package libdc1394
checked in at Sun Aug 5 17:34:32 CEST 2007.
--------
--- libdc1394/libdc1394.changes 2007-07-13 22:22:16.000000000 +0200
+++ /mounts/work_src_done/STABLE/libdc1394/libdc1394.changes 2007-08-05 11:58:26.000000000 +0200
@@ -1,0 +2,7 @@
+Sun Aug 5 11:55:22 CEST 2007 - olh@suse.de
+
+- split libdc1394-20 package which contains only libraries
+ split libdc1394_control12 and libdc1394_control12-devel
+ upgrade to 1.2.2, color filter fix
+
+-------------------------------------------------------------------
Old:
----
libdc1394-1.2.1.tar.bz2
libdc1394-grab_partial_image-CLK_TCK.patch
New:
----
libdc1394-1.2.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libdc1394.spec ++++++
--- /var/tmp/diff_new_pack.bj9898/_old 2007-08-05 17:34:07.000000000 +0200
+++ /var/tmp/diff_new_pack.bj9898/_new 2007-08-05 17:34:07.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package libdc1394 (Version 2.0.0)
+# spec file for package libdc1394 (Version 0)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,18 +11,19 @@
# norootforbuild
Name: libdc1394
+%define libdc1394_12_version 1.2.2
+%define libdc1394_version 2.0.0
BuildRequires: libraw1394-devel xorg-x11-devel
License: LGPL v2 or later
Group: Hardware/Camera
Autoreqprov: on
-Version: 2.0.0
-Release: 60
+Version: %{libdc1394_version}
+Release: 1
URL: http://sourceforge.net/projects/libdc1394/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: 1394-Based Digital Camera Control Library
-Source1: libdc1394-1.2.1.tar.bz2
-Source2: libdc1394-2.0.0-rc7.tar.bz2
-Patch1: libdc1394-grab_partial_image-CLK_TCK.patch
+Source1: libdc1394-%{libdc1394_12_version}.tar.bz2
+Source2: libdc1394-%{libdc1394_version}-rc7.tar.bz2
%description
This library provides functionality for controlling any camera that
@@ -44,10 +45,87 @@
David Moore
John Stanley
+%package -n libdc1394_control12
+Summary: 1394-Based Digital Camera Control Library
+Group: Hardware/Camera
+Version: %{libdc1394_12_version}
+Release: 1
+
+%description -n libdc1394_control12
+This library provides functionality for controlling any camera that
+conforms to the 1394-Based Digital Camera Specification (which can be
+found at
+http://www.1394ta.org/Download/Technology/Specifications/Camera120.pdf)
+. It utilizes the low-level functionality provided by libraw1394 to
+communicate with the camera.
+
+
+
+Authors:
+--------
+ Gord Peters
+ Per Dalgas Jakobsen
+ Chris Urmson
+ Damien Douxchamps
+ Dan Dennedy
+ David Moore
+ John Stanley
+
+%package -n libdc1394_control12-devel
+Summary: 1394-Based Digital Camera Control Library
+Group: Hardware/Camera
+Version: %{libdc1394_12_version}
+Release: 1
+Requires: libdc1394_control12 = %{libdc1394_12_version}
+
+%description -n libdc1394_control12-devel
+This library provides functionality for controlling any camera that
+conforms to the 1394-Based Digital Camera Specification (which can be
+found at
+http://www.1394ta.org/Download/Technology/Specifications/Camera120.pdf)
+. It utilizes the low-level functionality provided by libraw1394 to
+communicate with the camera.
+
+
+
+Authors:
+--------
+ Gord Peters
+ Per Dalgas Jakobsen
+ Chris Urmson
+ Damien Douxchamps
+ Dan Dennedy
+ David Moore
+ John Stanley
+
+%package 20
+Summary: 1394-Based Digital Camera Control Library
+Group: Hardware/Camera
+
+%description 20
+This library provides functionality for controlling any camera that
+conforms to the 1394-Based Digital Camera Specification (which can be
+found at
+http://www.1394ta.org/Download/Technology/Specifications/Camera120.pdf)
+. It utilizes the low-level functionality provided by libraw1394 to
+communicate with the camera.
+
+
+
+Authors:
+--------
+ Gord Peters
+ Per Dalgas Jakobsen
+ Chris Urmson
+ Damien Douxchamps
+ Dan Dennedy
+ David Moore
+ John Stanley
+
%package devel
Summary: Development libraries and header files for dc1394
Group: Development/Libraries/C and C++
-Requires: libdc1394 = %{version}
+Requires: libdc1394-20 = %{libdc1394_version}
Requires: libraw1394-devel
%description devel
@@ -70,8 +148,6 @@
%setup -q -T -c -a 1 -a 2
mv libdc1394-1* libdc1394-1
mv libdc1394-2* libdc1394-2
-cd libdc1394-1
-%patch1 -p1
%build
for i in libdc1394-1 libdc1394-2
@@ -91,30 +167,52 @@
for i in libdc1394-1 libdc1394-2
do
cd $i
- %{__make} DESTDIR=$RPM_BUILD_ROOT install
+ %{__make} DESTDIR=${RPM_BUILD_ROOT} install
cd ..
done
-%post -p /sbin/ldconfig
+%post -n libdc1394_control12 -p /sbin/ldconfig
+
+%postun -n libdc1394_control12 -p /sbin/ldconfig
+
+%post 20 -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%postun 20 -p /sbin/ldconfig
%files
%defattr(-,root,root)
%doc libdc1394-2/{AUTHORS,COPYING,ChangeLog,NEWS,README}
%_bindir/dc1394_vloopback
%_bindir/dc1394_reset_bus
-%_libdir/lib*.so.*
+
+%files 20
+%defattr(-,root,root)
+%_libdir/libdc1394.so.*
+
+%files -n libdc1394_control12
+%defattr(-,root,root)
+%_libdir/libdc1394_control.so.*
+
+%files -n libdc1394_control12-devel
+%defattr(-,root,root)
+%_includedir/libdc1394
+%_libdir/libdc1394_control*.la
+%_libdir/libdc1394_control*.a
+%_libdir/libdc1394_control*.so
%files devel
%defattr(-,root,root)
-%_includedir/*
-%_libdir/lib*.la
-%_libdir/lib*.a
-%_libdir/lib*.so
+%_includedir/dc1394
+%_libdir/libdc1394.la
+%_libdir/libdc1394.a
+%_libdir/libdc1394.so
%_libdir/pkgconfig/*.pc
%changelog
+* Sun Aug 05 2007 - olh@suse.de
+- split libdc1394-20 package which contains only libraries
+ split libdc1394_control12 and libdc1394_control12-devel
+ upgrade to 1.2.2, color filter fix
* Fri Jul 13 2007 - olh@suse.de
- update to 2.0.0-rc7
API fixes
++++++ libdc1394-1.2.1.tar.bz2 -> libdc1394-1.2.2.tar.bz2 ++++++
++++ 16982 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdc1394-1.2.1/ChangeLog new/libdc1394-1.2.2/ChangeLog
--- old/libdc1394-1.2.1/ChangeLog 2006-03-31 07:02:16.000000000 +0200
+++ new/libdc1394-1.2.2/ChangeLog 2007-08-03 10:09:54.000000000 +0200
@@ -544,3 +544,13 @@
and correcting this!
* updated TRIGGER_MODE_NUM definition
* Release 1.2.1
+
+2006-04-05 Damien
+ * replaced CLK_TCK by CLOCKS_PER_SEC. Thanks to Sean Darcy for (re)
+ spotting this in version 1.
+
+2007-08-03 Damien
+ * Fixed color filter bug (Johann Schoonees)
+ * Removed unnecessary function to set the color filter
+ (color filter is read only) (Johann Schoonees)
+ * release 1.2.2
\ No newline at end of file
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdc1394-1.2.1/compile new/libdc1394-1.2.2/compile
--- old/libdc1394-1.2.1/compile 2006-03-12 05:12:27.000000000 +0100
+++ new/libdc1394-1.2.2/compile 1970-01-01 01:00:00.000000000 +0100
@@ -1,142 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2005-05-14.22
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-# Written by Tom Tromey .
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to or send patches to
-# .
-
-case $1 in
- '')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
- exit 1;
- ;;
- -h | --h*)
- cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to .
-EOF
- exit $?
- ;;
- -v | --v*)
- echo "compile $scriptversion"
- exit $?
- ;;
-esac
-
-ofile=
-cfile=
-eat=
-
-for arg
-do
- if test -n "$eat"; then
- eat=
- else
- case $1 in
- -o)
- # configure might choose to run compile as `compile cc -o foo foo.c'.
- # So we strip `-o arg' only if arg is an object.
- eat=1
- case $2 in
- *.o | *.obj)
- ofile=$2
- ;;
- *)
- set x "$@" -o "$2"
- shift
- ;;
- esac
- ;;
- *.c)
- cfile=$1
- set x "$@" "$1"
- shift
- ;;
- *)
- set x "$@" "$1"
- shift
- ;;
- esac
- fi
- shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
- # If no `-o' option was seen then we might have been invoked from a
- # pattern rule where we don't need one. That is ok -- this is a
- # normal compilation that the losing compiler can handle. If no
- # `.c' file was seen then we are probably linking. That is also
- # ok.
- exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file. Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
-while true; do
- if mkdir "$lockdir" >/dev/null 2>&1; then
- break
- fi
- sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
- mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
- mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdc1394-1.2.1/config.h.in new/libdc1394-1.2.2/config.h.in
--- old/libdc1394-1.2.1/config.h.in 2006-03-31 06:53:57.000000000 +0200
+++ new/libdc1394-1.2.2/config.h.in 2007-08-03 10:10:03.000000000 +0200
@@ -75,5 +75,5 @@
/* Define to 1 if the X Window System is missing or not being used. */
#undef X_DISPLAY_MISSING
-/* Define to `unsigned' if does not define. */
+/* Define to `unsigned int' if does not define. */
#undef size_t
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdc1394-1.2.1/configure.in new/libdc1394-1.2.2/configure.in
--- old/libdc1394-1.2.1/configure.in 2006-03-31 06:53:08.000000000 +0200
+++ new/libdc1394-1.2.2/configure.in 2007-08-03 10:08:49.000000000 +0200
@@ -1,7 +1,7 @@
# process this file with autoconf to get a configure script
AC_INIT(libdc1394/dc1394_control.c)
-AM_INIT_AUTOMAKE(libdc1394, 1.2.1)
+AM_INIT_AUTOMAKE(libdc1394, 1.2.2)
AM_CONFIG_HEADER(config.h)
AC_PROG_CC
@@ -26,7 +26,7 @@
# set the libtool shared library version numbers
lt_major=13
-lt_revision=1
+lt_revision=2
lt_age=1
AC_SUBST(lt_major)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdc1394-1.2.1/examples/dc1394_multiview.c new/libdc1394-1.2.2/examples/dc1394_multiview.c
--- old/libdc1394-1.2.1/examples/dc1394_multiview.c 2006-03-19 06:28:32.000000000 +0100
+++ new/libdc1394-1.2.2/examples/dc1394_multiview.c 2007-08-03 08:47:33.000000000 +0200
@@ -1,8 +1,8 @@
/**************************************************************************
** Title: display video from multiple cameras/multiple cards
-** $RCSfile: dc1394_multiview.c,v $
-** $Revision: 1.11 $$Name: $
-** $Date: 2005/12/21 11:22:49 $
+** $RCSfile$
+** $Revision: 255 $$Name$
+** $Date: 2005-12-21 20:22:50 +0900 (Wed, 21 Dec 2005) $
** Copyright: LGPL $Author: ddouxchamps $
** Description:
**
@@ -14,7 +14,7 @@
**
**-------------------------------------------------------------------------
**
-** $Log: dc1394_multiview.c,v $
+** $Log$
** Revision 1.11 2005/12/21 11:22:49 ddouxchamps
** Fixed compilation warning and a bug in camera detection
**
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdc1394-1.2.1/examples/dc1394_vloopback.c new/libdc1394-1.2.2/examples/dc1394_vloopback.c
--- old/libdc1394-1.2.1/examples/dc1394_vloopback.c 2006-03-19 06:28:32.000000000 +0100
+++ new/libdc1394-1.2.2/examples/dc1394_vloopback.c 2007-08-03 08:47:33.000000000 +0200
@@ -1,8 +1,8 @@
/**************************************************************************
** Title: Turn a Digital Camera into a V4L device using vloopback
-** $RCSfile: dc1394_vloopback.c,v $
-** $Revision: 1.12 $$Name: $
-** $Date: 2005/12/21 11:22:49 $
+** $RCSfile$
+** $Revision: 255 $$Name$
+** $Date: 2005-12-21 20:22:50 +0900 (Wed, 21 Dec 2005) $
** Copyright: LGPL $Author: ddouxchamps $
** Description:
**
@@ -20,7 +20,7 @@
**
**-------------------------------------------------------------------------
**
-** $Log: dc1394_vloopback.c,v $
+** $Log$
** Revision 1.12 2005/12/21 11:22:49 ddouxchamps
** Fixed compilation warning and a bug in camera detection
**
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdc1394-1.2.1/examples/grab_color_image.c new/libdc1394-1.2.2/examples/grab_color_image.c
--- old/libdc1394-1.2.1/examples/grab_color_image.c 2004-01-20 05:12:27.000000000 +0100
+++ new/libdc1394-1.2.2/examples/grab_color_image.c 2007-08-03 08:47:33.000000000 +0200
@@ -1,8 +1,8 @@
/**************************************************************************
** Title: grab one color image using libdc1394
-** $RCSfile: grab_color_image.c,v $
-** $Revision: 1.5 $$Name: $
-** $Date: 2004/01/20 04:12:27 $
+** $RCSfile$
+** $Revision: 150 $$Name$
+** $Date: 2004-01-20 13:12:27 +0900 (Tue, 20 Jan 2004) $
** Copyright: LGPL $Author: ddennedy $
** Description:
**
@@ -11,7 +11,7 @@
**
**-------------------------------------------------------------------------
**
-** $Log: grab_color_image.c,v $
+** $Log$
** Revision 1.5 2004/01/20 04:12:27 ddennedy
** added dc1394_free_camera_nodes and applied to examples
**
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdc1394-1.2.1/examples/grab_gray_image.c new/libdc1394-1.2.2/examples/grab_gray_image.c
--- old/libdc1394-1.2.1/examples/grab_gray_image.c 2005-04-15 03:09:48.000000000 +0200
+++ new/libdc1394-1.2.2/examples/grab_gray_image.c 2007-08-03 08:47:33.000000000 +0200
@@ -1,8 +1,8 @@
/**************************************************************************
** Title: grab one gray image using libdc1394
-** $RCSfile: grab_gray_image.c,v $
-** $Revision: 1.7 $$Name: $
-** $Date: 2005/04/15 01:09:48 $
+** $RCSfile$
+** $Revision: 197 $$Name$
+** $Date: 2005-04-15 10:09:49 +0900 (Fri, 15 Apr 2005) $
** Copyright: LGPL $Author: ddouxchamps $
** Description:
**
@@ -11,7 +11,7 @@
**
**-------------------------------------------------------------------------
**
-** $Log: grab_gray_image.c,v $
+** $Log$
** Revision 1.7 2005/04/15 01:09:48 ddouxchamps
** added the AVT extensions of Pierre Moos
**
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdc1394-1.2.1/examples/grab_partial_image.c new/libdc1394-1.2.2/examples/grab_partial_image.c
--- old/libdc1394-1.2.1/examples/grab_partial_image.c 2005-08-18 09:03:06.000000000 +0200
+++ new/libdc1394-1.2.2/examples/grab_partial_image.c 2007-08-03 08:47:33.000000000 +0200
@@ -1,8 +1,8 @@
/**************************************************************************
** Title: grab partial images from camera, measure frame rate
-** $RCSfile: grab_partial_image.c,v $
-** $Revision: 1.5 $$Name: $
-** $Date: 2005/08/18 07:03:06 $
+** $RCSfile$
+** $Revision: 264 $$Name$
+** $Date: 2006-04-05 11:34:43 +0900 (Wed, 05 Apr 2006) $
** Copyright: LGPL $Author: ddouxchamps $
** Description:
**
@@ -11,7 +11,10 @@
**
**-------------------------------------------------------------------------
**
-** $Log: grab_partial_image.c,v $
+** $Log$
+** Revision 1.6 2006/04/05 02:34:43 ddouxchamps
+** replaced CLK_TCK by CLOCKS_PER_SEC.
+**
** Revision 1.5 2005/08/18 07:03:06 ddouxchamps
** I looked at the bug reports on SF and applied some fixes
**
@@ -218,7 +221,7 @@
/*---------------------------------------------------------------------
* output elapsed time
*---------------------------------------------------------------------*/
- elapsed_time = (float)(times(&tms_buf) - start_time) / CLK_TCK;
+ elapsed_time = (float)(times(&tms_buf) - start_time) / CLOCKS_PER_SEC;
printf( "got frame %d. elapsed time: %g sec ==> %g frames/second\n",
i, elapsed_time, (float)i / elapsed_time);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdc1394-1.2.1/libdc1394/dc1394_control.h new/libdc1394-1.2.2/libdc1394/dc1394_control.h
--- old/libdc1394-1.2.1/libdc1394/dc1394_control.h 2006-03-31 07:01:52.000000000 +0200
+++ new/libdc1394-1.2.2/libdc1394/dc1394_control.h 2007-08-03 10:07:34.000000000 +0200
@@ -1219,14 +1219,9 @@
float *interval);
int
-dc1394_set_format7_color_filter_id(raw1394handle_t handle, nodeid_t node,
- unsigned int mode,
- unsigned int color_id);
-
-int
dc1394_query_format7_color_filter_id(raw1394handle_t handle, nodeid_t node,
unsigned int mode,
- unsigned int *color_id);
+ unsigned int *filter_id);
/**********************************
* ABSOLUTE SETTING FUNCTIONS *
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdc1394-1.2.1/libdc1394/dc1394_format7.c new/libdc1394-1.2.2/libdc1394/dc1394_format7.c
--- old/libdc1394-1.2.1/libdc1394/dc1394_format7.c 2006-03-19 06:28:32.000000000 +0100
+++ new/libdc1394-1.2.2/libdc1394/dc1394_format7.c 2007-08-03 10:07:55.000000000 +0200
@@ -1177,7 +1177,7 @@
int
dc1394_query_format7_color_filter_id(raw1394handle_t handle, nodeid_t node,
unsigned int mode,
- unsigned int *color_id)
+ unsigned int *filter_id)
{
quadlet_t value;
@@ -1188,22 +1188,7 @@
&value)==DC1394_FAILURE)
return DC1394_FAILURE;
- *color_id= (value >> 24)+COLOR_FORMAT7_MIN;
- return DC1394_SUCCESS;
-}
-
-int
-dc1394_set_format7_color_filter_id(raw1394handle_t handle, nodeid_t node,
- unsigned int mode,
- unsigned int color_id)
-{
-
- if ( (mode > MODE_FORMAT7_MAX) || (mode < MODE_FORMAT7_MIN) )
- return DC1394_FAILURE;
-
- if (SetCameraFormat7Register(handle, node, mode, REG_CAMERA_FORMAT7_COLOR_FILTER_ID,
- color_id - COLOR_FORMAT7_MIN)==DC1394_FAILURE)
- return DC1394_FAILURE;
-
+ *filter_id= (value >> 24)+COLOR_FILTER_FORMAT7_MIN;
return DC1394_SUCCESS;
}
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdc1394-1.2.1/missing new/libdc1394-1.2.2/missing
--- old/libdc1394-1.2.1/missing 2005-02-06 07:18:29.000000000 +0100
+++ new/libdc1394-1.2.2/missing 2006-11-17 14:08:39.000000000 +0100
@@ -1,7 +1,11 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 2001, 2002 Free Software Foundation, Inc.
-# Franc,ois Pinard , 1996.
+
+scriptversion=2006-05-10.23
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+# Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -15,23 +19,49 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
if test $# -eq 0; then
echo 1>&2 "Try \`$0 --help' for more information"
exit 1
fi
+run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
+
# In the cases where this matters, `missing' is being run in the
# srcdir already.
-if test -f configure.in; then
+if test -f configure.ac; then
configure_ac=configure.ac
else
configure_ac=configure.in
fi
-case "$1" in
+msg="missing on your system"
+
+case $1 in
+--run)
+ # Try to run requested program, and just exit if it succeeds.
+ run=
+ shift
+ "$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+ run=:
+ msg="probably too old"
+ fi
+ ;;
-h|--h|--he|--hel|--help)
echo "\
@@ -43,21 +73,29 @@
Options:
-h, --help display this help and exit
-v, --version output version information and exit
+ --run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
+ help2man touch the output file
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
+ tar try tar, gnutar, gtar, then tar without non-portable flags
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to ."
+ exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing - GNU libit 0.0"
+ echo "missing $scriptversion (GNU Automake)"
+ exit $?
;;
-*)
@@ -66,10 +104,45 @@
exit 1
;;
+esac
+
+# Now exit if we have it, but it failed. Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).
+case $1 in
+ lex|yacc)
+ # Not GNU programs, they don't have --version.
+ ;;
+
+ tar)
+ if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ exit 1
+ fi
+ ;;
+
+ *)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
+ fi
+ ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case $1 in
aclocal*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`acinclude.m4' or \`$configure_ac'. You might want
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
touch aclocal.m4
@@ -77,8 +150,8 @@
autoconf)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`$configure_ac'. You might want to install the
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
touch configure
@@ -86,15 +159,15 @@
autoheader)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`acconfig.h' or \`$configure_ac'. You might want
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' $configure_ac`
+ files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -105,8 +178,8 @@
automake*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`$configure_ac'.
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
find . -type f -name Makefile.am -print |
@@ -114,81 +187,170 @@
while read f; do touch "$f"; done
;;
+ autom4te)
+ echo 1>&2 "\
+WARNING: \`$1' is needed, but is $msg.
+ You might have modified some files without having the
+ proper tools for further handling them.
+ You can get \`$1' as part of \`Autoconf' from any GNU
+ archive site."
+
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+ echo "#! /bin/sh"
+ echo "# Created by GNU Automake missing as a replacement of"
+ echo "# $ $@"
+ echo "exit 0"
+ chmod +x $file
+ exit 1
+ fi
+ ;;
+
bison|yacc)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
lex|flex)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
+ help2man)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified a dependency of a manual page. You may need the
+ \`Help2man' package in order for those modifications to take
+ effect. You can get \`Help2man' from any GNU archive site."
+
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+ echo ".ab help2man is required to generate this page"
+ exit 1
+ fi
+ ;;
+
makeinfo)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ # The file to touch is that specified with -o ...
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
touch $file
;;
+ tar)
+ shift
+
+ # We have already tried tar in the generic part.
+ # Look for gnutar/gtar before invocation to avoid ugly error
+ # messages.
+ if (gnutar --version > /dev/null 2>&1); then
+ gnutar "$@" && exit 0
+ fi
+ if (gtar --version > /dev/null 2>&1); then
+ gtar "$@" && exit 0
+ fi
+ firstarg="$1"
+ if shift; then
+ case $firstarg in
+ *o*)
+ firstarg=`echo "$firstarg" | sed s/o//`
+ tar "$firstarg" "$@" && exit 0
+ ;;
+ esac
+ case $firstarg in
+ *h*)
+ firstarg=`echo "$firstarg" | sed s/h//`
+ tar "$firstarg" "$@" && exit 0
+ ;;
+ esac
+ fi
+
+ echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+ You may want to install GNU tar or Free paxutils, or check the
+ command line arguments."
+ exit 1
+ ;;
+
*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, and is $msg.
+ You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
- it often tells you about the needed prerequirements for installing
+ it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
some other package would contain this missing \`$1' program."
exit 1
@@ -196,3 +358,10 @@
esac
exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org