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

Accepting request 151358 from home:matwey:branches:multimedia:libs

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/151358
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libdc1394?expand=0&rev=26
This commit is contained in:
Cristian Morales Vega 2013-02-25 09:22:47 +00:00 committed by Git OBS Bridge
parent 611b6b3d92
commit 9d25cf9a31
6 changed files with 24 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libdc1394-1.2.2.tar.bz2
View File

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

4
libdc1394-swab_fix.patch
View File

@ -1,7 +1,3 @@
---
libdc1394-2.0.2/dc1394/conversions.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- a/libdc1394-2.2.1/dc1394/conversions.c
+++ b/libdc1394-2.2.1/dc1394/conversions.c
@@ -22,11 +22,10 @@

5
libdc1394.changes
View File

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

15
libdc1394.no-x11.patch
View File

@ -1,18 +1,3 @@
---
libdc1394-1.2.2/examples/Makefile.am | 2 +-
libdc1394-2.0.2/configure.in | 34 +++++++++++++++++++++-------------
2 files changed, 22 insertions(+), 14 deletions(-)
--- a/libdc1394-1.2.2/examples/Makefile.am
+++ b/libdc1394-1.2.2/examples/Makefile.am
@@ -1,6 +1,6 @@
MAINTAINERCLEANFILES = Makefile.in
bin_PROGRAMS = dc1394_vloopback
-noinst_PROGRAMS = grab_gray_image grab_partial_image dc1394_multiview grab_color_image
+noinst_PROGRAMS = grab_gray_image grab_partial_image grab_color_image
grab_gray_image_SOURCES = grab_gray_image.c
grab_gray_image_LDADD = ../libdc1394/libdc1394_control.la -lraw1394
--- a/libdc1394-2.2.1/configure.in
+++ b/libdc1394-2.2.1/configure.in
@@ -102,21 +102,30 @@

24
libdc1394.raw1394_set_iso_handler.patch
View File

