packages: hal/hal-link.patch, hal/hal.spec, hal/hal-kill-v4l1.patch (NEW) -...

[qboosh]

Author: qboosh                       Date: Wed Apr 20 18:00:15 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated link patch to remove libsmbios from libhal and libhal-storage linking
- added kill-v4l1 patch to kill Video4Linux 1 API usage (and thus allow build with recent headers)
- release 12

---- Files affected:
packages/hal:
   hal-link.patch (1.4 -> 1.5) , hal.spec (1.192 -> 1.193) , hal-kill-v4l1.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/hal/hal-link.patch
diff -u packages/hal/hal-link.patch:1.4 packages/hal/hal-link.patch:1.5
--- packages/hal/hal-link.patch:1.4	Wed Apr 30 20:27:29 2008
+++ packages/hal/hal-link.patch	Wed Apr 20 20:00:09 2011
@@ -11,3 +11,19 @@
  
    AC_MSG_CHECKING([for libparted == 1.7.1 or >= 1.8.0])
    if ! $PKG_CONFIG --atleast-version 1.8.0 libparted; then
+@@ -417,6 +417,7 @@
+ 	AC_LANG_POP([C++])
+ 	if test "$LIB_SMBIOS" = "yes" ; then
+    		AC_MSG_CHECKING([for libsmbios >= 0.13.4])
++		save_LIBS="$LIBS"
+    		LIBS="$LIBS -lsmbios"
+    		AC_RUN_IFELSE([AC_LANG_SOURCE([[
+    		#include <smbios/version.h>
+@@ -436,6 +437,7 @@
+ 			return 1;
+    		}]])], [USE_SMBIOS=yes; AC_MSG_RESULT(yes); AM_CONDITIONAL(HAVE_SMBIOS,true)],
+        		[USE_SMBIOS=no; AC_MSG_RESULT(failed); AM_CONDITIONAL(HAVE_SMBIOS,false)])
++		LIBS="$save_LIBS"
+ 	else
+   		USE_SMBIOS=no
+   		AM_CONDITIONAL(HAVE_SMBIOS, [false])

================================================================
Index: packages/hal/hal.spec
diff -u packages/hal/hal.spec:1.192 packages/hal/hal.spec:1.193
--- packages/hal/hal.spec:1.192	Tue Mar 29 07:50:54 2011
+++ packages/hal/hal.spec	Wed Apr 20 20:00:09 2011
@@ -3,13 +3,13 @@
 # Conditional build:
 %bcond_without	doc		# disable documentation building
 %bcond_with	policykit	# http://lists.pld-linux.org/mailman/pipermail/pld-devel-pl/2010-January/150972.html
-%bcond_without	consolekit
+%bcond_without	consolekit	# ConsoleKit support
 
 Summary:	HAL - Hardware Abstraction Layer
 Summary(pl.UTF-8):	HAL - abstrakcyjna warstwa dostępu do sprzętu
 Name:		hal
 Version:	0.5.14
-Release:	11
+Release:	12
 License:	AFL v2.0 or GPL v2
 Group:		Libraries
 Source0:	http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
@@ -26,6 +26,7 @@
 Patch5:		%{name}-x11-zap.patch
 Patch6:		%{name}-out.patch
 Patch7:		%{name}-fixes.patch
+Patch8:		%{name}-kill-v4l1.patch
 URL:		http://freedesktop.org/Software/hal
 %{?with_consolekit:BuildRequires:	ConsoleKit-devel}
 %{?with_policykit:BuildRequires:	PolicyKit-devel >= 0.7}
@@ -158,6 +159,7 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
 %{__rm} acinclude.m4
@@ -313,6 +315,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.193  2011/04/20 18:00:09  qboosh
+- updated link patch to remove libsmbios from libhal and libhal-storage linking
+- added kill-v4l1 patch to kill Video4Linux 1 API usage (and thus allow build with recent headers)
+- release 12
+
 Revision 1.192  2011/03/29 05:50:54  glen
 - release 11
 

================================================================
Index: packages/hal/hal-kill-v4l1.patch
diff -u /dev/null packages/hal/hal-kill-v4l1.patch:1.1
--- /dev/null	Wed Apr 20 20:00:15 2011
+++ packages/hal/hal-kill-v4l1.patch	Wed Apr 20 20:00:09 2011
@@ -0,0 +1,49 @@
+--- hal-0.5.14/hald/linux/probing/probe-video4linux.c.orig	2009-08-24 14:42:30.000000000 +0200
++++ hal-0.5.14/hald/linux/probing/probe-video4linux.c	2011-04-20 18:57:54.383104888 +0200
+@@ -30,7 +30,6 @@
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <sys/ioctl.h>
+-#include <linux/videodev.h>
+ #include <linux/videodev2.h>
+ #include <errno.h>
+ #include <fcntl.h>
+@@ -50,7 +49,6 @@
+ 	int ret = -1;
+ 	char *udi;
+ 	char *device_file;
+-	struct video_capability v1cap;
+ 	struct v4l2_capability v2cap;
+ 	LibHalContext *ctx = NULL;
+ 	LibHalChangeSet *cset;
+@@ -108,30 +106,6 @@
+ 		}
+ 	} else {
+ 		HAL_DEBUG (("ioctl VIDIOC_QUERYCAP failed"));
+-
+-		if (ioctl (fd, VIDIOCGCAP, &v1cap) == 0) {
+-			libhal_changeset_set_property_string (cset,
+-			                                      "video4linux.version", "1");
+-
+-			libhal_changeset_set_property_string (cset,
+-			                                      "info.product", v1cap.name);
+-
+-			if ((v1cap.type & VID_TYPE_CAPTURE) > 0) {
+-				LIBHAL_FREE_DBUS_ERROR (&error);
+-				libhal_device_add_capability (ctx, udi, "video4linux.video_capture", &error);
+-			} if ((v1cap.type & VID_TYPE_OVERLAY) > 0) {
+-				LIBHAL_FREE_DBUS_ERROR (&error);
+-				libhal_device_add_capability (ctx, udi, "video4linux.video_overlay", &error);
+-			} if (v1cap.audios > 0) {
+-				LIBHAL_FREE_DBUS_ERROR (&error);
+-				libhal_device_add_capability (ctx, udi, "video4linux.audio", &error);
+-			} if ((v1cap.type & VID_TYPE_TUNER) > 0) {
+-				LIBHAL_FREE_DBUS_ERROR (&error);
+-				libhal_device_add_capability (ctx, udi, "video4linux.tuner", &error);
+-			}
+-		} else {
+-			HAL_DEBUG (("ioctl VIDIOCGCAP failed"));
+-		}
+ 	}
+ 
+ 	LIBHAL_FREE_DBUS_ERROR (&error);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hal/hal-link.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hal/hal.spec?r1=1.192&r2=1.193&f=u