From 0a63f09f29901227956c04f14c35756d42fe8872 Mon Sep 17 00:00:00 2001 From: tron Date: Mon, 23 Mar 2009 18:06:52 +0000 Subject: Pullup ticket #2723 - requested by rafal cheese: bug fix Revisions pulled up: - graphics/cheese/Makefile 1.11 via patch - graphics/cheese/distinfo 1.9 - graphics/cheese/patches/patch-ab 1.6 --- Module Name: pkgsrc Committed By: jmorse Date: Fri Feb 6 17:01:49 UTC 2009 Modified Files: pkgsrc/doc: CHANGES-2009 pkgsrc/graphics/cheese: distinfo pkgsrc/graphics/cheese/patches: patch-ab Log Message: Updated graphics/cheese to 2.24.3nb1, fixes detection of webcams through hal. --- Module Name: pkgsrc Committed By: jmorse Date: Fri Feb 6 17:46:02 UTC 2009 Modified Files: pkgsrc/graphics/cheese: Makefile Log Message: Bump cheese PKGREVISION --- graphics/cheese/Makefile | 3 ++- graphics/cheese/distinfo | 4 ++-- graphics/cheese/patches/patch-ab | 42 ++++++++++++++++++++++++++++++++-------- 3 files changed, 38 insertions(+), 11 deletions(-) diff --git a/graphics/cheese/Makefile b/graphics/cheese/Makefile index b1d1365ed70..004b92cdb31 100644 --- a/graphics/cheese/Makefile +++ b/graphics/cheese/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2008/12/24 04:04:04 jmcneill Exp $ +# $NetBSD: Makefile,v 1.9.2.1 2009/03/23 18:06:52 tron Exp $ DISTNAME= cheese-2.24.2 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GNOME:=sources/cheese/2.24/} diff --git a/graphics/cheese/distinfo b/graphics/cheese/distinfo index 1c35bce2b56..d377201c9f4 100644 --- a/graphics/cheese/distinfo +++ b/graphics/cheese/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.7 2008/12/24 04:04:04 jmcneill Exp $ +$NetBSD: distinfo,v 1.7.2.1 2009/03/23 18:06:52 tron Exp $ SHA1 (cheese-2.24.2.tar.gz) = efa0de5e3d663a7417244b3f463844edefe7835c RMD160 (cheese-2.24.2.tar.gz) = 619bf834d9e71b0901a8c177e4e3109e57e81587 Size (cheese-2.24.2.tar.gz) = 2878710 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..a2f62b321d5 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.5.2.1 2009/03/23 18:06:52 tron 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 #include @@ -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; -- cgit v1.2.3