Tue Oct 4 10:31:37 2011 UTC ()
Upstream patch to build on Linux systems without V4L1 support.

http://cgit.freedesktop.org/hal/commit/?id=ae13d96fa2a0612b6000f4b8f6ed9d3564035703

Fixes build on Ubuntu 11.04.


(dsainty)
diff -r1.21 -r1.22 pkgsrc/sysutils/hal/distinfo
diff -r1.10 -r1.11 pkgsrc/sysutils/hal/patches/patch-na
diff -r0 -r1.3 pkgsrc/sysutils/hal/patches/patch-nd
cvs diff -r1.21 -r1.22 pkgsrc/sysutils/hal/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/hal/distinfo 2011/03/30 13:05:41 1.21
+++ pkgsrc/sysutils/hal/distinfo 2011/10/04 10:31:37 1.22
@@ -1,30 +1,31 @@ @@ -1,30 +1,31 @@
1$NetBSD: distinfo,v 1.21 2011/03/30 13:05:41 obache Exp $ 1$NetBSD: distinfo,v 1.22 2011/10/04 10:31:37 dsainty Exp $
2 2
3SHA1 (hal-0.5.14.tar.bz2) = a6ec098d78112e18e2773afa5f9ed642b00c4c59 3SHA1 (hal-0.5.14.tar.bz2) = a6ec098d78112e18e2773afa5f9ed642b00c4c59
4RMD160 (hal-0.5.14.tar.bz2) = 0314dace9512bf49a62bd1556963fc60a6c9caf9 4RMD160 (hal-0.5.14.tar.bz2) = 0314dace9512bf49a62bd1556963fc60a6c9caf9
5Size (hal-0.5.14.tar.bz2) = 942954 bytes 5Size (hal-0.5.14.tar.bz2) = 942954 bytes
6SHA1 (patch-aa) = 83d20e99943be5c4e9eaeff7a86d79a8912d9c99 6SHA1 (patch-aa) = 83d20e99943be5c4e9eaeff7a86d79a8912d9c99
7SHA1 (patch-ab) = 03723893f9219967a0e3b48c1a03592688389234 7SHA1 (patch-ab) = 03723893f9219967a0e3b48c1a03592688389234
8SHA1 (patch-ac) = 5836bb68f4742bdccc9c61fbf8cc86020007a0a5 8SHA1 (patch-ac) = 5836bb68f4742bdccc9c61fbf8cc86020007a0a5
9SHA1 (patch-ad) = d1ccd7c21008304998293031632f572f250033c1 9SHA1 (patch-ad) = d1ccd7c21008304998293031632f572f250033c1
10SHA1 (patch-ae) = ebc98ede0b6e9535825434f2dc6185193d837f36 10SHA1 (patch-ae) = ebc98ede0b6e9535825434f2dc6185193d837f36
11SHA1 (patch-af) = 161b59ee30d59dbc9e0c79f7f3162bcec5480d99 11SHA1 (patch-af) = 161b59ee30d59dbc9e0c79f7f3162bcec5480d99
12SHA1 (patch-ag) = 3fd8b7d10b1a43311541d2c6ad67a944e286c5ec 12SHA1 (patch-ag) = 3fd8b7d10b1a43311541d2c6ad67a944e286c5ec
13SHA1 (patch-ah) = 6d801a2c30cee6199b25acf46d7e9866f6004182 13SHA1 (patch-ah) = 6d801a2c30cee6199b25acf46d7e9866f6004182
14SHA1 (patch-aj) = f20e4b1286d177e53a550b2ba1608d22e4b5c609 14SHA1 (patch-aj) = f20e4b1286d177e53a550b2ba1608d22e4b5c609
15SHA1 (patch-ak) = c6e9f20df9230de1bbf599315ad7f32fe6433f48 15SHA1 (patch-ak) = c6e9f20df9230de1bbf599315ad7f32fe6433f48
16SHA1 (patch-al) = fe567d7504e961cb623e492f8dc155ef2f3b4c9e 16SHA1 (patch-al) = fe567d7504e961cb623e492f8dc155ef2f3b4c9e
17SHA1 (patch-am) = 6a4940006e583300d9a983511bdcb05268f74b1a 17SHA1 (patch-am) = 6a4940006e583300d9a983511bdcb05268f74b1a
18SHA1 (patch-an) = 0307b2f0f6bb5e4a6d7bf837163e74749b7d24b2 18SHA1 (patch-an) = 0307b2f0f6bb5e4a6d7bf837163e74749b7d24b2
19SHA1 (patch-ao) = 2bbd39404284c5c05068e87c9d20b8f6a65c3503 19SHA1 (patch-ao) = 2bbd39404284c5c05068e87c9d20b8f6a65c3503
20SHA1 (patch-ap) = 9051ced9c00911b993198c98c6d02f5846c16728 20SHA1 (patch-ap) = 9051ced9c00911b993198c98c6d02f5846c16728
21SHA1 (patch-aq) = 7d0b224b4b1e6052983a6512217eee4f530e0720 21SHA1 (patch-aq) = 7d0b224b4b1e6052983a6512217eee4f530e0720
22SHA1 (patch-ar) = bf44c939b338359f18457b1e65434731c3605130 22SHA1 (patch-ar) = bf44c939b338359f18457b1e65434731c3605130
23SHA1 (patch-as) = a6319e523affc90701f09266949cb7891c044ba7 23SHA1 (patch-as) = a6319e523affc90701f09266949cb7891c044ba7
24SHA1 (patch-at) = 040a018a7be5b28a0dc23dd66a0c10bbb0abc6bf 24SHA1 (patch-at) = 040a018a7be5b28a0dc23dd66a0c10bbb0abc6bf
25SHA1 (patch-au) = c9e843f57b8a31f1bdc42478d450ea5606b4d7db 25SHA1 (patch-au) = c9e843f57b8a31f1bdc42478d450ea5606b4d7db
26SHA1 (patch-av) = 075ab5e265be4733d856a17184129d0b301bc0b8 26SHA1 (patch-av) = 075ab5e265be4733d856a17184129d0b301bc0b8
27SHA1 (patch-ax) = 278cbf10dd288f7a4aeedd7545b325c1a82715db 27SHA1 (patch-ax) = 278cbf10dd288f7a4aeedd7545b325c1a82715db
28SHA1 (patch-na) = bd27a1386672df2d7805c303939854bb851d1227 28SHA1 (patch-na) = 2786db8149a55dbd5ea11419d789f420bac1993c
29SHA1 (patch-nb) = 1693b7a2faa5bee20a594f0b60b8ff6caea0efdc 29SHA1 (patch-nb) = 1693b7a2faa5bee20a594f0b60b8ff6caea0efdc
30SHA1 (patch-nc) = 32453e49734902749ce24eb4364fc7f531986227 30SHA1 (patch-nc) = 32453e49734902749ce24eb4364fc7f531986227
 31SHA1 (patch-nd) = 877dcbafaca0cebd3fdce74c5a622721823c153b
