Author: kwizart Update of /cvs/free/rpms/transcode/F-15 In directory se02.es.rpmfusion.net:/tmp/cvs-serv18123/F-15 Modified Files: transcode.spec Added Files: transcode-1.1.5-fix_v4l_1.patch Log Message: Fix rfbz#1824 transcode-1.1.5-fix_v4l_1.patch: probe_v4l.c | 2 +- v4l/import_v4l.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE transcode-1.1.5-fix_v4l_1.patch --- --- transcode-1.1.5/import/v4l/import_v4l.c 2009-02-21 23:01:57.000000000 +0200 +++ transcode-1.1.5/import/v4l/import_v4l.c.fix_v4l_1 2011-06-26 20:09:32.039709334 +0200 @@ -29,7 +29,7 @@ #include <sys/ioctl.h> #include <sys/mman.h> -#include <linux/videodev.h> +#include <libv4l1-videodev.h> #define MOD_NAME "import_v4l.so" #define MOD_VERSION "v0.2.0 (2008-10-26)" --- transcode-1.1.5/import/probe_v4l.c 2011-06-26 20:22:27.898708862 +0200 +++ transcode-1.1.5/import/probe_v4l.c.fix_v4l_1 2011-06-26 20:21:48.066708886 +0200 @@ -31,7 +31,7 @@ #include <sys/ioctl.h> -#include <linux/videodev.h> +#include <libv4l1-videodev.h> #if defined(HAVE_LINUX_VIDEODEV2_H) && defined(HAVE_STRUCT_V4L2_BUFFER) #define _LINUX_TIME_H Index: transcode.spec =================================================================== RCS file: /cvs/free/rpms/transcode/F-15/transcode.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- transcode.spec 21 Apr 2011 20:25:47 -0000 1.26 +++ transcode.spec 26 Jun 2011 20:10:56 -0000 1.27 @@ -7,7 +7,7 @@ Name: transcode Version: 1.1.5 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Video stream processing tool Group: Applications/Multimedia @@ -17,9 +17,9 @@ Patch0: %{name}-pvmbin.patch Patch3: transcode-1.0.4.external_dv.patch Patch4: transcode-1.1.5-fix_v4l.patch -Patch5: transcode-1.1.5-no_video.patch +Patch5: transcode-1.1.5-no_video.patch Patch6: transcode-1.1.5-videodev2.patch - +Patch7: transcode-1.1.5-fix_v4l_1.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -77,6 +77,7 @@ %patch4 -p1 -b .fix_v4l %patch5 -p1 -b .no_video %patch6 -p1 -b .videodev2 +%patch7 -p1 -b .fix_v4l_1 rm filter/preview/dv_types.h rm import/v4l/videodev.h @@ -122,6 +123,7 @@ --enable-nuv \ %endif --enable-deprecated \ + --enable-v4l \ --enable-libv4l2 \ --enable-libv4lconvert \ --enable-libmpeg2 \ @@ -153,6 +155,9 @@ %changelog +* Sun Jun 26 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.1.5-7 +- Fix support for v4l - rfbz#1824 + * Wed Apr 20 2011 David Juran <david(a)juran.se&gt; - 1.1.5-6 - Disable v4l, Bz 1700