Hello community, here is the log from the commit of package libraw1394 for openSUSE:Factory checked in at 2015-11-18 22:32:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libraw1394 (Old) and /work/SRC/openSUSE:Factory/.libraw1394.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libraw1394" Changes: -------- --- /work/SRC/openSUSE:Factory/libraw1394/libraw1394.changes 2015-03-25 09:54:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libraw1394.new/libraw1394.changes 2015-11-18 22:32:12.000000000 +0100 @@ -1,0 +2,16 @@ +Sat Nov 14 15:14:55 UTC 2015 - [email protected] + +- Update to new upstream release 2.2.1 +* Align fw_handle buffer for 64-bit access +* Prevent requests for previously provided ISO TX packets +* Save and restore errno in raw1394_new_handle{,_on_port} for + legacy applications +- Store and use gpg key to verify. Trim description and update it + for the contemporary Firewire stack. +- Make libraw1394-exports.patch simpler by avoiding ^- lines. +- Drop redundant --with-pic; it is only used for static libs (which + we do not build), and always on anyway for shared libraires. +- Name the utility package -tools as with many other pkgs. +- Remove non-library packages from baselibs.conf. + +------------------------------------------------------------------- Old: ---- libraw1394-2.1.0.tar.xz New: ---- libraw1394-2.1.1.tar.sign libraw1394-2.1.1.tar.xz libraw1394.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libraw1394.spec ++++++ --- /var/tmp/diff_new_pack.8sWuqp/_old 2015-11-18 22:32:13.000000000 +0100 +++ /var/tmp/diff_new_pack.8sWuqp/_new 2015-11-18 22:32:13.000000000 +0100 @@ -17,74 +17,74 @@ Name: libraw1394 -Version: 2.1.0 +Version: 2.1.1 Release: 0 -Summary: A Firewire Interface +Summary: A Firewire Interface library License: LGPL-2.1+ -Group: System/Kernel +Group: Development/Libraries/C and C++ Url: http://www.dennedy.org/libraw1394/ -Source0: http://www.kernel.org/pub/linux/libs/ieee1394/%{name}-%{version}.tar.xz -Source1: baselibs.conf + +#Git-Web: https://git.kernel.org/cgit/libs/ieee1394/libraw1394.git/ +#Git-Clone: git://git.kernel.org/pub/scm/libs/ieee1394/libraw1394 +Source: https://www.kernel.org/pub/linux/libs/ieee1394/%name-%version.tar.xz +Source2: https://www.kernel.org/pub/linux/libs/ieee1394/%name-%version.tar.sign +Source3: %name.keyring +Source4: baselibs.conf Patch0: libraw1394.no-isodump.patch Patch1: libraw1394-exports.patch BuildRequires: libtool BuildRequires: openjade-devel BuildRequires: pkg-config +BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -The Linux kernel's IEEE 1394 subsystem provides access to the raw 1394 -bus through the raw1394 module. This includes the standard 1394 -transactions (read, write, lock) on the active side, isochronous -stream receiving and sending and dumps of data written to the -FCP_COMMAND and FCP_RESPONSE registers. raw1394 uses a character -device to communicate to user programs using a special protocol. - -libraw1394 was created with the intent to hide that protocol from -applications so that - -- the protocol has to be implemented correctly only once. - -- all work can be done using easy to understand functions instead of - handling a complicated command structure. - -- only libraw1394 has to be changed when raw1394's interface changes. - -Maintainer: Dan Dennedy <[email protected]> - -Original author: Andreas Bombe <[email protected]> - or <[email protected]> - -Contributors: -Manfred Weihs <[email protected]> -Christian Toegel <[email protected]> -Dan Maas <[email protected]> -Ben Collins <[email protected]> -Pieter Palmers <[email protected]> +libraw1394 provides direct access to the connected 1394 buses to +userspace. Through this library, applications can directly send to +and receive from other nodes without requiring a kernel driver for +the protocol in question. %package 11 -Summary: A Firewire Interface -Group: System/Kernel +Summary: A Firewire Interface library +Group: System/Libraries %description 11 -A library for the Linux IEEE-1394 subsystem, which provides direct -access to the connected 1394 (Firewire) bus. +libraw1394 provides direct access to the connected 1394 buses to +userspace. Through this library, applications can directly send to +and receive from other nodes without requiring a kernel driver for +the protocol in question. + +libraw1394 abstracts the interface that is used to communicate with +the kernel. It works with both the Juju stack (firewire-core.ko; +/dev/fw*; present since Linux kernel 2.6.22) and the old Linux1394 +(raw1394.ko; /dev/raw1394; present until 2.6.36). %package devel -Summary: Development and Include Files for libraw1394 +Summary: Development files for libraw1394 Group: Development/Libraries/C and C++ Summary(pt_BR): Arquivos de desenvolvimento e cabeçalhos para o libraw1394 -Requires: %{name}-11 == %{version} +Requires: %{name}-11 = %{version} Requires: glibc-devel %description devel -Libraw1394 is the only supported interface to the kernel side raw1394 -of the Linux IEEE-1394 subsystem, which provides the user space direct -access to the connected 1394 buses. Through libraw1394/raw1394, -applications can directly send to and receive from other nodes without -requiring a kernel driver for the protocol in question. - -This archive contains the header files for libraw1394 development. +libraw1394 provides direct access to the connected 1394 buses to +userspace. Through this library, applications can directly send to +and receive from other nodes without requiring a kernel driver for +the protocol in question. + +This subpackage contains the library links and headers for +libraw1394. + +%package tools +Summary: Command-line utilties to manipulate IEEE1394 devices +Group: Hardware/Other +# added on 2015-11-14 +Obsoletes: %name < %version-%release +Provides: %name = %version-%release + +%description tools +Command-line utilities to inspect and send IEEE 1394 isochronous +packets, and to test the basic functionality of raw1394. %prep %setup -q @@ -93,9 +93,7 @@ %build autoreconf --force --install -%configure \ - --disable-static \ - --with-pic +%configure --disable-static make %{?_smp_mflags} all %install @@ -107,13 +105,13 @@ %postun 11 -p /sbin/ldconfig -%files +%files tools %defattr(-,root,root) %doc AUTHORS COPYING* NEWS README %{_bindir}/testlibraw %{_bindir}/dumpiso %{_bindir}/sendiso -%{_mandir}/man*/* +%{_mandir}/man1/* %files 11 %defattr(-,root,root) ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.8sWuqp/_old 2015-11-18 22:32:13.000000000 +0100 +++ /var/tmp/diff_new_pack.8sWuqp/_new 2015-11-18 22:32:13.000000000 +0100 @@ -1,4 +1,3 @@ -libraw1394 libraw1394-11 obsoletes "libraw1394-<targettype> <= <version>" provides "libraw1394-<targettype> = <version>" ++++++ libraw1394-2.1.0.tar.xz -> libraw1394-2.1.1.tar.xz ++++++ ++++ 28154 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/libraw1394-2.1.0/ChangeLog new/libraw1394-2.1.1/ChangeLog --- old/libraw1394-2.1.0/ChangeLog 2012-07-29 12:01:26.000000000 +0200 +++ new/libraw1394-2.1.1/ChangeLog 2015-04-28 23:35:01.000000000 +0200 @@ -1,3 +1,29 @@ +2015-04-28 Stefan Richter <[email protected]> + + * configure.ac, Changelog, NEWS: update to version 2.1.1 + +2015-02-15 Aaro Koskinen <[email protected]> + + * Align fw_handle buffer for 64-bit access + +2014-06-10 Jonathan Woithe <[email protected]> + + * Prevent requests for previously provided iso tx packets + +2013-09-08 Lee Cewd <[email protected]> + + * Fix memory leak in response handler + +2013-08-24 Stefan Richter <[email protected]> + + * Save and restore errno in raw1394_new_handle{,_on_port} for legacy applications + + * tools: Fix startup of dumpiso and sendiso on juju + +2012-07-31 Stefan Richter <[email protected]> + + * Documentation improvement: return code of raw1394_read_cycle_timer{,_and_clock} + 2012-07-29 Stefan Richter <[email protected]> * Changelog, NEWS: update to version 2.1.0 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/libraw1394-2.1.0/INSTALL new/libraw1394-2.1.1/INSTALL --- old/libraw1394-2.1.0/INSTALL 2012-06-18 02:13:22.000000000 +0200 +++ new/libraw1394-2.1.1/INSTALL 2015-04-28 23:36:44.000000000 +0200 @@ -1,19 +1,25 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, +Inc. -This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. + Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. Basic Installation ================== -Briefly, the shell commands `./configure; make; make install' should + Briefly, the shell commands `./configure; make; make install' should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for -instructions specific to this package. +instructions specific to this package. Some packages provide this +`INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -42,7 +48,7 @@ you want to change it or regenerate `configure' using a newer version of `autoconf'. -The simplest way to compile this package is: + The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type `./configure' to configure the package for your system. @@ -53,12 +59,22 @@ 2. Type `make' to compile the package. 3. Optionally, type `make check' to run any self-tests that come with - the package. + the package, generally using the just-built uninstalled binaries. 4. Type `make install' to install the programs and any data files and - documentation. + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the `make install' phase executed with root + privileges. + + 5. Optionally, type `make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior `make install' required + root privileges, verifies that the installation completed + correctly. - 5. You can remove the program binaries and object files from the + 6. You can remove the program binaries and object files from the source code directory by typing `make clean'. To also remove the files that `configure' created (so you can compile the package for a different kind of computer), type `make distclean'. There is @@ -67,15 +83,22 @@ all sorts of other programs in order to regenerate files that came with the distribution. - 6. Often, you can also type `make uninstall' to remove the installed - files again. + 7. Often, you can also type `make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + + 8. Some packages, particularly those that use Automake, provide `make + distcheck', which can by used by developers to test that all other + targets like `make install' and `make uninstall' work correctly. + This target is generally not run by end users. Compilers and Options ===================== -Some systems require unusual options for compilation or linking that the -`configure' script does not know about. Run `./configure --help' for -details on some of the pertinent environment variables. + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. You can give `configure' initial values for configuration parameters by setting variables in the command line or in the environment. Here @@ -88,25 +111,41 @@ Compiling For Multiple Architectures ==================================== -You can compile the package for more than one kind of computer at the + You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. +source code in the directory that `configure' is in and in `..'. This +is known as a "VPATH" build. With a non-GNU `make', it is safer to compile the package for one architecture at a time in the source code directory. After you have installed the package for one architecture, use `make distclean' before reconfiguring for another architecture. + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + Installation Names ================== -By default, `make install' installs the package's commands under + By default, `make install' installs the package's commands under `/usr/local/bin', include files under `/usr/local/include', etc. You can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. +`configure' the option `--prefix=PREFIX', where PREFIX must be an +absolute file name. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you @@ -117,16 +156,47 @@ In addition, if you use an unusual directory layout you can give options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. +you can set and what kinds of files go in them. In general, the +default for these options is expressed in terms of `${prefix}', so that +specifying just `--prefix' will affect all of the other directory +specifications that were not explicitly provided. + + The most portable way to affect installation locations is to pass the +correct locations to `configure'; however, many packages provide one or +both of the following shortcuts of passing variable assignments to the +`make install' command line to change installation locations without +having to reconfigure or recompile. + + The first method involves providing an override variable for each +affected directory. For example, `make install +prefix=/alternate/directory' will choose an alternate location for all +directory configuration variables that were expressed in terms of +`${prefix}'. Any directories that were specified during `configure', +but not in terms of `${prefix}', must each be overridden at install +time for the entire installation to be relocated. The approach of +makefile variable overrides for each directory variable is required by +the GNU Coding Standards, and ideally causes no recompilation. +However, some platforms have known limitations with the semantics of +shared libraries that end up requiring recompilation when using this +method, particularly noticeable in packages that use GNU Libtool. + + The second method involves providing the `DESTDIR' variable. For +example, `make install DESTDIR=/alternate/directory' will prepend +`/alternate/directory' before all installation names. The approach of +`DESTDIR' overrides is not required by the GNU Coding Standards, and +does not work on platforms that have drive letters. On the other hand, +it does better at avoiding recompilation issues, and works well even +when some directory options were not specified in terms of `${prefix}' +at `configure' time. + +Optional Features +================= If the package supports it, you can cause programs to be installed with an extra prefix or suffix on their names by giving `configure' the option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. -Optional Features -================= - -Some packages pay attention to `--enable-FEATURE' options to + Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE is something like `gnu-as' or `x' (for the X Window System). The @@ -138,14 +208,58 @@ you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. + Some packages offer the ability to configure how verbose the +execution of `make' will be. For these packages, running `./configure +--enable-silent-rules' sets the default to minimal output, which can be +overridden with `make V=1'; while running `./configure +--disable-silent-rules' sets the default to verbose, which can be +overridden with `make V=0'. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + + On Solaris, don't put `/usr/ucb' early in your `PATH'. This +directory contains several dysfunctional programs; working variants of +these programs are available in `/usr/bin'. So, if you need `/usr/ucb' +in your `PATH', put it _after_ `/usr/bin'. + + On Haiku, software installed for all users goes in `/boot/common', +not `/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + Specifying the System Type ========================== -There may be some features `configure' cannot figure out automatically, -but needs to determine by the type of machine the package will run on. -Usually, assuming the package is built to be run on the _same_ -architectures, `configure' can figure that out, but if it prints a -message saying it cannot guess the machine type, give it the + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the `--build=TYPE' option. TYPE can either be a short name for the system type, such as `sun4', or a canonical name which has the form: @@ -153,7 +267,8 @@ where SYSTEM can have one of these forms: - OS KERNEL-OS + OS + KERNEL-OS See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't @@ -171,9 +286,9 @@ Sharing Defaults ================ -If you want to set default values for `configure' scripts to share, you -can create a site shell script called `config.site' that gives default -values for variables like `CC', `cache_file', and `prefix'. + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the `CONFIG_SITE' environment variable to the location of the site script. @@ -182,7 +297,7 @@ Defining Variables ================== -Variables not defined in a site shell script can be set in the + Variables not defined in a site shell script can be set in the environment passed to `configure'. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you should set @@ -194,18 +309,27 @@ overridden in the site shell script). Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: +an Autoconf limitation. Until the limitation is lifted, you can use +this workaround: - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation ====================== -`configure' recognizes the following options to control how it operates. + `configure' recognizes the following options to control how it +operates. `--help' `-h' - Print a summary of the options to `configure', and exit. + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. `--version' `-V' @@ -232,6 +356,15 @@ Look for the package's source code in directory DIR. Usually `configure' can determine that directory automatically. +`--prefix=DIR' + Use DIR as the installation prefix. *note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. - 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/libraw1394-2.1.0/NEWS new/libraw1394-2.1.1/NEWS --- old/libraw1394-2.1.0/NEWS 2012-07-29 11:58:04.000000000 +0200 +++ new/libraw1394-2.1.1/NEWS 2015-04-28 23:27:20.000000000 +0200 @@ -1,5 +1,15 @@ libraw1394 Release Notes +Version 2.1.1: +- Fix backwards moving cycle timer in isochronous transmit. + The problem has been observed with audio I/O on different systems. +- Fix crash with SIGBUS on SPARC and similar architectures. +- Fix memory leak in address range mapping response handler. +- Fix errno reporting to applications which relied on behavior of + libraw1394 1.x. +- Fix errno checking in the dumpiso and sendiso example programs. +- Minor documentation improvement. + Version 2.1.0: - Behavior changes of the backend to firewire-core: - The isochronous reception buffer is now mapped read/writable 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/libraw1394-2.1.0/config.h.in new/libraw1394-2.1.1/config.h.in --- old/libraw1394-2.1.0/config.h.in 2012-06-27 22:10:31.000000000 +0200 +++ new/libraw1394-2.1.1/config.h.in 2015-04-28 23:36:44.000000000 +0200 @@ -42,8 +42,7 @@ /* Define to 1 if you have the <valgrind/valgrind.h> header file. */ #undef HAVE_VALGRIND_VALGRIND_H -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR /* Name of package */ 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/libraw1394-2.1.0/configure.ac new/libraw1394-2.1.1/configure.ac --- old/libraw1394-2.1.0/configure.ac 2012-06-27 22:10:19.000000000 +0200 +++ new/libraw1394-2.1.1/configure.ac 2015-04-28 23:34:43.000000000 +0200 @@ -1,6 +1,6 @@ # process this file with autoconf to get a configure script -AC_INIT(libraw1394, 2.1.0) +AC_INIT(libraw1394, 2.1.1) AC_CONFIG_SRCDIR(src/raw1394.h) AM_CONFIG_HEADER(config.h) 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/libraw1394-2.1.0/libraw1394.pc new/libraw1394-2.1.1/libraw1394.pc --- old/libraw1394-2.1.0/libraw1394.pc 2012-06-27 22:10:30.000000000 +0200 +++ new/libraw1394-2.1.1/libraw1394.pc 2015-04-28 23:36:53.000000000 +0200 @@ -5,6 +5,6 @@ Name: libraw1394 Description: Interface library for the Linux IEEE1394 drivers. -Version: 2.1.0 +Version: 2.1.1 Libs: -L${libdir} -lraw1394 Cflags: -I${includedir} 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/libraw1394-2.1.0/libraw1394.spec new/libraw1394-2.1.1/libraw1394.spec --- old/libraw1394-2.1.0/libraw1394.spec 2012-06-27 22:10:30.000000000 +0200 +++ new/libraw1394-2.1.1/libraw1394.spec 2015-04-28 23:36:53.000000000 +0200 @@ -1,13 +1,13 @@ %define prefix /usr Name: libraw1394 -Version: 2.1.0 +Version: 2.1.1 Release: 1 Copyright: LGPL Group: Libraries -Source: http://linux1394.org/libraw1394/libraw1394-2.1.0.tar.gz +Source: http://linux1394.org/libraw1394/libraw1394-2.1.1.tar.gz URL: http://linux1394.org -BuildRoot: /var/tmp/libraw1394-2.1.0-root +BuildRoot: /var/tmp/libraw1394-2.1.1-root Summary: Streaming library for IEEE1394 BuildRequires: openjade 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/libraw1394-2.1.0/missing new/libraw1394-2.1.1/missing --- old/libraw1394-2.1.0/missing 2012-06-18 02:10:01.000000000 +0200 +++ new/libraw1394-2.1.1/missing 2015-04-28 23:36:44.000000000 +0200 @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-06-26.16; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <[email protected]>, 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard <[email protected]>, 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 @@ -18,9 +17,7 @@ # 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. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -28,69 +25,40 @@ # 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" + 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.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -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 - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. 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 - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to <[email protected]>." exit $? @@ -102,272 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# 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). This is about non-GNU programs, so use $1 not -# $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 - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - 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 $program in - aclocal*) - echo 1>&2 "\ -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 - ;; - - autoconf*) - echo 1>&2 "\ -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 - ;; - - autoheader*) - echo 1>&2 "\ -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}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -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 | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - 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' $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 test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -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 test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - 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 $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -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." - # 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 - # ... 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 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 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 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'automa4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) 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/libraw1394-2.1.0/src/dispatch.c new/libraw1394-2.1.1/src/dispatch.c --- old/libraw1394-2.1.0/src/dispatch.c 2012-07-08 20:27:52.000000000 +0200 +++ new/libraw1394-2.1.1/src/dispatch.c 2015-04-28 22:43:14.000000000 +0200 @@ -28,11 +28,14 @@ fw_handle_t fw_handle; raw1394handle_t handle; struct raw1394_portinfo port; + int errno_bak; handle = (raw1394handle_t) malloc(sizeof(struct raw1394_handle)); if (!handle) return NULL; + errno_bak = errno; /* workaround for faulty legacy applications */ + ieee1394_handle = ieee1394_new_handle(); if (!ieee1394_handle) goto try_fw; @@ -44,6 +47,8 @@ } ieee1394_destroy_handle(ieee1394_handle); try_fw: + errno = errno_bak; + fw_handle = fw_new_handle(); if (fw_handle) { handle->is_fw = 1; @@ -72,11 +77,14 @@ ieee1394handle_t ieee1394_handle; fw_handle_t fw_handle; raw1394handle_t handle; + int errno_bak; handle = (raw1394handle_t) malloc(sizeof(struct raw1394_handle)); if (!handle) return NULL; + errno_bak = errno; /* workaround for faulty legacy applications */ + ieee1394_handle = ieee1394_new_handle_on_port(port); if (ieee1394_handle) { handle->is_fw = 0; @@ -84,6 +92,8 @@ return handle; } + errno = errno_bak; + fw_handle = fw_new_handle_on_port(port); if (fw_handle) { handle->is_fw = 1; 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/libraw1394-2.1.0/src/fw-iso.c new/libraw1394-2.1.1/src/fw-iso.c --- old/libraw1394-2.1.0/src/fw-iso.c 2012-06-27 22:10:19.000000000 +0200 +++ new/libraw1394-2.1.1/src/fw-iso.c 2015-04-28 22:16:16.000000000 +0200 @@ -322,10 +322,9 @@ { int cycle; - fwhandle->iso.packet_count -= fwhandle->iso.irq_interval; - /* Check whether the ABI version provides iso tx timestamps. */ if (interrupt->header_length) { + fwhandle->iso.packet_count -= interrupt->header_length/4; /* * Take the cycle of the last packet transmitted, add * the number of packets currently queued, plus one, and @@ -335,6 +334,7 @@ cycle = be32_to_cpu(interrupt->header[interrupt->header_length/4 - 1]); cycle &= 0x1fff; } else { + fwhandle->iso.packet_count -= fwhandle->iso.irq_interval; /* * Bogusly faking it again. Assume that the last packet * transmitted was transmitted on interrupt->cycle. 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/libraw1394-2.1.0/src/fw.c new/libraw1394-2.1.1/src/fw.c --- old/libraw1394-2.1.0/src/fw.c 2012-07-08 20:27:52.000000000 +0200 +++ new/libraw1394-2.1.1/src/fw.c 2015-04-28 22:01:21.000000000 +0200 @@ -793,7 +793,7 @@ struct fw_cdev_send_response response; arm_options_t type; size_t in_length; - int pos; + int pos, retval; pos = offset - allocation->offset; response.handle = kernel_handle; @@ -898,8 +898,10 @@ rrb->response.buffer = rrb->data + in_length; memcpy(rrb->response.buffer, allocation->data + pos, response.length); - return fwhandle->arm_tag_handler(handle, allocation->tag, type, - length, &rrb->request_response); + retval = fwhandle->arm_tag_handler(handle, allocation->tag, type, + length, &rrb->request_response); + free(rrb); + return retval; } int 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/libraw1394-2.1.0/src/fw.h new/libraw1394-2.1.1/src/fw.h --- old/libraw1394-2.1.0/src/fw.h 2012-07-08 20:27:52.000000000 +0200 +++ new/libraw1394-2.1.1/src/fw.h 2015-04-28 22:39:11.000000000 +0200 @@ -131,7 +131,7 @@ struct fw_cdev_iso_packet *packets; } iso; - char buffer[BUFFER_SIZE]; + __u64 buffer[BUFFER_SIZE / sizeof(__u64)]; }; typedef struct fw_handle *fw_handle_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/libraw1394-2.1.0/src/raw1394.h new/libraw1394-2.1.1/src/raw1394.h --- old/libraw1394-2.1.0/src/raw1394.h 2012-07-08 20:27:52.000000000 +0200 +++ new/libraw1394-2.1.1/src/raw1394.h 2013-09-29 17:28:59.000000000 +0200 @@ -369,7 +369,7 @@ * CLOCK_REALTIME is subject to resets; CLOCK_MONOTONIC is subject to gradual * adjustments; CLOCK_MONOTONIC_RAW is the bare hardware clock. * - * Returns: the error code of the ioctl, or 0 if successful. + * Returns: 0 on success or -1 on failure (sets errno) * * History: New function in libraw1394 v2.1.0. **/ 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/libraw1394-2.1.0/tools/dumpiso.c new/libraw1394-2.1.1/tools/dumpiso.c --- old/libraw1394-2.1.0/tools/dumpiso.c 2012-01-01 12:25:00.000000000 +0100 +++ new/libraw1394-2.1.1/tools/dumpiso.c 2013-09-29 17:28:59.000000000 +0200 @@ -212,7 +212,7 @@ int main(int argc, char **argv) { raw1394handle_t handle; - int i; + int i, ret; parse_args(argc, argv); @@ -236,10 +236,10 @@ exit(1); } - raw1394_set_port(handle, which_port); - } while (errno == ESTALE); + ret = raw1394_set_port(handle, which_port); + } while (ret < 0 && errno == ESTALE); - if (errno) { + if (ret < 0) { perror("raw1394_set_port"); exit(1); } 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/libraw1394-2.1.0/tools/sendiso.c new/libraw1394-2.1.1/tools/sendiso.c --- old/libraw1394-2.1.0/tools/sendiso.c 2012-01-01 12:24:04.000000000 +0100 +++ new/libraw1394-2.1.1/tools/sendiso.c 2013-09-29 17:28:59.000000000 +0200 @@ -274,6 +274,7 @@ int main(int argc, char **argv) { raw1394handle_t handle; + int ret; parse_args(argc, argv); @@ -296,10 +297,10 @@ exit(1); } - raw1394_set_port(handle, which_port); - } while (errno == ESTALE); + ret = raw1394_set_port(handle, which_port); + } while (ret < 0 && errno == ESTALE); - if (errno) { + if (ret < 0) { perror("raw1394_set_port"); exit(1); } ++++++ libraw1394-exports.patch ++++++ --- /var/tmp/diff_new_pack.8sWuqp/_old 2015-11-18 22:32:13.000000000 +0100 +++ /var/tmp/diff_new_pack.8sWuqp/_new 2015-11-18 22:32:13.000000000 +0100 @@ -1,11 +1,16 @@ ---- libraw1394-2.1.0.orig/src/Makefile.am -+++ libraw1394-2.1.0/src/Makefile.am -@@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in - +--- + src/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +Index: libraw1394-2.1.1/src/Makefile.am +=================================================================== +--- libraw1394-2.1.1.orig/src/Makefile.am ++++ libraw1394-2.1.1/src/Makefile.am +@@ -5,6 +5,7 @@ MAINTAINERCLEANFILES = Makefile.in lib_LTLIBRARIES = libraw1394.la --libraw1394_la_LDFLAGS = -version-info @lt_major@:@lt_revision@:@lt_age@ -+libraw1394_la_LDFLAGS = -export-symbols-regex '^raw1394_' -no-undefined -version-info @lt_major@:@lt_revision@:@lt_age@ + libraw1394_la_LDFLAGS = -version-info @lt_major@:@lt_revision@:@lt_age@ ++libraw1394_la_LDFLAGS += -export-symbols-regex '^raw1394_' -no-undefined libraw1394_la_SOURCES = \ main.c \ ++++++ libraw1394.keyring ++++++ pub 4096R/0x79F36FB2545D79D0 2011-10-21 Key fingerprint = 955C 0098 E5C4 6EF9 A152 4814 79F3 6FB2 545D 79D0 uid [ unknown] Stefan Richter <[email protected]> sub 4096R/0x8243C1F5D30851B0 2011-10-21 -----BEGIN PGP PUBLIC KEY BLOCK----- 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 8fwWIvw2x3j0 =iBf9 -----END PGP PUBLIC KEY BLOCK-----
