- added v4l2 patch and v4l1 bcond (to allow build without V4L1, removed from Linux...

- added link patch to fix libunicap linking

Changed files:
    libunicap-link.patch -> 1.1
    libunicap-v4l2.patch -> 1.1
    libunicap.spec -> 1.3

diff --git a/libunicap-link.patch b/libunicap-link.patch
new file mode 100644 (file)
index 0000000..e91e34a
--- /dev/null
+++ b/libunicap-link.patch
@@ -0,0 +1,28 @@
+--- libunicap-0.9.12/src/Makefile.am.orig      2010-05-27 09:21:01.000000000 +0200
++++ libunicap-0.9.12/src/Makefile.am   2012-01-25 19:38:19.599689823 +0100
+@@ -4,9 +4,9 @@
+ lib_LTLIBRARIES = libunicap.la
+ 
+ if ENABLE_STATIC_CPI
+-libunicap_la_LDFLAGS = -version-info @lt_major@:@lt_revision@:@lt_age@ @RT_LIBS@ -static
++libunicap_la_LDFLAGS = -version-info @lt_major@:@lt_revision@:@lt_age@ -static
+ else
+-libunicap_la_LDFLAGS = -version-info @lt_major@:@lt_revision@:@lt_age@ @RT_LIBS@
++libunicap_la_LDFLAGS = -version-info @lt_major@:@lt_revision@:@lt_age@
+ endif
+ 
+ libunicap_la_SOURCES =   \
+@@ -33,11 +33,13 @@
+ 
+ if ENABLE_STATIC_CPI
+ libunicap_la_LIBADD = \
++      @PTHREAD_LIBS@ \
+       @DL_LIBS@ \
+       @M_LIBS@ \
+       ../$(LIBV4L2) ../$(LIBV4L) ../$(LIBDCAM) ../$(LIBVID21394)
+ else
+ libunicap_la_LIBADD = \
++      @PTHREAD_LIBS@ \
+       @DL_LIBS@ \
+       @M_LIBS@
+ endif

diff --git a/libunicap-v4l2.patch b/libunicap-v4l2.patch
new file mode 100644 (file)
index 0000000..725e363
--- /dev/null
+++ b/libunicap-v4l2.patch
@@ -0,0 +1,11 @@
+--- libunicap-0.9.12/cpi/v4l2cpi/uvcvideo.h.orig       2010-01-17 08:49:29.000000000 +0100
++++ libunicap-0.9.12/cpi/v4l2cpi/uvcvideo.h    2012-01-25 18:55:09.409603093 +0100
+@@ -2,7 +2,7 @@
+ #define _USB_VIDEO_H_
+ 
+ #include <linux/kernel.h>
+-#include <linux/videodev.h>
++#include <linux/videodev2.h>
+ 
+ #include "uvc_compat.h"
+ 

diff --git a/libunicap.spec b/libunicap.spec
index 008710aee625407506596a2d883cef932ec70a4c..a5d6dc9d3700b3559f05d743c6144e880e8d5f3a 100644 (file)
--- a/libunicap.spec
+++ b/libunicap.spec
@@ -1,3 +1,7 @@
+#
+# Conditional build
+%bcond_with    v4l1    # Video4Linux 1 support
+#
 Summary:       Library to access differend kinds of video capturing devices
 Summary(pl.UTF-8):     Biblioteka dostępu do różnych urządzeń przechwytujących obraz
 Name:          libunicap
@@ -8,9 +12,17 @@ Group:                Libraries
 #Source0Download: http://unicap-imaging.org/download.htm
 Source0:       http://unicap-imaging.org/downloads/%{name}-%{version}.tar.gz
 # Source0-md5: 353657b4da519251d4cc6dee5a232391
+Patch0:                %{name}-v4l2.patch
+Patch1:                %{name}-link.patch
 URL:           http://unicap-imaging.org/
+BuildRequires: autoconf >= 2.59
+BuildRequires: automake
+BuildRequires: gettext-devel
 BuildRequires: gtk-doc >= 1.4
+BuildRequires: intltool >= 0.35.0
+%{?with_v4l1:BuildRequires:    linux-libc-headers < 7:2.6.38}
 BuildRequires: libraw1394-devel >= 1.1.0
+BuildRequires: libtool
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -78,10 +90,18 @@ Reguły udeva dla urządzeń obsługiwanych przez unicap.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
-       --with-html-dir=%{_gtkdocdir}
+       --with-html-dir=%{_gtkdocdir} \
+       %{!?with_v4l1:--disable-v4l}
 %{__make}
 
 %install
@@ -109,7 +129,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/unicap2/cpi
 %attr(755,root,root) %{_libdir}/unicap2/cpi/libdcam.so
 %attr(755,root,root) %{_libdir}/unicap2/cpi/libeuvccam_cpi.so
+%if %{with v4l1}
 %attr(755,root,root) %{_libdir}/unicap2/cpi/libv4l.so
+%endif
 %attr(755,root,root) %{_libdir}/unicap2/cpi/libv4l2cpi.so
 %attr(755,root,root) %{_libdir}/unicap2/cpi/libvid21394.so