@ -1,24 +0,0 @@
Bug 431916 - libdc1394-2.0.0-7: ordered comparison of pointer with integer zero
dc1394_capture.c:441: warning: ordered comparison of pointer with integer zero
---
libdc1394-1.2.2/libdc1394/dc1394_capture.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/libdc1394-1.2.2/libdc1394/dc1394_capture.c
+++ b/libdc1394-1.2.2/libdc1394/dc1394_capture.c
@@ -438,11 +438,11 @@ dc1394_multi_capture(raw1394handle_t han
_dc1394_buffer[cams[i].channel]= cams[i].capture_buffer;
if (raw1394_set_iso_handler(handle,cams[i].channel,
- _dc1394_video_iso_handler) < 0)
+ _dc1394_video_iso_handler) == (iso_handler_t)-1)
{
/* error handling- for some reason something didn't work,
so we have to reset everything....*/
- printf("(%s:%d) error!\n",__FILE__, __LINE__);
+ printf("(%s:%s:%d) error while calling raw1394_set_iso_handler!\n",__FILE__, __func__, __LINE__);
for (j= i - 1; j > -1; j--)
{

115
libdc1394.spec
View File

@ -16,12 +16,7 @@
#
# if Build_12 is equal to 0 don't build version 1.2.2
%define Build_12 0
Name: libdc1394
%define libdc1394_12_version 1.2.2
%define libdc1394_version 2.2.1
BuildRequires: autoconf
%if 0%{?suse_version} > 1110
BuildRequires: libSDL-devel
@ -38,21 +33,19 @@ BuildRequires: pkg-config
%if 0%{?suse_version} >= 1210
BuildRequires: libv4l-devel >= 0.8.4
%endif
Version: %{libdc1394_version}
Version: 2.2.1
Release: 0
Summary: 1394-Based Digital Camera Control Library
License: LGPL-2.1+
Group: Hardware/Camera
Url: http://sourceforge.net/projects/libdc1394/
Source1: libdc1394-%{libdc1394_12_version}.tar.bz2
Source2: libdc1394-%{libdc1394_version}.tar.bz2
Source3: %{name}-rpmlintrc
Source0: libdc1394-%{version}.tar.bz2
Source1: %{name}-rpmlintrc
Patch0: libdc1394.no-x11.patch
Patch1: libdc1394.ac.patch
Patch2: libdc1394-swab_fix.patch
Patch3: libdc1394.raw1394_set_iso_handler.patch
Patch4: libdc1394-v4l-2.6.38.patch
Patch5: libdc1394-visibility.patch
Patch3: libdc1394-v4l-2.6.38.patch
Patch4: libdc1394-visibility.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -61,38 +54,6 @@ conforms to the 1394-Based Digital Camera Specification. It utilizes
the low-level functionality provided by libraw1394 to communicate with
the camera.
%if %{Build_12} >= 1
%package -n libdc1394_control12
Version: %{libdc1394_12_version}
Release: 0
Summary: 1394-Based Digital Camera Control Library
Group: Hardware/Camera
%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.
%package -n libdc1394_control12-devel
Version: %{libdc1394_12_version}
Release: 0
Summary: 1394-Based Digital Camera Control Library
Group: Development/Libraries/C and C++
Requires: libdc1394_control12 = %{libdc1394_12_version}
Requires: libraw1394-devel
%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.
%endif
%package 22
Summary: 1394-Based Digital Camera Control Library
Group: Hardware/Camera
@ -107,8 +68,8 @@ communicate with the camera.
%package devel
Summary: Development libraries and header files for dc1394
Group: Development/Libraries/C and C++
Requires: libdc1394 = %{libdc1394_version}
Requires: libdc1394-22 = %{libdc1394_version}
Requires: libdc1394 = %{version}
Requires: libdc1394-22 = %{version}
Requires: libraw1394-devel
%description devel
@ -116,61 +77,35 @@ This package contains the header files and libraries for building
programs using the dc1394 library.
%prep
%setup -q -T -c -a 1 -a 2
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%setup -q
%patch0 -p2
%patch1 -p2
%patch2 -p2
%if 0%{?suse_version} >= 1210
%patch4
%patch3 -p1
%endif
%patch5
%patch4 -p1
%build
doit() {
if pushd "$1" ; then
autoreconf --force --install
export CFLAGS="%{optflags}"
%{configure} --disable-static --with-pic --disable-xv
make %{?_smp_mflags}
popd
fi
}
%if %{Build_12} >= 1
doit libdc1394-%{libdc1394_12_version}
%endif
doit libdc1394-%{libdc1394_version}
autoreconf --force --install
export CFLAGS="%{optflags}"
%{configure} --disable-static --with-pic --disable-xv
make %{?_smp_mflags}
%install
doit() {
if pushd "$1" ; then
make DESTDIR=%{buildroot} install
popd
fi
}
%if %{Build_12} >= 1
doit libdc1394-%{libdc1394_12_version}
%endif
doit libdc1394-%{libdc1394_version}
make DESTDIR=%{buildroot} install
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*
rm -f %{buildroot}%{_libdir}/*.la
%if %{Build_12} >= 1
%post -n libdc1394_control12 -p /sbin/ldconfig
%postun -n libdc1394_control12 -p /sbin/ldconfig
%endif
%post 22 -p /sbin/ldconfig
%postun 22 -p /sbin/ldconfig
%files
%defattr(-,root,root)
%doc libdc1394-%{libdc1394_version}/{AUTHORS,COPYING,ChangeLog,NEWS,README}
%doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/dc1394_reset_bus
%{_mandir}/man1/dc1394_reset_bus.1*
@ -178,18 +113,6 @@ rm -f %{buildroot}%{_libdir}/*.la
%defattr(-,root,root)
%{_libdir}/libdc1394.so.22*
%if %{Build_12} >= 1
%files -n libdc1394_control12
%defattr(-,root,root)
%{_libdir}/libdc1394_control.so.*
%files -n libdc1394_control12-devel
%defattr(-,root,root)
%{_includedir}/libdc1394
%{_libdir}/libdc1394_control*.so
%endif
%files devel
%defattr(-,root,root)
%{_includedir}/dc1394