rpm/libdc1394
SHA256
1
0
Fork 0
forked from pool/libdc1394
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
OBS User unknown 2008-01-15 04:47:57 +00:00 committed by Git OBS Bridge
parent 53ce04da3d
commit 8676f4974f
5 changed files with 22 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libdc1394-2.0.0-rc7.tar.bz2
View File

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

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

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

6
libdc1394.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
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

88
libdc1394.license.patch
View File

@ -1,88 +0,0 @@
remove inclusion of code which is labeled as GPL
---
libdc1394-2.0.0-rc7/dc1394/bayer.c | 2 +-
libdc1394-2.0.0-rc7/dc1394/linux/Makefile.am | 5 +----
libdc1394-2.0.0-rc7/dc1394/linux/control.c | 7 ++-----
libdc1394-2.0.0-rc7/dc1394/linux/linux.h | 2 --
4 files changed, 4 insertions(+), 12 deletions(-)
--- a/libdc1394-2.0.0-rc7/dc1394/bayer.c
+++ b/libdc1394-2.0.0-rc7/dc1394/bayer.c
@@ -473,7 +473,7 @@ dc1394_bayer_HQLinear(const uint8_t *res
}
}
-/* coriander's Bayer decoding (GPL) */
+/* coriander's Bayer decoding */
/* Edge Sensing Interpolation II from http://www-ise.stanford.edu/~tingchen/ */
/* (Laroche,Claude A. "Apparatus and method for adaptively
interpolating a full color image utilizing chrominance gradients"
--- a/libdc1394-2.0.0-rc7/dc1394/linux/Makefile.am
+++ b/libdc1394-2.0.0-rc7/dc1394/linux/Makefile.am
@@ -7,10 +7,7 @@ libdc1394_linux_la_SOURCES = \
control.c \
capture.c \
capture.h \
- linux.h \
- topology.h \
- topology.c \
- raw1394support.h
+ linux.h
# headers to be installed
pkglinuxinclude_HEADERS = \
--- a/libdc1394-2.0.0-rc7/dc1394/linux/control.c
+++ b/libdc1394-2.0.0-rc7/dc1394/linux/control.c
@@ -25,14 +25,13 @@
#include <libraw1394/csr.h>
#include "config.h"
#include "internal.h"
-#include "linux/raw1394support.h"
-#include "linux/topology.h"
#include "register.h"
#include "offsets.h"
#include "linux/linux.h"
#include "utils.h"
+#if 0
void
GrabSelfIds(dc1394camera_t **cams, int ncams)
{
@@ -86,6 +85,7 @@ GrabSelfIds(dc1394camera_t **cams, int n
}
}
+#endif
dc1394camera_t*
dc1394_new_camera_platform (uint32_t port, uint16_t node)
@@ -308,9 +308,6 @@ dc1394_find_cameras_platform(dc1394camer
if (numCam==0)
return DC1394_NO_CAMERA;
- else {
- GrabSelfIds(cameras, numCam);
- }
return DC1394_SUCCESS;
}
--- a/libdc1394-2.0.0-rc7/dc1394/linux/linux.h
+++ b/libdc1394-2.0.0-rc7/dc1394/linux/linux.h
@@ -25,7 +25,6 @@
#include <libraw1394/raw1394.h>
#include <libraw1394/csr.h>
-#include "linux/raw1394support.h"
#include "control.h"
#define DC1394_CAST_CAMERA_TO_LINUX(camlinux, camera) dc1394camera_linux_t * camlinux = (dc1394camera_linux_t *) camera
@@ -52,7 +51,6 @@ typedef struct __dc1394_camera_linux
dc1394camera_t camera;
raw1394handle_t handle;
dc1394capture_t capture;
- SelfIdPacket_t selfid_packet;
} dc1394camera_linux_t;

25
libdc1394.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package libdc1394 (Version 0)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2008 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.
#
@ -14,17 +14,16 @@ Name: libdc1394
%define libdc1394_12_version 1.2.2
%define libdc1394_version 2.0.0
BuildRequires: libraw1394-devel xorg-x11-devel
License: LGPL v2 or later
License: LGPL v2.1 or later
Group: Hardware/Camera
Autoreqprov: on
AutoReqProv: on
Version: %{libdc1394_version}
Release: 1
URL: http://sourceforge.net/projects/libdc1394/
Url: http://sourceforge.net/projects/libdc1394/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: 1394-Based Digital Camera Control Library
Source1: libdc1394-%{libdc1394_12_version}.tar.bz2
Source2: libdc1394-%{libdc1394_version}-rc7.tar.bz2
Patch1: libdc1394.license.patch
Source2: libdc1394-%{libdc1394_version}.tar.bz2
%description
This library provides functionality for controlling any camera that
@ -99,11 +98,11 @@ Authors:
David Moore <david@startbox.com>
John Stanley <stanley@peak.org>
%package 20
%package 22
Summary: 1394-Based Digital Camera Control Library
Group: Hardware/Camera
%description 20
%description 22
This library provides functionality for controlling any camera that
conforms to the 1394-Based Digital Camera Specification (which can be
found at
@ -147,7 +146,6 @@ Authors:
%prep
%setup -q -T -c -a 1 -a 2
%patch1 -p1
mv libdc1394-1* libdc1394-1
mv libdc1394-2* libdc1394-2
@ -178,16 +176,16 @@ rm -f $RPM_BUILD_ROOT%_bindir/dc1394_vloopback
%postun -n libdc1394_control12 -p /sbin/ldconfig
%post 20 -p /sbin/ldconfig
%post 22 -p /sbin/ldconfig
%postun 20 -p /sbin/ldconfig
%postun 22 -p /sbin/ldconfig
%files
%defattr(-,root,root)
%doc libdc1394-2/{AUTHORS,COPYING,ChangeLog,NEWS,README}
%_bindir/dc1394_reset_bus
%files 20
%files 22
%defattr(-,root,root)
%_libdir/libdc1394.so.*
@ -211,6 +209,9 @@ rm -f $RPM_BUILD_ROOT%_bindir/dc1394_vloopback
%_libdir/pkgconfig/*.pc
%changelog
* Mon Jan 14 2008 - olh@suse.de
- update to 2.0.0 final
rename libdc1394-20 to libdc1394-22 due to SONAME change
* Thu Aug 16 2007 - olh@suse.de
- libdc1394_control12-devel needs libraw1394-devel
* Thu Aug 16 2007 - olh@suse.de