From ecb7e8977815b8feca645fbc7ae618d8d9b09913 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 14 Feb 2011 10:45:46 -0600 Subject: [PATCH] another approach, disabling v4l support hammers both v4l1 and v4l2 --- xine-lib.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/xine-lib.spec b/xine-lib.spec index 726c3c0..087da2c 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -39,7 +39,7 @@ %endif %if 0%{?fedora} > 14 -%undefine _enable_v4l +%define _disable_v4l1 1 %endif %if 0%{?fedora} > 11 || 0%{?rhel} > 5 @@ -283,6 +283,12 @@ rm -Rf $RPM_BUILD_ROOT%{_libdir}/libxine.la __docs/README \ # Directory for binary codecs mkdir -p $RPM_BUILD_ROOT%{codecdir} +# unpackaged files +%if 0%{?_disable_v4l1:1} +rm -fv $RPM_BUILD_ROOT%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_pvr.so +rm -fv $RPM_BUILD_ROOT%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l.so +%endif + %clean rm -rf $RPM_BUILD_ROOT @@ -390,10 +396,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_rtsp.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_stdin_fifo.so %if 0%{?_enable_v4l:1} +%if ! 0%{?_disable_v4l1:1} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_pvr.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l.so %endif -%if 0%{?_enable_libv4l:1) %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l2.so %endif %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_fb.so