This commit is contained in:
commit
4b4cae8a33
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal 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
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
.osc
|
3
libdc1394-1.2.1.tar.bz2
Normal file
3
libdc1394-1.2.1.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:b3e2d9207d4485fdfcef5a4608b8597d04e204df7b11fdbc07412c167725827b
|
||||||
|
size 261489
|
3
libdc1394-2.0.0-rc3.tar.bz2
Normal file
3
libdc1394-2.0.0-rc3.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:8d6ae61e0886b6100184bd3134c8b0b0b91031a9cf2fe272449933fa8f9a1742
|
||||||
|
size 304737
|
32
libdc1394-grab_partial_image-CLK_TCK.patch
Normal file
32
libdc1394-grab_partial_image-CLK_TCK.patch
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
|
||||||
|
|
||||||
|
from time.h:
|
||||||
|
|
||||||
|
/* This defines CLOCKS_PER_SEC, which is the number of processor clock
|
||||||
|
ticks per second. */
|
||||||
|
# include <bits/time.h>
|
||||||
|
|
||||||
|
/* This is the obsolete POSIX.1-1988 name for the same constant. */
|
||||||
|
# if !defined __STRICT_ANSI__ && !defined __USE_XOPEN2K
|
||||||
|
# ifndef CLK_TCK
|
||||||
|
# define CLK_TCK CLOCKS_PER_SEC
|
||||||
|
# endif
|
||||||
|
# endif
|
||||||
|
|
||||||
|
|
||||||
|
examples/grab_partial_image.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
Index: libdc1394-1.2.1/examples/grab_partial_image.c
|
||||||
|
===================================================================
|
||||||
|
--- libdc1394-1.2.1.orig/examples/grab_partial_image.c
|
||||||
|
+++ libdc1394-1.2.1/examples/grab_partial_image.c
|
||||||
|
@@ -218,7 +218,7 @@ int main(int argc, char *argv[])
|
||||||
|
/*---------------------------------------------------------------------
|
||||||
|
* output elapsed time
|
||||||
|
*---------------------------------------------------------------------*/
|
||||||
|
- elapsed_time = (float)(times(&tms_buf) - start_time) / CLK_TCK;
|
||||||
|
+ elapsed_time = (float)(times(&tms_buf) - start_time) / CLOCKS_PER_SEC;
|
||||||
|
printf( "got frame %d. elapsed time: %g sec ==> %g frames/second\n",
|
||||||
|
i, elapsed_time, (float)i / elapsed_time);
|
||||||
|
}
|
91
libdc1394.changes
Normal file
91
libdc1394.changes
Normal file
@ -0,0 +1,91 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
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
|
||||||
|
|
||||||
|
|
159
libdc1394.spec
Normal file
159
libdc1394.spec
Normal file
@ -0,0 +1,159 @@
|
|||||||
|
#
|
||||||
|
# spec file for package libdc1394 (Version 2.0.0)
|
||||||
|
#
|
||||||
|
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
|
# This file and all modifications and additions to the pristine
|
||||||
|
# package are under the same license as the package itself.
|
||||||
|
#
|
||||||
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||||
|
#
|
||||||
|
|
||||||
|
# norootforbuild
|
||||||
|
|
||||||
|
Name: libdc1394
|
||||||
|
BuildRequires: libraw1394-devel xorg-x11-devel
|
||||||
|
License: LGPL
|
||||||
|
Group: Hardware/Other
|
||||||
|
Autoreqprov: on
|
||||||
|
Version: 2.0.0
|
||||||
|
Release: 1
|
||||||
|
URL: http://sourceforge.net/projects/libdc1394/
|
||||||
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
Summary: 1394-Based Digital Camera Control Library
|
||||||
|
Source1: libdc1394-1.2.1.tar.bz2
|
||||||
|
Source2: libdc1394-2.0.0-rc3.tar.bz2
|
||||||
|
Patch1: libdc1394-grab_partial_image-CLK_TCK.patch
|
||||||
|
|
||||||
|
%description
|
||||||
|
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.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Authors:
|
||||||
|
--------
|
||||||
|
Gord Peters <GordPeters@smarttech.com>
|
||||||
|
Per Dalgas Jakobsen <pdj@maridan.dk>
|
||||||
|
Chris Urmson <curmson@ri.cmu.edu>
|
||||||
|
Damien Douxchamps <douxchamps@ieee.org>
|
||||||
|
Dan Dennedy <dan@dennedy.org>
|
||||||
|
David Moore <david@startbox.com>
|
||||||
|
John Stanley <stanley@peak.org>
|
||||||
|
|
||||||
|
%package devel
|
||||||
|
Summary: Development libraries and header files for dc1394
|
||||||
|
Group: Development/Libraries/C and C++
|
||||||
|
Requires: libdc1394 = %{version}
|
||||||
|
Requires: libraw1394-devel
|
||||||
|
|
||||||
|
%description devel
|
||||||
|
This package contains the header files and libraries for building
|
||||||
|
programs using the dc1394 library.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Authors:
|
||||||
|
--------
|
||||||
|
Gord Peters <GordPeters@smarttech.com>
|
||||||
|
Per Dalgas Jakobsen <pdj@maridan.dk>
|
||||||
|
Chris Urmson <curmson@ri.cmu.edu>
|
||||||
|
Damien Douxchamps <douxchamps@ieee.org>
|
||||||
|
Dan Dennedy <dan@dennedy.org>
|
||||||
|
David Moore <david@startbox.com>
|
||||||
|
John Stanley <stanley@peak.org>
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup -q -T -c -a 1 -a 2
|
||||||
|
mv libdc1394-1* libdc1394-1
|
||||||
|
mv libdc1394-2* libdc1394-2
|
||||||
|
cd libdc1394-1
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
|
%build
|
||||||
|
for i in libdc1394-1 libdc1394-2
|
||||||
|
do
|
||||||
|
cd $i
|
||||||
|
autoreconf --force --install
|
||||||
|
CFLAGS="$RPM_OPT_FLAGS" \
|
||||||
|
./configure \
|
||||||
|
--prefix=/usr \
|
||||||
|
--libdir=%_libdir \
|
||||||
|
--mandir=%_mandir
|
||||||
|
%{__make} %{?jobs:-j%jobs}
|
||||||
|
cd ..
|
||||||
|
done
|
||||||
|
|
||||||
|
%install
|
||||||
|
for i in libdc1394-1 libdc1394-2
|
||||||
|
do
|
||||||
|
cd $i
|
||||||
|
%{__make} DESTDIR=$RPM_BUILD_ROOT install
|
||||||
|
cd ..
|
||||||
|
done
|
||||||
|
|
||||||
|
%post
|
||||||
|
%run_ldconfig
|
||||||
|
|
||||||
|
%files
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%doc libdc1394-2/{AUTHORS,COPYING,ChangeLog,NEWS,README}
|
||||||
|
%_bindir/dc1394_vloopback
|
||||||
|
%_libdir/lib*.so.*
|
||||||
|
|
||||||
|
%files devel
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%_includedir/*
|
||||||
|
%_libdir/lib*.la
|
||||||
|
%_libdir/lib*.a
|
||||||
|
%_libdir/lib*.so
|
||||||
|
|
||||||
|
%changelog -n libdc1394
|
||||||
|
* Tue Aug 15 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 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 2006 - mls@suse.de
|
||||||
|
- converted neededforbuild to BuildRequires
|
||||||
|
* Fri Oct 21 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 2005 - mls@suse.de
|
||||||
|
- make devel package require base package
|
||||||
|
* Tue Jul 05 2005 - olh@suse.de
|
||||||
|
- go back to version 1, version 2 still needs some time
|
||||||
|
* Fri Jul 01 2005 - olh@suse.de
|
||||||
|
- update to version 2.0.0-pre3
|
||||||
|
* Fri Jul 01 2005 - olh@suse.de
|
||||||
|
- update to version 1.1.0
|
||||||
|
* Thu Jan 13 2005 - olh@suse.de
|
||||||
|
- update to version 1.0.0, cvs status 2004-11-12
|
||||||
|
* Tue Jan 11 2005 - olh@suse.de
|
||||||
|
- update to version 1.0.0
|
||||||
|
* Mon Mar 08 2004 - lmuelle@suse.de
|
||||||
|
- update to version 0.9.3
|
||||||
|
- create devel sub package
|
||||||
|
* Wed Jan 07 2004 - lmuelle@suse.de
|
||||||
|
- update to version 0.9.2
|
||||||
|
* Mon Jul 28 2003 - adrian@suse.de
|
||||||
|
- fix lib filename suffix
|
||||||
|
* Fri Jul 25 2003 - adrian@suse.de
|
||||||
|
- update to version 0.9.1
|
||||||
|
- use BuildRoot
|
||||||
|
- add %%run_ldconfig
|
||||||
|
* Fri Sep 27 2002 - uli@suse.de
|
||||||
|
- initial package
|
Loading…
Reference in New Issue
Block a user