[Pkg-utopia-commits] r3813 - in /packages/unstable/hal/debian: changelog patches/00_disable_v4l1_probing.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sun Apr 10 05:06:57 2011
New Revision: 3813

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3813
Log:
* debian/patches/00_disable_v4l1_probing.patch
  - The hald-probe-video4linux prober supports both v4l1 and v4l2. Support
    for v4l1 has been removed from Linux kernel 2.6.38. Instead of
    disabling the prober altogether, #ifdef the v4l1 parts when building on a
    newer kernel. This partially reverts 00upstream_video4linux_check.patch.
    (Closes: #621973)

Added:
    packages/unstable/hal/debian/patches/00_disable_v4l1_probing.patch
Modified:
    packages/unstable/hal/debian/changelog
    packages/unstable/hal/debian/patches/series

Modified: packages/unstable/hal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/changelog?rev=3813&op=diff
==============================================================================
--- packages/unstable/hal/debian/changelog (original)
+++ packages/unstable/hal/debian/changelog Sun Apr 10 05:06:57 2011
@@ -1,11 +1,20 @@
 hal (0.5.14-6) UNRELEASED; urgency=low
 
+  [ Martin Pitt ]
   * Add 00upstream_video4linux_check.patch: Do not build
     hald-probe-video4linux if v4l1 is not available. (LP: #721399)
   * Refresh 99-autoreconf.patch for above.
   * 45-fix-libusb-detection.patch: Unfuzz.
 
- -- Martin Pitt <mpitt at debian.org>  Mon, 14 Feb 2011 11:45:59 +0100
+  [ Michael Biebl ]
+  * debian/patches/00_disable_v4l1_probing.patch
+    - The hald-probe-video4linux prober supports both v4l1 and v4l2. Support
+      for v4l1 has been removed from Linux kernel 2.6.38. Instead of
+      disabling the prober altogether, #ifdef the v4l1 parts when building on a
+      newer kernel. This partially reverts 00upstream_video4linux_check.patch.
+      (Closes: #621973)
+
+ -- Michael Biebl <biebl at debian.org>  Sun, 10 Apr 2011 06:57:58 +0200
 
 hal (0.5.14-5) unstable; urgency=low
 

Added: packages/unstable/hal/debian/patches/00_disable_v4l1_probing.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/patches/00_disable_v4l1_probing.patch?rev=3813&op=file
==============================================================================
--- packages/unstable/hal/debian/patches/00_disable_v4l1_probing.patch (added)
+++ packages/unstable/hal/debian/patches/00_disable_v4l1_probing.patch Sun Apr 10 05:06:57 2011
@@ -1,0 +1,61 @@
+Index: hal-0.5.14/hald/linux/probing/Makefile.am
+===================================================================
+--- hal-0.5.14.orig/hald/linux/probing/Makefile.am	2011-04-10 06:55:03.054548554 +0200
++++ hal-0.5.14/hald/linux/probing/Makefile.am	2011-04-10 06:55:22.934298633 +0200
+@@ -19,11 +19,8 @@
+ 	hald-probe-smbios 		\
+ 	hald-probe-serial 		\
+ 	hald-probe-ieee1394-unit 	\
+-	hald-probe-net-bluetooth
+-
+-if HAVE_V4L1
+-libexec_PROGRAMS += hald-probe-video4linux
+-endif
++	hald-probe-net-bluetooth 	\
++	hald-probe-video4linux
+ endif
+ 
+ hald_probe_smbios_SOURCES = probe-smbios.c ../../logger.c
+Index: hal-0.5.14/hald/linux/probing/probe-video4linux.c
+===================================================================
+--- hal-0.5.14.orig/hald/linux/probing/probe-video4linux.c	2011-04-10 06:54:50.666704291 +0200
++++ hal-0.5.14/hald/linux/probing/probe-video4linux.c	2011-04-10 06:57:17.776854865 +0200
+@@ -30,7 +30,9 @@
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <sys/ioctl.h>
++#ifdef HAVE_LINUX_VIDEODEV_H
+ #include <linux/videodev.h>
++#endif
+ #include <linux/videodev2.h>
+ #include <errno.h>
+ #include <fcntl.h>
+@@ -50,7 +52,9 @@
+ 	int ret = -1;
+ 	char *udi;
+ 	char *device_file;
++#ifdef HAVE_LINUX_VIDEODEV_H
+ 	struct video_capability v1cap;
++#endif
+ 	struct v4l2_capability v2cap;
+ 	LibHalContext *ctx = NULL;
+ 	LibHalChangeSet *cset;
+@@ -106,7 +110,9 @@
+ 			LIBHAL_FREE_DBUS_ERROR (&error);
+ 			libhal_device_add_capability (ctx, udi, "video4linux.radio", &error);
+ 		}
+-	} else {
++	}
++#ifdef HAVE_LINUX_VIDEODEV_H
++	else {
+ 		HAL_DEBUG (("ioctl VIDIOC_QUERYCAP failed"));
+ 
+ 		if (ioctl (fd, VIDIOCGCAP, &v1cap) == 0) {
+@@ -133,6 +139,7 @@
+ 			HAL_DEBUG (("ioctl VIDIOCGCAP failed"));
+ 		}
+ 	}
++#endif
+ 
+ 	LIBHAL_FREE_DBUS_ERROR (&error);
+ 	libhal_device_commit_changeset (ctx, cset, &error);

Modified: packages/unstable/hal/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/patches/series?rev=3813&op=diff
==============================================================================
--- packages/unstable/hal/debian/patches/series (original)
+++ packages/unstable/hal/debian/patches/series Sun Apr 10 05:06:57 2011
@@ -1,5 +1,6 @@
 # Debian patches for hal
 00upstream_video4linux_check.patch
+00_disable_v4l1_probing.patch
 01_at_console.patch
 02_libhal_dont_check_running.patch
 10_nonpolkit-mount-policy.patch