summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2010-04-18 06:01:34 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2010-04-18 06:01:34 +0800
commit4b2ec28a4cead1843b704bce443c4474aaa67cbb (patch)
treefa277ef666725a177eab9c8c2d041562047d6c03
parentd46324ee5879b0281887074af75b83c795ac838c (diff)
downloadmarcuscom-ports-4b2ec28a4cead1843b704bce443c4474aaa67cbb.tar
marcuscom-ports-4b2ec28a4cead1843b704bce443c4474aaa67cbb.tar.gz
marcuscom-ports-4b2ec28a4cead1843b704bce443c4474aaa67cbb.tar.bz2
marcuscom-ports-4b2ec28a4cead1843b704bce443c4474aaa67cbb.tar.lz
marcuscom-ports-4b2ec28a4cead1843b704bce443c4474aaa67cbb.tar.xz
marcuscom-ports-4b2ec28a4cead1843b704bce443c4474aaa67cbb.tar.zst
marcuscom-ports-4b2ec28a4cead1843b704bce443c4474aaa67cbb.zip
Fix the usage of g_access().
Reported by: kwm git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14053 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--multimedia/cheese/Makefile4
-rw-r--r--multimedia/cheese/files/patch-libcheese_cheese-camera-device-monitor.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/multimedia/cheese/Makefile b/multimedia/cheese/Makefile
index ee2f02a03..f45e96f4c 100644
--- a/multimedia/cheese/Makefile
+++ b/multimedia/cheese/Makefile
@@ -3,12 +3,12 @@
# Whom: FreeBSD GNOME Team <gnome@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/cheese/Makefile,v 1.53 2010/04/17 03:06:16 marcus Exp $
+# $MCom: ports/multimedia/cheese/Makefile,v 1.54 2010/04/17 16:13:04 marcus Exp $
#
PORTNAME= cheese
PORTVERSION= 2.30.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/multimedia/cheese/files/patch-libcheese_cheese-camera-device-monitor.c b/multimedia/cheese/files/patch-libcheese_cheese-camera-device-monitor.c
index 66e3dee55..05da52bbd 100644
--- a/multimedia/cheese/files/patch-libcheese_cheese-camera-device-monitor.c
+++ b/multimedia/cheese/files/patch-libcheese_cheese-camera-device-monitor.c
@@ -1,5 +1,5 @@
--- libcheese/cheese-camera-device-monitor.c.orig 2010-03-29 16:27:42.000000000 -0400
-+++ libcheese/cheese-camera-device-monitor.c 2010-04-17 16:06:20.000000000 -0400
++++ libcheese/cheese-camera-device-monitor.c 2010-04-17 17:57:57.000000000 -0400
@@ -24,24 +24,11 @@
#endif
@@ -128,7 +128,7 @@
- /* vbi devices support capture capability too, but cannot be used,
- * so detect them by device name */
- if (strstr (device_file, "vbi"))
-+ if (!g_access (device_file, (R_OK | W_OK)))
++ if (g_access (device_file, (R_OK | W_OK)) == -1)
{
- GST_INFO ("Skipping vbi device: %s", device_file);
+ GST_WARNING ("Device %s does not have proper permissions. Permissions must be 0666", device_file);