Hello community, here is the log from the commit of package libdc1394 for openSUSE:Factory checked in at 2019-07-23 08:39:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdc1394 (Old) and /work/SRC/openSUSE:Factory/.libdc1394.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libdc1394" Tue Jul 23 08:39:20 2019 rev:48 rq: version:2.2.5 Changes: -------- --- /work/SRC/openSUSE:Factory/libdc1394/libdc1394.changes 2019-07-22 12:15:47.719737826 +0200 +++ /work/SRC/openSUSE:Factory/.libdc1394.new.4126/libdc1394.changes 2019-07-23 08:39:22.143933823 +0200 @@ -2,8 +1,0 @@ -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.6.tar.gz New: ---- libdc1394-2.2.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdc1394.spec ++++++ --- /var/tmp/diff_new_pack.JgEmpG/_old 2019-07-23 08:39:22.643933735 +0200 +++ /var/tmp/diff_new_pack.JgEmpG/_new 2019-07-23 08:39:22.643933735 +0200 @@ -1,7 +1,7 @@ # # spec file for package libdc1394 # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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,15 +12,15 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: libdc1394 -Version: 2.2.6 +Version: 2.2.5 Release: 0 Summary: 1394-Based Digital Camera Control Library -License: LGPL-2.1-or-later +License: LGPL-2.1+ Group: Hardware/Camera Url: http://damien.douxchamps.net/ieee1394/libdc1394/ Source0: https://downloads.sourceforge.net/project/libdc1394/libdc1394-2/%{version}/%{name}-%{version}.tar.gz @@ -54,11 +54,11 @@ the low-level functionality provided by libraw1394 to communicate with the camera. -%package 25 +%package 22 Summary: 1394-based Digital Camera Control library Group: System/Libraries -%description 25 +%description 22 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,7 +69,7 @@ Summary: Development libraries and header files for dc1394 Group: Development/Libraries/C and C++ Requires: %{name}-tools = %{version} -Requires: libdc1394-25 = %{version} +Requires: libdc1394-22 = %{version} Requires: libraw1394-devel %description devel @@ -109,9 +109,9 @@ rm -f %{buildroot}%{_mandir}/man1/grab_*_image.1* find %{buildroot} -type f -name "*.la" -delete -print -%post 25 -p /sbin/ldconfig +%post 22 -p /sbin/ldconfig -%postun 25 -p /sbin/ldconfig +%postun 22 -p /sbin/ldconfig %files tools %defattr(-,root,root) @@ -119,9 +119,9 @@ %{_bindir}/dc1394_reset_bus %{_mandir}/man1/dc1394_reset_bus.1* -%files 25 +%files 22 %defattr(-,root,root) -%{_libdir}/libdc1394.so.25* +%{_libdir}/libdc1394.so.22* %files devel %defattr(-,root,root) ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.JgEmpG/_old 2019-07-23 08:39:22.711933723 +0200 +++ /var/tmp/diff_new_pack.JgEmpG/_new 2019-07-23 08:39:22.711933723 +0200 @@ -1 +1 @@ -libdc1394-25 +libdc1394-22 ++++++ libdc1394-2.2.6.tar.gz -> libdc1394-2.2.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdc1394-2.2.6/AUTHORS new/libdc1394-2.2.5/AUTHORS --- old/libdc1394-2.2.6/AUTHORS 2017-04-19 09:27:35.000000000 +0200 +++ new/libdc1394-2.2.5/AUTHORS 2016-12-22 09:29:16.000000000 +0100 @@ -21,7 +21,6 @@ Tim Canham Jim Cassidy Paul Chavent -Natanael Copa Hugo Costelha danalien Damien Delannay @@ -106,5 +105,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.6/configure new/libdc1394-2.2.5/configure --- old/libdc1394-2.2.6/configure 2019-04-28 02:36:21.000000000 +0200 +++ new/libdc1394-2.2.5/configure 2016-12-22 09:26:26.000000000 +0100 @@ -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.6. +# Generated by GNU Autoconf 2.69 for libdc1394 2.2.5. # # Report bugs to <[email protected]>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='libdc1394' PACKAGE_TARNAME='libdc1394' -PACKAGE_VERSION='2.2.6' -PACKAGE_STRING='libdc1394 2.2.6' +PACKAGE_VERSION='2.2.5' +PACKAGE_STRING='libdc1394 2.2.5' 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.6 to adapt to many kinds of systems. +\`configure' configures libdc1394 2.2.5 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.6:";; + short | recursive ) echo "Configuration of libdc1394 2.2.5:";; 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.6 +libdc1394 configure 2.2.5 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.6, which was +It was created by libdc1394 $as_me 2.2.5, 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.6' + VERSION='2.2.5' cat >>confdefs.h <<_ACEOF @@ -16639,9 +16639,9 @@ rm -f conftest.mmap conftest.txt -lt_current=25 -lt_revision=0 -lt_age=0 +lt_current=24 +lt_revision=1 +lt_age=2 @@ -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.6, which was +This file was extended by libdc1394 $as_me 2.2.5, 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.6 +libdc1394 config.status 2.2.5 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.6/configure.ac new/libdc1394-2.2.5/configure.ac --- old/libdc1394-2.2.6/configure.ac 2019-04-28 02:36:05.000000000 +0200 +++ new/libdc1394-2.2.5/configure.ac 2016-12-22 09:25:55.000000000 +0100 @@ -1,6 +1,6 @@ # process this file with autoconf to get a configure script AC_PREREQ([2.6.0]) -AC_INIT([libdc1394],[2.2.6],[[email protected]]) +AC_INIT([libdc1394],[2.2.5],[[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=25 -lt_revision=0 -lt_age=0 +lt_current=24 +lt_revision=1 +lt_age=2 AC_SUBST(lt_current) AC_SUBST(lt_revision) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdc1394-2.2.6/dc1394/bayer.c new/libdc1394-2.2.5/dc1394/bayer.c --- old/libdc1394-2.2.6/dc1394/bayer.c 2017-01-12 08:41:04.000000000 +0100 +++ new/libdc1394-2.2.5/dc1394/bayer.c 2016-10-11 08:19:10.000000000 +0200 @@ -24,7 +24,6 @@ #include <limits.h> #include <math.h> #include <stdlib.h> -#include <stdint.h> #include <string.h> #include "conversions.h" @@ -776,7 +775,7 @@ { uint8_t *outR, *outG, *outB; register int i, j; - int tmp; + uint 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.6/dc1394/juju/control.c new/libdc1394-2.2.5/dc1394/juju/control.c --- old/libdc1394-2.2.6/dc1394/juju/control.c 2019-04-28 02:40:21.000000000 +0200 +++ new/libdc1394-2.2.5/dc1394/juju/control.c 2013-03-25 13:54:06.000000000 +0100 @@ -105,7 +105,7 @@ } while ((de = readdir(dir))) { - char filename[262]; + char filename[32]; 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.6/dc1394/macosx/capture.c new/libdc1394-2.2.5/dc1394/macosx/capture.c --- old/libdc1394-2.2.6/dc1394/macosx/capture.c 2017-01-12 08:38:04.000000000 +0100 +++ new/libdc1394-2.2.5/dc1394/macosx/capture.c 2016-12-20 14:10:34.000000000 +0100 @@ -614,7 +614,7 @@ dc1394video_frame_t * frame_tmp = capture->frames + next; char ch; - if(craw->capture.frames==NULL || craw->capture_is_set==0) { + if(craw->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.6/dc1394/usb/capture.c new/libdc1394-2.2.5/dc1394/usb/capture.c --- old/libdc1394-2.2.6/dc1394/usb/capture.c 2019-04-28 02:42:00.000000000 +0200 +++ new/libdc1394-2.2.5/dc1394/usb/capture.c 2016-12-20 14:13:12.000000000 +0100 @@ -155,12 +155,12 @@ } static dc1394error_t -init_frame(platform_camera_t *craw, int index, dc1394video_frame_t *proto, size_t padded_frame_size) +init_frame(platform_camera_t *craw, int index, dc1394video_frame_t *proto) { struct usb_frame *f = craw->frames + index; memcpy (&f->frame, proto, sizeof f->frame); - f->frame.image = craw->buffer + index * padded_frame_size; + f->frame.image = craw->buffer + index * proto->total_bytes; f->frame.id = index; f->transfer = libusb_alloc_transfer (0); f->pcam = craw; @@ -197,11 +197,7 @@ 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; @@ -230,7 +226,7 @@ craw->current = -1; craw->frames_ready = 0; craw->queue_broken = 0; - craw->buffer_size = padded_frame_size * num_dma_buffers; + craw->buffer_size = proto.total_bytes * num_dma_buffers; craw->buffer = malloc (craw->buffer_size); if (craw->buffer == NULL) { dc1394_usb_capture_stop (craw); @@ -244,7 +240,7 @@ } for (i = 0; i < num_dma_buffers; i++) - init_frame(craw, i, &proto, padded_frame_size); + init_frame(craw, i, &proto); if (libusb_init(&craw->thread_context) != 0) { dc1394_log_error ("usb: Failed to create thread USB context"); @@ -423,9 +419,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.6/dc1394/utils.h new/libdc1394-2.2.5/dc1394/utils.h --- old/libdc1394-2.2.6/dc1394/utils.h 2017-04-21 04:46:39.000000000 +0200 +++ new/libdc1394-2.2.5/dc1394/utils.h 2010-01-11 05:33:03.000000000 +0100 @@ -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, dc1394video_mode_t video_mode, uint32_t *width, uint32_t *height); +dc1394error_t dc1394_get_image_size_from_video_mode(dc1394camera_t *camera, uint32_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.6/dc1394/vendor/basler_sff_registry.c new/libdc1394-2.2.5/dc1394/vendor/basler_sff_registry.c --- old/libdc1394-2.2.6/dc1394/vendor/basler_sff_registry.c 2019-04-28 02:43:54.000000000 +0200 +++ new/libdc1394-2.2.5/dc1394/vendor/basler_sff_registry.c 2010-01-11 05:33:03.000000000 +0100 @@ -28,7 +28,7 @@ #include "../control.h" #include "basler_sff_registry.h" -const struct sff_feature sff_feature_registry[] = { +const struct sff_feature const 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.6/dc1394/video.h new/libdc1394-2.2.5/dc1394/video.h --- old/libdc1394-2.2.6/dc1394/video.h 2017-04-02 14:54:27.000000000 +0200 +++ new/libdc1394-2.2.5/dc1394/video.h 2010-01-11 05:33:03.000000000 +0100 @@ -164,12 +164,12 @@ dc1394error_t dc1394_video_set_framerate(dc1394camera_t *camera, dc1394framerate_t framerate); /** - * Gets the current video mode. + * Gets the current vide mode. */ dc1394error_t dc1394_video_get_mode(dc1394camera_t *camera, dc1394video_mode_t *video_mode); /** - * Sets the current video mode. + * Sets the current vide mode. */ dc1394error_t dc1394_video_set_mode(dc1394camera_t *camera, dc1394video_mode_t video_mode);
