diff options
author | jmorse <jmorse@pkgsrc.org> | 2009-02-06 17:01:49 +0000 |
---|---|---|
committer | jmorse <jmorse@pkgsrc.org> | 2009-02-06 17:01:49 +0000 |
commit | c6a05f666649d9f0b61bcf89e75c4d1c556a524d (patch) | |
tree | 891b38081f570ba1282000ffeb20344bc9b849d8 /graphics/cheese | |
parent | 4be66048adf7e57523a82c4109617ba0bf12a682 (diff) | |
download | pkgsrc-c6a05f666649d9f0b61bcf89e75c4d1c556a524d.tar.gz |
Updated graphics/cheese to 2.24.3nb1, fixes detection of webcams through hal.
Diffstat (limited to 'graphics/cheese')
-rw-r--r-- | graphics/cheese/distinfo | 4 | ||||
-rw-r--r-- | graphics/cheese/patches/patch-ab | 42 |
2 files changed, 36 insertions, 10 deletions
diff --git a/graphics/cheese/distinfo b/graphics/cheese/distinfo index d2b3666561d..f2c829be6d3 100644 --- a/graphics/cheese/distinfo +++ b/graphics/cheese/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.8 2009/01/14 15:48:23 wiz Exp $ +$NetBSD: distinfo,v 1.9 2009/02/06 17:01:49 jmorse Exp $ SHA1 (cheese-2.24.3.tar.gz) = d5056dc88ef0100e7f37e7f3a39e2de5332e14fe RMD160 (cheese-2.24.3.tar.gz) = 5df906796afbe21e500a77f1db993d89104605f3 Size (cheese-2.24.3.tar.gz) = 3166488 bytes SHA1 (patch-aa) = dcb50c18f53385b524c58e8205d448dcdbc09ec2 -SHA1 (patch-ab) = e345b9b4959717c7439107717db3f539f2d721f8 +SHA1 (patch-ab) = 3b01eeb7fd7f9c8252963f46f54de6625e6716af SHA1 (patch-ac) = 4db9fc3c6288ba6eb20ad98aca8875326952dfd8 SHA1 (patch-ad) = 8755f4b1dc133f1ab6164894a9ea19cb96a8a49b diff --git a/graphics/cheese/patches/patch-ab b/graphics/cheese/patches/patch-ab index ec54e153f7e..6be4e4566c1 100644 --- a/graphics/cheese/patches/patch-ab +++ b/graphics/cheese/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.5 2008/12/24 04:04:04 jmcneill Exp $ +$NetBSD: patch-ab,v 1.6 2009/02/06 17:01:49 jmorse Exp $ ---- src/cheese-webcam.c.orig 2008-11-24 18:03:19.000000000 -0500 -+++ src/cheese-webcam.c 2008-12-23 22:58:59.000000000 -0500 +--- ./src/cheese-webcam.c.orig 2008-11-24 23:03:19.000000000 +0000 ++++ ./src/cheese-webcam.c 2009-02-04 01:19:38.000000000 +0000 @@ -32,13 +32,26 @@ #include <gst/gst.h> #include <gdk-pixbuf/gdk-pixbuf.h> @@ -52,7 +52,33 @@ $NetBSD: patch-ab,v 1.5 2008/12/24 04:04:04 jmcneill Exp $ gint vendor_id = 0; gint product_id = 0; gchar *property_name = NULL; -@@ -365,9 +383,14 @@ cheese_webcam_get_video_devices_from_hal +@@ -320,14 +338,17 @@ cheese_webcam_get_video_devices_from_hal + + 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\n", error.name, error.message); +- dbus_error_free (&error); +- } +- g_free (property_name); ++ if (subsystem == NULL) { ++ vendor_id = g_strdup("{No vendor ID}"); ++ } else { ++ 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\n", error.name, error.message); ++ dbus_error_free (&error); ++ } ++ g_free (property_name); ++ } /*no subsystem patch*/ + + property_name = g_strjoin (".", subsystem, "product_id", NULL); + product_id = libhal_device_get_property_int (hal_ctx, parent_udi, property_name, &error); +@@ -365,9 +386,14 @@ cheese_webcam_get_video_devices_from_hal libhal_free_string (device); continue; } @@ -67,7 +93,7 @@ $NetBSD: patch-ab,v 1.5 2008/12/24 04:04:04 jmcneill Exp $ ok = ioctl (fd, VIDIOCGCAP, &v1cap); if (ok < 0) { -@@ -381,14 +404,22 @@ cheese_webcam_get_video_devices_from_hal +@@ -381,14 +407,22 @@ cheese_webcam_get_video_devices_from_hal g_print ("Device type: %d\n", v1cap.type); gstreamer_src = "v4lsrc"; product_name = v1cap.name; @@ -91,7 +117,7 @@ $NetBSD: patch-ab,v 1.5 2008/12/24 04:04:04 jmcneill Exp $ if (!(cap & V4L2_CAP_VIDEO_CAPTURE)) { g_print ("Device %s seems to not have the capture capability, (radio tuner?)\n" -@@ -399,6 +430,10 @@ cheese_webcam_get_video_devices_from_hal +@@ -399,6 +433,10 @@ cheese_webcam_get_video_devices_from_hal } gstreamer_src = "v4l2src"; product_name = (char *) v2cap.card; @@ -102,7 +128,7 @@ $NetBSD: patch-ab,v 1.5 2008/12/24 04:04:04 jmcneill Exp $ } g_print ("\n"); -@@ -434,6 +469,55 @@ fallback: +@@ -434,6 +472,55 @@ fallback: priv->webcam_devices[0].hal_udi = g_strdup ("cheese_fake_videodevice"); } } @@ -158,7 +184,7 @@ $NetBSD: patch-ab,v 1.5 2008/12/24 04:04:04 jmcneill Exp $ static void cheese_webcam_get_supported_framerates (CheeseVideoFormat *video_format, GstStructure *structure) -@@ -739,7 +823,11 @@ cheese_webcam_detect_webcam_devices (Che +@@ -739,7 +826,11 @@ cheese_webcam_detect_webcam_devices (Che int i; |