cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- tweak this patch a bit, no function change.

Browse Source
This commit is contained in:
jasper 2009-11-09 09:56:46 +00:00
parent 051dfbf361
commit d6d7e85df2
1 changed files with 99 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

287
x11/gnome/cheese/patches/patch-src_cheese-webcam_c
View File

@ -1,194 +1,95 @@
$OpenBSD: patch-src_cheese-webcam_c,v 1.6 2009/10/15 11:02:30 ajacoutot Exp $
--- src/cheese-webcam.c.orig Fri Sep 18 20:45:08 2009
+++ src/cheese-webcam.c Thu Oct 15 12:46:40 2009
@@ -31,13 +31,12 @@
$OpenBSD: patch-src_cheese-webcam_c,v 1.7 2009/11/09 09:56:46 jasper Exp $
Unbreak cheese on OpenBSD with uvideo(4).
--- src/cheese-webcam.c.orig Mon Nov 9 10:45:12 2009
+++ src/cheese-webcam.c Mon Nov 9 10:53:12 2009
@@ -31,13 +31,19 @@
#include <gst/gst.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <X11/Xlib.h>
-#include <libhal.h>
+#ifndef __OpenBSD__
#include <libhal.h>
+#endif /* !__OpenBSD__ */
/* for ioctl query */
#include <fcntl.h>
#include <unistd.h>
#include <sys/ioctl.h>
-#include <linux/videodev.h>
+#ifdef __OpenBSD__
+#include <sys/videoio.h>
+#else
#include <linux/videodev.h>
+#endif /* __OpenBSD__ */
#include "cheese-webcam.h"
@@ -281,141 +280,40 @@ cheese_webcam_get_video_devices_from_hal (CheeseWebcam
@@ -276,11 +282,117 @@ cheese_webcam_bus_message_cb (GstBus *bus, GstMessage
}
}
+#ifdef __OpenBSD__
static void
cheese_webcam_get_video_devices_from_hal (CheeseWebcam *webcam)
{
CheeseWebcamPrivate *priv = CHEESE_WEBCAM_GET_PRIVATE (webcam);
- int i, fd, ok;
- int num_udis = 0;
- char **udis;
- DBusError error;
- LibHalContext *hal_ctx;
+ int i, fd, ok, max_devs = 20;
+ struct dev_info {
+ int node;
+ char *pname;
+ }dev_list[max_devs];
priv->num_webcam_devices = 0;
g_print ("Probing devices with HAL...\n");
- dbus_error_init (&error);
- hal_ctx = libhal_ctx_new ();
- if (hal_ctx == NULL)
- {
- g_warning ("Could not create libhal context");
- dbus_error_free (&error);
- goto fallback;
- }
-
- if (!libhal_ctx_set_dbus_connection (hal_ctx, dbus_bus_get (DBUS_BUS_SYSTEM, &error)))
- {
- g_warning ("libhal_ctx_set_dbus_connection: %s: %s", error.name, error.message);
- dbus_error_free (&error);
- goto fallback;
- }
-
- if (!libhal_ctx_init (hal_ctx, &error))
- {
- if (dbus_error_is_set (&error))
- {
- g_warning ("libhal_ctx_init: %s: %s", error.name, error.message);
- dbus_error_free (&error);
- }
- g_warning ("Could not initialise connection to hald.\n"
- "Normally this means the HAL daemon (hald) is not running or not ready");
- goto fallback;
- }
-
- udis = libhal_find_device_by_capability (hal_ctx, "video4linux", &num_udis, &error);
-
- if (dbus_error_is_set (&error))
- {
- g_warning ("libhal_find_device_by_capability: %s: %s", error.name, error.message);
- dbus_error_free (&error);
- goto fallback;
- }
-
- /* Initialize webcam structures */
- priv->webcam_devices = g_new0 (CheeseWebcamDevice, num_udis);
-
- for (i = 0; i < num_udis; i++)
- {
+
+ priv->num_webcam_devices = 0;
+
+ g_print ("Probing devices with HAL...\n");
+
+ for (i = 0; i < max_devs; i++)
+ {
char *device;
- char *parent_udi = NULL;
- char *subsystem = NULL;
char *gstreamer_src, *product_name;
+ char *device;
+ struct stat s;
struct v4l2_capability v2cap;
- struct video_capability v1cap;
- gint vendor_id = 0;
- gint product_id = 0;
- gchar *property_name = NULL;
- parent_udi = libhal_device_get_property_string (hal_ctx, udis[i], "info.parent", &error);
- if (dbus_error_is_set (&error))
- {
- g_warning ("error getting parent for %s: %s: %s", udis[i], error.name, error.message);
- dbus_error_free (&error);
- }
-
- if (parent_udi != NULL)
- {
- subsystem = libhal_device_get_property_string (hal_ctx, parent_udi, "info.subsystem", NULL);
- if (subsystem == NULL) continue;
- property_name = g_strjoin (".", subsystem, "vendor_id", NULL);
- vendor_id = libhal_device_get_property_int (hal_ctx, parent_udi, property_name, &error);
- if (dbus_error_is_set (&error))
- {
- g_warning ("error getting vendor id: %s: %s", error.name, error.message);
- dbus_error_free (&error);
- }
- g_free (property_name);
-
- property_name = g_strjoin (".", subsystem, "product_id", NULL);
- product_id = libhal_device_get_property_int (hal_ctx, parent_udi, property_name, &error);
- if (dbus_error_is_set (&error))
- {
- g_warning ("error getting product id: %s: %s", error.name, error.message);
- dbus_error_free (&error);
- }
- g_free (property_name);
- libhal_free_string (subsystem);
- libhal_free_string (parent_udi);
- }
-
- g_print ("Found device %04x:%04x, getting capabilities...\n", vendor_id, product_id);
-
- device = libhal_device_get_property_string (hal_ctx, udis[i], "video4linux.device", &error);
- if (dbus_error_is_set (&error))
- {
- g_warning ("error getting V4L device for %s: %s: %s", udis[i], error.name, error.message);
- dbus_error_free (&error);
+ char *gstreamer_src, *product_name;
+ struct v4l2_capability v2cap;
+
+ dev_list[i].node = -1;
+ device = g_strdup_printf("%s%d", "/dev/video", i);
+ if (lstat(device, &s) != 0)
continue;
- }
- /* vbi devices support capture capability too, but cannot be used,
- * so detect them by device name */
- if (strstr (device, "vbi"))
- {
- g_print ("Skipping vbi device: %s\n", device);
- libhal_free_string (device);
- continue;
- }
-
if ((fd = open (device, O_RDONLY | O_NONBLOCK)) < 0)
{
g_warning ("Failed to open %s: %s", device, strerror (errno));
- libhal_free_string (device);
+ continue;
+
+ if ((fd = open (device, O_RDONLY | O_NONBLOCK)) < 0)
+ {
+ g_warning ("Failed to open %s: %s", device, strerror (errno));
+ free (device);
continue;
}
ok = ioctl (fd, VIDIOC_QUERYCAP, &v2cap);
if (ok < 0)
{
- ok = ioctl (fd, VIDIOCGCAP, &v1cap);
- if (ok < 0)
- {
- g_warning ("Error while probing v4l capabilities for %s: %s",
- device, strerror (errno));
- libhal_free_string (device);
- close (fd);
- continue;
- }
- g_print ("Detected v4l device: %s\n", v1cap.name);
- g_print ("Device type: %d\n", v1cap.type);
- gstreamer_src = "v4lsrc";
- product_name = v1cap.name;
+ continue;
+ }
+ ok = ioctl (fd, VIDIOC_QUERYCAP, &v2cap);
+ if (ok < 0)
+ {
+ g_warning ("Failed to query the capture capability of %s: %s", device, strerror (errno));
+ free (device);
+ continue;
}
else
{
@@ -429,20 +327,38 @@ cheese_webcam_get_video_devices_from_hal (CheeseWebcam
{
g_print ("Device %s seems to not have the capture capability, (radio tuner?)\n"
"Removing it from device list.\n", device);
- libhal_free_string (device);
+ }
+ else
+ {
+ guint cap = v2cap.capabilities;
+ g_print ("Detected v4l2 device: %s\n", v2cap.card);
+ g_print ("Driver: %s, version: %d\n", v2cap.driver, v2cap.version);
+
+ /* g_print ("Bus info: %s\n", v2cap.bus_info); */ /* Doesn't seem anything useful */
+ g_print ("Capabilities: 0x%08X\n", v2cap.capabilities);
+ if (!(cap & V4L2_CAP_VIDEO_CAPTURE))
+ {
+ g_print ("Device %s seems to not have the capture capability, (radio tuner?)\n"
+ "Removing it from device list.\n", device);
+ free (device);
close (fd);
continue;
}
- gstreamer_src = "v4l2src";
product_name = (char *) v2cap.card;
}
g_print ("\n");
- priv->webcam_devices[priv->num_webcam_devices].hal_udi = g_strdup (udis[i]);
+ close (fd);
+ continue;
+ }
+ product_name = (char *) v2cap.card;
+ }
+
+ g_print ("\n");
+
+ dev_list[i].node = i;
+ dev_list[i].pname = product_name;
+ priv->num_webcam_devices++;
@ -209,37 +110,47 @@ $OpenBSD: patch-src_cheese-webcam_c,v 1.6 2009/10/15 11:02:30 ajacoutot Exp $
+ continue;
+ device = g_strdup_printf("%s%d", "/dev/video", i);
+ priv->webcam_devices[priv->num_webcam_devices].hal_udi = g_strdup (device);
priv->webcam_devices[priv->num_webcam_devices].video_device = g_strdup (device);
- priv->webcam_devices[priv->num_webcam_devices].gstreamer_src = g_strdup (gstreamer_src);
- priv->webcam_devices[priv->num_webcam_devices].product_name = g_strdup (product_name);
+ priv->webcam_devices[priv->num_webcam_devices].video_device = g_strdup (device);
+ priv->webcam_devices[priv->num_webcam_devices].gstreamer_src = g_strdup ("v4l2src");
+ priv->webcam_devices[priv->num_webcam_devices].product_name = g_strdup (dev_list[i].pname);
priv->webcam_devices[priv->num_webcam_devices].num_video_formats = 0;
priv->webcam_devices[priv->num_webcam_devices].video_formats =
g_array_new (FALSE, FALSE, sizeof (CheeseVideoFormat));
@@ -450,20 +366,13 @@ cheese_webcam_get_video_devices_from_hal (CheeseWebcam
g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
priv->num_webcam_devices++;
- libhal_free_string (device);
- close (fd);
}
- libhal_free_string_array (udis);
if (priv->num_webcam_devices == 0)
{
/* Create a fake device so that resolution changing stil works even if the
* computer doesn't have a webcam. */
-fallback:
- if (num_udis == 0)
- {
- priv->webcam_devices = g_new0 (CheeseWebcamDevice, 1);
- }
+ priv->webcam_devices[priv->num_webcam_devices].num_video_formats = 0;
+ priv->webcam_devices[priv->num_webcam_devices].video_formats =
+ g_array_new (FALSE, FALSE, sizeof (CheeseVideoFormat));
+ priv->webcam_devices[priv->num_webcam_devices].supported_resolutions =
+ g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+ priv->num_webcam_devices++;
+
+ }
+
+ if (priv->num_webcam_devices == 0)
+ {
+ /* Create a fake device so that resolution changing stil works even if the
+ * computer doesn't have a webcam. */
+ priv->webcam_devices = g_new0 (CheeseWebcamDevice, 1);
priv->webcam_devices[0].num_video_formats = 0;
priv->webcam_devices[0].video_formats =
g_array_new (FALSE, FALSE, sizeof (CheeseVideoFormat));
@@ -712,7 +621,8 @@ cheese_webcam_get_webcam_device_data (CheeseWebcam
+ priv->webcam_devices[0].num_video_formats = 0;
+ priv->webcam_devices[0].video_formats =
+ g_array_new (FALSE, FALSE, sizeof (CheeseVideoFormat));
+ priv->webcam_devices[0].hal_udi = g_strdup ("cheese_fake_videodevice");
+ }
+}
+#else
+static void
+cheese_webcam_get_video_devices_from_hal (CheeseWebcam *webcam)
+{
+ CheeseWebcamPrivate *priv = CHEESE_WEBCAM_GET_PRIVATE (webcam);
+
int i, fd, ok;
int num_udis = 0;
char **udis;
@@ -470,6 +582,7 @@ fallback:
priv->webcam_devices[0].hal_udi = g_strdup ("cheese_fake_videodevice");
}
}
+#endif /* __OpenBSD__ */
static void
cheese_webcam_get_supported_framerates (CheeseVideoFormat *video_format, GstStructure *structure)
@@ -712,7 +825,8 @@ cheese_webcam_get_webcam_device_data (CheeseWebcam
if ((pipeline != NULL) && (err == NULL))
{
/* Start the pipeline and wait for max. 10 seconds for it to start up */