tags 621960 + patch thanks Hello,
attached you'll find a debdiff (taken from Ubuntu) that fixes the FTBFS bugs in the dv4l package. Unfortunately I'm no DD yet, so I cannot NMU this package. Gregor H., could you please NMU this package if Nobuhiro does not take care himself? Additionally I prepared a Lintian clean package: http://mentors.debian.net/debian/pool/main/d/dv4l/dv4l_1.0-4.dsc Thanks, Gregor
diff -u dv4l-1.0/debian/changelog dv4l-1.0/debian/changelog --- dv4l-1.0/debian/changelog +++ dv4l-1.0/debian/changelog @@ -1,3 +1,17 @@ +dv4l (1.0-3.1) unstable; urgency=low + + [ Daniel Polehn ] + * Fix FTBFS, changed linux/videodev.h location. LP: #749235. + + [ Matthias Klose ] + * Build with -fPIC. + * Fix FTBFS with ld --as-needed. + + [ Gregor Jasny ] + * Imported patch from Ubuntu (Closes: #615836 #621960) + + -- Gregor Jasny <gja...@googlemail.com> Sat, 31 Dec 2011 13:09:36 +0100 + dv4l (1.0-3) unstable; urgency=low * Fix FTBFS with new dpkg-dev. (Closes: #535287) diff -u dv4l-1.0/debian/control dv4l-1.0/debian/control --- dv4l-1.0/debian/control +++ dv4l-1.0/debian/control @@ -4,7 +4,7 @@ Maintainer: Nobuhiro Iwamatsu <iwama...@nigauri.org> Dm-Upload-Allowed: yes Build-Depends: cdbs, debhelper (>= 7), autotools-dev, dpatch, - libraw1394-dev, libiec61883-dev, libdv-dev + libraw1394-dev, libiec61883-dev, libdv-dev, libv4l-dev Standards-Version: 3.8.2 Homepage: http://dv4l.berlios.de/ diff -u dv4l-1.0/debian/patches/00list dv4l-1.0/debian/patches/00list --- dv4l-1.0/debian/patches/00list +++ dv4l-1.0/debian/patches/00list @@ -6,0 +7,3 @@ +07_ld_as_needed +07_use_libv4l-dev +08_fix_build_fail diff -u dv4l-1.0/debian/patches/06_fix_fdset_conflicting_types.dpatch dv4l-1.0/debian/patches/06_fix_fdset_conflicting_types.dpatch --- dv4l-1.0/debian/patches/06_fix_fdset_conflicting_types.dpatch +++ dv4l-1.0/debian/patches/06_fix_fdset_conflicting_types.dpatch @@ -14,7 +14,7 @@ VER := @PACKAGE_VERSION@ -CFLAGS := -Wall -O3 -MMD -+CFLAGS := -Wall -O3 -MMD -D__KERNEL_STRICT_NAMES ++CFLAGS := -Wall -fPIC -O3 -MMD -D__KERNEL_STRICT_NAMES LDFLAGS := -lraw1394 -liec61883 -ldv datarootdir=@datarootdir@ only in patch2: unchanged: only in patch2: unchanged: --- dv4l-1.0.orig/debian/patches/07_use_libv4l-dev.dpatch +++ dv4l-1.0/debian/patches/07_use_libv4l-dev.dpatch @@ -0,0 +1,66 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## use_libv4l-dev.dpatch by Daniel Polehn <dpol...@gmail.com> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' dv4l~/dv4l.c dv4l/dv4l.c +--- dv4l~/dv4l.c 2011-06-26 22:32:29.058413510 -0700 ++++ dv4l/dv4l.c 2011-06-26 22:37:55.608892461 -0700 +@@ -23,7 +23,7 @@ + #include <sys/select.h> + #include <sys/stat.h> + #include <sys/time.h> +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + #include <assert.h> + #include <fcntl.h> + #include <getopt.h> +@@ -61,6 +61,10 @@ + #define DV4LVERSION "0.0" + #endif + ++#ifndef BASE_VIDIOCPRIVATE ++#define BASE_VIDIOCPRIVATE 192 ++#endif ++ + /* + * these constants are used to detect a vloopback input device + * let's hope they won't change them +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' dv4l~/interdv4l.c dv4l/interdv4l.c +--- dv4l~/interdv4l.c 2011-06-26 22:32:29.038413485 -0700 ++++ dv4l/interdv4l.c 2011-06-26 22:32:29.218413750 -0700 +@@ -44,7 +44,7 @@ + + #define __USE_LARGEFILE64 + #include <sys/stat.h> +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + #include <dirent.h> + #include "config.h" + #include "version.h" +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' dv4l~/palettes.c dv4l/palettes.c +--- dv4l~/palettes.c 2011-06-26 22:26:53.000000000 -0700 ++++ dv4l/palettes.c 2011-06-26 22:32:29.218413750 -0700 +@@ -17,7 +17,7 @@ + * Author: Wolfgang Beck <bewo at users.berlios.de> 2007 + */ + +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + + /* + * RGB to YUV420P conversion taken from +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' dv4l~/util.c dv4l/util.c +--- dv4l~/util.c 2011-06-26 22:26:53.000000000 -0700 ++++ dv4l/util.c 2011-06-26 22:32:29.218413750 -0700 +@@ -23,7 +23,7 @@ + #include <stdarg.h> + #include <string.h> + #include <fcntl.h> +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + #include "util.h" + + static int tracelevel = 1; only in patch2: unchanged: --- dv4l-1.0.orig/debian/patches/07_ld_as_needed.dpatch +++ dv4l-1.0/debian/patches/07_ld_as_needed.dpatch @@ -0,0 +1,24 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run + +@DPATCH@ +--- ./Makefile.in.old 2011-09-19 14:02:03.880744845 +0000 ++++ ./Makefile.in 2011-09-19 14:04:21.230946292 +0000 +@@ -56,13 +56,13 @@ + all: dv4l libdv4l.so dv4lstart + + dv4l: $(OBJ) +- $(CC) $(LDFLAGS) -o $@ $(OBJ) ++ $(CC) -o $@ $(OBJ) $(LDFLAGS) + +-libdv4l.so: interdv4l.c normfile.c scale.c palettes.c util.c $(INCS) ++libdv4l.so: $(OBJ) + $(CC) $(CFLAGS) -shared -fpic -Wl,-soname,$@ \ +- -D DV4LLIBNAME=@prefix@@libdir@/libdv4l.so \ +- -ldl -lraw1394 -liec61883 -ldv $< \ +- normfile.c scale.c palettes.c util.c -o $@ ++ -DDV4LLIBNAME=@prefix@@libdir@/libdv4l.so \ ++ $(OBJ) \ ++ -ldl -lraw1394 -liec61883 -ldv -o $@ + + dv4lstart: + ./mkdv4lstart @prefix@@libdir@ $(VER) only in patch2: unchanged: --- dv4l-1.0.orig/debian/patches/08_fix_build_fail.dpatch +++ dv4l-1.0/debian/patches/08_fix_build_fail.dpatch @@ -0,0 +1,28 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 08_fix_build_fail.dpatch by Daniel Polehn <dpol...@gmail.com> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' dv4l-1~/dv4l.c dv4l-1/dv4l.c +--- dv4l-1~/dv4l.c 2011-06-28 22:30:02.173394425 -0700 ++++ dv4l-1/dv4l.c 2011-06-28 22:30:30.833436470 -0700 +@@ -76,7 +76,7 @@ + + #define NUM_BUFS 8 + +-typedef enum { MmapMode = 1, WriteMode } mode_t; ++typedef enum { MmapMode = 1, WriteMode } rmode_t; + typedef struct { + struct video_mbuf vmbuf; + unsigned char *vframebuf; +@@ -89,7 +89,7 @@ + int v_cnt; + int rgbonly; + int v_vfd; +- mode_t v_mode; ++ rmode_t v_mode; + struct video_capability vcap; + struct video_channel vchan; + struct video_picture vpic;
