Hello community, here is the log from the commit of package hal for openSUSE:Factory checked in at Thu Jun 30 13:21:41 CEST 2011.
-------- --- hal/hal-doc.changes 2011-01-15 02:36:37.000000000 +0100 +++ /mounts/work_src_done/STABLE/hal/hal-doc.changes 2011-06-30 10:00:06.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jun 30 07:14:33 UTC 2011 - [email protected] + +- Fix building with newer kernel headers (hal-videodev.patch taken + from hal git). + +------------------------------------------------------------------- hal.changes: same change calling whatdependson for head-i586 New: ---- hal-videodev.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hal-doc.spec ++++++ --- /var/tmp/diff_new_pack.bfTeVI/_old 2011-06-30 13:14:53.000000000 +0200 +++ /var/tmp/diff_new_pack.bfTeVI/_new 2011-06-30 13:14:53.000000000 +0200 @@ -28,7 +28,7 @@ %define dbus_release 1 %define hal_info_version 20091130 Version: 0.5.14 -Release: 14 +Release: 15 Url: http://freedesktop.org/Software/hal License: GPLv2+ ; AFL2.0 or GPLv2.0 Group: System/Daemons @@ -70,6 +70,7 @@ Patch4: hal-nonpolkit-mount-policy.patch Patch5: hal-fix-docking.patch Patch6: hal-probe-input-segv.patch +Patch7: hal-videodev.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # @@ -120,6 +121,7 @@ #patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 chmod 644 tools/hal-functions pushd hal-info-%{hal_info_version} popd ++++++ hal.spec ++++++ --- /var/tmp/diff_new_pack.bfTeVI/_old 2011-06-30 13:14:53.000000000 +0200 +++ /var/tmp/diff_new_pack.bfTeVI/_new 2011-06-30 13:14:53.000000000 +0200 @@ -28,7 +28,7 @@ %define dbus_release 1 %define hal_info_version 20091130 Version: 0.5.14 -Release: 14 +Release: 21 Url: http://freedesktop.org/Software/hal License: GPLv2+ ; AFL2.0 or GPLv2.0 Group: System/Daemons @@ -70,6 +70,7 @@ Patch4: hal-nonpolkit-mount-policy.patch Patch5: hal-fix-docking.patch Patch6: hal-probe-input-segv.patch +Patch7: hal-videodev.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # @@ -120,6 +121,7 @@ #patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 chmod 644 tools/hal-functions pushd hal-info-%{hal_info_version} popd ++++++ hal-videodev.patch ++++++ commit ae13d96fa2a0612b6000f4b8f6ed9d3564035703 Author: Michael Biebl <[email protected]> Date: Sun Apr 10 14:54:53 2011 +0200 Build hald-probe-video4linux on current kernels again 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. Signed-off-by: Martin Pitt <[email protected]> diff --git a/hald/linux/probing/probe-video4linux.c b/hald/linux/probing/probe-video4linux.c index 7bc13e8..b055720 100644 --- a/hald/linux/probing/probe-video4linux.c +++ b/hald/linux/probing/probe-video4linux.c @@ -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 @@ main (int argc, char *argv[]) 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; @@ -107,7 +111,9 @@ main (int argc, char *argv[]) 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) { @@ -134,6 +140,7 @@ main (int argc, char *argv[]) HAL_DEBUG (("ioctl VIDIOCGCAP failed")); } } +#endif LIBHAL_FREE_DBUS_ERROR (&error); libhal_device_commit_changeset (ctx, cset, &error); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
