packages: libunicap/libunicap.spec, libunicap/libunicap-link.patch (NEW), l...

[qboosh]

Author: qboosh                       Date: Wed Jan 25 20:14:07 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added v4l2 patch and v4l1 bcond (to allow build without V4L1, removed from Linux 2.6.38+)
- added link patch to fix libunicap linking

---- Files affected:
packages/libunicap:
   libunicap.spec (1.2 -> 1.3) , libunicap-link.patch (NONE -> 1.1)  (NEW), libunicap-v4l2.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libunicap/libunicap.spec
diff -u packages/libunicap/libunicap.spec:1.2 packages/libunicap/libunicap.spec:1.3
--- packages/libunicap/libunicap.spec:1.2	Sun Jan 23 09:02:02 2011
+++ packages/libunicap/libunicap.spec	Wed Jan 25 21:14:01 2012
@@ -1,4 +1,8 @@
 # $Revision$, $Date$
+#
+# 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
@@ -9,9 +13,17 @@
 #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
@@ -79,10 +91,18 @@
 
 %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
@@ -110,7 +130,9 @@
 %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
 
@@ -139,6 +161,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2012/01/25 20:14:01  qboosh
+- added v4l2 patch and v4l1 bcond (to allow build without V4L1, removed from Linux 2.6.38+)
+- added link patch to fix libunicap linking
+
 Revision 1.2  2011/01/23 08:02:02  qboosh
 - unused bcond cleanup
 

================================================================
Index: packages/libunicap/libunicap-link.patch
diff -u /dev/null packages/libunicap/libunicap-link.patch:1.1
--- /dev/null	Wed Jan 25 21:14:07 2012
+++ packages/libunicap/libunicap-link.patch	Wed Jan 25 21:14:01 2012
@@ -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

================================================================
Index: packages/libunicap/libunicap-v4l2.patch
diff -u /dev/null packages/libunicap/libunicap-v4l2.patch:1.1
--- /dev/null	Wed Jan 25 21:14:07 2012
+++ packages/libunicap/libunicap-v4l2.patch	Wed Jan 25 21:14:01 2012
@@ -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"
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libunicap/libunicap.spec?r1=1.2&r2=1.3&f=u