summaryrefslogtreecommitdiff
path: root/sysutils/hal
diff options
context:
space:
mode:
authordsainty <dsainty@pkgsrc.org>2011-10-04 10:31:37 +0000
committerdsainty <dsainty@pkgsrc.org>2011-10-04 10:31:37 +0000
commitc3b78ed474cd601fae12ea74cc7ecf584e7411d8 (patch)
tree687eaf9385c743720277bc6f430e2fedbab10f4a /sysutils/hal
parent1d3d4ae90f77722dafc3912c5b150ca0159ed5bd (diff)
downloadpkgsrc-c3b78ed474cd601fae12ea74cc7ecf584e7411d8.tar.gz
Upstream patch to build on Linux systems without V4L1 support.
http://cgit.freedesktop.org/hal/commit/?id=ae13d96fa2a0612b6000f4b8f6ed9d3564035703 Fixes build on Ubuntu 11.04.
Diffstat (limited to 'sysutils/hal')
-rw-r--r--sysutils/hal/distinfo5
-rw-r--r--sysutils/hal/patches/patch-na32
-rw-r--r--sysutils/hal/patches/patch-nd47
3 files changed, 71 insertions, 13 deletions
diff --git a/sysutils/hal/distinfo b/sysutils/hal/distinfo
index cfb5c376622..df3b1f3a82a 100644
--- a/sysutils/hal/distinfo
+++ b/sysutils/hal/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2011/03/30 13:05:41 obache Exp $
+$NetBSD: distinfo,v 1.22 2011/10/04 10:31:37 dsainty Exp $
SHA1 (hal-0.5.14.tar.bz2) = a6ec098d78112e18e2773afa5f9ed642b00c4c59
RMD160 (hal-0.5.14.tar.bz2) = 0314dace9512bf49a62bd1556963fc60a6c9caf9
@@ -25,6 +25,7 @@ SHA1 (patch-at) = 040a018a7be5b28a0dc23dd66a0c10bbb0abc6bf
SHA1 (patch-au) = c9e843f57b8a31f1bdc42478d450ea5606b4d7db
SHA1 (patch-av) = 075ab5e265be4733d856a17184129d0b301bc0b8
SHA1 (patch-ax) = 278cbf10dd288f7a4aeedd7545b325c1a82715db
-SHA1 (patch-na) = bd27a1386672df2d7805c303939854bb851d1227
+SHA1 (patch-na) = 2786db8149a55dbd5ea11419d789f420bac1993c
SHA1 (patch-nb) = 1693b7a2faa5bee20a594f0b60b8ff6caea0efdc
SHA1 (patch-nc) = 32453e49734902749ce24eb4364fc7f531986227
+SHA1 (patch-nd) = 877dcbafaca0cebd3fdce74c5a622721823c153b
diff --git a/sysutils/hal/patches/patch-na b/sysutils/hal/patches/patch-na
index bf6ee03495e..f1a585dca92 100644
--- a/sysutils/hal/patches/patch-na
+++ b/sysutils/hal/patches/patch-na
@@ -1,8 +1,18 @@
-$NetBSD: patch-na,v 1.10 2011/03/30 13:05:41 obache Exp $
+$NetBSD: patch-na,v 1.11 2011/10/04 10:31:37 dsainty Exp $
---- configure.in.orig 2009-08-24 12:42:29.000000000 +0000
-+++ configure.in
-@@ -482,9 +482,10 @@ AM_CONDITIONAL([HAVE_LIBPCI], [test "x$U
+Includes upstream patch to build on Linux systems without V4L1 support.
+
+http://cgit.freedesktop.org/hal/commit/?id=8f624253f0135ca77a893ad4e8168f51ef90d4da
+
+--- configure.in.orig 2009-08-25 00:42:29.000000000 +1200
++++ configure.in 2011-10-04 22:56:25.700308098 +1300
+@@ -479,12 +479,16 @@
+ fi
+ AM_CONDITIONAL([HAVE_LIBPCI], [test "x$USE_LIBPCI" = "xyes"])
+
++AC_CHECK_HEADERS([linux/videodev.h], [have_videodev_h=yes], [])
++AM_CONDITIONAL(HAVE_V4L1, [test "x$have_videodev_h" = "xyes"])
++
USE_LIBUSB20=no
USE_LIBUSB=no
LIBUSB20_LIBS=""
@@ -14,7 +24,7 @@ $NetBSD: patch-na,v 1.10 2011/03/30 13:05:41 obache Exp $
[backend=$withval])
if ! test -z "$with_backend" ; then
HALD_BACKEND="$with_backend"
-@@ -493,6 +494,9 @@ else
+@@ -493,6 +497,9 @@
*-*-solaris*)
HALD_BACKEND="solaris"
;;
@@ -24,7 +34,7 @@ $NetBSD: patch-na,v 1.10 2011/03/30 13:05:41 obache Exp $
*-*-freebsd* | *-*-kfreebsd*-gnu)
HALD_BACKEND="freebsd"
;;
-@@ -508,8 +512,10 @@ AM_CONDITIONAL(HALD_COMPILE_DUMMY, [test
+@@ -508,8 +515,10 @@
AM_CONDITIONAL(HALD_COMPILE_LINUX, [test x$HALD_BACKEND = xlinux], [Compiling for Linux])
AM_CONDITIONAL(HALD_COMPILE_FREEBSD, [test x$HALD_BACKEND = xfreebsd], [Compiling for FreeBSD])
AM_CONDITIONAL(HALD_COMPILE_SOLARIS, [test x$HALD_BACKEND = xsolaris], [Compiling for Solaris])
@@ -35,7 +45,7 @@ $NetBSD: patch-na,v 1.10 2011/03/30 13:05:41 obache Exp $
AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_LIBUSB20=yes], [USE_LIBUSB20=no])
fi
if test "x$USE_LIBUSB20" = "xno"; then
-@@ -526,6 +532,8 @@ elif test "x$USE_LIBUSB" = "xyes"; then
+@@ -526,6 +535,8 @@
fi
AC_SUBST(LIBUSB20_LIBS)
@@ -44,7 +54,7 @@ $NetBSD: patch-na,v 1.10 2011/03/30 13:05:41 obache Exp $
dnl DBUS API is subject to changes
AC_DEFINE_UNQUOTED(DBUS_API_SUBJECT_TO_CHANGE, [], [DBUS API is subject to change])
-@@ -706,8 +714,8 @@ else
+@@ -706,8 +717,8 @@
fi
AC_MSG_RESULT($have_glib_2_14)
@@ -55,7 +65,7 @@ $NetBSD: patch-na,v 1.10 2011/03/30 13:05:41 obache Exp $
PKG_CHECK_MODULES(VOLUME_ID, [$volume_id_module])
AC_SUBST(VOLUME_ID_CFLAGS)
AC_SUBST(VOLUME_ID_LIBS)
-@@ -718,14 +726,13 @@ esac
+@@ -718,14 +729,13 @@
# blkid (util-linux-ng)
case "$host" in
@@ -74,7 +84,7 @@ $NetBSD: patch-na,v 1.10 2011/03/30 13:05:41 obache Exp $
esac
# OS specific libs
-@@ -1086,6 +1093,9 @@ hald/linux/addons/Makefile
+@@ -1086,6 +1096,9 @@
hald/solaris/Makefile
hald/solaris/probing/Makefile
hald/solaris/addons/Makefile
@@ -84,7 +94,7 @@ $NetBSD: patch-na,v 1.10 2011/03/30 13:05:41 obache Exp $
hald/freebsd/Makefile
hald/freebsd/probing/Makefile
hald/freebsd/libprobe/Makefile
-@@ -1096,6 +1106,7 @@ libhal-storage/Makefile
+@@ -1096,6 +1109,7 @@
tools/Makefile
tools/freebsd/Makefile
tools/linux/Makefile
diff --git a/sysutils/hal/patches/patch-nd b/sysutils/hal/patches/patch-nd
new file mode 100644
index 00000000000..b479b3b5acd
--- /dev/null
+++ b/sysutils/hal/patches/patch-nd
@@ -0,0 +1,47 @@
+$NetBSD: patch-nd,v 1.3 2011/10/04 10:31:37 dsainty Exp $
+
+Upstream patch to build on Linux systems without V4L1 support.
+
+http://cgit.freedesktop.org/hal/commit/?id=ae13d96fa2a0612b6000f4b8f6ed9d3564035703
+
+--- hald/linux/probing/probe-video4linux.c.orig 2009-08-25 00:42:30.000000000 +1200
++++ hald/linux/probing/probe-video4linux.c 2011-10-04 23:15:50.132307906 +1300
+@@ -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);