Author: qboosh Date: Tue Jun 28 15:50:36 2011 GMT Module: packages Tag: HEAD ---- Log message: - added pvr patch (build pvr input driver together with V4L2, not V4L1); moved pvr driver to xine-input-v4l package - disable v4l1 driver by default
---- Files affected: packages/xine-lib: xine-lib.spec (1.283 -> 1.284) , xine-lib-pvr.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/xine-lib/xine-lib.spec diff -u packages/xine-lib/xine-lib.spec:1.283 packages/xine-lib/xine-lib.spec:1.284 --- packages/xine-lib/xine-lib.spec:1.283 Mon Jun 27 22:02:59 2011 +++ packages/xine-lib/xine-lib.spec Tue Jun 28 17:50:31 2011 @@ -25,6 +25,7 @@ %bcond_without sdl # don't build SDL video output plugin %bcond_without stk # don't build stk video output plugin %bcond_without wavpack # don't build wavpack decode plugin +%bcond_with v4l1 # Video4Linux 1 input plugin (obsolete in current Linux) %bcond_with xvid # build xvid decode plugin [disabled in sources at the moment] %bcond_with vdr # build with vdr support %bcond_without vis # build without vis sparc extensions - with vis breaks compatibility @@ -43,9 +44,9 @@ Version: 1.1.19 Release: 10 Epoch: 2 -License: GPL +License: GPL v2+ Group: Libraries -Source0: http://dl.sourceforge.net/xine/%{name}-%{version}.tar.bz2 +Source0: http://downloads.sourceforge.net/xine/%{name}-%{version}.tar.bz2 # Source0-md5: a410a0f0617e1d6309f0cbe907f73f8a Patch0: %{name}-nolibs.patch Patch1: %{name}-win32-path.patch @@ -55,6 +56,7 @@ Patch5: %{name}-ac.patch Patch6: %{name}-xxmc.patch Patch7: %{name}-ffmpeg-0.8.patch +Patch8: %{name}-pvr.patch URL: http://xine.sourceforge.net/ %{?with_directfb:BuildRequires: DirectFB-devel >= 0.9.22} %{?with_fusionsound:BuildRequires: FusionSound-devel >= 0.9.23} @@ -783,13 +785,10 @@ %patch5 -p1 %patch6 -p0 %patch7 -p1 - -# kill hack, it fails with recent automake -echo 'AC_DEFUN([AM_PROG_AS_MOD],[AM_PROG_AS])' > m4/as.m4 +%patch8 -p1 %build -# breaks DOMAIN (modified Makefile.in.in?) -#%%{__gettextize} +%{__gettextize} %{__libtoolize} %{__aclocal} -I m4 %{__autoconf} @@ -867,7 +866,6 @@ %attr(755,root,root) %{_pluginsdir}/xineplug_inp_mms.so %attr(755,root,root) %{_pluginsdir}/xineplug_inp_net.so %attr(755,root,root) %{_pluginsdir}/xineplug_inp_pnm.so -%attr(755,root,root) %{_pluginsdir}/xineplug_inp_pvr.so %attr(755,root,root) %{_pluginsdir}/xineplug_inp_rtp.so %attr(755,root,root) %{_pluginsdir}/xineplug_inp_rtsp.so %attr(755,root,root) %{_pluginsdir}/xineplug_inp_stdin_fifo.so @@ -995,7 +993,10 @@ %files -n xine-input-v4l %defattr(644,root,root,755) +%attr(755,root,root) %{_pluginsdir}/xineplug_inp_pvr.so +%if %{with v4l1} %attr(755,root,root) %{_pluginsdir}/xineplug_inp_v4l.so +%endif %attr(755,root,root) %{_pluginsdir}/xineplug_inp_v4l2.so %files -n xine-input-vcd @@ -1162,6 +1163,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.284 2011/06/28 15:50:31 qboosh +- added pvr patch (build pvr input driver together with V4L2, not V4L1); moved pvr driver to xine-input-v4l package +- disable v4l1 driver by default + Revision 1.283 2011/06/27 20:02:59 qboosh - added ffmpeg-0.8 patch ================================================================ Index: packages/xine-lib/xine-lib-pvr.patch diff -u /dev/null packages/xine-lib/xine-lib-pvr.patch:1.1 --- /dev/null Tue Jun 28 17:50:36 2011 +++ packages/xine-lib/xine-lib-pvr.patch Tue Jun 28 17:50:31 2011 @@ -0,0 +1,15 @@ +--- xine-lib-1.1.19/src/input/Makefile.am.orig 2010-03-09 23:17:05.000000000 +0100 ++++ xine-lib-1.1.19/src/input/Makefile.am 2011-06-28 17:18:15.174627748 +0200 +@@ -21,11 +21,11 @@ + + if HAVE_V4L + in_v4l = xineplug_inp_v4l.la +-in_pvr = xineplug_inp_pvr.la + endif + + if HAVE_V4L2 + in_v4l2 = xineplug_inp_v4l2.la ++in_pvr = xineplug_inp_pvr.la + endif + + if HAVE_GNOME_VFS ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xine-lib/xine-lib.spec?r1=1.283&r2=1.284&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
