packages: vlc/vlc.spec - rel 2; v4l1 as bcond, only on old llh

[arekm]

Author: arekm                        Date: Fri Dec 23 08:00:45 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; v4l1 as bcond, only on old llh

---- Files affected:
packages/vlc:
   vlc.spec (1.282 -> 1.283) 

---- Diffs:

================================================================
Index: packages/vlc/vlc.spec
diff -u packages/vlc/vlc.spec:1.282 packages/vlc/vlc.spec:1.283
--- packages/vlc/vlc.spec:1.282	Thu Dec 22 11:08:11 2011
+++ packages/vlc/vlc.spec	Fri Dec 23 09:00:40 2011
@@ -37,12 +37,17 @@
 %bcond_without	udev		# udev services discovery
 %bcond_without	upnp		# upnp plugin
 %bcond_without	x264		# build without x264 support
+%bcond_with	v4l1		# video4linux v1
+
+%if "%(test -f %{_includedir}/linux/videodev.h && echo 1 || echo 0)" == "1"
+%global	with_v4l1	1
+%endif
 
 Summary:	VLC - a multimedia player and stream server
 Summary(pl.UTF-8):	VLC - odtwarzacz multimedialny oraz serwer strumieni
 Name:		vlc
 Version:	1.1.13
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		X11/Applications/Multimedia
 # use the bz2 src, its a 4mb difference
@@ -374,7 +379,8 @@
 	%{?with_twolame:--enable-twolame} \
 	%{!?with_udev:--disable-udev} \
 	%{?with_upnp:--enable-upnp} \
-	--enable-v4l\
+	--%{?with_v4l1:en}%{!?with_v4l1:dis}able-v4l \
+	--enable-v4l2 \
 	--enable-vcdx \
 	%{!?with_x264:--disable-x264} \
 	--enable-xosd \
@@ -481,7 +487,7 @@
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libfilesystem_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libpvr_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/librtp_plugin.so
-%attr(755,root,root) %{_libdir}/vlc/plugins/access/libv4l_plugin.so
+%{?with_v4l1:%attr(755,root,root) %{_libdir}/vlc/plugins/access/libv4l_plugin.so}
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libv4l2_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libvcd_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libvcdx_plugin.so
@@ -863,6 +869,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.283  2011/12/23 08:00:40  arekm
+- rel 2; v4l1 as bcond, only on old llh
+
 Revision 1.282  2011/12/22 10:08:11  lisu
 - up to 1.1.13
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vlc/vlc.spec?r1=1.282&r2=1.283&f=u