diff --git a/libdc1394.changes b/libdc1394.changes index a4d879f..db99eb2 100644 --- a/libdc1394.changes +++ b/libdc1394.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +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 diff --git a/libdc1394.license.patch b/libdc1394.license.patch new file mode 100644 index 0000000..0c17cd2 --- /dev/null +++ b/libdc1394.license.patch @@ -0,0 +1,88 @@ +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 + #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 + #include +-#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; + diff --git a/libdc1394.spec b/libdc1394.spec index 86f25f0..a91ef60 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -24,6 +24,7 @@ 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 %description This library provides functionality for controlling any camera that @@ -76,7 +77,7 @@ Summary: 1394-Based Digital Camera Control Library Group: Hardware/Camera Version: %{libdc1394_12_version} Release: 1 -Requires: libdc1394_control12 = %{libdc1394_12_version} +Requires: libdc1394_control12 = %{libdc1394_12_version} libraw1394-devel %description -n libdc1394_control12-devel This library provides functionality for controlling any camera that @@ -146,6 +147,7 @@ Authors: %prep %setup -q -T -c -a 1 -a 2 +%patch1 -p1 mv libdc1394-1* libdc1394-1 mv libdc1394-2* libdc1394-2 @@ -170,6 +172,7 @@ do %{__make} DESTDIR=${RPM_BUILD_ROOT} install cd .. done +rm -f $RPM_BUILD_ROOT%_bindir/dc1394_vloopback %post -n libdc1394_control12 -p /sbin/ldconfig @@ -182,7 +185,6 @@ done %files %defattr(-,root,root) %doc libdc1394-2/{AUTHORS,COPYING,ChangeLog,NEWS,README} -%_bindir/dc1394_vloopback %_bindir/dc1394_reset_bus %files 20 @@ -209,6 +211,12 @@ done %_libdir/pkgconfig/*.pc %changelog +* Thu Aug 16 2007 - olh@suse.de +- libdc1394_control12-devel needs libraw1394-devel +* Thu Aug 16 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 05 2007 - olh@suse.de - split libdc1394-20 package which contains only libraries split libdc1394_control12 and libdc1394_control12-devel