diff --git a/xine-lib.spec b/xine-lib.spec index b69280e..b43f805 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -31,7 +31,8 @@ %endif %if 0%{?fedora} > 8 || 0%{?rhel} > 5 -%define _enable_v4l --enable-v4l --enable-libv4l +%define _enable_v4l --enable-v4l +%define _enable_libv4l --enable-libv4l %define _without_arts --without-arts %define _with_pa %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1} %define _with_xcb %{?_without_xcb:0}%{!?_without_xcb:1} @@ -44,7 +45,7 @@ Summary: A multimedia engine Name: xine-lib Version: 1.1.19 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.xine-project.org/ @@ -81,7 +82,7 @@ BuildRequires: libXv-devel BuildRequires: libXinerama-devel %{?_enable_xvmc:BuildRequires: libXvMC-devel} BuildRequires: libGLU-devel -%if 0%{?_enable_v4l:1} +%if 0%{?_enable_libv4l:1} BuildRequires: libv4l-devel %endif %if 0%{?_with_xcb:1} @@ -231,7 +232,8 @@ export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)" %if 0%{!?_without_directfb:1} --enable-directfb \ %endif # directfb - %{?_enable_v4l}%{!?_enable_v4l:--disable-v4l --disable-libv4l} \ + %{?_enable_v4l}%{!?_enable_v4l:--disable-v4l} \ + %{?_enable_libv4l}%{!?_enable_libv4l:--disable-libv4l} \ %{?_enable_xvmc}%{!?_enable_xvmc:--disable-xvmc} \ %{?_disable_gnomevfs} \ --disable-a52dec \ @@ -386,6 +388,8 @@ rm -rf $RPM_BUILD_ROOT %if 0%{?_enable_v4l: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 @@ -456,6 +460,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 14 2011 Rex Dieter 1.1.19-6 +- split v4l, libv4l handling + * Mon Feb 07 2011 Fedora Release Engineering - 1.1.19-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild