Hello community, here is the log from the commit of package libraw1394 for openSUSE:Factory checked in at 2020-08-19 20:02:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libraw1394 (Old) and /work/SRC/openSUSE:Factory/.libraw1394.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libraw1394" Wed Aug 19 20:02:53 2020 rev:30 rq:827582 version:2.1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libraw1394/libraw1394.changes 2015-11-18 22:32:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libraw1394.new.3399/libraw1394.changes 2020-08-19 20:02:57.781946074 +0200 @@ -1,0 +2,7 @@ +Sun Aug 16 00:59:00 UTC 2020 - Dirk Mueller <[email protected]> + +- update to 2.1.2 + - Fix build with some alternative C libraries and with some older + build environments. No functional changes. + +------------------------------------------------------------------- Old: ---- libraw1394-2.1.1.tar.sign libraw1394-2.1.1.tar.xz New: ---- libraw1394-2.1.2.tar.sign libraw1394-2.1.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libraw1394.spec ++++++ --- /var/tmp/diff_new_pack.13onew/_old 2020-08-19 20:02:59.101946759 +0200 +++ /var/tmp/diff_new_pack.13onew/_new 2020-08-19 20:02:59.105946761 +0200 @@ -1,7 +1,7 @@ # # spec file for package libraw1394 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,31 +12,27 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: libraw1394 -Version: 2.1.1 +Version: 2.1.2 Release: 0 Summary: A Firewire Interface library -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ -Url: http://www.dennedy.org/libraw1394/ - -#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 +URL: http://www.dennedy.org/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: pkgconfig BuildRequires: xz -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description libraw1394 provides direct access to the connected 1394 buses to @@ -77,10 +73,10 @@ %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 +Group: Hardware/Other +Obsoletes: %{name} < %{version}-%{release} +Provides: %{name} = %{version}-%{release} %description tools Command-line utilities to inspect and send IEEE 1394 isochronous @@ -94,31 +90,28 @@ %build autoreconf --force --install %configure --disable-static -make %{?_smp_mflags} all +%make_build all %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install # empty dependency libs rm -f %{buildroot}%{_libdir}/libraw1394.la %post 11 -p /sbin/ldconfig - %postun 11 -p /sbin/ldconfig %files tools -%defattr(-,root,root) -%doc AUTHORS COPYING* NEWS README +%license COPYING* +%doc AUTHORS NEWS README %{_bindir}/testlibraw %{_bindir}/dumpiso %{_bindir}/sendiso %{_mandir}/man1/* %files 11 -%defattr(-,root,root) %{_libdir}/libraw1394.so.11* %files devel -%defattr(-,root,root) %{_includedir}/libraw1394 %{_libdir}/libraw1394.so %{_libdir}/pkgconfig/libraw1394.pc ++++++ libraw1394-2.1.1.tar.xz -> libraw1394-2.1.2.tar.xz ++++++ ++++ 2138 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.1/ChangeLog new/libraw1394-2.1.2/ChangeLog --- old/libraw1394-2.1.1/ChangeLog 2015-04-28 23:35:01.000000000 +0200 +++ new/libraw1394-2.1.2/ChangeLog 2016-04-03 16:37:11.000000000 +0200 @@ -1,3 +1,13 @@ +2016-04-03 Stefan Richter <[email protected]> + + * configure.ac, Changelog, NEWS: update to version 2.1.2 + +2016-02-12 Thomas Petazzoni <[email protected]> + + * testlibraw: build the CLOCK_MONOTONIC_RAW test conditionally + + * Use <stdint.h> types instead of non-standard types + 2015-04-28 Stefan Richter <[email protected]> * configure.ac, Changelog, NEWS: update to version 2.1.1 @@ -30,6 +40,8 @@ 2012-06-30 Stefan Richter <[email protected]> + * testlibraw: Fix printing of card name + * Add raw1394_get_speed() API * Trivial whitespace normalization in ieee1394.h and raw1394.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.1/INSTALL new/libraw1394-2.1.2/INSTALL --- old/libraw1394-2.1.1/INSTALL 2015-04-28 23:36:44.000000000 +0200 +++ new/libraw1394-2.1.2/INSTALL 2016-04-03 16:46:41.000000000 +0200 @@ -12,8 +12,8 @@ Basic Installation ================== - Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following + Briefly, the shell command `./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. Some packages provide this `INSTALL' file but do not implement all of the features documented 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.1/NEWS new/libraw1394-2.1.2/NEWS --- old/libraw1394-2.1.1/NEWS 2015-04-28 23:27:20.000000000 +0200 +++ new/libraw1394-2.1.2/NEWS 2016-04-03 16:41:33.000000000 +0200 @@ -1,5 +1,9 @@ libraw1394 Release Notes +Version 2.1.2: +- Fix build with some alternative C libraries and with some older + build environments. No functional changes. + Version 2.1.1: - Fix backwards moving cycle timer in isochronous transmit. The problem has been observed with audio I/O on different systems. 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.1/compile new/libraw1394-2.1.2/compile --- old/libraw1394-2.1.1/compile 1970-01-01 01:00:00.000000000 +0100 +++ new/libraw1394-2.1.2/compile 2016-04-03 16:46:41.000000000 +0200 @@ -0,0 +1,347 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-10-14.11; # UTC + +# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Written by Tom Tromey <[email protected]>. +# +# 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, 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 +# 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 <[email protected]> or send patches to +# <[email protected]>. + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + 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'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +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 <[email protected]>. +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +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 's|^.*[\\/]||; s|^[a-zA-Z]:||; 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 + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || 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-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# 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/libraw1394-2.1.1/configure.ac new/libraw1394-2.1.2/configure.ac --- old/libraw1394-2.1.1/configure.ac 2015-04-28 23:34:43.000000000 +0200 +++ new/libraw1394-2.1.2/configure.ac 2016-04-03 16:32:50.000000000 +0200 @@ -1,6 +1,6 @@ # process this file with autoconf to get a configure script -AC_INIT(libraw1394, 2.1.1) +AC_INIT(libraw1394, 2.1.2) 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.1/libraw1394.pc new/libraw1394-2.1.2/libraw1394.pc --- old/libraw1394-2.1.1/libraw1394.pc 2015-04-28 23:36:53.000000000 +0200 +++ new/libraw1394-2.1.2/libraw1394.pc 2016-04-03 16:46:57.000000000 +0200 @@ -5,6 +5,6 @@ Name: libraw1394 Description: Interface library for the Linux IEEE1394 drivers. -Version: 2.1.1 +Version: 2.1.2 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.1/libraw1394.spec new/libraw1394-2.1.2/libraw1394.spec --- old/libraw1394-2.1.1/libraw1394.spec 2015-04-28 23:36:53.000000000 +0200 +++ new/libraw1394-2.1.2/libraw1394.spec 2016-04-03 16:46:57.000000000 +0200 @@ -1,13 +1,13 @@ %define prefix /usr Name: libraw1394 -Version: 2.1.1 +Version: 2.1.2 Release: 1 Copyright: LGPL Group: Libraries -Source: http://linux1394.org/libraw1394/libraw1394-2.1.1.tar.gz +Source: http://linux1394.org/libraw1394/libraw1394-2.1.2.tar.gz URL: http://linux1394.org -BuildRoot: /var/tmp/libraw1394-2.1.1-root +BuildRoot: /var/tmp/libraw1394-2.1.2-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.1/missing new/libraw1394-2.1.2/missing --- old/libraw1394-2.1.1/missing 2015-04-28 23:36:44.000000000 +0200 +++ new/libraw1394-2.1.2/missing 2016-04-03 16:46:41.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-06-26.16; # UTC +scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 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 @@ -160,7 +160,7 @@ ;; autom4te*) echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." + echo "the 'autom4te' program to be rebuilt." program_details 'autom4te' ;; bison*|yacc*) 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.1/src/fw-iso.c new/libraw1394-2.1.2/src/fw-iso.c --- old/libraw1394-2.1.1/src/fw-iso.c 2015-04-28 22:16:16.000000000 +0200 +++ new/libraw1394-2.1.2/src/fw-iso.c 2016-03-20 17:08:48.000000000 +0100 @@ -303,7 +303,7 @@ } static int handle_iso_event(raw1394handle_t handle, - struct epoll_closure *closure, __uint32_t events) + struct epoll_closure *closure, uint32_t events) { fw_handle_t fwhandle = handle->mode.fw; struct fw_cdev_event_iso_interrupt *interrupt; 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.1/src/fw.c new/libraw1394-2.1.2/src/fw.c --- old/libraw1394-2.1.1/src/fw.c 2015-04-28 22:01:21.000000000 +0200 +++ new/libraw1394-2.1.2/src/fw.c 2016-03-20 17:08:48.000000000 +0100 @@ -187,7 +187,7 @@ static int handle_echo_pipe(raw1394handle_t handle, - struct epoll_closure *ec, __uint32_t events) + struct epoll_closure *ec, uint32_t events) { quadlet_t value; @@ -258,7 +258,7 @@ static int handle_device_event(raw1394handle_t handle, - struct epoll_closure *ec, __uint32_t events) + struct epoll_closure *ec, uint32_t events) { fw_handle_t fwhandle = handle->mode.fw; union fw_cdev_event *u; @@ -421,7 +421,7 @@ static int handle_inotify(raw1394handle_t handle, struct epoll_closure *ec, - __uint32_t events) + uint32_t events) { fw_handle_t fwhandle = handle->mode.fw; struct inotify_event *event; 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.1/src/fw.h new/libraw1394-2.1.2/src/fw.h --- old/libraw1394-2.1.1/src/fw.h 2015-04-28 22:39:11.000000000 +0200 +++ new/libraw1394-2.1.2/src/fw.h 2016-03-20 17:08:48.000000000 +0100 @@ -12,6 +12,7 @@ #ifndef LIBRAW1394_FW_H #define LIBRAW1394_FW_H +#include <stdint.h> #include <stdlib.h> #include <byteswap.h> @@ -48,7 +49,7 @@ struct epoll_closure { int (*func)(raw1394handle_t handle, - struct epoll_closure *closure, __uint32_t events); + struct epoll_closure *closure, uint32_t events); }; struct port { 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.1/tools/testlibraw.c new/libraw1394-2.1.2/tools/testlibraw.c --- old/libraw1394-2.1.1/tools/testlibraw.c 2013-09-29 17:28:59.000000000 +0200 +++ new/libraw1394-2.1.2/tools/testlibraw.c 2016-03-20 17:12:31.000000000 +0100 @@ -211,6 +211,7 @@ printf(" local time from CLOCK_MONOTONIC: %lld us\n", (unsigned long long)local_time); +#if defined(CLOCK_MONOTONIC_RAW) retval = raw1394_read_cycle_timer_and_clock(handle, &ct, &local_time, CLOCK_MONOTONIC_RAW); if (retval < 0) { @@ -221,6 +222,7 @@ ct >> 25, (ct >> 12) & 0x1fff, ct & 0xfff); printf(" local time from CLOCK_MONOTONIC_RAW: %lld us\n", (unsigned long long)local_time); +#endif } int test_card(int card)
