r73894 - in /trunk/libvideo-capture-v4l-perl/debian: changelog control patches/v4l2.patch
dom at users.alioth.debian.org
dom at users.alioth.debian.org
Sun May 1 13:44:17 UTC 2011
Author: dom
Date: Sun May 1 13:44:04 2011
New Revision: 73894
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=73894
Log:
* Tweak patch v4l2.patch to stop using the now-removed
linux/videodev.h (Closes: #621466)
Modified:
trunk/libvideo-capture-v4l-perl/debian/changelog
trunk/libvideo-capture-v4l-perl/debian/control
trunk/libvideo-capture-v4l-perl/debian/patches/v4l2.patch
Modified: trunk/libvideo-capture-v4l-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libvideo-capture-v4l-perl/debian/changelog?rev=73894&op=diff
==============================================================================
--- trunk/libvideo-capture-v4l-perl/debian/changelog (original)
+++ trunk/libvideo-capture-v4l-perl/debian/changelog Sun May 1 13:44:04 2011
@@ -1,3 +1,10 @@
+libvideo-capture-v4l-perl (0.902-3) UNRELEASED; urgency=low
+
+ * Tweak patch v4l2.patch to stop using the now-removed
+ linux/videodev.h (Closes: #621466)
+
+ -- Dominic Hargreaves <dom at earth.li> Sun, 01 May 2011 14:40:42 +0100
+
libvideo-capture-v4l-perl (0.902-2) unstable; urgency=low
[ gregor herrmann ]
Modified: trunk/libvideo-capture-v4l-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libvideo-capture-v4l-perl/debian/control?rev=73894&op=diff
==============================================================================
--- trunk/libvideo-capture-v4l-perl/debian/control (original)
+++ trunk/libvideo-capture-v4l-perl/debian/control Sun May 1 13:44:04 2011
@@ -3,7 +3,8 @@
Priority: optional
Build-Depends: debhelper (>= 7), libv4l-dev, perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: gregor herrmann <gregoa at debian.org>
+Uploaders: gregor herrmann <gregoa at debian.org>,
+ Dominic Hargreaves <dom at earth.li>
Standards-Version: 3.8.4
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/v4l2.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libvideo-capture-v4l-perl/debian/patches/v4l2.patch?rev=73894&op=diff
==============================================================================
--- trunk/libvideo-capture-v4l-perl/debian/patches/v4l2.patch (original)
+++ trunk/libvideo-capture-v4l-perl/debian/patches/v4l2.patch Sun May 1 13:44:04 2011
@@ -5,7 +5,7 @@
--- a/V4l/V4l.pm
+++ b/V4l/V4l.pm
-@@ -7,6 +7,7 @@ use vars qw($VERSION @ISA @EXPORT @EXPOR
+@@ -7,6 +7,7 @@
require Exporter;
require DynaLoader;
@@ -13,7 +13,7 @@
use Fcntl;
$VERSION = '0.902';
-@@ -92,9 +93,8 @@ sub new(;$) {
+@@ -92,9 +93,8 @@
my $device = shift || "/dev/video0";
my $self = bless { device => $device }, $class;
@@ -25,7 +25,7 @@
$self->{capability} = _capabilities_new ($self->{fd});
$self->{picture} = _picture_new ($self->{fd});
-@@ -176,9 +176,8 @@ sub new(;$) {
+@@ -176,9 +176,8 @@
my $device = shift || "/dev/vbi0";
my $self = bless { device => $device }, $class;
@@ -37,17 +37,27 @@
$self
}
+--- a/V4l/Makefile.PL
++++ b/V4l/Makefile.PL
+@@ -8,5 +8,5 @@
+ WriteMakefile(
+ 'NAME' => 'Video::Capture::V4l',
+ 'VERSION_FROM' => 'V4l.pm',
+- LIBS => '-lpthread',
++ LIBS => '-lpthread -lv4l1',
+ );
--- a/V4l/V4l.xs
+++ b/V4l/V4l.xs
-@@ -10,6 +10,7 @@
+@@ -9,7 +9,7 @@
+
#include <string.h>
#include <pthread.h>
- #include <linux/videodev.h>
+-#include <linux/videodev.h>
+#include <libv4l1.h>
#define NEED_newCONSTSUB
#include "../gppport.h"
-@@ -89,7 +90,7 @@ static int
+@@ -89,7 +89,7 @@
private_free (pTHX_ SV *obj, MAGIC *mg)
{
struct private *p = (struct private *)mg->mg_ptr;
@@ -56,7 +66,7 @@
return 0;
}
-@@ -105,9 +106,9 @@ find_private (SV *sv)
+@@ -105,9 +105,9 @@
{
struct private p;
p.fd = SvIV (*hv_fetch (hv, "fd", 2, 0));
@@ -68,7 +78,7 @@
if (p.mmap_base)
{
sv_magic ((SV*)hv, 0, '~', (char*)&p, sizeof p);
-@@ -164,7 +165,7 @@ vbi_snatcher_thread (void *arg)
+@@ -164,7 +164,7 @@
pthread_mutex_unlock (&vbi_lock);
next->next = 0;
@@ -77,7 +87,7 @@
pthread_mutex_lock (&vbi_lock);
-@@ -229,7 +230,7 @@ field(self)
+@@ -229,7 +229,7 @@
RETVAL = newSVpvn ("", 0);
SvGROW (RETVAL, VBI_BPF);
@@ -86,7 +96,7 @@
SvCUR_set (RETVAL, len);
}
-@@ -314,6 +315,15 @@ queued(self)
+@@ -314,6 +314,15 @@
OUTPUT:
RETVAL
@@ -102,7 +112,7 @@
MODULE = Video::Capture::V4l PACKAGE = Video::Capture::V4l
SV *
-@@ -333,7 +343,7 @@ capture(sv,frame,width,height,format = V
+@@ -333,7 +342,7 @@
vm.height = height;
vm.width = width;
vm.format = format;
@@ -111,7 +121,7 @@
{
SV *fr = newSV (0);
SvUPGRADE (fr, SVt_PV);
-@@ -361,7 +371,7 @@ sync(sv,frame)
+@@ -361,7 +370,7 @@
{
struct private *p;
if ((p = find_private (sv))
@@ -120,7 +130,7 @@
XSRETURN_YES;
else
XSRETURN_EMPTY;
-@@ -375,11 +385,11 @@ _freq (fd,fr)
+@@ -375,11 +384,11 @@
if (items > 1)
{
fr = ((fr<<4)+499)/1000;
@@ -134,7 +144,7 @@
RETVAL = (fr*1000+7)>>4;
else
XSRETURN_EMPTY;
-@@ -430,13 +440,22 @@ _picture_new(fd)
+@@ -430,13 +439,22 @@
OUTPUT:
RETVAL
@@ -158,7 +168,7 @@
MODULE = Video::Capture::V4l PACKAGE = Video::Capture::V4l::Channel
-@@ -444,13 +463,13 @@ void
+@@ -444,13 +462,13 @@
get(sv)
SV * sv
CODE:
@@ -174,7 +184,7 @@
MODULE = Video::Capture::V4l PACKAGE = Video::Capture::V4l::Tuner
-@@ -458,13 +477,13 @@ void
+@@ -458,13 +476,13 @@
get(sv)
SV * sv
CODE:
@@ -190,7 +200,7 @@
MODULE = Video::Capture::V4l PACKAGE = Video::Capture::V4l::Audio
-@@ -472,13 +491,13 @@ void
+@@ -472,13 +490,13 @@
get(sv)
SV * sv
CODE:
@@ -206,7 +216,7 @@
MODULE = Video::Capture::V4l PACKAGE = Video::Capture::V4l::Picture
-@@ -486,13 +505,13 @@ void
+@@ -486,13 +504,13 @@
get(sv)
SV * sv
CODE:
@@ -222,12 +232,13 @@
# accessors/mutators
INCLUDE: ./genacc |
---- 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',
- );
+@@ -510,9 +528,6 @@
+ newCONSTSUB(stash,"AUDIO_MUTE", newSViv(VIDEO_AUDIO_MUTE));
+ newCONSTSUB(stash,"AUDIO_TREBLE", newSViv(VIDEO_AUDIO_TREBLE));
+ newCONSTSUB(stash,"AUDIO_VOLUME", newSViv(VIDEO_AUDIO_VOLUME));
+- newCONSTSUB(stash,"CAPTURE_EVEN", newSViv(VIDEO_CAPTURE_EVEN));
+- newCONSTSUB(stash,"CAPTURE_ODD", newSViv(VIDEO_CAPTURE_ODD));
+- newCONSTSUB(stash,"MAX_FRAME", newSViv(VIDEO_MAX_FRAME));
+ newCONSTSUB(stash,"MODE_AUTO", newSViv(VIDEO_MODE_AUTO));
+ newCONSTSUB(stash,"MODE_NTSC", newSViv(VIDEO_MODE_NTSC));
+ newCONSTSUB(stash,"MODE_PAL", newSViv(VIDEO_MODE_PAL));
More information about the Pkg-perl-cvs-commits
mailing list