cvs diff -r1.10 -r1.11 pkgsrc/sysutils/hal/patches/patch-na (expand / switch to unified diff)

--- pkgsrc/sysutils/hal/patches/patch-na 2011/03/30 13:05:41 1.10
+++ pkgsrc/sysutils/hal/patches/patch-na 2011/10/04 10:31:37 1.11
@@ -1,94 +1,104 @@ @@ -1,94 +1,104 @@
1$NetBSD: patch-na,v 1.10 2011/03/30 13:05:41 obache Exp $ 1$NetBSD: patch-na,v 1.11 2011/10/04 10:31:37 dsainty Exp $
2 2
3--- configure.in.orig 2009-08-24 12:42:29.000000000 +0000 3Includes upstream patch to build on Linux systems without V4L1 support.
4+++ configure.in 4
5@@ -482,9 +482,10 @@ AM_CONDITIONAL([HAVE_LIBPCI], [test "x$U 5http://cgit.freedesktop.org/hal/commit/?id=8f624253f0135ca77a893ad4e8168f51ef90d4da
 6
 7--- configure.in.orig 2009-08-25 00:42:29.000000000 +1200
 8+++ configure.in 2011-10-04 22:56:25.700308098 +1300
 9@@ -479,12 +479,16 @@
 10 fi
 11 AM_CONDITIONAL([HAVE_LIBPCI], [test "x$USE_LIBPCI" = "xyes"])
 12
 13+AC_CHECK_HEADERS([linux/videodev.h], [have_videodev_h=yes], [])
 14+AM_CONDITIONAL(HAVE_V4L1, [test "x$have_videodev_h" = "xyes"])
 15+
6 USE_LIBUSB20=no 16 USE_LIBUSB20=no
7 USE_LIBUSB=no 17 USE_LIBUSB=no
8 LIBUSB20_LIBS="" 18 LIBUSB20_LIBS=""
9+LIBUFS_LIBS="" 19+LIBUFS_LIBS=""
10 AC_ARG_WITH([backend], 20 AC_ARG_WITH([backend],
11 AS_HELP_STRING([--with-backend=<name>], 21 AS_HELP_STRING([--with-backend=<name>],
12- [backend to use (linux/solaris/freebsd/dummy)]), 22- [backend to use (linux/solaris/freebsd/dummy)]),
13+ [backend to use (linux/solaris/netbsd/freebsd/dummy)]), 23+ [backend to use (linux/solaris/netbsd/freebsd/dummy)]),
14 [backend=$withval]) 24 [backend=$withval])
15 if ! test -z "$with_backend" ; then 25 if ! test -z "$with_backend" ; then
16 HALD_BACKEND="$with_backend" 26 HALD_BACKEND="$with_backend"
17@@ -493,6 +494,9 @@ else 27@@ -493,6 +497,9 @@
18 *-*-solaris*) 28 *-*-solaris*)
19 HALD_BACKEND="solaris" 29 HALD_BACKEND="solaris"
20 ;; 30 ;;
21+ *-*-netbsd*) 31+ *-*-netbsd*)
22+ HALD_BACKEND="netbsd" 32+ HALD_BACKEND="netbsd"
23+ ;; 33+ ;;
24 *-*-freebsd* | *-*-kfreebsd*-gnu) 34 *-*-freebsd* | *-*-kfreebsd*-gnu)
25 HALD_BACKEND="freebsd" 35 HALD_BACKEND="freebsd"
26 ;; 36 ;;
27@@ -508,8 +512,10 @@ AM_CONDITIONAL(HALD_COMPILE_DUMMY, [test 37@@ -508,8 +515,10 @@
28 AM_CONDITIONAL(HALD_COMPILE_LINUX, [test x$HALD_BACKEND = xlinux], [Compiling for Linux]) 38 AM_CONDITIONAL(HALD_COMPILE_LINUX, [test x$HALD_BACKEND = xlinux], [Compiling for Linux])
29 AM_CONDITIONAL(HALD_COMPILE_FREEBSD, [test x$HALD_BACKEND = xfreebsd], [Compiling for FreeBSD]) 39 AM_CONDITIONAL(HALD_COMPILE_FREEBSD, [test x$HALD_BACKEND = xfreebsd], [Compiling for FreeBSD])
30 AM_CONDITIONAL(HALD_COMPILE_SOLARIS, [test x$HALD_BACKEND = xsolaris], [Compiling for Solaris]) 40 AM_CONDITIONAL(HALD_COMPILE_SOLARIS, [test x$HALD_BACKEND = xsolaris], [Compiling for Solaris])
31+AM_CONDITIONAL(HALD_COMPILE_NETBSD, [test x$HALD_BACKEND = xnetbsd], [Compiling for NetBSD]) 41+AM_CONDITIONAL(HALD_COMPILE_NETBSD, [test x$HALD_BACKEND = xnetbsd], [Compiling for NetBSD])
32 AC_SUBST(HALD_BACKEND) 42 AC_SUBST(HALD_BACKEND)
33 if test "x$HALD_BACKEND" = "xfreebsd"; then 43 if test "x$HALD_BACKEND" = "xfreebsd"; then
34+ AC_SEARCH_LIBS([ufs_disk_fillout], [ufs], [LIBUFS_LIBS="-lufs"], []) 44+ AC_SEARCH_LIBS([ufs_disk_fillout], [ufs], [LIBUFS_LIBS="-lufs"], [])
35 AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_LIBUSB20=yes], [USE_LIBUSB20=no]) 45 AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_LIBUSB20=yes], [USE_LIBUSB20=no])
36 fi 46 fi
37 if test "x$USE_LIBUSB20" = "xno"; then 47 if test "x$USE_LIBUSB20" = "xno"; then
38@@ -526,6 +532,8 @@ elif test "x$USE_LIBUSB" = "xyes"; then 48@@ -526,6 +535,8 @@
39 fi 49 fi
40 AC_SUBST(LIBUSB20_LIBS) 50 AC_SUBST(LIBUSB20_LIBS)
41  51
42+AC_SUBST(LIBUFS_LIBS) 52+AC_SUBST(LIBUFS_LIBS)
43+ 53+
44 dnl DBUS API is subject to changes 54 dnl DBUS API is subject to changes
45 AC_DEFINE_UNQUOTED(DBUS_API_SUBJECT_TO_CHANGE, [], [DBUS API is subject to change]) 55 AC_DEFINE_UNQUOTED(DBUS_API_SUBJECT_TO_CHANGE, [], [DBUS API is subject to change])
46  56
47@@ -706,8 +714,8 @@ else 57@@ -706,8 +717,8 @@
48 fi 58 fi
49 AC_MSG_RESULT($have_glib_2_14) 59 AC_MSG_RESULT($have_glib_2_14)
50  60
51-case "$host" in 61-case "$host" in
52- *-*-freebsd*) 62- *-*-freebsd*)
53+case "$HALD_BACKEND" in 63+case "$HALD_BACKEND" in
54+ freebsd | netbsd) 64+ freebsd | netbsd)
55 PKG_CHECK_MODULES(VOLUME_ID, [$volume_id_module]) 65 PKG_CHECK_MODULES(VOLUME_ID, [$volume_id_module])
56 AC_SUBST(VOLUME_ID_CFLAGS) 66 AC_SUBST(VOLUME_ID_CFLAGS)
57 AC_SUBST(VOLUME_ID_LIBS) 67 AC_SUBST(VOLUME_ID_LIBS)
58@@ -718,14 +726,13 @@ esac 68@@ -718,14 +729,13 @@
59  69
60 # blkid (util-linux-ng) 70 # blkid (util-linux-ng)
61 case "$host" in 71 case "$host" in
62-*-*-freebsd*) 72-*-*-freebsd*)
63- ;; 73- ;;
64-*-*-solaris*) 74-*-*-solaris*)
65- ;; 75- ;;
66-*) 76-*)
67+*linux*) 77+*linux*)
68 PKG_CHECK_MODULES(BLKID, [$blkid_module]) 78 PKG_CHECK_MODULES(BLKID, [$blkid_module])
69 AC_SUBST(BLKID_CFLAGS) 79 AC_SUBST(BLKID_CFLAGS)
70 AC_SUBST(BLKID_LIBS) 80 AC_SUBST(BLKID_LIBS)
71+ ;; 81+ ;;
72+*) 82+*)
73+ ;; 83+ ;;
74 esac 84 esac
75  85
76 # OS specific libs 86 # OS specific libs
77@@ -1086,6 +1093,9 @@ hald/linux/addons/Makefile 87@@ -1086,6 +1096,9 @@
78 hald/solaris/Makefile 88 hald/solaris/Makefile
79 hald/solaris/probing/Makefile 89 hald/solaris/probing/Makefile
80 hald/solaris/addons/Makefile 90 hald/solaris/addons/Makefile
81+hald/netbsd/Makefile 91+hald/netbsd/Makefile
82+hald/netbsd/probing/Makefile 92+hald/netbsd/probing/Makefile
83+hald/netbsd/addons/Makefile 93+hald/netbsd/addons/Makefile
84 hald/freebsd/Makefile 94 hald/freebsd/Makefile
85 hald/freebsd/probing/Makefile 95 hald/freebsd/probing/Makefile
86 hald/freebsd/libprobe/Makefile 96 hald/freebsd/libprobe/Makefile
87@@ -1096,6 +1106,7 @@ libhal-storage/Makefile 97@@ -1096,6 +1109,7 @@
88 tools/Makefile 98 tools/Makefile
89 tools/freebsd/Makefile 99 tools/freebsd/Makefile
90 tools/linux/Makefile 100 tools/linux/Makefile
91+tools/netbsd/Makefile 101+tools/netbsd/Makefile
92 partutil/Makefile 102 partutil/Makefile
93 policy/Makefile 103 policy/Makefile
94 fdi/Makefile 104 fdi/Makefile
File Added: pkgsrc/sysutils/hal/patches/patch-nd
$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);