diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-09-10 00:05:35 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-09-10 00:05:35 +0800 |
commit | 55fc27ae7b035644a6b6f78a306c363a4f775546 (patch) | |
tree | 2f1f0a94bbdabd904595b43b77c734c03e2a06f5 /multimedia | |
parent | 628e081c67e03f4e386273bf15ab7e573fd60cad (diff) | |
download | marcuscom-ports-55fc27ae7b035644a6b6f78a306c363a4f775546.tar marcuscom-ports-55fc27ae7b035644a6b6f78a306c363a4f775546.tar.gz marcuscom-ports-55fc27ae7b035644a6b6f78a306c363a4f775546.tar.bz2 marcuscom-ports-55fc27ae7b035644a6b6f78a306c363a4f775546.tar.lz marcuscom-ports-55fc27ae7b035644a6b6f78a306c363a4f775546.tar.xz marcuscom-ports-55fc27ae7b035644a6b6f78a306c363a4f775546.tar.zst marcuscom-ports-55fc27ae7b035644a6b6f78a306c363a4f775546.zip |
Update to 2.23.92.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11497 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/cheese/Makefile | 4 | ||||
-rw-r--r-- | multimedia/cheese/distinfo | 6 | ||||
-rw-r--r-- | multimedia/cheese/files/patch-src_cheese-webcam.c | 40 | ||||
-rw-r--r-- | multimedia/cheese/pkg-plist | 2 |
4 files changed, 47 insertions, 5 deletions
diff --git a/multimedia/cheese/Makefile b/multimedia/cheese/Makefile index 43a18b611..d399905c2 100644 --- a/multimedia/cheese/Makefile +++ b/multimedia/cheese/Makefile @@ -3,11 +3,11 @@ # Whom: FreeBSD GNOME Team <gnome@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/multimedia/cheese/Makefile,v 1.20 2008/08/21 21:52:59 mezz Exp $ +# $MCom: ports/multimedia/cheese/Makefile,v 1.21 2008/09/01 22:44:58 ahze Exp $ # PORTNAME= cheese -PORTVERSION= 2.23.91 +PORTVERSION= 2.23.92 CATEGORIES= multimedia gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/multimedia/cheese/distinfo b/multimedia/cheese/distinfo index dba61b001..c7a0b4f3e 100644 --- a/multimedia/cheese/distinfo +++ b/multimedia/cheese/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/cheese-2.23.91.tar.bz2) = 2de86694e145ce455ae1063acb45a18b -SHA256 (gnome2/cheese-2.23.91.tar.bz2) = 973d3a280974554eea1e8417d5cbb84586435c66e69307c0781b7e919613f14e -SIZE (gnome2/cheese-2.23.91.tar.bz2) = 1779842 +MD5 (gnome2/cheese-2.23.92.tar.bz2) = 323e0db49d9cee1e85d3dd4b8d8c015f +SHA256 (gnome2/cheese-2.23.92.tar.bz2) = 98222bf502fb30ffe832652a34e731bea47afc9d4d37ebe5d634726cec7fea13 +SIZE (gnome2/cheese-2.23.92.tar.bz2) = 1788852 diff --git a/multimedia/cheese/files/patch-src_cheese-webcam.c b/multimedia/cheese/files/patch-src_cheese-webcam.c new file mode 100644 index 000000000..a0b5afd21 --- /dev/null +++ b/multimedia/cheese/files/patch-src_cheese-webcam.c @@ -0,0 +1,40 @@ +--- src/cheese-webcam.c.orig 2008-09-09 11:59:18.000000000 -0400 ++++ src/cheese-webcam.c 2008-09-09 12:01:14.000000000 -0400 +@@ -301,7 +301,9 @@ cheese_webcam_get_video_devices_from_hal + { + char *device; + char *gstreamer_src, *product_name; ++#ifdef VIDIOC_QUERYCAP + struct v4l2_capability v2cap; ++#endif + struct video_capability v1cap; + + device = libhal_device_get_property_string (hal_ctx, udis[i], "video4linux.device", &error); +@@ -327,7 +329,11 @@ cheese_webcam_get_video_devices_from_hal + libhal_free_string (device); + continue; + } ++#ifdef VIDIOC_QUERYCAP + ok = ioctl (fd, VIDIOC_QUERYCAP, &v2cap); ++#else ++ ok = -1; ++#endif + if (ok < 0) + { + ok = ioctl (fd, VIDIOCGCAP, &v1cap); +@@ -346,6 +352,7 @@ cheese_webcam_get_video_devices_from_hal + } + else + { ++#ifdef VIDIOC_QUERYCAP + guint cap = v2cap.capabilities; + g_print ("Detected v4l2 device: %s\n", v2cap.card); + g_print ("Driver: %s, version: %d\n", v2cap.driver, v2cap.version); +@@ -361,6 +368,7 @@ cheese_webcam_get_video_devices_from_hal + } + gstreamer_src = "v4l2src"; + product_name = (char *) v2cap.card; ++#endif + } + + priv->webcam_devices[priv->num_webcam_devices].hal_udi = g_strdup (udis[i]); diff --git a/multimedia/cheese/pkg-plist b/multimedia/cheese/pkg-plist index eabdea15b..4ac4d80c1 100644 --- a/multimedia/cheese/pkg-plist +++ b/multimedia/cheese/pkg-plist @@ -88,6 +88,8 @@ share/locale/ga/LC_MESSAGES/cheese.mo share/locale/gl/LC_MESSAGES/cheese.mo share/locale/gu/LC_MESSAGES/cheese.mo share/locale/he/LC_MESSAGES/cheese.mo +share/locale/hi/LC_MESSAGES/cheese.mo +share/locale/hr/LC_MESSAGES/cheese.mo share/locale/hu/LC_MESSAGES/cheese.mo share/locale/it/LC_MESSAGES/cheese.mo share/locale/ja/LC_MESSAGES/cheese.mo |