Hello community, here is the log from the commit of package libdc1394 for openSUSE:Factory checked in at 2019-08-16 15:31:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdc1394 (Old) and /work/SRC/openSUSE:Factory/.libdc1394.new.22127 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libdc1394" Fri Aug 16 15:31:44 2019 rev:49 rq:723232 version:2.2.6 Changes: -------- --- /work/SRC/openSUSE:Factory/libdc1394/libdc1394.changes 2019-07-23 08:39:22.143933823 +0200 +++ /work/SRC/openSUSE:Factory/.libdc1394.new.22127/libdc1394.changes 2019-08-16 15:31:54.173939105 +0200 @@ -1,0 +2,13 @@ +Wed Aug 14 08:31:11 UTC 2019 - Tomáš Chvátal <[email protected]> + +- Switch up to pkgconfgi style dependencies + +------------------------------------------------------------------- +Sat Jul 6 13:34:52 UTC 2019 - Matwey V. Kornilov <[email protected]> + +- Update to 2.2.6: + - Fix a few compilation warnings with a recent GCC + - Fix argument type in dc1394_get_image_size_from_video_mode() + - Fix USB3 transfer errors + +------------------------------------------------------------------- Old: ---- libdc1394-2.2.5.tar.gz libdc1394-rpmlintrc New: ---- libdc1394-2.2.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdc1394.spec ++++++ --- /var/tmp/diff_new_pack.hMuUMb/_old 2019-08-16 15:31:55.449938733 +0200 +++ /var/tmp/diff_new_pack.hMuUMb/_new 2019-08-16 15:31:55.449938733 +0200 @@ -1,7 +1,7 @@ # # spec file for package libdc1394 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,41 +12,30 @@ # 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: libdc1394 -Version: 2.2.5 +Version: 2.2.6 Release: 0 Summary: 1394-Based Digital Camera Control Library -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Hardware/Camera -Url: http://damien.douxchamps.net/ieee1394/libdc1394/ +URL: https://damien.douxchamps.net/ieee1394/libdc1394/ Source0: https://downloads.sourceforge.net/project/libdc1394/libdc1394-2/%{version}/%{name}-%{version}.tar.gz -Source1: %{name}-rpmlintrc Source2: baselibs.conf Patch0: libdc1394.no-x11.patch Patch1: libdc1394.ac.patch Patch2: libdc1394-swab_fix.patch Patch3: libdc1394-v4l-2.6.38.patch BuildRequires: autoconf -BuildRequires: libraw1394-devel BuildRequires: libtool -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} > 1110 -BuildRequires: libSDL-devel -%else -BuildRequires: SDL-devel -%endif -%if 0%{?suse_version} > 1100 -# no IIDC-over-USB support for openSUSE 11.0 -BuildRequires: libusb-1_0-devel -BuildRequires: pkg-config -%endif -%if 0%{?suse_version} >= 1210 -BuildRequires: libv4l-devel >= 0.8.4 -%endif +BuildRequires: pkgconfig +BuildRequires: pkgconfig(libraw1394) +BuildRequires: pkgconfig(libusb-1.0) +BuildRequires: pkgconfig(libv4l2) >= 0.8.4 +BuildRequires: pkgconfig(sdl) %description This library provides functionality for controlling any camera that @@ -54,11 +43,11 @@ the low-level functionality provided by libraw1394 to communicate with the camera. -%package 22 +%package 25 Summary: 1394-based Digital Camera Control library Group: System/Libraries -%description 22 +%description 25 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). @@ -69,8 +58,8 @@ Summary: Development libraries and header files for dc1394 Group: Development/Libraries/C and C++ Requires: %{name}-tools = %{version} -Requires: libdc1394-22 = %{version} -Requires: libraw1394-devel +Requires: libdc1394-25 = %{version} +Requires: pkgconfig(libraw1394) %description devel This package contains the header files and libraries for building @@ -80,23 +69,18 @@ Summary: Command-line utilities from libdc1394 # added on 2015-11-14 Group: Hardware/Camera -Obsoletes: %name < %version-%release -Provides: %name = %version-%release +Obsoletes: %{name} < %{version}-%{release} +Provides: %{name} = %{version}-%{release} %description tools This subpackage contains a 1394 bus reset utility. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%if 0%{?suse_version} >= 1210 -%patch3 -p1 -%endif +%autopatch -p1 %build -autoreconf --force --install +autoreconf -fvi %configure \ --disable-static \ --disable-xv @@ -109,22 +93,19 @@ rm -f %{buildroot}%{_mandir}/man1/grab_*_image.1* find %{buildroot} -type f -name "*.la" -delete -print -%post 22 -p /sbin/ldconfig - -%postun 22 -p /sbin/ldconfig +%post 25 -p /sbin/ldconfig +%postun 25 -p /sbin/ldconfig %files tools -%defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog NEWS README +%license COPYING +%doc AUTHORS ChangeLog NEWS README %{_bindir}/dc1394_reset_bus -%{_mandir}/man1/dc1394_reset_bus.1* +%{_mandir}/man1/dc1394_reset_bus.1%{?ext_man} -%files 22 -%defattr(-,root,root) -%{_libdir}/libdc1394.so.22* +%files 25 +%{_libdir}/libdc1394.so.25* %files devel -%defattr(-,root,root) %{_includedir}/dc1394 %{_libdir}/libdc1394.so %{_libdir}/pkgconfig/*.pc ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.hMuUMb/_old 2019-08-16 15:31:55.473938726 +0200 +++ /var/tmp/diff_new_pack.hMuUMb/_new 2019-08-16 15:31:55.473938726 +0200 @@ -1 +1 @@ -libdc1394-22 +libdc1394-25 ++++++ libdc1394-2.2.5.tar.gz -> libdc1394-2.2.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdc1394-2.2.5/AUTHORS new/libdc1394-2.2.6/AUTHORS --- old/libdc1394-2.2.5/AUTHORS 2016-12-22 09:29:16.000000000 +0100 +++ new/libdc1394-2.2.6/AUTHORS 2017-04-19 09:27:35.000000000 +0200 @@ -21,6 +21,7 @@ Tim Canham Jim Cassidy Paul Chavent +Natanael Copa Hugo Costelha danalien Damien Delannay @@ -105,5 +106,5 @@ Thomas Woellert Jonathan Wonders Daniel Westhoff +Michael Zahniser Boris Zingerman - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdc1394-2.2.5/configure new/libdc1394-2.2.6/configure --- old/libdc1394-2.2.5/configure 2016-12-22 09:26:26.000000000 +0100 +++ new/libdc1394-2.2.6/configure 2019-04-28 02:36:21.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libdc1394 2.2.5. +# Generated by GNU Autoconf 2.69 for libdc1394 2.2.6. # # Report bugs to <[email protected]>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='libdc1394' PACKAGE_TARNAME='libdc1394' -PACKAGE_VERSION='2.2.5' -PACKAGE_STRING='libdc1394 2.2.5' +PACKAGE_VERSION='2.2.6' +PACKAGE_STRING='libdc1394 2.2.6' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1421,7 +1421,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libdc1394 2.2.5 to adapt to many kinds of systems. +\`configure' configures libdc1394 2.2.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1496,7 +1496,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libdc1394 2.2.5:";; + short | recursive ) echo "Configuration of libdc1394 2.2.6:";; esac cat <<\_ACEOF @@ -1633,7 +1633,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libdc1394 configure 2.2.5 +libdc1394 configure 2.2.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2056,7 +2056,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libdc1394 $as_me 2.2.5, which was +It was created by libdc1394 $as_me 2.2.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -6371,7 +6371,7 @@ # Define the identity of the package. PACKAGE='libdc1394' - VERSION='2.2.5' + VERSION='2.2.6' cat >>confdefs.h <<_ACEOF @@ -16639,9 +16639,9 @@ rm -f conftest.mmap conftest.txt -lt_current=24 -lt_revision=1 -lt_age=2 +lt_current=25 +lt_revision=0 +lt_age=0 @@ -17312,7 +17312,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libdc1394 $as_me 2.2.5, which was +This file was extended by libdc1394 $as_me 2.2.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17378,7 +17378,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libdc1394 config.status 2.2.5 +libdc1394 config.status 2.2.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdc1394-2.2.5/configure.ac new/libdc1394-2.2.6/configure.ac --- old/libdc1394-2.2.5/configure.ac 2016-12-22 09:25:55.000000000 +0100 +++ new/libdc1394-2.2.6/configure.ac 2019-04-28 02:36:05.000000000 +0200 @@ -1,6 +1,6 @@ # process this file with autoconf to get a configure script AC_PREREQ([2.6.0]) -AC_INIT([libdc1394],[2.2.5],[[email protected]]) +AC_INIT([libdc1394],[2.2.6],[[email protected]]) AC_CONFIG_SRCDIR([dc1394/control.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -142,9 +142,9 @@ dnl 3. If the interface changes consist solely of additions, increment AGE. dnl 4. If the interface has removed or changed elements, set AGE to 0. dnl --------------------------------------------------------------------------- -lt_current=24 -lt_revision=1 -lt_age=2 +lt_current=25 +lt_revision=0 +lt_age=0 AC_SUBST(lt_current) AC_SUBST(lt_revision) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdc1394-2.2.5/dc1394/bayer.c new/libdc1394-2.2.6/dc1394/bayer.c --- old/libdc1394-2.2.5/dc1394/bayer.c 2016-10-11 08:19:10.000000000 +0200 +++ new/libdc1394-2.2.6/dc1394/bayer.c 2017-01-12 08:41:04.000000000 +0100 @@ -24,6 +24,7 @@ #include <limits.h> #include <math.h> #include <stdlib.h> +#include <stdint.h> #include <string.h> #include "conversions.h" @@ -775,7 +776,7 @@ { uint8_t *outR, *outG, *outB; register int i, j; - uint tmp; + int tmp; int st=sx*sy; int p; int sx2=sx<<1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdc1394-2.2.5/dc1394/juju/control.c new/libdc1394-2.2.6/dc1394/juju/control.c --- old/libdc1394-2.2.5/dc1394/juju/control.c 2013-03-25 13:54:06.000000000 +0100 +++ new/libdc1394-2.2.6/dc1394/juju/control.c 2019-04-28 02:40:21.000000000 +0200 @@ -105,7 +105,7 @@ } while ((de = readdir(dir))) { - char filename[32]; + char filename[262]; int fd; platform_device_t * device; struct fw_cdev_get_info get_info; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdc1394-2.2.5/dc1394/macosx/capture.c new/libdc1394-2.2.6/dc1394/macosx/capture.c --- old/libdc1394-2.2.5/dc1394/macosx/capture.c 2016-12-20 14:10:34.000000000 +0100 +++ new/libdc1394-2.2.6/dc1394/macosx/capture.c 2017-01-12 08:38:04.000000000 +0100 @@ -614,7 +614,7 @@ dc1394video_frame_t * frame_tmp = capture->frames + next; char ch; - if(craw->frames==NULL || craw->capture_is_set==0) { + if(craw->capture.frames==NULL || craw->capture_is_set==0) { *frame=NULL; return DC1394_CAPTURE_IS_NOT_SET; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdc1394-2.2.5/dc1394/usb/capture.c new/libdc1394-2.2.6/dc1394/usb/capture.c --- old/libdc1394-2.2.5/dc1394/usb/capture.c 2016-12-20 14:13:12.000000000 +0100 +++ new/libdc1394-2.2.6/dc1394/usb/capture.c 2019-04-28 02:42:00.000000000 +0200 @@ -155,12 +155,12 @@ } static dc1394error_t -init_frame(platform_camera_t *craw, int index, dc1394video_frame_t *proto) +init_frame(platform_camera_t *craw, int index, dc1394video_frame_t *proto, size_t padded_frame_size) { struct usb_frame *f = craw->frames + index; memcpy (&f->frame, proto, sizeof f->frame); - f->frame.image = craw->buffer + index * proto->total_bytes; + f->frame.image = craw->buffer + index * padded_frame_size; f->frame.id = index; f->transfer = libusb_alloc_transfer (0); f->pcam = craw; @@ -197,7 +197,11 @@ dc1394_usb_capture_stop (craw); return DC1394_FAILURE; } - + size_t padded_frame_size = proto.total_bytes; + if (libusb_get_device_speed(libusb_get_device(craw->handle)) == LIBUSB_SPEED_SUPER) { + proto.total_bytes = proto.image_bytes; + padded_frame_size = (proto.total_bytes + 1023) & ~1023; + } if (pipe (craw->notify_pipe) < 0) { dc1394_usb_capture_stop (craw); return DC1394_FAILURE; @@ -226,7 +230,7 @@ craw->current = -1; craw->frames_ready = 0; craw->queue_broken = 0; - craw->buffer_size = proto.total_bytes * num_dma_buffers; + craw->buffer_size = padded_frame_size * num_dma_buffers; craw->buffer = malloc (craw->buffer_size); if (craw->buffer == NULL) { dc1394_usb_capture_stop (craw); @@ -240,7 +244,7 @@ } for (i = 0; i < num_dma_buffers; i++) - init_frame(craw, i, &proto); + init_frame(craw, i, &proto, padded_frame_size); if (libusb_init(&craw->thread_context) != 0) { dc1394_log_error ("usb: Failed to create thread USB context"); @@ -419,9 +423,9 @@ int next = NEXT_BUFFER (craw, craw->current); struct usb_frame * f = craw->frames + next; - if ((policy < DC1394_CAPTURE_POLICY_MIN) - || (policy > DC1394_CAPTURE_POLICY_MAX)) + if (policy < DC1394_CAPTURE_POLICY_MIN || policy > DC1394_CAPTURE_POLICY_MAX) { return DC1394_INVALID_CAPTURE_POLICY; + } if(craw->buffer==NULL || craw->capture_is_set==0) { *frame_return=NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdc1394-2.2.5/dc1394/utils.h new/libdc1394-2.2.6/dc1394/utils.h --- old/libdc1394-2.2.5/dc1394/utils.h 2010-01-11 05:33:03.000000000 +0100 +++ new/libdc1394-2.2.6/dc1394/utils.h 2017-04-21 04:46:39.000000000 +0200 @@ -38,7 +38,7 @@ /** * Returns the image width and height (in pixels) corresponding to a video mode. Works for scalable and non-scalable video modes. */ -dc1394error_t dc1394_get_image_size_from_video_mode(dc1394camera_t *camera, uint32_t video_mode, uint32_t *width, uint32_t *height); +dc1394error_t dc1394_get_image_size_from_video_mode(dc1394camera_t *camera, dc1394video_mode_t video_mode, uint32_t *width, uint32_t *height); /** * Returns the given framerate as a float. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdc1394-2.2.5/dc1394/vendor/basler_sff_registry.c new/libdc1394-2.2.6/dc1394/vendor/basler_sff_registry.c --- old/libdc1394-2.2.5/dc1394/vendor/basler_sff_registry.c 2010-01-11 05:33:03.000000000 +0100 +++ new/libdc1394-2.2.6/dc1394/vendor/basler_sff_registry.c 2019-04-28 02:43:54.000000000 +0200 @@ -28,7 +28,7 @@ #include "../control.h" #include "basler_sff_registry.h" -const struct sff_feature const sff_feature_registry[] = { +const struct sff_feature sff_feature_registry[] = { /* DC1394_BASLER_SFF_EXTENDED_DATA_STREAM */ { /* name */ "Extended Data Stream", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdc1394-2.2.5/dc1394/video.h new/libdc1394-2.2.6/dc1394/video.h --- old/libdc1394-2.2.5/dc1394/video.h 2010-01-11 05:33:03.000000000 +0100 +++ new/libdc1394-2.2.6/dc1394/video.h 2017-04-02 14:54:27.000000000 +0200 @@ -164,12 +164,12 @@ dc1394error_t dc1394_video_set_framerate(dc1394camera_t *camera, dc1394framerate_t framerate); /** - * Gets the current vide mode. + * Gets the current video mode. */ dc1394error_t dc1394_video_get_mode(dc1394camera_t *camera, dc1394video_mode_t *video_mode); /** - * Sets the current vide mode. + * Sets the current video mode. */ dc1394error_t dc1394_video_set_mode(dc1394camera_t *camera, dc1394video_mode_t video_mode);
