Hello community, here is the log from the commit of package libunicap for openSUSE:Factory checked in at 2020-06-05 20:21:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libunicap (Old) and /work/SRC/openSUSE:Factory/.libunicap.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libunicap" Fri Jun 5 20:21:48 2020 rev:17 rq:811710 version:0.9.12 Changes: -------- --- /work/SRC/openSUSE:Factory/libunicap/libunicap.changes 2017-09-29 11:56:42.155666790 +0200 +++ /work/SRC/openSUSE:Factory/.libunicap.new.3606/libunicap.changes 2020-06-05 20:28:32.349229190 +0200 @@ -1,0 +2,8 @@ +Fri Jun 5 09:12:57 UTC 2020 - Dave Plater <davejpla...@gmail.com> + +- Fix Factory build, add patches from Fedora: + libunicap-0.9.12-gcc10.patch, libunicap-0.9.12-arraycmp.patch, + libunicap-0.9.12-datadirname.patch, libunicap-bz641623.patch + and libunicap-0.9.12-memerrs.patch + +------------------------------------------------------------------- New: ---- libunicap-0.9.12-arraycmp.patch libunicap-0.9.12-datadirname.patch libunicap-0.9.12-gcc10.patch libunicap-0.9.12-memerrs.patch libunicap-bz641623.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libunicap.spec ++++++ --- /var/tmp/diff_new_pack.eiKMCp/_old 2020-06-05 20:28:34.133234460 +0200 +++ /var/tmp/diff_new_pack.eiKMCp/_new 2020-06-05 20:28:34.133234460 +0200 @@ -1,7 +1,7 @@ # # spec file for package libunicap # -# Copyright (c) 2017 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,7 +12,7 @@ # 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/ # @@ -26,9 +26,9 @@ Version: 0.9.12 Release: 0 Summary: Library to access different kinds of (video) capture devices -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Hardware/Camera -Url: http://www.unicap-imaging.org/ +URL: http://www.unicap-imaging.org/ Source0: %{name}-%{version}.tar.bz2 Source1: libunicap-filter.sh Source2: baselibs.conf @@ -39,6 +39,12 @@ # PATCH-FIX-UPSTREAM libunicap-udev.patch bnc726471 https://bugs.launchpad.net/unicap/+bug/959626 sbra...@suse.cz -- port rules to the new udev Patch3: libunicap-udev.patch Patch4: unicap-implicit-fortify-decl.patch +# Patches from Fedora: +Patch5: libunicap-0.9.12-gcc10.patch +Patch8: libunicap-0.9.12-arraycmp.patch +Patch9: libunicap-0.9.12-datadirname.patch +Patch10: libunicap-bz641623.patch +Patch12: libunicap-0.9.12-memerrs.patch BuildRequires: alsa-lib-devel BuildRequires: gettext BuildRequires: gtk-doc >= 1.4 @@ -96,12 +102,7 @@ %prep %setup -q -n %{name}-%{version} -%if 0%{?suse_version} >= 1210 -%patch1 -%endif -%patch2 -p 1 -%patch3 -p 1 -%patch4 +%autopatch -p1 %build mkdir -p m4 autoreconf -fiv @@ -122,7 +123,8 @@ %files -n libunicap2 -f unicap.lang %defattr(-,root,root) -%doc AUTHORS ChangeLog COPYING README +%doc AUTHORS ChangeLog README +%license COPYING %{_libdir}/*.so.* %{_libdir}/unicap2 %{_udevrulesdir}/50-euvccam.rules ++++++ libunicap-0.9.12-arraycmp.patch ++++++ >From 6cf16e964e312a2e040cc3e7b45be21715961a19 Mon Sep 17 00:00:00 2001 From: Kamil Dudka <kdu...@redhat.com> Date: Thu, 7 Oct 2010 11:02:48 +0200 Subject: [PATCH 2/2] linunicap: do not compare arrays with NULL --- cpi/vid21394/vid21394_base.c | 2 +- cpi/vid21394/vid21394_cpi.c | 3 --- src/unicap_helpers.c | 10 +++++----- 3 files changed, 6 insertions(+), 9 deletions(-) Index: libunicap-0.9.12/cpi/vid21394/vid21394_base.c =================================================================== --- libunicap-0.9.12.orig/cpi/vid21394/vid21394_base.c 2010-01-25 19:28:00.000000000 +0200 +++ libunicap-0.9.12/cpi/vid21394/vid21394_base.c 2020-06-05 10:51:38.609127177 +0200 @@ -501,7 +501,7 @@ static unicap_status_t _vid21394_send_fc raw1394handle_t raw1394handle = vid21394handle->raw1394handle; - nodeid_t nodeid = nodeid = 0xffc0 | vid21394handle->node; + nodeid_t nodeid = 0xffc0 | vid21394handle->node; unicap_status_t status = STATUS_SUCCESS; Index: libunicap-0.9.12/cpi/vid21394/vid21394_cpi.c =================================================================== --- libunicap-0.9.12.orig/cpi/vid21394/vid21394_cpi.c 2010-01-17 09:49:29.000000000 +0200 +++ libunicap-0.9.12/cpi/vid21394/vid21394_cpi.c 2020-06-05 10:51:38.609127177 +0200 @@ -655,7 +655,6 @@ int cpi_enumerate_formats( void *cpi_dat return STATUS_INVALID_PARAMETER; } - if( !data->current_formats ) { int tmp; cpi_reenumerate_formats( cpi_data, &tmp ); @@ -684,7 +683,6 @@ int cpi_set_format( void *cpi_data, unic TRACE( "cpi_set_format\n" ); - if( !data->current_formats ) { int tmp; cpi_reenumerate_formats( cpi_data, &tmp ); @@ -846,7 +844,6 @@ unicap_status_t cpi_get_format( void *cp { vid21394_data_t *data = cpi_data; - if( !data->current_formats ) { int tmp; cpi_reenumerate_formats( cpi_data, &tmp ); Index: libunicap-0.9.12/src/unicap_helpers.c =================================================================== --- libunicap-0.9.12.orig/src/unicap_helpers.c 2010-01-17 09:49:29.000000000 +0200 +++ libunicap-0.9.12/src/unicap_helpers.c 2020-06-05 10:51:38.609127177 +0200 @@ -105,13 +105,13 @@ unicap_status_t unicap_describe_device( "Vendor id: %u ( 0x%x )\n"\ "cpi: %s\n"\ "device: %s\n", - device->identifier ? device->identifier : "(nil)", - device->model_name ? device->model_name : "(nil)", - device->vendor_name ? device->vendor_name : "(nil)", + device->identifier, + device->model_name, + device->vendor_name, device->model_id, device->vendor_id, device->vendor_id, - device->cpi_layer ? device->cpi_layer : "(nil)", - device->device ? device->device : "(nil)" ); + device->cpi_layer, + device->device); strncpy( buffer, tmp_buffer, (*buffer_size)-1 ); ++++++ libunicap-0.9.12-datadirname.patch ++++++ Patch by Robert Scheck <rob...@fedoraproject.org> for libunicap <= 0.9.12 to work around the issue of /usr/@DATADIRNAME@/locale/ rather /usr/share/locale/ on Fedora 22 (and newer). --- libunicap-0.9.12/po/Makefile.in.in 2009-09-21 18:08:22.000000000 +0200 +++ libunicap-0.9.12/po/Makefile.in.in.datadirname 2015-05-31 21:44:58.000000000 +0200 @@ -33,7 +33,7 @@ datadir = @datadir@ datarootdir = @datarootdir@ libdir = @libdir@ -DATADIRNAME = @DATADIRNAME@ +DATADIRNAME = share itlocaledir = $(prefix)/$(DATADIRNAME)/locale subdir = po install_sh = @install_sh@ ++++++ libunicap-0.9.12-find_videodev.patch ++++++ --- /var/tmp/diff_new_pack.eiKMCp/_old 2020-06-05 20:28:34.173234579 +0200 +++ /var/tmp/diff_new_pack.eiKMCp/_new 2020-06-05 20:28:34.173234579 +0200 @@ -1,5 +1,7 @@ ---- cpi/v4l/v4l.c.orig -+++ cpi/v4l/v4l.c +Index: libunicap-0.9.12/cpi/v4l/v4l.c +=================================================================== +--- libunicap-0.9.12.orig/cpi/v4l/v4l.c 2010-01-17 09:49:29.000000000 +0200 ++++ libunicap-0.9.12/cpi/v4l/v4l.c 2020-06-05 10:40:11.017168305 +0200 @@ -49,7 +49,7 @@ #endif #include <debug.h> @@ -9,8 +11,10 @@ #include <linux/videodev2.h> // for v4l2 checks #include "v4l.h" ---- cpi/v4l2cpi/uvcvideo.h.orig -+++ cpi/v4l2cpi/uvcvideo.h +Index: libunicap-0.9.12/cpi/v4l2cpi/uvcvideo.h +=================================================================== +--- libunicap-0.9.12.orig/cpi/v4l2cpi/uvcvideo.h 2010-01-17 09:49:29.000000000 +0200 ++++ libunicap-0.9.12/cpi/v4l2cpi/uvcvideo.h 2020-06-05 10:40:11.017168305 +0200 @@ -2,7 +2,7 @@ #define _USB_VIDEO_H_ ++++++ libunicap-0.9.12-gcc10.patch ++++++ Patch by Robert Scheck <rob...@fedoraproject.org> for libunicap <= 0.9.12 to declare the struct as extern in header files (https://gcc.gnu.org/gcc-10/porting_to.html). --- libunicap-0.9.12/common/queue.h 2010-01-17 08:49:29.000000000 +0100 +++ libunicap-0.9.12/common/queue.h.gcc10 2020-02-09 23:30:16.963136320 +0100 @@ -24,7 +24,7 @@ #include <sys/time.h> #include <semaphore.h> -struct _unicap_queue +extern struct _unicap_queue { sem_t sema; sem_t *psema; --- libunicap-0.9.12/cpi/euvccam/queue.h 2010-01-19 07:52:49.000000000 +0100 +++ libunicap-0.9.12/cpi/euvccam/queue.h.gcc10 2020-02-09 23:30:05.037048713 +0100 @@ -24,7 +24,7 @@ #include <sys/time.h> #include <semaphore.h> -struct _unicap_queue +extern struct _unicap_queue { sem_t sema; sem_t *psema; ++++++ libunicap-0.9.12-memerrs.patch ++++++ >From 739d6bde46f6d7dd68e228f2a27eb039d0550999 Mon Sep 17 00:00:00 2001 From: Kamil Dudka <kdu...@redhat.com> Date: Thu, 7 Oct 2010 10:56:06 +0200 Subject: [PATCH] libunicap: fix various memory errors --- cpi/dcam/dcam_v_modes.c | 3 ++- cpi/euvccam/euvccam_capture.c | 1 + cpi/v4l/v4l.c | 2 +- cpi/v4l2cpi/v4l2.c | 12 ++++++++++-- cpi/vid21394/vid21394_cpi.c | 5 ++--- src/unicap.c | 2 ++ 6 files changed, 18 insertions(+), 7 deletions(-) Index: libunicap-0.9.12/cpi/dcam/dcam_v_modes.c =================================================================== --- libunicap-0.9.12.orig/cpi/dcam/dcam_v_modes.c 2020-06-05 10:53:06.896699260 +0200 +++ libunicap-0.9.12/cpi/dcam/dcam_v_modes.c 2020-06-05 10:53:18.353163741 +0200 @@ -182,7 +182,8 @@ unicap_status_t _dcam_prepare_format_arr int index = _dcam_get_mode_index( f, i ); TRACE( "f: %d m: %d index: %d (%s)\n", f, i, index, _dcam_unicap_formats[index].identifier ); TRACE( "size: %d x %d\n", _dcam_unicap_formats[index].size.width, _dcam_unicap_formats[index].size.height ); - memcpy( format_array + current_format, &_dcam_unicap_formats[index], sizeof( unicap_format_t ) ); + if( 0 < index ) + memcpy( format_array + current_format, &_dcam_unicap_formats[index], sizeof( unicap_format_t ) ); current_format++; } } Index: libunicap-0.9.12/cpi/euvccam/euvccam_capture.c =================================================================== --- libunicap-0.9.12.orig/cpi/euvccam/euvccam_capture.c 2020-06-05 10:53:06.896699260 +0200 +++ libunicap-0.9.12/cpi/euvccam/euvccam_capture.c 2020-06-05 10:53:18.353163741 +0200 @@ -231,6 +231,7 @@ static void *capture_thread( euvccam_han if( ret < 0 ){ TRACE( "Failed to submit urb!\n" ); perror( "ioctl" ); + free( urb ); return NULL; } Index: libunicap-0.9.12/cpi/v4l/v4l.c =================================================================== --- libunicap-0.9.12.orig/cpi/v4l/v4l.c 2020-06-05 10:53:06.896699260 +0200 +++ libunicap-0.9.12/cpi/v4l/v4l.c 2020-06-05 10:53:18.353163741 +0200 @@ -292,7 +292,7 @@ static unicap_status_t v4l_open( void ** v4l_handle_t v4lhandle; *cpi_data = malloc( sizeof( struct _v4l_handle ) ); - if( !cpi_data ) + if( !*cpi_data ) { TRACE( "malloc failed\n" ); return STATUS_FAILURE; Index: libunicap-0.9.12/cpi/v4l2cpi/v4l2.c =================================================================== --- libunicap-0.9.12.orig/cpi/v4l2cpi/v4l2.c 2020-06-05 10:53:06.896699260 +0200 +++ libunicap-0.9.12/cpi/v4l2cpi/v4l2.c 2020-06-05 10:53:18.353163741 +0200 @@ -864,7 +864,7 @@ static unicap_status_t v4l2_reenumerate_ sizes = build_format_size_table( handle, v4l2_fmt.pixelformat, &size_count ); - if( size_count == 0 ) + if( sizes == NULL ) { handle->unicap_formats[v4l2_fmt.index].min_size.width = handle->unicap_formats[v4l2_fmt.index].min_size.height = 1; @@ -2152,6 +2152,8 @@ static unicap_status_t v4l2_queue_buffer else { TRACE( "queue buffer failed\n" ); + free( queue ); + /* FIXME: should return STATUS_FAILURE? */ } if( ( status == STATUS_NO_BUFFERS ) && ( buffer->type == UNICAP_BUFFER_TYPE_SYSTEM ) ) @@ -2159,6 +2161,10 @@ static unicap_status_t v4l2_queue_buffer status = STATUS_SUCCESS; } } + else + { + free( queue ); + } return STATUS_SUCCESS; Index: libunicap-0.9.12/cpi/vid21394/vid21394_cpi.c =================================================================== --- libunicap-0.9.12.orig/cpi/vid21394/vid21394_cpi.c 2020-06-05 10:51:38.609127177 +0200 +++ libunicap-0.9.12/cpi/vid21394/vid21394_cpi.c 2020-06-05 10:53:18.353163741 +0200 @@ -504,9 +504,6 @@ int cpi_close( void *cpi_data ) { vid21394_data_t *data = cpi_data; - vid21394_close( data->vid21394handle ); - - ucutil_destroy_queue( data->in_queue ); ucutil_destroy_queue( data->out_queue ); @@ -515,6 +512,8 @@ int cpi_close( void *cpi_data ) free( data->vid21394handle->unicap_handle ); } + vid21394_close( data->vid21394handle ); + g_instance_count--; free( data ); ++++++ libunicap-bz641623.patch ++++++ diff --git a/cpi/v4l2cpi/v4l2.c b/cpi/v4l2cpi/v4l2.c index a8e0c92..ec4c8db 100644 --- a/cpi/v4l2cpi/v4l2.c +++ b/cpi/v4l2cpi/v4l2.c @@ -1928,6 +1928,10 @@ static unicap_status_t v4l2_capture_start( void *cpi_data ) } handle->buffer_mgr = buffer_mgr_create( handle->fd, &handle->current_format ); + if( !handle->buffer_mgr ) + { + return STATUS_FAILURE; + } handle->capture_running = 1; ++++++ libunicap-udev.patch ++++++ --- /var/tmp/diff_new_pack.eiKMCp/_old 2020-06-05 20:28:34.205234673 +0200 +++ /var/tmp/diff_new_pack.eiKMCp/_new 2020-06-05 20:28:34.205234673 +0200 @@ -1,5 +1,7 @@ ---- libunicap-0.9.12.orig/data/50-euvccam.rules -+++ libunicap-0.9.12/data/50-euvccam.rules +Index: libunicap-0.9.12/data/50-euvccam.rules +=================================================================== +--- libunicap-0.9.12.orig/data/50-euvccam.rules 2010-04-29 08:24:24.000000000 +0200 ++++ libunicap-0.9.12/data/50-euvccam.rules 2020-06-05 10:40:30.597937086 +0200 @@ -1,8 +1,13 @@ -SYSFS{idVendor}=="199e", SYSFS{idProduct}=="8201", GROUP="video", MODE="0660" -SYSFS{idVendor}=="199e", SYSFS{idProduct}=="8202", GROUP="video", MODE="0660" @@ -21,8 +23,10 @@ +ATTRS{idVendor}=="199e", ATTRS{idProduct}=="8207", GROUP="video", MODE="0660" + +LABEL="euvccam_rules_end" ---- libunicap-0.9.12.orig/data/Makefile.am -+++ libunicap-0.9.12/data/Makefile.am +Index: libunicap-0.9.12/data/Makefile.am +=================================================================== +--- libunicap-0.9.12.orig/data/Makefile.am 2010-07-15 22:08:51.000000000 +0200 ++++ libunicap-0.9.12/data/Makefile.am 2020-06-05 10:40:30.601937250 +0200 @@ -1,4 +1,4 @@ -euvccamrulesdir=/etc/udev/rules.d +euvccamrulesdir=$(shell pkg-config --variable=udevdir udev)/rules.d ++++++ libunicap_0912_fixPrivate.patch ++++++ --- /var/tmp/diff_new_pack.eiKMCp/_old 2020-06-05 20:28:34.217234708 +0200 +++ /var/tmp/diff_new_pack.eiKMCp/_new 2020-06-05 20:28:34.217234708 +0200 @@ -1,6 +1,8 @@ ---- libunicap-0.9.12/include/unicap.h.old -+++ libunicap-0.9.12/include/unicap.h -@@ -215,7 +215,7 @@ +Index: libunicap-0.9.12/include/unicap.h +=================================================================== +--- libunicap-0.9.12.orig/include/unicap.h 2010-08-05 08:51:58.000000000 +0200 ++++ libunicap-0.9.12/include/unicap.h 2020-06-05 10:40:26.525774869 +0200 +@@ -215,7 +215,7 @@ struct _unicap_data_buffer_t unicap_buffer_flags_t flags; @@ -9,9 +11,11 @@ }; typedef struct _unicap_data_buffer_t unicap_data_buffer_t; ---- libunicap-0.9.12/src/unicap.c.old -+++ libunicap-0.9.12/src/unicap.c -@@ -1467,7 +1467,7 @@ +Index: libunicap-0.9.12/src/unicap.c +=================================================================== +--- libunicap-0.9.12.orig/src/unicap.c 2010-09-19 09:02:48.000000000 +0200 ++++ libunicap-0.9.12/src/unicap.c 2020-06-05 10:40:26.525774869 +0200 +@@ -1467,7 +1467,7 @@ unicap_data_buffer_t *unicap_data_buffer buffer->buffer_size = buffer->format.buffer_size; buffer->data = malloc( buffer->buffer_size ); unicap_copy_format( &buffer->format, format ); @@ -20,7 +24,7 @@ return buffer; } -@@ -1475,28 +1475,28 @@ +@@ -1475,28 +1475,28 @@ unicap_data_buffer_t *unicap_data_buffer void unicap_data_buffer_init( unicap_data_buffer_t *buffer, unicap_format_t *format, unicap_data_buffer_init_data_t *init_data ) { unicap_copy_format( &buffer->format, format ); @@ -34,7 +38,7 @@ - buffer->private->unref_func = init_data->unref_func; - buffer->private->unref_func_data = init_data->unref_func_data; + buffer->private_buffer = malloc( sizeof( unicap_data_buffer_private_t ) ); -+ sem_init( &buffer->private_buffer->lock, 0, 1 ); ++ sem_init( &buffer->private_buffer->lock, 0, 1 ); + buffer->private_buffer->ref_count = 0; + buffer->private_buffer->free_func = init_data->free_func; + buffer->private_buffer->free_func_data = init_data->free_func_data; @@ -64,7 +68,7 @@ if (buffer->data) free( buffer->data ); free( buffer ); -@@ -1504,9 +1504,9 @@ +@@ -1504,9 +1504,9 @@ void unicap_data_buffer_free( unicap_dat unicap_status_t unicap_data_buffer_ref( unicap_data_buffer_t *buffer ) { @@ -77,7 +81,7 @@ return STATUS_SUCCESS; } -@@ -1514,36 +1514,36 @@ +@@ -1514,36 +1514,36 @@ unicap_status_t unicap_data_buffer_ref( unicap_status_t unicap_data_buffer_unref( unicap_data_buffer_t *buffer ) { unicap_status_t status = STATUS_SUCCESS; ++++++ unicap-implicit-fortify-decl.patch ++++++ --- /var/tmp/diff_new_pack.eiKMCp/_old 2020-06-05 20:28:34.225234732 +0200 +++ /var/tmp/diff_new_pack.eiKMCp/_new 2020-06-05 20:28:34.225234732 +0200 @@ -1,5 +1,7 @@ ---- cpi/v4l2cpi/buffermanager.c.orig -+++ cpi/v4l2cpi/buffermanager.c +Index: libunicap-0.9.12/cpi/v4l2cpi/buffermanager.c +=================================================================== +--- libunicap-0.9.12.orig/cpi/v4l2cpi/buffermanager.c 2010-08-17 18:13:08.000000000 +0200 ++++ libunicap-0.9.12/cpi/v4l2cpi/buffermanager.c 2020-06-05 10:40:34.274087670 +0200 @@ -1,12 +1,13 @@ #include "config.h" @@ -29,8 +31,10 @@ #define CLOSE v4l2_close #define IOCTL v4l2_ioctl #define MMAP v4l2_mmap ---- cpi/euvccam/euvccam_colorproc.c.orig -+++ cpi/euvccam/euvccam_colorproc.c +Index: libunicap-0.9.12/cpi/euvccam/euvccam_colorproc.c +=================================================================== +--- libunicap-0.9.12.orig/cpi/euvccam/euvccam_colorproc.c 2010-08-19 20:04:25.000000000 +0200 ++++ libunicap-0.9.12/cpi/euvccam/euvccam_colorproc.c 2020-06-05 10:40:34.274087670 +0200 @@ -18,6 +18,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -40,8 +44,10 @@ #include "euvccam_cpi.h" #include "debayer.h" ---- cpi/euvccam/euvccam_usb.c.orig -+++ cpi/euvccam/euvccam_usb.c +Index: libunicap-0.9.12/cpi/euvccam/euvccam_usb.c +=================================================================== +--- libunicap-0.9.12.orig/cpi/euvccam/euvccam_usb.c 2010-03-01 12:42:38.000000000 +0200 ++++ libunicap-0.9.12/cpi/euvccam/euvccam_usb.c 2020-06-05 10:40:34.274087670 +0200 @@ -18,6 +18,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -51,8 +57,10 @@ #include <sys/types.h> #include <ctype.h> #include <dirent.h> ---- cpi/euvccam/logging.c.orig -+++ cpi/euvccam/logging.c +Index: libunicap-0.9.12/cpi/euvccam/logging.c +=================================================================== +--- libunicap-0.9.12.orig/cpi/euvccam/logging.c 2010-01-19 08:52:22.000000000 +0200 ++++ libunicap-0.9.12/cpi/euvccam/logging.c 2020-06-05 10:40:34.274087670 +0200 @@ -18,9 +18,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -65,8 +73,10 @@ FILE *g_logfp = NULL; int g_log_modules_mask = 0xffff; ---- common/Makefile.am.orig -+++ common/Makefile.am +Index: libunicap-0.9.12/common/Makefile.am +=================================================================== +--- libunicap-0.9.12.orig/common/Makefile.am 2010-01-17 15:17:21.000000000 +0200 ++++ libunicap-0.9.12/common/Makefile.am 2020-06-05 10:40:36.954197456 +0200 @@ -1,5 +1,5 @@ -INCLUDES=-I../include +AM_CPPFLAGS= -include $(top_builddir)/config.h -I../include @@ -75,9 +85,11 @@ libucutils_la_SOURCES = queue.c queue.h ucutil.h -libucutils_la_LIBADD = \ No newline at end of file -+libucutils_la_LIBADD = ---- cpi/dcam/Makefile.am.orig -+++ cpi/dcam/Makefile.am ++libucutils_la_LIBADD = +Index: libunicap-0.9.12/cpi/dcam/Makefile.am +=================================================================== +--- libunicap-0.9.12.orig/cpi/dcam/Makefile.am 2010-05-27 09:24:46.000000000 +0200 ++++ libunicap-0.9.12/cpi/dcam/Makefile.am 2020-06-05 10:40:34.274087670 +0200 @@ -1,5 +1,5 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I../include -I../../include -I../../ -I../../common @LIBRAW1394_PACKAGE_CFLAGS@ @@ -94,8 +106,10 @@ libdcam_la_SOURCES = \ 1394util.c \ ---- cpi/euvccam/Makefile.am.orig -+++ cpi/euvccam/Makefile.am +Index: libunicap-0.9.12/cpi/euvccam/Makefile.am +=================================================================== +--- libunicap-0.9.12.orig/cpi/euvccam/Makefile.am 2010-08-19 19:52:27.000000000 +0200 ++++ libunicap-0.9.12/cpi/euvccam/Makefile.am 2020-06-05 10:40:34.274087670 +0200 @@ -1,4 +1,4 @@ -INCLUDES = -I../include -I../../include -I../../ -I../../common +INCLUDES = -include $(top_builddir)/config.h -I../include -I../../include -I../../ -I../../common @@ -112,8 +126,10 @@ libeuvccam_cpi_la_SOURCES= \ euvccam_cpi.c euvccam_cpi.h \ ---- cpi/thing/Makefile.am.orig -+++ cpi/thing/Makefile.am +Index: libunicap-0.9.12/cpi/thing/Makefile.am +=================================================================== +--- libunicap-0.9.12.orig/cpi/thing/Makefile.am 2010-01-17 09:49:29.000000000 +0200 ++++ libunicap-0.9.12/cpi/thing/Makefile.am 2020-06-05 10:40:34.274087670 +0200 @@ -1,5 +1,5 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I../include -I../../include @@ -121,8 +137,10 @@ libcpi_LTLIBRARIES = libthing.la ---- cpi/v4l/Makefile.am.orig -+++ cpi/v4l/Makefile.am +Index: libunicap-0.9.12/cpi/v4l/Makefile.am +=================================================================== +--- libunicap-0.9.12.orig/cpi/v4l/Makefile.am 2010-05-27 09:24:09.000000000 +0200 ++++ libunicap-0.9.12/cpi/v4l/Makefile.am 2020-06-05 10:40:34.274087670 +0200 @@ -1,5 +1,5 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I../include -I../../include -I../../common @@ -139,8 +157,10 @@ libv4l_la_SOURCES = \ v4l.c v4l.h ---- cpi/v4l2cpi/Makefile.am.orig -+++ cpi/v4l2cpi/Makefile.am +Index: libunicap-0.9.12/cpi/v4l2cpi/Makefile.am +=================================================================== +--- libunicap-0.9.12.orig/cpi/v4l2cpi/Makefile.am 2010-07-05 18:27:15.000000000 +0200 ++++ libunicap-0.9.12/cpi/v4l2cpi/Makefile.am 2020-06-05 10:40:34.274087670 +0200 @@ -1,5 +1,5 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I../include -I../../include -I../../common @@ -164,8 +184,10 @@ -EXTRA_DIST = v4l2_i18n_strings.h \ No newline at end of file +EXTRA_DIST = v4l2_i18n_strings.h ---- cpi/vid21394/Makefile.am.orig -+++ cpi/vid21394/Makefile.am +Index: libunicap-0.9.12/cpi/vid21394/Makefile.am +=================================================================== +--- libunicap-0.9.12.orig/cpi/vid21394/Makefile.am 2010-05-27 09:27:19.000000000 +0200 ++++ libunicap-0.9.12/cpi/vid21394/Makefile.am 2020-06-05 10:40:34.274087670 +0200 @@ -1,5 +1,5 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I../include -I../../include @LIBRAW1394_PACKAGE_CFLAGS@ -I. -I../../common @@ -189,8 +211,10 @@ -libvid21394_la_CFLAGS = -fno-strict-aliasing \ No newline at end of file +libvid21394_la_CFLAGS = -fno-strict-aliasing ---- src/Makefile.am.orig -+++ src/Makefile.am +Index: libunicap-0.9.12/src/Makefile.am +=================================================================== +--- libunicap-0.9.12.orig/src/Makefile.am 2010-05-27 09:21:01.000000000 +0200 ++++ libunicap-0.9.12/src/Makefile.am 2020-06-05 10:40:34.274087670 +0200 @@ -1,12 +1,12 @@ MAINTAINERCLEANFILES = Makefile.in INCLUDES = -I../include -I../cpi/include @@ -206,8 +230,10 @@ endif libunicap_la_SOURCES = \ ---- cpi/v4l2cpi/tiseuvccam.c.orig -+++ cpi/v4l2cpi/tiseuvccam.c +Index: libunicap-0.9.12/cpi/v4l2cpi/tiseuvccam.c +=================================================================== +--- libunicap-0.9.12.orig/cpi/v4l2cpi/tiseuvccam.c 2010-01-17 09:49:29.000000000 +0200 ++++ libunicap-0.9.12/cpi/v4l2cpi/tiseuvccam.c 2020-06-05 10:40:34.274087670 +0200 @@ -37,7 +37,8 @@ #define FOURCC(a,b,c,d) (unsigned int)((((unsigned int)d)<<24)+(((unsigned int)c)<<16)+(((unsigned int)b)<<8)+a) @@ -218,8 +244,10 @@ #define CLOSE v4l2_close #define IOCTL v4l2_ioctl #define MMAP v4l2_mmap ---- cpi/v4l2cpi/tisuvccam.c.orig -+++ cpi/v4l2cpi/tisuvccam.c +Index: libunicap-0.9.12/cpi/v4l2cpi/tisuvccam.c +=================================================================== +--- libunicap-0.9.12.orig/cpi/v4l2cpi/tisuvccam.c 2010-01-18 17:14:25.000000000 +0200 ++++ libunicap-0.9.12/cpi/v4l2cpi/tisuvccam.c 2020-06-05 10:40:34.274087670 +0200 @@ -39,7 +39,8 @@ @@ -230,8 +258,10 @@ #define CLOSE v4l2_close #define IOCTL v4l2_ioctl #define MMAP v4l2_mmap ---- configure.ac.orig -+++ configure.ac +Index: libunicap-0.9.12/configure.ac +=================================================================== +--- libunicap-0.9.12.orig/configure.ac 2010-09-19 09:16:40.000000000 +0200 ++++ libunicap-0.9.12/configure.ac 2020-06-05 10:40:34.274087670 +0200 @@ -38,12 +38,12 @@ AC_SUBST(pkg_version) AC_CONFIG_MACRO_DIR(m4)
