SLFO-pool/libdc1394
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main libdc1394 revision 02e6629068f0d2b323ff27692125d8cb

Browse Source
This commit is contained in:
Adrian Schröter 2024-05-03 14:50:22 +02:00
commit aee42f288e
9 changed files with 614 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
baselibs.conf Normal file
View File

@ -0,0 +1 @@
libdc1394-26

BIN
libdc1394-2.2.7.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

20
libdc1394-swab_fix.patch Normal file
View File

@ -0,0 +1,20 @@
Index: libdc1394-2.2.3/dc1394/conversions.c
===================================================================
--- libdc1394-2.2.3.orig/dc1394/conversions.c
+++ libdc1394-2.2.3/dc1394/conversions.c
@@ -20,13 +20,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#define _XOPEN_SOURCE
#include <string.h>
#include <stdlib.h>
+#include <unistd.h>
#include "conversions.h"
-// this should disappear...
-extern void swab();
-
/**********************************************************************
*
* CONVERSION FUNCTIONS TO YUV422

13
libdc1394-v4l-2.6.38.patch Normal file
View File

@ -0,0 +1,13 @@
Index: libdc1394-2.2.3/examples/dc1394_vloopback.c
===================================================================
--- libdc1394-2.2.3.orig/examples/dc1394_vloopback.c
+++ libdc1394-2.2.3/examples/dc1394_vloopback.c
@@ -46,7 +46,7 @@
#include <signal.h>
#define _LINUX_TIME_H
#define _DEVICE_H_
-#include <linux/videodev.h>
+#include <libv4l1-videodev.h>
#include <getopt.h>
#include <stdint.h>
#include <inttypes.h>

37
libdc1394.ac.patch Normal file
View File

@ -0,0 +1,37 @@
Index: libdc1394-2.2.3/configure.ac
===================================================================
--- libdc1394-2.2.3.orig/configure.ac
+++ libdc1394-2.2.3/configure.ac
@@ -8,12 +8,6 @@ m4_include([ax_check_framework.m4])
AC_CANONICAL_SYSTEM
-case "$host" in
-*-*-cygwin* | *-*-mingw*)
-AC_LIBTOOL_WIN32_DLL
-;;
-esac
-
#
DX_HTML_FEATURE(OFF)
DX_CHM_FEATURE(OFF)
@@ -26,11 +20,11 @@ DX_PS_FEATURE(OFF)
#
DX_INIT_DOXYGEN([libdc1394], [Doxyfile.in])
#
-AM_PROG_AR
AM_INIT_AUTOMAKE([--warnings=all 1.9.6])
AC_CONFIG_HEADERS([config.h])
AC_PROG_CC
+AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
AM_PROG_CC_C_O
@@ -242,4 +236,4 @@ if test "x$EXAMPLESMSG" = xYes; then
Build V4L examples: ${VIDEXAMPLESMSG}"
fi
dnl extra newline:
-echo ""
\ No newline at end of file
+echo ""

354
libdc1394.changes Normal file
View File

@ -0,0 +1,354 @@
-------------------------------------------------------------------
Thu Jun 22 16:59:13 UTC 2023 - Matwey Kornilov <matwey.kornilov@gmail.com>
- Update to 2.2.7:
- Update autoconf files.
-------------------------------------------------------------------
Sat Jan 4 16:05:50 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Drop pkgconfig(sdl), no point in building examples which are
not packaged.
-------------------------------------------------------------------
Wed Aug 14 08:31:11 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
- Switch up to pkgconfgi style dependencies
-------------------------------------------------------------------
Sat Jul 6 13:34:52 UTC 2019 - Matwey V. Kornilov <matwey.kornilov@gmail.com>
- 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
-------------------------------------------------------------------
Mon Jan 9 13:49:42 UTC 2017 - matwey.kornilov@gmail.com
- Update to 2.2.5:
- Minor thread-safety improvements
-------------------------------------------------------------------
Wed Feb 3 14:09:56 UTC 2016 - matwey.kornilov@gmail.com
- Update to 2.2.4:
- Add USB IDs for some Point Grey cameras
- Re-activate the EdgeSense debayering algorithm (patent has expired)
- USB-captured frames now have a valid timestamp
- Look for USB enpoints on all interfaces
-------------------------------------------------------------------
Sat Nov 14 19:24:14 UTC 2015 - jengelh@inai.de
- 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.
-------------------------------------------------------------------
Sat Mar 21 07:49:15 UTC 2015 - mpluskal@suse.com
- Cleanup spec file with spec-cleaner
- Use url for source
-------------------------------------------------------------------
Mon Nov 10 18:05:57 UTC 2014 - matwey.kornilov@gmail.com
- Add baselibs.conf as Source
-------------------------------------------------------------------
Wed Sep 10 07:10:14 UTC 2014 - matwey.kornilov@gmail.com
- Version 2.2.3
- several product IDs have been added for Point Grey USB/IIDC cameras
-------------------------------------------------------------------
Thu May 1 03:44:33 UTC 2014 - crrodriguez@opensuse.org
- remove libdc1394-visibility.patch, nowadays
the package uses -export-symbols-regex to limit
the visible symbols to those prefixed with dc1394_
fixes http://lists.opensuse.org/opensuse-packaging/2014-04/msg00064.html
-------------------------------------------------------------------
Fri Mar 7 16:00:17 UTC 2014 - matwey.kornilov@gmail.com
- Update to 2.2.2
- several product IDs have been added for Point Grey USB/IIDC cameras
-------------------------------------------------------------------
Tue Jan 29 14:27:01 UTC 2013 - matwey.kornilov@gmail.com
- Drop support of libdc1394-1 (which is unused for a long time)
-------------------------------------------------------------------
Mon Jan 28 07:17:50 UTC 2013 - matwey.kornilov@gmail.com
- Update to 2.2.1
- updated all licenses to LPGL2 (bnc#777083)
- misc fixes
- don't expose internal symbols
-------------------------------------------------------------------
Fri Mar 09 17:09:02 MSK 2012 - matwey.kornilov@gmail.com
- Update to 2.2.0.
- new Windows stack
- fixed small memory leak in Juju
- added two USB cameras from Point Grey.
-------------------------------------------------------------------
Thu Nov 17 22:31:02 MSK 2011 - matwey.kornilov@gmail.com
- Update to 2.1.4.
- Allow image buffers to be editable by client apps on Linux juju
- Correct error in downsample bayer function
- Rename poorly named externally-visible symbol usb_init
(meanwhile libdc1394-visibility.patch is still kept)
-------------------------------------------------------------------
Sun Nov 13 09:15:01 UTC 2011 - coolo@suse.com
- add libtool as explicit buildrequire to avoid implicit dependency from prjconf
-------------------------------------------------------------------
Mon Aug 29 08:03:27 UTC 2011 - idonmez@suse.com
- Add libdc1394-visibility.patch to properly hide internal symbols
to prevent potential clashes with other libraries, sf #3361405 ,
bko # 268267
-------------------------------------------------------------------
Thu Jul 7 09:47:56 UTC 2011 - idonmez@novell.com
- Add libdc1394-v4l-2.6.38.patch: use the new v4l interface
-------------------------------------------------------------------
Fri Apr 14 13:38:21 UTC 2011 - toddrme2178@gmail.com
- added 32bit compatibility libraries
- added necessary devel depedencies (fix for RPMLINT warning)
-------------------------------------------------------------------
Mon Jan 3 10:27:58 MSK 2011 - matwey.kornilov@gmail.com
- Update to 2.1.3.
- Bug fixes:
Fix for usb writes larger than 1 quadlet
On MAC OS, add needed frameworks to link line
Update firewire-{cdev,constants}.h to latest version and license
Change dequeue/enqueue to return error code if usb transfer haserror
dc1394/conversions.h: Fix typo in DC1394_STEREO_METHOD_MIN define
-------------------------------------------------------------------
Fri Nov 19 18:10:03 UTC 2010 - jslaby@novell.com
- don't strip the objects when installing to allow for -debug*
package creation
-------------------------------------------------------------------
Mon Oct 4 16:17:07 UTC 2010 - davejplater@gmail.com
- Version 1.2.2 no longer builds with libraw1394-2.0.5 so sub packages
libdc1394_control12 and libdc1394_control12-devel are no longer
provided. See entry for Tue Aug 15 14:10:33 CEST 2006.
-------------------------------------------------------------------
Sun Dec 27 19:06:15 MSK 2009 - matwey.kornilov@gmail.com
- Update to 2.1.2.
- IIDC-over-USB support
- Bug fixes:
bayer conversion problem for 16bit over MONO16
dc1394_deinterlace_stereo_frames (LP#360520)
- Bug fixes on Linux Juju:
missing frames with OHCI 1.0
automatic iso allocation
timestamp support
broadcasting
-------------------------------------------------------------------
Mon Nov 23 09:48:55 MSK 2009 - matwey.kornilov@gmail.com
- Update to 2.0.3. Changes since 2.0.2:
- Bug fixes on MSW port
- Bug fixes:
dc1394_trigger_get_polarity
dc1394_deinterlace_stereo_frames
- Bug fixes on Linux Juju:
- alignment problem during reads
- Bug fixes on Mac OS:
- crash fix for Mac OS 10.4
-------------------------------------------------------------------
Tue Jan 13 17:07:56 CET 2009 - crrodriguez@suse.de
- remove static libraries and "la" files
-------------------------------------------------------------------
Mon Oct 6 10:15:29 CEST 2008 - olh@suse.de
- fix ordered comparison of pointer with integer zero (bnc#431916)
-------------------------------------------------------------------
Thu Jun 19 14:19:30 CEST 2008 - pth@suse.de
- Include unistd.h to get prototype for swab.
- Update to 2.0.2. Changes since 2.0.0:
- New functions on all platforms:
dc1394_camera_get_node
dc1394_capture_is_frame_corrupt
- New function on Linux video1394 only:
dc1394_camera_get_linux_port
- New example program to capture PVN sequences.
- Bug fixes on Linux Juju:
- Better retry timeouts
- Fix manual isochronous channel allocation
- Bug fixes on Mac OS:
- Auto detection of bad or skipped packets (used for
dc1394_capture_is_frame_corrupt)
- Bug fixes on Linux video1394:
- Fix select() with multiple cameras on the same controller
- Handle EINTR return code properly in dc1394_capture_dequeue
- Better error detection if camera enumeration fails
- Documentation improvements
-- 2.0.1:
- Fixed broken dc1394/dc1394.h include file when compiling externally.
- Removed the "edge-sense" bayer demosaic algorithm out of patent concern.
-------------------------------------------------------------------
Fri Apr 11 16:13:18 CEST 2008 - schwab@suse.de
- Fix configure script.
-------------------------------------------------------------------
Thu Jan 24 20:23:11 CET 2008 - olh@suse.de
- remove buildrequires for xorg-x11-devel
-------------------------------------------------------------------
Tue Jan 15 08:50:11 CET 2008 - olh@suse.de
- libdc1394-devel requires libdc1394-22
-------------------------------------------------------------------
Mon Jan 14 16:46:04 CET 2008 - olh@suse.de
- update to 2.0.0 final
rename libdc1394-20 to libdc1394-22 due to SONAME change
-------------------------------------------------------------------
Thu Aug 16 16:21:39 CEST 2007 - olh@suse.de
- libdc1394_control12-devel needs libraw1394-devel
-------------------------------------------------------------------
Thu Aug 16 16:08:22 CEST 2007 - olh@suse.de
- remove inclusion of code which is labeled as GPL (298152)
removes topology.h, cooked1394_read() and others
remove dc1394_vloopback binary
-------------------------------------------------------------------
Sun Aug 5 11:55:22 CEST 2007 - olh@suse.de
- split libdc1394-20 package which contains only libraries
split libdc1394_control12 and libdc1394_control12-devel
upgrade to 1.2.2, color filter fix
-------------------------------------------------------------------
Fri Jul 13 22:22:01 CEST 2007 - olh@suse.de
- update to 2.0.0-rc7
API fixes
-------------------------------------------------------------------
Tue Aug 15 14:10:33 CEST 2006 - olh@suse.de
- update to 2.0.0-rc3 (#198102)
all new API
- keep old library version until every app is converted
-------------------------------------------------------------------
Wed Jul 19 17:39:44 CEST 2006 - olh@suse.de
- update to 1.2.1
replaced camera version detection in dc1394_is_camera() by a
proper call to dc1394_get_sw_version().
fixed compilation warnings due to mixed signedness in the whole code.
fixed a serious bug in the camera detection.
updated TRIGGER_MODE_NUM definition
-------------------------------------------------------------------
Wed Jan 25 21:37:25 CET 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
-------------------------------------------------------------------
Fri Oct 21 19:47:42 CEST 2005 - olh@suse.de
- correct usage of CLK_TCK
- update to current cvs
fixed memory leak in capture functions (dma device name not freed)
fixed trigger capabilities detection (Markus Niebel)
fixed some confusion between raw1394_new_handle and dc1394_create_handle
(Thanks to Thorondor)
-------------------------------------------------------------------
Mon Sep 26 22:08:26 CEST 2005 - mls@suse.de
- make devel package require base package
-------------------------------------------------------------------
Tue Jul 5 17:36:54 CEST 2005 - olh@suse.de
- go back to version 1, version 2 still needs some time
-------------------------------------------------------------------
Fri Jul 1 21:47:41 CEST 2005 - olh@suse.de
- update to version 2.0.0-pre3
-------------------------------------------------------------------
Fri Jul 1 17:27:52 CEST 2005 - olh@suse.de
- update to version 1.1.0
-------------------------------------------------------------------
Thu Jan 13 11:23:53 CET 2005 - olh@suse.de
- update to version 1.0.0, cvs status 2004-11-12
-------------------------------------------------------------------
Tue Jan 11 20:47:48 CET 2005 - olh@suse.de
- update to version 1.0.0
-------------------------------------------------------------------
Mon Mar 8 14:48:43 CET 2004 - lmuelle@suse.de
- update to version 0.9.3
- create devel sub package
-------------------------------------------------------------------
Wed Jan 7 11:43:41 CET 2004 - lmuelle@suse.de
- update to version 0.9.2
-------------------------------------------------------------------
Mon Jul 28 10:42:24 CEST 2003 - adrian@suse.de
- fix lib filename suffix
-------------------------------------------------------------------
Fri Jul 25 16:10:12 CEST 2003 - adrian@suse.de
- update to version 0.9.1
- use BuildRoot
- add %run_ldconfig
-------------------------------------------------------------------
Fri Sep 27 14:47:54 CEST 2002 - uli@suse.de
- initial package

49
libdc1394.no-x11.patch Normal file
View File

@ -0,0 +1,49 @@
Index: libdc1394-2.2.3/configure.ac
===================================================================
--- libdc1394-2.2.3.orig/configure.ac
+++ libdc1394-2.2.3/configure.ac
@@ -107,21 +107,30 @@ AM_CONDITIONAL(MAKE_EXAMPLES, test x$bui
# check for Xv extensions (necessary for examples/dc1394_multiview)
# imported from Coriander
+AC_ARG_ENABLE([xv],
+ AS_HELP_STRING([--disable-xv], [Disable the check for Xv extensions]),
+ [test_xv=yes], [test_xv=no])
+
AC_DEFUN([AC_CHECK_XV],[
- AC_SUBST(XV_CFLAGS)
- AC_SUBST(XV_LIBS)
- AC_MSG_CHECKING(for Xv extensions)
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <X11/Xlib.h>
- #include <X11/extensions/Xvlib.h>]], [[
- int main(void) { (void) XvGetPortAttribute(0, 0, 0, 0); return 0; }
- ]])],[xv=yes],[xv=no])
- AC_MSG_RESULT($xv)
- if test x$xv = xyes; then
- XV_LIBS="-lXv -lXext"
- XV_CFLAGS=""
- fi
- AM_CONDITIONAL(HAVE_XV, test x$xv = xyes)
+ if test x$test_xv != "xno"; then
+ AC_SUBST(XV_CFLAGS)
+ AC_SUBST(XV_LIBS)
+ AC_MSG_CHECKING(for Xv extensions)
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include <X11/Xlib.h>
+ #include <X11/extensions/Xvlib.h>]], [[
+ int main(void) { (void) XvGetPortAttribute(0, 0, 0, 0); return 0; }
+ ]])],[xv=yes],[xv=no]);
+ AC_MSG_RESULT($xv)
+ if test x$xv = xyes; then
+ XV_LIBS="-lXv -lXext"
+ XV_CFLAGS=""
+ AC_DEFINE(HAVE_XV,1,[defined if XV video overlay is available])
+ fi
+ else
+ xv=no
+ fi
+ AM_CONDITIONAL(HAVE_XV, test x$xv = xyes)
])
AC_CHECK_XV

114
libdc1394.spec Normal file
View File

@ -0,0 +1,114 @@
#
# spec file for package libdc1394
#
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# 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/
#
Name: libdc1394
Version: 2.2.7
Release: 0
Summary: 1394-Based Digital Camera Control Library
License: LGPL-2.1-or-later
Group: Hardware/Camera
URL: https://damien.douxchamps.net/ieee1394/libdc1394/
Source0: https://downloads.sourceforge.net/project/libdc1394/libdc1394-2/%{version}/%{name}-%{version}.tar.gz
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: libtool
BuildRequires: pkgconfig
BuildRequires: pkgconfig(libraw1394)
BuildRequires: pkgconfig(libusb-1.0)
BuildRequires: pkgconfig(libv4l2) >= 0.8.4
%description
This library provides functionality for controlling any camera that
conforms to the 1394-Based Digital Camera Specification. It utilizes
the low-level functionality provided by libraw1394 to communicate with
the camera.
%package -n libdc1394-26
Summary: 1394-based Digital Camera Control library
Group: System/Libraries
%description -n libdc1394-26
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).
It utilizes the low-level functionality provided by libraw1394 to
communicate with the camera.
%package devel
Summary: Development libraries and header files for dc1394
Group: Development/Libraries/C and C++
Requires: %{name}-tools = %{version}
Requires: libdc1394-26 = %{version}
Requires: pkgconfig(libraw1394)
%description devel
This package contains the header files and libraries for building
programs using the dc1394 library.
%package tools
Summary: Command-line utilities from libdc1394
# added on 2015-11-14
Group: Hardware/Camera
Obsoletes: %{name} < %{version}-%{release}
Provides: %{name} = %{version}-%{release}
%description tools
This subpackage contains a 1394 bus reset utility.
%prep
%setup -q
%autopatch -p1
# Dummy macro for ignored SDL, autoreconf fails otherwise
echo "AC_DEFUN([AM_PATH_SDL], [])" >> m4/dummy_sdl.m4
%build
autoreconf -fvi
%configure \
--disable-static \
--disable-xv
make %{?_smp_mflags}
%install
%make_install %{?_smp_mflags}
rm -f %{buildroot}%{_bindir}/dc1394_vloopback %{buildroot}%{_mandir}/man1/dc1394_vloopback.1*
rm -f %{buildroot}%{_mandir}/man1/dc1394_multiview.1*
rm -f %{buildroot}%{_mandir}/man1/grab_*_image.1*
find %{buildroot} -type f -name "*.la" -delete -print
%post -n libdc1394-26 -p /sbin/ldconfig
%postun -n libdc1394-26 -p /sbin/ldconfig
%files tools
%license COPYING
%doc AUTHORS ChangeLog NEWS README
%{_bindir}/dc1394_reset_bus
%{_mandir}/man1/dc1394_reset_bus.1%{?ext_man}
%files -n libdc1394-26
%{_libdir}/libdc1394.so.26*
%files devel
%{_includedir}/dc1394
%{_libdir}/libdc1394.so
%{_libdir}/pkgconfig/*.pc
%changelog