svn commit: r395027 - in head/sysutils/hal: . files

[Thomas Zander]

Author: riggs
Date: Sat Aug 22 10:58:56 2015
New Revision: 395027
URL: https://svnweb.freebsd.org/changeset/ports/395027

Log:
  - Allow to detect video interfaces when kernel is built without STACK
  - Bump PORTREVISION
  
  PR:		194345
  Submitted by:	lenzi.sergio at gmail.com
  Reviewed by:	pi
  Approved by:	maintainer timeout

Modified:
  head/sysutils/hal/Makefile
  head/sysutils/hal/files/patch-hald_freebsd_probing_probe-video4linux.c

Modified: head/sysutils/hal/Makefile
==============================================================================
--- head/sysutils/hal/Makefile	Sat Aug 22 10:55:59 2015	(r395026)
+++ head/sysutils/hal/Makefile	Sat Aug 22 10:58:56 2015	(r395027)
@@ -4,7 +4,7 @@
 
 PORTNAME=	hal
 DISTVERSION=	0.5.14
-PORTREVISION=	29
+PORTREVISION=	30
 CATEGORIES=	sysutils
 MASTER_SITES=	http://hal.freedesktop.org/releases/
 

Modified: head/sysutils/hal/files/patch-hald_freebsd_probing_probe-video4linux.c
==============================================================================
--- head/sysutils/hal/files/patch-hald_freebsd_probing_probe-video4linux.c	Sat Aug 22 10:55:59 2015	(r395026)
+++ head/sysutils/hal/files/patch-hald_freebsd_probing_probe-video4linux.c	Sat Aug 22 10:58:56 2015	(r395027)
@@ -1,6 +1,6 @@
---- hald/freebsd/probing/probe-video4linux.c.orig	2010-02-21 14:51:01.000000000 -0500
-+++ hald/freebsd/probing/probe-video4linux.c	2010-02-21 14:54:51.000000000 -0500
-@@ -0,0 +1,225 @@
+--- hald/freebsd/probing/probe-video4linux.c.orig	2014-10-03 22:48:53.887627582 -0300
++++ hald/freebsd/probing/probe-video4linux.c	2014-10-12 23:37:47.263963719 -0300
+@@ -0,0 +1,218 @@
 +/***************************************************************************
 + * CVSID: $Id$
 + *
@@ -87,17 +87,6 @@
 +		return -1;
 +	}
 +	g_free (contents);
-+
-+	len = 4;
-+	sysctlnametomib ("kern.proc.pid", mib, &len);
-+
-+	len = sizeof(struct kinfo_proc);
-+	mib[3] = pid;
-+
-+	/* This is just a rough test. */
-+	if (sysctl (mib, 4, NULL, &len, NULL, 0) == -1)
-+		return -1;
-+
 +	return i;
 +}
 +
@@ -110,6 +99,7 @@
 +	int bus = -1;
 +	int addr = -1;
 +	int intf = -1;
++	//int i;
 +	char *device_file = NULL;
 +	char *busstr;
 +	char *addrstr;
@@ -118,6 +108,7 @@
 +	struct v4l2_capability v2cap;
 +	LibHalChangeSet *cset;
 +
++
 +	if (! hfp_init (argc, argv))
 +		goto out;
 +
@@ -134,6 +125,8 @@
 +	bus = atoi (busstr);
 +	addr = atoi (addrstr);
 +	intf = atoi (intfstr);
++
++	//g_message("bus:%d, addr=%d, intf=%d",bus,addr,intf);
 +	if (intf != 0)
 +		goto out;
 +