Author: juran Update of /cvs/free/rpms/transcode/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv6182 Modified Files: .cvsignore sources transcode.spec Added Files: transcode-1.1.5-fix_v4l.patch Log Message: upgrade to 1.1.5 transcode-1.1.5-fix_v4l.patch: --- NEW FILE transcode-1.1.5-fix_v4l.patch --- diff -up transcode-1.1.5/acinclude.m4.fix_v4l transcode-1.1.5/acinclude.m4 --- transcode-1.1.5/acinclude.m4.fix_v4l 2009-10-31 18:39:02.000000000 +0200 +++ transcode-1.1.5/acinclude.m4 2009-11-01 20:55:17.000000000 +0200 @@ -189,7 +189,7 @@ if test x"$enable_v4l" = x"yes" ; then #include <linux/videodev2.h> ], [ struct v4l2_buffer buf; -buffer.memory = V4L2_MEMORY_MMAP +buf.memory = V4L2_MEMORY_MMAP ], [AC_DEFINE([HAVE_STRUCT_V4L2_BUFFER], 1, [define if your videodev2 header has struct v4l2_buffer]) AC_MSG_RESULT([yes])], diff -up transcode-1.1.5/import/probe_v4l.c.fix_v4l transcode-1.1.5/import/probe_v4l.c --- transcode-1.1.5/import/probe_v4l.c.fix_v4l 2009-11-01 20:59:47.000000000 +0200 +++ transcode-1.1.5/import/probe_v4l.c 2009-11-01 21:00:09.000000000 +0200 @@ -31,7 +31,7 @@ #include <sys/ioctl.h> -#include "v4l/videodev.h" +#include <linux/videodev.h> #if defined(HAVE_LINUX_VIDEODEV2_H) && defined(HAVE_STRUCT_V4L2_BUFFER) #define _LINUX_TIME_H diff -up transcode-1.1.5/import/v4l/import_v4l.c.fix_v4l transcode-1.1.5/import/v4l/import_v4l.c --- transcode-1.1.5/import/v4l/import_v4l.c.fix_v4l 2009-02-21 23:01:57.000000000 +0200 +++ transcode-1.1.5/import/v4l/import_v4l.c 2009-11-01 20:55:17.000000000 +0200 @@ -29,7 +29,7 @@ #include <sys/ioctl.h> #include <sys/mman.h> -#include "videodev.h" +#include <linux/videodev.h> #define MOD_NAME "import_v4l.so" #define MOD_VERSION "v0.2.0 (2008-10-26)" Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/transcode/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 27 Aug 2009 19:22:43 -0000 1.10 +++ .cvsignore 1 Nov 2009 20:19:39 -0000 1.11 @@ -1 +1 @@ -transcode-1.1.4.tar.bz2 +transcode-1.1.5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/transcode/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 27 Aug 2009 19:22:43 -0000 1.10 +++ sources 1 Nov 2009 20:19:39 -0000 1.11 @@ -1 +1 @@ -6ba277fde95c26d217a88bbe5e6dd994 transcode-1.1.4.tar.bz2 +41ac6b1c0fe30f3aab286e771fc31b9e transcode-1.1.5.tar.bz2 Index: transcode.spec =================================================================== RCS file: /cvs/free/rpms/transcode/devel/transcode.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- transcode.spec 16 Oct 2009 22:09:31 -0000 1.20 +++ transcode.spec 1 Nov 2009 20:19:39 -0000 1.21 @@ -6,8 +6,8 @@ %define pvmdir %{_datadir}/pvm3 Name: transcode -Version: 1.1.4 -Release: 2%{?dist} +Version: 1.1.5 +Release: 1%{?dist} Summary: Video stream processing tool Group: Applications/Multimedia @@ -16,6 +16,7 @@ Source0: http://prdownload.berlios.de/tcforge/%{name}-%{version}.tar.bz2 Patch0: %{name}-pvmbin.patch Patch3: transcode-1.0.4.external_dv.patch +Patch4: transcode-1.1.5-fix_v4l.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -48,6 +49,8 @@ %endif BuildRequires: ImageMagick-devel BuildRequires: libmpeg3-devel +BuildRequires: kernel-headers +BuildRequires: libv4l-devel # libtool + autotools for patch2, autoreconf BuildRequires: libtool @@ -68,6 +71,8 @@ %setup -q %patch0 -p1 -b .pvmbin %patch3 -p1 -b .external_dv +%patch4 -p1 -b .fix_v4l + rm filter/preview/dv_types.h rm import/v4l/videodev.h @@ -112,7 +117,11 @@ %ifarch %{ix86} x86_64 --enable-nuv \ %endif - --enable-deprecated + --enable-deprecated \ + --enable-libv4l2 \ + --enable-libv4lconvert \ + --enable-v4l + make %{?_smp_mflags} @@ -138,6 +147,9 @@ %changelog +* Sun Nov 1 2009 David Juran <david(a)juran.se&gt; - 1.1.5-1 +- upgrade to 1.1.5 + * Sat Oct 17 2009 kwizart < kwizart at gmail.com > - 1.1.4-2 - Conditionalize faac (moved to nonfree).