From 7b283f7afe165b543701835ab7c3c2b13ba31adbfc50caef9ca8766de11c5cf4 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 23 Jul 2019 06:39:20 +0000 Subject: [PATCH 1/3] Updating link to change in openSUSE:Factory/libdc1394 revision 48.0 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libdc1394?expand=0&rev=6349c1921486d9bf17b7417de70234d3 --- baselibs.conf | 2 +- libdc1394-2.2.5.tar.gz | 3 +++ libdc1394-2.2.6.tar.gz | 3 --- libdc1394.changes | 8 -------- libdc1394.spec | 22 +++++++++++----------- 5 files changed, 15 insertions(+), 23 deletions(-) create mode 100644 libdc1394-2.2.5.tar.gz delete mode 100644 libdc1394-2.2.6.tar.gz diff --git a/baselibs.conf b/baselibs.conf index 3690950..8625e26 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1 @@ -libdc1394-25 +libdc1394-22 diff --git a/libdc1394-2.2.5.tar.gz b/libdc1394-2.2.5.tar.gz new file mode 100644 index 0000000..a9fa1de --- /dev/null +++ b/libdc1394-2.2.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:350cc8d08aee5ffc4e1f3049e2e1c2bc6660642d424595157da97ab5b1263337 +size 611918 diff --git a/libdc1394-2.2.6.tar.gz b/libdc1394-2.2.6.tar.gz deleted file mode 100644 index 50b0aa3..0000000 --- a/libdc1394-2.2.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2b905fc9aa4eec6bdcf6a2ae5f5ba021232739f5be047dec8fe8dd6049c10fed -size 612067 diff --git a/libdc1394.changes b/libdc1394.changes index 6209477..c25f5dd 100644 --- a/libdc1394.changes +++ b/libdc1394.changes @@ -1,11 +1,3 @@ -------------------------------------------------------------------- -Sat Jul 6 13:34:52 UTC 2019 - Matwey V. Kornilov - -- 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 diff --git a/libdc1394.spec b/libdc1394.spec index fc8d8e3..41b3ddc 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -1,7 +1,7 @@ # # spec file for package libdc1394 # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,15 +12,15 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: libdc1394 -Version: 2.2.6 +Version: 2.2.5 Release: 0 Summary: 1394-Based Digital Camera Control Library -License: LGPL-2.1-or-later +License: LGPL-2.1+ Group: Hardware/Camera Url: http://damien.douxchamps.net/ieee1394/libdc1394/ Source0: https://downloads.sourceforge.net/project/libdc1394/libdc1394-2/%{version}/%{name}-%{version}.tar.gz @@ -54,11 +54,11 @@ conforms to the 1394-Based Digital Camera Specification. It utilizes the low-level functionality provided by libraw1394 to communicate with the camera. -%package 25 +%package 22 Summary: 1394-based Digital Camera Control library Group: System/Libraries -%description 25 +%description 22 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). @@ -69,7 +69,7 @@ communicate with the camera. Summary: Development libraries and header files for dc1394 Group: Development/Libraries/C and C++ Requires: %{name}-tools = %{version} -Requires: libdc1394-25 = %{version} +Requires: libdc1394-22 = %{version} Requires: libraw1394-devel %description devel @@ -109,9 +109,9 @@ rm -f %{buildroot}%{_mandir}/man1/dc1394_multiview.1* rm -f %{buildroot}%{_mandir}/man1/grab_*_image.1* find %{buildroot} -type f -name "*.la" -delete -print -%post 25 -p /sbin/ldconfig +%post 22 -p /sbin/ldconfig -%postun 25 -p /sbin/ldconfig +%postun 22 -p /sbin/ldconfig %files tools %defattr(-,root,root) @@ -119,9 +119,9 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_bindir}/dc1394_reset_bus %{_mandir}/man1/dc1394_reset_bus.1* -%files 25 +%files 22 %defattr(-,root,root) -%{_libdir}/libdc1394.so.25* +%{_libdir}/libdc1394.so.22* %files devel %defattr(-,root,root) From 6d1b9d3a472fe97940be20902603da93991d9654f49be893d2192821172610ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 23 Jul 2019 06:52:25 +0000 Subject: [PATCH 2/3] Accepting request 717771 from openSUSE:Factory Resubmit reverted update into devel branch OBS-URL: https://build.opensuse.org/request/show/717771 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libdc1394?expand=0&rev=46 --- baselibs.conf | 2 +- libdc1394-2.2.5.tar.gz | 3 --- libdc1394-2.2.6.tar.gz | 3 +++ libdc1394.changes | 8 ++++++++ libdc1394.spec | 22 +++++++++++----------- 5 files changed, 23 insertions(+), 15 deletions(-) delete mode 100644 libdc1394-2.2.5.tar.gz create mode 100644 libdc1394-2.2.6.tar.gz diff --git a/baselibs.conf b/baselibs.conf index 8625e26..3690950 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1 @@ -libdc1394-22 +libdc1394-25 diff --git a/libdc1394-2.2.5.tar.gz b/libdc1394-2.2.5.tar.gz deleted file mode 100644 index a9fa1de..0000000 --- a/libdc1394-2.2.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:350cc8d08aee5ffc4e1f3049e2e1c2bc6660642d424595157da97ab5b1263337 -size 611918 diff --git a/libdc1394-2.2.6.tar.gz b/libdc1394-2.2.6.tar.gz new file mode 100644 index 0000000..50b0aa3 --- /dev/null +++ b/libdc1394-2.2.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b905fc9aa4eec6bdcf6a2ae5f5ba021232739f5be047dec8fe8dd6049c10fed +size 612067 diff --git a/libdc1394.changes b/libdc1394.changes index c25f5dd..6209477 100644 --- a/libdc1394.changes +++ b/libdc1394.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Jul 6 13:34:52 UTC 2019 - Matwey V. Kornilov + +- 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 diff --git a/libdc1394.spec b/libdc1394.spec index 41b3ddc..fc8d8e3 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed @@ -12,15 +12,15 @@ # license that conforms to the Open Source Definition (Version 1.9) # 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 -Version: 2.2.5 +Version: 2.2.6 Release: 0 Summary: 1394-Based Digital Camera Control Library -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Hardware/Camera Url: http://damien.douxchamps.net/ieee1394/libdc1394/ Source0: https://downloads.sourceforge.net/project/libdc1394/libdc1394-2/%{version}/%{name}-%{version}.tar.gz @@ -54,11 +54,11 @@ conforms to the 1394-Based Digital Camera Specification. It utilizes the low-level functionality provided by libraw1394 to communicate with the camera. -%package 22 +%package 25 Summary: 1394-based Digital Camera Control library Group: System/Libraries -%description 22 +%description 25 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). @@ -69,7 +69,7 @@ communicate with the camera. Summary: Development libraries and header files for dc1394 Group: Development/Libraries/C and C++ Requires: %{name}-tools = %{version} -Requires: libdc1394-22 = %{version} +Requires: libdc1394-25 = %{version} Requires: libraw1394-devel %description devel @@ -109,9 +109,9 @@ rm -f %{buildroot}%{_mandir}/man1/dc1394_multiview.1* rm -f %{buildroot}%{_mandir}/man1/grab_*_image.1* find %{buildroot} -type f -name "*.la" -delete -print -%post 22 -p /sbin/ldconfig +%post 25 -p /sbin/ldconfig -%postun 22 -p /sbin/ldconfig +%postun 25 -p /sbin/ldconfig %files tools %defattr(-,root,root) @@ -119,9 +119,9 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_bindir}/dc1394_reset_bus %{_mandir}/man1/dc1394_reset_bus.1* -%files 22 +%files 25 %defattr(-,root,root) -%{_libdir}/libdc1394.so.22* +%{_libdir}/libdc1394.so.25* %files devel %defattr(-,root,root) From e4cbd41dba9c9ea09640ab96e9caf8fdb573131124fcb9d51f7154a766c87587 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 14 Aug 2019 08:32:07 +0000 Subject: [PATCH 3/3] - Switch up to pkgconfgi style dependencies OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libdc1394?expand=0&rev=47 --- libdc1394-rpmlintrc | 5 ----- libdc1394.changes | 5 +++++ libdc1394.spec | 47 ++++++++++++++------------------------------- 3 files changed, 19 insertions(+), 38 deletions(-) delete mode 100644 libdc1394-rpmlintrc diff --git a/libdc1394-rpmlintrc b/libdc1394-rpmlintrc deleted file mode 100644 index 874b4af..0000000 --- a/libdc1394-rpmlintrc +++ /dev/null @@ -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.*") diff --git a/libdc1394.changes b/libdc1394.changes index 6209477..8f714c3 100644 --- a/libdc1394.changes +++ b/libdc1394.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 14 08:31:11 UTC 2019 - Tomáš Chvátal + +- Switch up to pkgconfgi style dependencies + ------------------------------------------------------------------- Sat Jul 6 13:34:52 UTC 2019 - Matwey V. Kornilov diff --git a/libdc1394.spec b/libdc1394.spec index fc8d8e3..b807925 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -22,31 +22,20 @@ Release: 0 Summary: 1394-Based Digital Camera Control Library License: LGPL-2.1-or-later 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 -Source1: %{name}-rpmlintrc Source2: baselibs.conf Patch0: libdc1394.no-x11.patch Patch1: libdc1394.ac.patch Patch2: libdc1394-swab_fix.patch Patch3: libdc1394-v4l-2.6.38.patch BuildRequires: autoconf -BuildRequires: libraw1394-devel BuildRequires: libtool -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} > 1110 -BuildRequires: libSDL-devel -%else -BuildRequires: SDL-devel -%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 +BuildRequires: pkgconfig +BuildRequires: pkgconfig(libraw1394) +BuildRequires: pkgconfig(libusb-1.0) +BuildRequires: pkgconfig(libv4l2) >= 0.8.4 +BuildRequires: pkgconfig(sdl) %description This library provides functionality for controlling any camera that @@ -70,7 +59,7 @@ Summary: Development libraries and header files for dc1394 Group: Development/Libraries/C and C++ Requires: %{name}-tools = %{version} Requires: libdc1394-25 = %{version} -Requires: libraw1394-devel +Requires: pkgconfig(libraw1394) %description devel 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 # added on 2015-11-14 Group: Hardware/Camera -Obsoletes: %name < %version-%release -Provides: %name = %version-%release +Obsoletes: %{name} < %{version}-%{release} +Provides: %{name} = %{version}-%{release} %description tools This subpackage contains a 1394 bus reset utility. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%if 0%{?suse_version} >= 1210 -%patch3 -p1 -%endif +%autopatch -p1 %build -autoreconf --force --install +autoreconf -fvi %configure \ --disable-static \ --disable-xv @@ -110,21 +94,18 @@ rm -f %{buildroot}%{_mandir}/man1/grab_*_image.1* find %{buildroot} -type f -name "*.la" -delete -print %post 25 -p /sbin/ldconfig - %postun 25 -p /sbin/ldconfig %files tools -%defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog NEWS README +%license COPYING +%doc AUTHORS ChangeLog NEWS README %{_bindir}/dc1394_reset_bus -%{_mandir}/man1/dc1394_reset_bus.1* +%{_mandir}/man1/dc1394_reset_bus.1%{?ext_man} %files 25 -%defattr(-,root,root) %{_libdir}/libdc1394.so.25* %files devel -%defattr(-,root,root) %{_includedir}/dc1394 %{_libdir}/libdc1394.so %{_libdir}/pkgconfig/*.pc