Author: kwizart
Update of /cvs/free/rpms/transcode/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30094/F-16
Modified Files:
.cvsignore sources transcode.spec
Added Files:
transcode-1.1.6.header.patch
Removed Files:
transcode-1.1.5-fix_v4l.patch transcode-1.1.5-fix_v4l_1.patch
transcode-1.1.5-no_video.patch transcode-1.1.5-videodev2.patch
transcode-ffmpeg.patch
Log Message:
Update to 1.1.6
Sync with F-16
transcode-1.1.6.header.patch:
probe_v4l.c | 2 +-
v4l/import_v4l.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE transcode-1.1.6.header.patch ---
diff -up transcode-1.1.6/import/probe_v4l.c.header transcode-1.1.6/import/probe_v4l.c
--- transcode-1.1.6/import/probe_v4l.c.header 2011-11-06 09:35:02.000000000 +0100
+++ transcode-1.1.6/import/probe_v4l.c 2011-11-09 22:58:47.082990096 +0100
@@ -31,7 +31,7 @@
#include <sys/ioctl.h>
-#include "v4l/videodev.h"
+#include <libv4l1-videodev.h>
#if defined(HAVE_LINUX_VIDEODEV2_H) && defined(HAVE_STRUCT_V4L2_BUFFER)
#define _LINUX_TIME_H
diff -up transcode-1.1.6/import/v4l/import_v4l.c.header
transcode-1.1.6/import/v4l/import_v4l.c
--- transcode-1.1.6/import/v4l/import_v4l.c.header 2011-11-06 09:35:02.000000000 +0100
+++ transcode-1.1.6/import/v4l/import_v4l.c 2011-11-09 22:21:37.225106789 +0100
@@ -29,7 +29,7 @@
#include <sys/ioctl.h>
#include <sys/mman.h>
-#include "videodev.h"
+#include <libv4l1-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/F-16/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 1 Nov 2009 20:19:39 -0000 1.11
+++ .cvsignore 10 Nov 2011 19:14:24 -0000 1.12
@@ -1 +1 @@
-transcode-1.1.5.tar.bz2
+transcode-1.1.6.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/transcode/F-16/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 1 Nov 2009 20:19:39 -0000 1.11
+++ sources 10 Nov 2011 19:14:24 -0000 1.12
@@ -1 +1 @@
-41ac6b1c0fe30f3aab286e771fc31b9e transcode-1.1.5.tar.bz2
+d5e062a6f0bdde60285ff1cc5cfeb0f5 transcode-1.1.6.tar.bz2
Index: transcode.spec
===================================================================
RCS file: /cvs/free/rpms/transcode/F-16/transcode.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- transcode.spec 27 Sep 2011 20:47:11 -0000 1.30
+++ transcode.spec 10 Nov 2011 19:14:27 -0000 1.31
@@ -6,21 +6,17 @@
%define pvmdir %{_datadir}/pvm3
Name: transcode
-Version: 1.1.5
-Release: 9%{?dist}
+Version: 1.1.6
+Release: 1%{?dist}
Summary: Video stream processing tool
Group: Applications/Multimedia
License: GPLv2+
-URL:
http://tcforge.berlios.de/
-Source0:
http://prdownload.berlios.de/tcforge/%{name}-%{version}.tar.bz2
+URL:
https://bitbucket.org/france/transcode-tcforge/overview
+Source0:
https://bitbucket.org/france/transcode-tcforge/downloads/transcode-%{vers...
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
-Patch6: transcode-1.1.5-videodev2.patch
-Patch7: transcode-1.1.5-fix_v4l_1.patch
-Patch8: transcode-ffmpeg.patch
+Patch4: transcode-1.1.6.header.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -75,11 +71,7 @@
%setup -q
%patch0 -p1 -b .pvmbin
%patch3 -p1 -b .external_dv
-%patch4 -p1 -b .fix_v4l
-%patch5 -p1 -b .no_video
-%patch6 -p1 -b .videodev2
-%patch7 -p1 -b .fix_v4l_1
-%patch8 -p1 -b .ff08
+%patch4 -p1 -b .header
rm filter/preview/dv_types.h
rm import/v4l/videodev.h
@@ -157,6 +149,9 @@
%changelog
+* Wed Nov 09 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.6-1
+- Update to 1.1.6
+
* Mon Sep 26 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.5-9
- Rebuilt for FFmpeg-0.8
- Add patch from Rathann
--- transcode-1.1.5-fix_v4l.patch DELETED ---
--- transcode-1.1.5-fix_v4l_1.patch DELETED ---
--- transcode-1.1.5-no_video.patch DELETED ---
--- transcode-1.1.5-videodev2.patch DELETED ---
--- transcode-ffmpeg.patch DELETED ---