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

Bump to version 2.2.2,
Fix swab patch also.

OBS-URL: https://build.opensuse.org/request/show/225109
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libdc1394?expand=0&rev=28

libdc1394-2.2.1.tar.bz2

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

libdc1394-2.2.2.tar.bz2

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

libdc1394-swab_fix.patch

@@ -1,10 +1,14 @@
---- a/libdc1394-2.2.1/dc1394/conversions.c
-+++ b/libdc1394-2.2.1/dc1394/conversions.c
-@@ -22,11 +22,10 @@
+Index: libdc1394-2.2.2/dc1394/conversions.c
+===================================================================
+--- libdc1394-2.2.2.orig/dc1394/conversions.c
++++ libdc1394-2.2.2/dc1394/conversions.c
+@@ -20,13 +20,12 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
  
++#define _XOPEN_SOURCE
  #include <string.h>
  #include <stdlib.h>
-+#define _XOPEN_SOURCE
 +#include <unistd.h>
  #include "conversions.h"
  

libdc1394.ac.patch

@@ -1,7 +1,9 @@
---- a/libdc1394-2.2.1/configure.in	2009-11-23 10:11:16.000000000 +0300
-+++ b/libdc1394-2.2.1/configure.in	2009-11-23 10:11:51.000000000 +0300
-@@ -6,12 +6,6 @@
- 
+Index: libdc1394-2.2.2/configure.ac
+===================================================================
+--- libdc1394-2.2.2.orig/configure.ac
++++ libdc1394-2.2.2/configure.ac
+@@ -8,12 +8,6 @@ m4_include([ax_check_framework.m4])
+  
  AC_CANONICAL_SYSTEM
  
 -case "$host" in
@@ -13,7 +15,12 @@
  #
  DX_HTML_FEATURE(OFF)
  DX_CHM_FEATURE(OFF)
-@@ -28,6 +22,7 @@
+@@ -26,11 +20,11 @@ DX_PS_FEATURE(OFF)
+ #
+ DX_INIT_DOXYGEN([libdc1394], [Doxyfile.in])
+ #
+-AM_PROG_AR
+ AM_INIT_AUTOMAKE([--warnings=all 1.9.6])
  AC_CONFIG_HEADERS([config.h])
  
  AC_PROG_CC
@@ -21,3 +28,10 @@
  AC_PROG_LIBTOOL
  AM_PROG_CC_C_O
  
+@@ -242,4 +236,4 @@ if test "x$EXAMPLESMSG" = xYes; then
+       Build V4L examples:               ${VIDEXAMPLESMSG}"
+ fi
+ dnl extra newline:
+-echo ""
+\ No newline at end of file
++echo ""

libdc1394.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Mar  7 16:00:17 UTC 2014 - matwey.kornilov@gmail.com
+
+- Update to 2.2.2
+   - several product IDs have been added for Point Grey USB/IIDC cameras
+
 -------------------------------------------------------------------
 Tue Jan 29 14:27:01 UTC 2013 - matwey.kornilov@gmail.com
 

libdc1394.no-x11.patch

@@ -1,7 +1,9 @@
---- a/libdc1394-2.2.1/configure.in
-+++ b/libdc1394-2.2.1/configure.in
-@@ -102,21 +102,30 @@ 
-
+Index: libdc1394-2.2.2/configure.ac
+===================================================================
+--- libdc1394-2.2.2.orig/configure.ac
++++ libdc1394-2.2.2/configure.ac
+@@ -107,21 +107,30 @@ AM_CONDITIONAL(MAKE_EXAMPLES, test x$bui
+ 
  # check for Xv extensions (necessary for examples/dc1394_multiview)
  # imported from Coriander
 +AC_ARG_ENABLE([xv],
@@ -44,4 +46,4 @@
 +        AM_CONDITIONAL(HAVE_XV, test x$xv = xyes)
  ])
  AC_CHECK_XV
-
+ 

libdc1394.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libdc1394
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -33,7 +33,7 @@ BuildRequires:  pkg-config
 %if 0%{?suse_version} >= 1210
 BuildRequires:  libv4l-devel >= 0.8.4
 %endif
-Version:        2.2.1
+Version:        2.2.2
 Release:        0
 Summary:        1394-Based Digital Camera Control Library
 License:        LGPL-2.1+
@@ -78,9 +78,9 @@ programs using the dc1394 library.
 
 %prep
 %setup -q
-%patch0 -p2
-%patch1 -p2
-%patch2 -p2
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 %if 0%{?suse_version} >= 1210
 %patch3 -p1
 %endif