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

Accepting request 723232 from multimedia:libs

Browse Source 
- Switch up to pkgconfgi style dependencies

- Update to 2.2.6:
   - Fix a few compilation warnings with a recent GCC
   - Fix argument type in dc1394_get_image_size_from_video_mode()
   - Fix USB3 transfer errors

OBS-URL: https://build.opensuse.org/request/show/723232
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libdc1394?expand=0&rev=49
This commit is contained in:
Dominique Leuenberger 2019-08-16 13:31:44 +00:00 committed by Git OBS Bridge
commit eb6c24a5cb
6 changed files with 42 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
baselibs.conf
View File

@ -1 +1 @@
libdc1394-22 libdc1394-25

3
libdc1394-2.2.5.tar.gz
View File

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

3
libdc1394-2.2.6.tar.gz Normal file
View File

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

5
libdc1394-rpmlintrc
View File

@ -1,5 +0,0 @@
# This line is mandatory to access the configuration functions
from Config import *
addFilter("libdc1394.* package-with-huge-docs.*")
addFilter("libdc1394.* shlib-policy-missing-lib.*")

13
libdc1394.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Wed Aug 14 08:31:11 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
- Switch up to pkgconfgi style dependencies
-------------------------------------------------------------------
Sat Jul 6 13:34:52 UTC 2019 - Matwey V. Kornilov <matwey.kornilov@gmail.com>
- Update to 2.2.6:
- Fix a few compilation warnings with a recent GCC
- Fix argument type in dc1394_get_image_size_from_video_mode()
- Fix USB3 transfer errors
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 9 13:49:42 UTC 2017 - matwey.kornilov@gmail.com Mon Jan 9 13:49:42 UTC 2017 - matwey.kornilov@gmail.com

69
libdc1394.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libdc1394 # spec file for package libdc1394
# #
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -12,41 +12,30 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
Name: libdc1394 Name: libdc1394
Version: 2.2.5 Version: 2.2.6
Release: 0 Release: 0
Summary: 1394-Based Digital Camera Control Library Summary: 1394-Based Digital Camera Control Library
License: LGPL-2.1+ License: LGPL-2.1-or-later
Group: Hardware/Camera Group: Hardware/Camera
Url: http://damien.douxchamps.net/ieee1394/libdc1394/ URL: https://damien.douxchamps.net/ieee1394/libdc1394/
Source0: https://downloads.sourceforge.net/project/libdc1394/libdc1394-2/%{version}/%{name}-%{version}.tar.gz Source0: https://downloads.sourceforge.net/project/libdc1394/libdc1394-2/%{version}/%{name}-%{version}.tar.gz
Source1: %{name}-rpmlintrc
Source2: baselibs.conf Source2: baselibs.conf
Patch0: libdc1394.no-x11.patch Patch0: libdc1394.no-x11.patch
Patch1: libdc1394.ac.patch Patch1: libdc1394.ac.patch
Patch2: libdc1394-swab_fix.patch Patch2: libdc1394-swab_fix.patch
Patch3: libdc1394-v4l-2.6.38.patch Patch3: libdc1394-v4l-2.6.38.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: libraw1394-devel
BuildRequires: libtool BuildRequires: libtool
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: pkgconfig
%if 0%{?suse_version} > 1110 BuildRequires: pkgconfig(libraw1394)
BuildRequires: libSDL-devel BuildRequires: pkgconfig(libusb-1.0)
%else BuildRequires: pkgconfig(libv4l2) >= 0.8.4
BuildRequires: SDL-devel BuildRequires: pkgconfig(sdl)
%endif
%if 0%{?suse_version} > 1100
# no IIDC-over-USB support for openSUSE 11.0
BuildRequires: libusb-1_0-devel
BuildRequires: pkg-config
%endif
%if 0%{?suse_version} >= 1210
BuildRequires: libv4l-devel >= 0.8.4
%endif
%description %description
This library provides functionality for controlling any camera that This library provides functionality for controlling any camera that
@ -54,11 +43,11 @@ conforms to the 1394-Based Digital Camera Specification. It utilizes
the low-level functionality provided by libraw1394 to communicate with the low-level functionality provided by libraw1394 to communicate with
the camera. the camera.
%package 22 %package 25
Summary: 1394-based Digital Camera Control library Summary: 1394-based Digital Camera Control library
Group: System/Libraries Group: System/Libraries
%description 22 %description 25
This library provides functionality for controlling any camera that This library provides functionality for controlling any camera that
conforms to the 1394-Based Digital Camera Specification (which can be conforms to the 1394-Based Digital Camera Specification (which can be
found at http://www.1394ta.org/Download/Technology/Specifications/Camera120.pdf). found at http://www.1394ta.org/Download/Technology/Specifications/Camera120.pdf).
@ -69,8 +58,8 @@ communicate with the camera.
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: %{name}-tools = %{version} Requires: %{name}-tools = %{version}
Requires: libdc1394-22 = %{version} Requires: libdc1394-25 = %{version}
Requires: libraw1394-devel Requires: pkgconfig(libraw1394)
%description devel %description devel
This package contains the header files and libraries for building This package contains the header files and libraries for building
@ -80,23 +69,18 @@ programs using the dc1394 library.
Summary: Command-line utilities from libdc1394 Summary: Command-line utilities from libdc1394
# added on 2015-11-14 # added on 2015-11-14
Group: Hardware/Camera Group: Hardware/Camera
Obsoletes: %name < %version-%release Obsoletes: %{name} < %{version}-%{release}
Provides: %name = %version-%release Provides: %{name} = %{version}-%{release}
%description tools %description tools
This subpackage contains a 1394 bus reset utility. This subpackage contains a 1394 bus reset utility.
%prep %prep
%setup -q %setup -q
%patch0 -p1 %autopatch -p1
%patch1 -p1
%patch2 -p1
%if 0%{?suse_version} >= 1210
%patch3 -p1
%endif
%build %build
autoreconf --force --install autoreconf -fvi
%configure \ %configure \
--disable-static \ --disable-static \
--disable-xv --disable-xv
@ -109,22 +93,19 @@ rm -f %{buildroot}%{_mandir}/man1/dc1394_multiview.1*
rm -f %{buildroot}%{_mandir}/man1/grab_*_image.1* rm -f %{buildroot}%{_mandir}/man1/grab_*_image.1*
find %{buildroot} -type f -name "*.la" -delete -print find %{buildroot} -type f -name "*.la" -delete -print
%post 22 -p /sbin/ldconfig %post 25 -p /sbin/ldconfig
%postun 25 -p /sbin/ldconfig
%postun 22 -p /sbin/ldconfig
%files tools %files tools
%defattr(-,root,root) %license COPYING
%doc AUTHORS COPYING ChangeLog NEWS README %doc AUTHORS ChangeLog NEWS README
%{_bindir}/dc1394_reset_bus %{_bindir}/dc1394_reset_bus
%{_mandir}/man1/dc1394_reset_bus.1* %{_mandir}/man1/dc1394_reset_bus.1%{?ext_man}
%files 22 %files 25
%defattr(-,root,root) %{_libdir}/libdc1394.so.25*
%{_libdir}/libdc1394.so.22*
%files devel %files devel
%defattr(-,root,root)
%{_includedir}/dc1394 %{_includedir}/dc1394
%{_libdir}/libdc1394.so %{_libdir}/libdc1394.so
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc