Merge lp:~scarneiro/ubuntu/oneiric/setpwc/fix-for-755945 into lp:ubuntu/oneiric/setpwc

[Sebastian Carneiro]

Replaced old Video4Linux kernel interfaces with the ones from libv4l1 in the sources, Makefile, and Build-Depends in control file to fix FTBFS.

Thanks.

[Luke Yelavich (themuso)]

Thanks for your work. i see you linked to the Debian bug report in the patch. If you could push the patch to that bug report in Debian, that would be much appreciated.

Thanks again.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2009-06-11 10:58:09 +0000
+++ debian/changelog	2011-07-29 04:11:30 +0000
@@ -1,3 +1,15 @@
+setpwc (1.2-3ubuntu1) oneiric; urgency=low
+
+  * debian/patches/20-ftbfs-old-video4linux: Fixed FTBFS regarding
+    use of deprecated interfaces to Video4Linux (LP: #755945)
+    - Makefile: added v4l1 libraries to linker parameters and changed
+      order of parameters to build with ld --as-needed.
+    - setpwc.c: replaced old kernel includes of Video4Linux with 
+      the current ones from v4l1 libraries.
+  * debian/control: Added libv4l1-dev to Build-Depends.
+
+ -- Sebastian Carneiro <[e-mail]>  Fri, 29 Jul 2011 00:12:00 -0300
+
 setpwc (1.2-3) unstable; urgency=low
 
   * Bumped standards version to 3.8.1 (no changes).

=== modified file 'debian/control'
--- debian/control	2009-06-11 10:58:09 +0000
+++ debian/control	2011-07-29 04:11:30 +0000
@@ -1,8 +1,9 @@
 Source: setpwc
 Section: graphics
 Priority: optional
-Maintainer: Anders Lennartsson <[e-mail]>
-Build-Depends: debhelper (>= 4.0.0), dbs (>= 0.21)
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Anders Lennartsson <[e-mail]>
+Build-Depends: debhelper (>= 4.0.0), dbs (>= 0.21), libv4l-dev
 Standards-Version: 3.8.1
 
 Package: setpwc

=== added file 'debian/patches/20-ftbfs-old-video4linux'
--- debian/patches/20-ftbfs-old-video4linux	1970-01-01 00:00:00 +0000
+++ debian/patches/20-ftbfs-old-video4linux	2011-07-29 04:11:30 +0000
@@ -0,0 +1,39 @@
+Description: Replaced old Video4Linux kernel interfaces with
+ the current ones from v4l1 library to fix FTBFS. 
+Origin/Author: Sebastian Carneiro <[e-mail]>
+Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=621961
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/setpwc/+bug/755945
+Last-Update: 2011-07-28
+diff -ruN setpwc-1.2-old/Makefile setpwc-1.2/Makefile
+--- setpwc-1.2-old/Makefile	2011-07-29 00:13:27.895300001 -0300
++++ setpwc-1.2/Makefile	2011-07-29 00:13:29.645300001 -0300
+@@ -14,14 +14,14 @@
+ 
+ VERSION=1.2
+ CFLAGS+=-Wall -O2 -DVERSION=\"$(VERSION)\"
+-LDFLAGS=
++LDFLAGS=-lv4l1
+ 
+ OBJS=setpwc.o
+ 
+ all: setpwc
+ 
+ setpwc: $(OBJS)
+-	$(CC) -Wall -W $(OBJS) $(LDFLAGS) -o setpwc
++	$(CC) -Wall -W $(OBJS) -o setpwc $(LDFLAGS)
+ 	#
+ 	# Oh, blatant plug: http://keetweej.vanheusden.com/wishlist.html
+ 
+diff -ruN setpwc-1.2-old/setpwc.c setpwc-1.2/setpwc.c
+--- setpwc-1.2-old/setpwc.c	2006-11-27 06:14:03.000000000 -0300
++++ setpwc-1.2/setpwc.c	2011-07-29 00:13:29.665300001 -0300
+@@ -23,8 +23,7 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ #define _LINUX_TIME_H 1	/* to get things compile on kernel 2.6.x */
+-#include <linux/videodev.h>
+-
++#include <libv4l1-videodev.h>
+ #include "pwc-ioctl.h"
+ 
+ char *device = "/dev/video0";