r53973 - in /trunk/libvideo-capture-v4l-perl/debian: changelog control patches/series patches/v4l2.patch

dmn at users.alioth.debian.org dmn at users.alioth.debian.org
Tue Mar 9 11:58:00 UTC 2010


Author: dmn
Date: Tue Mar  9 11:57:49 2010
New Revision: 53973

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=53973
Log:
add v4l2.patch, making the module use v4l1_open function from libv4l.
Closes: #569091 -- Uses obsolete V4L1 API

Added:
    trunk/libvideo-capture-v4l-perl/debian/patches/v4l2.patch
Modified:
    trunk/libvideo-capture-v4l-perl/debian/changelog
    trunk/libvideo-capture-v4l-perl/debian/control
    trunk/libvideo-capture-v4l-perl/debian/patches/series

Modified: trunk/libvideo-capture-v4l-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libvideo-capture-v4l-perl/debian/changelog?rev=53973&op=diff
==============================================================================
--- trunk/libvideo-capture-v4l-perl/debian/changelog (original)
+++ trunk/libvideo-capture-v4l-perl/debian/changelog Tue Mar  9 11:57:49 2010
@@ -7,6 +7,10 @@
 
   [ Nathan Handler ]
   * debian/watch: Update to ignore development releases.
+
+  [ Damyan Ivanov ]
+  * add v4l2.patch, making the module use v4l1_open function from libv4l.
+    Closes: #569091 -- Uses obsolete V4L1 API
 
  -- gregor herrmann <gregoa at debian.org>  Sun, 16 Nov 2008 20:48:52 +0100
 

Modified: trunk/libvideo-capture-v4l-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libvideo-capture-v4l-perl/debian/control?rev=53973&op=diff
==============================================================================
--- trunk/libvideo-capture-v4l-perl/debian/control (original)
+++ trunk/libvideo-capture-v4l-perl/debian/control Tue Mar  9 11:57:49 2010
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: gregor herrmann <gregoa at debian.org>
-Build-Depends: debhelper (>= 6), perl (>= 5.8.0-7), quilt
+Build-Depends: debhelper (>= 6), perl (>= 5.8.0-7), quilt, libv4l-dev
 Standards-Version: 3.8.0
 Homepage: http://search.cpan.org/dist/Video-Capture-V4l/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libvideo-capture-v4l-perl/

Modified: trunk/libvideo-capture-v4l-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libvideo-capture-v4l-perl/debian/patches/series?rev=53973&op=diff
==============================================================================
--- trunk/libvideo-capture-v4l-perl/debian/patches/series (original)
+++ trunk/libvideo-capture-v4l-perl/debian/patches/series Tue Mar  9 11:57:49 2010
@@ -1,3 +1,4 @@
 bashism.patch
 compile-failure.patch
 compile_with_-fPIC.patch
+v4l2.patch

Added: trunk/libvideo-capture-v4l-perl/debian/patches/v4l2.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libvideo-capture-v4l-perl/debian/patches/v4l2.patch?rev=53973&op=file
==============================================================================
--- trunk/libvideo-capture-v4l-perl/debian/patches/v4l2.patch (added)
+++ trunk/libvideo-capture-v4l-perl/debian/patches/v4l2.patch Tue Mar  9 11:57:49 2010
@@ -1,0 +1,60 @@
+--- a/V4l/V4l.pm
++++ b/V4l/V4l.pm
+@@ -92,9 +92,7 @@ sub new(;$) {
+    my $device = shift || "/dev/video0";
+    my $self = bless { device => $device }, $class;
+ 
+-   $self->{handle} = local *{$device};
+-   sysopen $self->{handle},$device,O_RDWR or return;
+-   $self->{fd} = fileno ($self->{handle});
++   $self->{fd} = v4l_open($device,O_RDWR) or return;
+    $self->{capability} = _capabilities_new ($self->{fd});
+    $self->{picture} = _picture_new ($self->{fd});
+ 
+@@ -176,9 +174,7 @@ sub new(;$) {
+    my $device = shift || "/dev/vbi0";
+    my $self = bless { device => $device }, $class;
+ 
+-   $self->{handle} = local *{$device};
+-   sysopen $self->{handle},$device,O_RDWR or return;
+-   $self->{fd} = fileno ($self->{handle});
++   $self->{fd} = v4l_open($device,O_RDWR) or return;
+ 
+    $self
+ }
+--- a/V4l/V4l.xs
++++ b/V4l/V4l.xs
+@@ -14,6 +14,8 @@
+ #define NEED_newCONSTSUB
+ #include "../gppport.h"
+ 
++#include <libv4l1.h>
++
+ #ifndef pTHX_
+ #define pTHX_
+ #endif
+@@ -430,6 +432,15 @@ _picture_new(fd)
+         OUTPUT:
+         RETVAL
+ 
++int
++v4l_open (file,oflag)
++        char    *file
++        int     oflag
++        CODE:
++            RETVAL = v4l1_open (file, oflag);
++        OUTPUT:
++        RETVAL
++
+ MODULE = Video::Capture::V4l		PACKAGE = Video::Capture::V4l::Capability
+ 
+ void
+--- a/V4l/Makefile.PL
++++ b/V4l/Makefile.PL
+@@ -8,5 +8,5 @@ if ($^O ne "linux") {
+ WriteMakefile(
+     'NAME'	=> 'Video::Capture::V4l',
+     'VERSION_FROM' => 'V4l.pm',
+-    LIBS	=> '-lpthread',
++    LIBS	=> '-lpthread -lv4l1',
+ );




More information about the Pkg-perl-cvs-commits mailing list