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

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libdc1394?expand=0&rev=3

Browse Source
This commit is contained in:
OBS User unknown 2007-08-05 15:34:34 +00:00 committed by Git OBS Bridge
parent 209c4b9676
commit 4666ffddf4
5 changed files with 125 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libdc1394-1.2.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b3e2d9207d4485fdfcef5a4608b8597d04e204df7b11fdbc07412c167725827b
size 261489

3
libdc1394-1.2.2.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ec5aac9d7a90df6d6decce42cce4dc7553f346e900017b1279d57abab9ec9b6e
size 268733

32
libdc1394-grab_partial_image-CLK_TCK.patch
View File

@ -1,32 +0,0 @@
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);
}

7
libdc1394.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
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 Fri Jul 13 22:22:01 CEST 2007 - olh@suse.de

132
libdc1394.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package libdc1394 (Version 2.0.0) # spec file for package libdc1394 (Version 0)
# #
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine # This file and all modifications and additions to the pristine
@ -11,18 +11,19 @@
# norootforbuild # norootforbuild
Name: libdc1394 Name: libdc1394
%define libdc1394_12_version 1.2.2
%define libdc1394_version 2.0.0
BuildRequires: libraw1394-devel xorg-x11-devel BuildRequires: libraw1394-devel xorg-x11-devel
License: LGPL v2 or later License: LGPL v2 or later
Group: Hardware/Camera Group: Hardware/Camera
Autoreqprov: on Autoreqprov: on
Version: 2.0.0 Version: %{libdc1394_version}
Release: 60 Release: 1
URL: http://sourceforge.net/projects/libdc1394/ URL: http://sourceforge.net/projects/libdc1394/
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: 1394-Based Digital Camera Control Library Summary: 1394-Based Digital Camera Control Library
Source1: libdc1394-1.2.1.tar.bz2 Source1: libdc1394-%{libdc1394_12_version}.tar.bz2
Source2: libdc1394-2.0.0-rc7.tar.bz2 Source2: libdc1394-%{libdc1394_version}-rc7.tar.bz2
Patch1: libdc1394-grab_partial_image-CLK_TCK.patch
%description %description
This library provides functionality for controlling any camera that This library provides functionality for controlling any camera that
@ -34,6 +35,83 @@ 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 -n libdc1394_control12
Summary: 1394-Based Digital Camera Control Library
Group: Hardware/Camera
Version: %{libdc1394_12_version}
Release: 1
%description -n libdc1394_control12
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 -n libdc1394_control12-devel
Summary: 1394-Based Digital Camera Control Library
Group: Hardware/Camera
Version: %{libdc1394_12_version}
Release: 1
Requires: libdc1394_control12 = %{libdc1394_12_version}
%description -n libdc1394_control12-devel
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 20
Summary: 1394-Based Digital Camera Control Library
Group: Hardware/Camera
%description 20
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: Authors:
-------- --------
Gord Peters <GordPeters@smarttech.com> Gord Peters <GordPeters@smarttech.com>
@ -47,7 +125,7 @@ Authors:
%package devel %package devel
Summary: Development libraries and header files for dc1394 Summary: Development libraries and header files for dc1394
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libdc1394 = %{version} Requires: libdc1394-20 = %{libdc1394_version}
Requires: libraw1394-devel Requires: libraw1394-devel
%description devel %description devel
@ -70,8 +148,6 @@ Authors:
%setup -q -T -c -a 1 -a 2 %setup -q -T -c -a 1 -a 2
mv libdc1394-1* libdc1394-1 mv libdc1394-1* libdc1394-1
mv libdc1394-2* libdc1394-2 mv libdc1394-2* libdc1394-2
cd libdc1394-1
%patch1 -p1
%build %build
for i in libdc1394-1 libdc1394-2 for i in libdc1394-1 libdc1394-2
@ -91,30 +167,52 @@ done
for i in libdc1394-1 libdc1394-2 for i in libdc1394-1 libdc1394-2
do do
cd $i cd $i
%{__make} DESTDIR=$RPM_BUILD_ROOT install %{__make} DESTDIR=${RPM_BUILD_ROOT} install
cd .. cd ..
done done
%post -p /sbin/ldconfig %post -n libdc1394_control12 -p /sbin/ldconfig
%postun -p /sbin/ldconfig %postun -n libdc1394_control12 -p /sbin/ldconfig
%post 20 -p /sbin/ldconfig
%postun 20 -p /sbin/ldconfig
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc libdc1394-2/{AUTHORS,COPYING,ChangeLog,NEWS,README} %doc libdc1394-2/{AUTHORS,COPYING,ChangeLog,NEWS,README}
%_bindir/dc1394_vloopback %_bindir/dc1394_vloopback
%_bindir/dc1394_reset_bus %_bindir/dc1394_reset_bus
%_libdir/lib*.so.*
%files 20
%defattr(-,root,root)
%_libdir/libdc1394.so.*
%files -n libdc1394_control12
%defattr(-,root,root)
%_libdir/libdc1394_control.so.*
%files -n libdc1394_control12-devel
%defattr(-,root,root)
%_includedir/libdc1394
%_libdir/libdc1394_control*.la
%_libdir/libdc1394_control*.a
%_libdir/libdc1394_control*.so
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%_includedir/* %_includedir/dc1394
%_libdir/lib*.la %_libdir/libdc1394.la
%_libdir/lib*.a %_libdir/libdc1394.a
%_libdir/lib*.so %_libdir/libdc1394.so
%_libdir/pkgconfig/*.pc %_libdir/pkgconfig/*.pc
%changelog %changelog
* Sun Aug 05 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 2007 - olh@suse.de * Fri Jul 13 2007 - olh@suse.de
- update to 2.0.0-rc7 - update to 2.0.0-rc7
API fixes API fixes