[packages/libdc1394] HAVE_VIDEODEV likely is old v4l1

glen glen at pld-linux.org
Tue Mar 3 17:48:05 CET 2015


commit 0a9d41d0e89099bc88fbdfeddc15edcbd141a99f
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Mar 3 18:47:04 2015 +0200

    HAVE_VIDEODEV likely is old v4l1

 libdc1394.spec | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/libdc1394.spec b/libdc1394.spec
index 2f58cfc..322e310 100644
--- a/libdc1394.spec
+++ b/libdc1394.spec
@@ -1,6 +1,7 @@
 #
 # Conditional build:
 %bcond_without	static_libs	# don't build static library
+%bcond_with	v4l1	# build with Video4Linux 1.x API (dropped in linux kernel 2.6.38)
 
 Summary:	Library for 1394 Digital Camera Specification
 Summary(pl.UTF-8):	Biblioteka dla specyfikacji Kamera Cyfrowa 1394
@@ -103,6 +104,11 @@ rm -rf $RPM_BUILD_ROOT
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/{dc1394_multiview,grab_{color,gray,partial}_image}.1
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/avt_singleview.1
 
+%if %{without v4l1}
+# dc1394_vloopback not built if !HAVE_VIDEODEV, remove man page as well
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/dc1394_vloopback.1
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -113,11 +119,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/dc1394_reset_bus
-#%attr(755,root,root) %{_bindir}/dc1394_vloopback
 %attr(755,root,root) %{_libdir}/libdc1394.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libdc1394.so.22
 %{_mandir}/man1/dc1394_reset_bus.1*
-#%{_mandir}/man1/dc1394_vloopback.1*
+%if %{with v4l1}
+%attr(755,root,root) %{_bindir}/dc1394_vloopback
+%{_mandir}/man1/dc1394_vloopback.1*
+%endif
 
 %files devel
 %defattr(644,root,root,755)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libdc1394.git/commitdiff/0a9d41d0e89099bc88fbdfeddc15edcbd141a99f



More information about the pld-cvs-commit mailing list