From 180eccfa43f06da94e666956decf425cfb8b18e7829cedbf8cea4cf86634dfaf Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Sat, 20 Nov 2010 11:13:18 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/libdc1394 revision 20.0 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libdc1394?expand=0&rev=675073dcf7843a11eab1b1e6c3659ebf --- libdc1394.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libdc1394.spec b/libdc1394.spec index d72c940..39b6ed1 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -32,7 +32,7 @@ License: LGPLv2.1+ Group: Hardware/Camera AutoReqProv: on Version: %{libdc1394_version} -Release: 17 +Release: 18 Url: http://sourceforge.net/projects/libdc1394/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: 1394-Based Digital Camera Control Library @@ -70,7 +70,7 @@ License: LGPLv2.1+ Summary: 1394-Based Digital Camera Control Library Group: Hardware/Camera Version: %{libdc1394_12_version} -Release: 17 +Release: 18 %description -n libdc1394_control12 This library provides functionality for controlling any camera that @@ -97,7 +97,7 @@ License: LGPLv2.1+ Summary: 1394-Based Digital Camera Control Library Group: Development/Libraries/C and C++ Version: %{libdc1394_12_version} -Release: 17 +Release: 18 Requires: libdc1394_control12 = %{libdc1394_12_version} libraw1394-devel %description -n libdc1394_control12-devel From 9b9da1a4a8f38273cfa462e6370160532b3385f0af0e9740d052e0e78d72b3ff Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Mon, 3 Jan 2011 13:00:00 +0000 Subject: [PATCH 2/2] Accepting request 56997 from home:matwey:branches:multimedia:libs Reviewed ok OBS-URL: https://build.opensuse.org/request/show/56997 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libdc1394?expand=0&rev=11 --- libdc1394-2.1.2.tar.bz2 | 3 --- libdc1394-2.1.3.tar.bz2 | 3 +++ libdc1394-swab_fix.patch | 4 ++-- libdc1394.ac.patch | 4 ++-- libdc1394.changes | 9 +++++++++ libdc1394.no-x11.patch | 6 +++--- libdc1394.spec | 4 ++-- ready | 0 8 files changed, 21 insertions(+), 12 deletions(-) delete mode 100644 libdc1394-2.1.2.tar.bz2 create mode 100644 libdc1394-2.1.3.tar.bz2 create mode 100644 ready diff --git a/libdc1394-2.1.2.tar.bz2 b/libdc1394-2.1.2.tar.bz2 deleted file mode 100644 index 5473442..0000000 --- a/libdc1394-2.1.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1caf80535bb56219f80c558429c79810c1f35bbcda6a9f5a64d610d18f5721fa -size 428685 diff --git a/libdc1394-2.1.3.tar.bz2 b/libdc1394-2.1.3.tar.bz2 new file mode 100644 index 0000000..5bd43ca --- /dev/null +++ b/libdc1394-2.1.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b80292731d121852a8630e2cad97d20e57389f1c775503c61bf8b5f2b493c59f +size 434453 diff --git a/libdc1394-swab_fix.patch b/libdc1394-swab_fix.patch index c0a28aa..94bd99e 100644 --- a/libdc1394-swab_fix.patch +++ b/libdc1394-swab_fix.patch @@ -2,8 +2,8 @@ libdc1394-2.0.2/dc1394/conversions.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---- a/libdc1394-2.1.2/dc1394/conversions.c -+++ b/libdc1394-2.1.2/dc1394/conversions.c +--- a/libdc1394-2.1.3/dc1394/conversions.c ++++ b/libdc1394-2.1.3/dc1394/conversions.c @@ -22,11 +22,10 @@ #include diff --git a/libdc1394.ac.patch b/libdc1394.ac.patch index 86f30ff..a691f4f 100644 --- a/libdc1394.ac.patch +++ b/libdc1394.ac.patch @@ -1,5 +1,5 @@ ---- a/libdc1394-2.1.2/configure.in 2009-11-23 10:11:16.000000000 +0300 -+++ b/libdc1394-2.1.2/configure.in 2009-11-23 10:11:51.000000000 +0300 +--- a/libdc1394-2.1.3/configure.in 2009-11-23 10:11:16.000000000 +0300 ++++ b/libdc1394-2.1.3/configure.in 2009-11-23 10:11:51.000000000 +0300 @@ -5,12 +5,6 @@ AC_CANONICAL_SYSTEM diff --git a/libdc1394.changes b/libdc1394.changes index e38943a..2fba99e 100644 --- a/libdc1394.changes +++ b/libdc1394.changes @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Mon Jan 3 10:27:58 MSK 2011 - matwey.kornilov@gmail.com +- Update to 2.1.3. + - Bug fixes: + Fix for usb writes larger than 1 quadlet + On MAC OS, add needed frameworks to link line + Update firewire-{cdev,constants}.h to latest version and license + Change dequeue/enqueue to return error code if usb transfer haserror + dc1394/conversions.h: Fix typo in DC1394_STEREO_METHOD_MIN define +------------------------------------------------------------------- Fri Nov 19 18:10:03 UTC 2010 - jslaby@novell.com - don't strip the objects when installing to allow for -debug* diff --git a/libdc1394.no-x11.patch b/libdc1394.no-x11.patch index e94c50b..f5df713 100644 --- a/libdc1394.no-x11.patch +++ b/libdc1394.no-x11.patch @@ -13,9 +13,9 @@ grab_gray_image_SOURCES = grab_gray_image.c grab_gray_image_LDADD = ../libdc1394/libdc1394_control.la -lraw1394 ---- a/libdc1394-2.1.2/configure.in -+++ b/libdc1394-2.1.2/configure.in -@@ -79,21 +79,30 @@ +--- a/libdc1394-2.1.3/configure.in ++++ b/libdc1394-2.1.3/configure.in +@@ -76,21 +76,30 @@ # check for Xv extensions (necessary for examples/dc1394_multiview) # imported from Coriander diff --git a/libdc1394.spec b/libdc1394.spec index 39b6ed1..33c043f 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -1,5 +1,5 @@ # -# spec file for package libdc1394 (Version 2.1.2) +# spec file for package libdc1394 (Version 2.1.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,7 +22,7 @@ Name: libdc1394 %define libdc1394_12_version 1.2.2 -%define libdc1394_version 2.1.2 +%define libdc1394_version 2.1.3 BuildRequires: libraw1394-devel %if 0%{?suse_version} > 1100 # no IIDC-over-USB support for openSUSE 11.0 diff --git a/ready b/ready new file mode 100644 index 0000000..473a0f4