Author: juran Update of /cvs/free/rpms/transcode/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv13149 Modified Files: transcode.spec Added Files: transcode-1.1.5-videodev2.patch Log Message: Disable v4l, Bz 1700 transcode-1.1.5-videodev2.patch: acinclude.m4 | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) --- NEW FILE transcode-1.1.5-videodev2.patch --- diff -up transcode-1.1.5/acinclude.m4.videodev2 transcode-1.1.5/acinclude.m4 --- transcode-1.1.5/acinclude.m4.videodev2 2011-04-20 22:02:13.000000000 +0300 +++ transcode-1.1.5/acinclude.m4 2011-04-21 18:24:23.000000000 +0300 @@ -175,11 +175,8 @@ AC_ARG_ENABLE(v4l, [enable_v4l=no]) AC_MSG_RESULT($enable_v4l) -have_v4l=no -if test x"$enable_v4l" = x"yes" ; then - AC_CHECK_HEADERS([linux/videodev.h], [v4l=yes], [v4l=no]) - AC_CHECK_HEADERS([linux/videodev2.h], [v4l2=yes], [v4l2=no], - [#include <linux/types.h>]) +AC_CHECK_HEADERS([linux/videodev2.h], [v4l2=yes], [v4l2=no], + [#include <linux/types.h>]) if test x"$v4l2" = x"yes" ; then AC_MSG_CHECKING([for struct v4l2_buffer in videodev2.h]) @@ -196,6 +193,12 @@ buf.memory = V4L2_MEMORY_MMAP [AC_MSG_RESULT([no])]) fi +have_v4l=no +if test x"$enable_v4l" = x"yes" ; then + AC_CHECK_HEADERS([linux/videodev.h], [v4l=yes], [v4l=no]) + + + if test x"$v4l" = x"yes" -o x"$v4l2" = x"yes" ; then have_v4l=yes ifelse([$1], , :, [$1]) Index: transcode.spec =================================================================== RCS file: /cvs/free/rpms/transcode/devel/transcode.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- transcode.spec 30 Sep 2010 07:59:00 -0000 1.25 +++ transcode.spec 21 Apr 2011 20:25:47 -0000 1.26 @@ -7,7 +7,7 @@ Name: transcode Version: 1.1.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Video stream processing tool Group: Applications/Multimedia @@ -18,6 +18,8 @@ Patch3: transcode-1.0.4.external_dv.patch Patch4: transcode-1.1.5-fix_v4l.patch Patch5: transcode-1.1.5-no_video.patch +Patch6: transcode-1.1.5-videodev2.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -74,6 +76,7 @@ %patch3 -p1 -b .external_dv %patch4 -p1 -b .fix_v4l %patch5 -p1 -b .no_video +%patch6 -p1 -b .videodev2 rm filter/preview/dv_types.h rm import/v4l/videodev.h @@ -121,7 +124,6 @@ --enable-deprecated \ --enable-libv4l2 \ --enable-libv4lconvert \ - --enable-v4l \ --enable-libmpeg2 \ --enable-libmpeg2convert @@ -151,6 +153,9 @@ %changelog +* Wed Apr 20 2011 David Juran <david(a)juran.se&gt; - 1.1.5-6 +- Disable v4l, Bz 1700 + * Thu Sep 30 2010 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.1.5-5 - rebuilt for ImageMagick