OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libdc1394?expand=0&rev=8

libdc1394.ac.patch

@@ -0,0 +1,43 @@
+--- libdc1394-2/acinclude.m4
++++ libdc1394-2/acinclude.m4
+@@ -78,7 +78,7 @@ AC_DEFUN([DX_REQUIRE_PROG], [
+ AC_PATH_TOOL([$1], [$2])
+ if test "$DX_FLAG_[]DX_CURRENT_FEATURE$$1" = 1; then
+     AC_MSG_WARN([$2 not found - will not DX_CURRENT_DESCRIPTION])
+-    AC_SUBST([DX_FLAG_[]DX_CURRENT_FEATURE], 0)
++    AC_SUBST([DX_FLAG_]DX_CURRENT_FEATURE, 0)
+ fi
+ ])
+ 
+@@ -101,7 +101,7 @@ test "$DX_FLAG_$1" = "$2" \
+ # ----------------------------------------------------------
+ # Turn off the DX_CURRENT_FEATURE if the required feature is off.
+ AC_DEFUN([DX_CLEAR_DEPEND], [
+-test "$DX_FLAG_$1" = "$2" || AC_SUBST([DX_FLAG_[]DX_CURRENT_FEATURE], 0)
++test "$DX_FLAG_$1" = "$2" || AC_SUBST([DX_FLAG_]DX_CURRENT_FEATURE, 0)
+ ])
+ 
+ # DX_FEATURE_ARG(FEATURE, DESCRIPTION,
+--- libdc1394-2/configure.in
++++ libdc1394-2/configure.in
+@@ -3,12 +3,6 @@ AC_PREREQ([2.6.0])
+ AC_INIT([libdc1394],[2.0.0],[libdc1394-devel@lists.sf.net])
+ AC_CONFIG_SRCDIR([dc1394/control.c])
+ 
+-case "$host" in
+-*-*-cygwin* | *-*-mingw*)
+-AC_LIBTOOL_WIN32_DLL
+-;;
+-esac
+-
+ #
+ DX_HTML_FEATURE(OFF)
+ DX_CHM_FEATURE(OFF)
+@@ -27,6 +21,7 @@ AC_CONFIG_HEADERS([config.h])
+ AC_PROG_CC
+ AC_PROG_LIBTOOL
+ AM_PROG_CC_C_O
++AC_LIBTOOL_WIN32_DLL
+ 
+ # check if the 'restrict' prefix is supported
+ AC_C_RESTRICT

libdc1394.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Apr 11 16:13:18 CEST 2008 - schwab@suse.de
+
+- Fix configure script.
+
 -------------------------------------------------------------------
 Thu Jan 24 20:23:11 CET 2008 - olh@suse.de
 

libdc1394.spec

@@ -10,6 +10,7 @@
 
 # norootforbuild
 
+
 Name:           libdc1394
 %define libdc1394_12_version 1.2.2
 %define libdc1394_version 2.0.0
@@ -25,6 +26,7 @@ Summary:        1394-Based Digital Camera Control Library
 Source1:        libdc1394-%{libdc1394_12_version}.tar.bz2
 Source2:        libdc1394-%{libdc1394_version}.tar.bz2
 Patch0:         libdc1394.no-x11.patch
+Patch1:         libdc1394.ac.patch
 
 %description
 This library provides functionality for controlling any camera that
@@ -45,6 +47,7 @@ Authors:
     John Stanley <stanley@peak.org>
 
 %package -n libdc1394_control12
+License:        LGPL v2.1 or later
 Summary:        1394-Based Digital Camera Control Library
 Group:          Hardware/Camera
 Version:        %{libdc1394_12_version}
@@ -71,6 +74,7 @@ Authors:
     John Stanley <stanley@peak.org>
 
 %package -n libdc1394_control12-devel
+License:        LGPL v2.1 or later
 Summary:        1394-Based Digital Camera Control Library
 Group:          Hardware/Camera
 Version:        %{libdc1394_12_version}
@@ -98,6 +102,7 @@ Authors:
     John Stanley <stanley@peak.org>
 
 %package 22
+License:        LGPL v2.1 or later
 Summary:        1394-Based Digital Camera Control Library
 Group:          Hardware/Camera
 
@@ -122,6 +127,7 @@ Authors:
     John Stanley <stanley@peak.org>
 
 %package devel
+License:        LGPL v2.1 or later
 Summary:        Development libraries and header files for dc1394
 Group:          Development/Libraries/C and C++
 Requires:       libdc1394-22 = %{libdc1394_version}
@@ -148,6 +154,7 @@ Authors:
 mv libdc1394-1* libdc1394-1
 mv libdc1394-2* libdc1394-2
 %patch0 -p1
+%patch1
 
 %build
 for i in libdc1394-1 libdc1394-2
@@ -209,6 +216,8 @@ rm -f $RPM_BUILD_ROOT%_bindir/dc1394_vloopback
 %_libdir/pkgconfig/*.pc
 
 %changelog
+* Fri Apr 11 2008 schwab@suse.de
+- Fix configure script.
 * Thu Jan 24 2008 olh@suse.de
 - remove buildrequires for xorg-x11-devel
 * Tue Jan 15 2008 olh@suse.de
@@ -226,7 +235,7 @@ rm -f $RPM_BUILD_ROOT%_bindir/dc1394_vloopback
 - split libdc1394-20 package which contains only libraries
   split libdc1394_control12 and libdc1394_control12-devel
   upgrade to 1.2.2, color filter fix
-* Fri Jul 13 2007 olh@suse.de
+* Sat Jul 14 2007 olh@suse.de
 - update to 2.0.0-rc7
   API fixes
 * Tue Aug 15 2006 olh@suse.de
@@ -249,7 +258,7 @@ rm -f $RPM_BUILD_ROOT%_bindir/dc1394_vloopback
   fixed trigger capabilities detection (Markus Niebel)
   fixed some confusion between raw1394_new_handle and dc1394_create_handle
   (Thanks to Thorondor)
-* Mon Sep 26 2005 mls@suse.de
+* Tue Sep 27 2005 mls@suse.de
 - make devel package require base package
 * Tue Jul 05 2005 olh@suse.de
 - go back to version 1, version 2 still needs some time