rpms/gtk-v4l/F-12 gtk-v4l-udev.patch,NONE,1.1 gtk-v4l.spec,1.2,1.3

[Huzaifa Sidhpurwala]

Author: huzaifas

Update of /cvs/pkgs/rpms/gtk-v4l/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20080

Modified Files:
	gtk-v4l.spec 
Added Files:
	gtk-v4l-udev.patch 
Log Message:
patch to get it working on F12

gtk-v4l-udev.patch:
 configure                 |   18 +++++++++---------
 configure.ac              |    3 ++-
 src/gtk-v4l-device-list.c |    2 ++
 3 files changed, 13 insertions(+), 10 deletions(-)

--- NEW FILE gtk-v4l-udev.patch ---
diff -Naur gtk-v4l-0.3/configure gtk-v4l-0.3.udev/configure
--- gtk-v4l-0.3/configure	2010-06-03 09:59:34.000000000 +0530
+++ gtk-v4l-0.3.udev/configure	2010-06-03 12:19:18.863302881 +0530
@@ -4458,12 +4458,12 @@
     pkg_cv_GUDEV_CFLAGS="$GUDEV_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gudev-1.0 >= 151\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gudev-1.0 >= 151") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gudev-1.0 >= 145\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gudev-1.0 >= 145") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GUDEV_CFLAGS=`$PKG_CONFIG --cflags "gudev-1.0 >= 151" 2>/dev/null`
+  pkg_cv_GUDEV_CFLAGS=`$PKG_CONFIG --cflags "gudev-1.0 >= 145" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -4474,12 +4474,12 @@
     pkg_cv_GUDEV_LIBS="$GUDEV_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gudev-1.0 >= 151\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gudev-1.0 >= 151") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gudev-1.0 >= 145\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gudev-1.0 >= 145") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GUDEV_LIBS=`$PKG_CONFIG --libs "gudev-1.0 >= 151" 2>/dev/null`
+  pkg_cv_GUDEV_LIBS=`$PKG_CONFIG --libs "gudev-1.0 >= 145" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -4497,14 +4497,14 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GUDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gudev-1.0 >= 151" 2>&1`
+	        GUDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gudev-1.0 >= 145" 2>&1`
         else
-	        GUDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors "gudev-1.0 >= 151" 2>&1`
+	        GUDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors "gudev-1.0 >= 145" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GUDEV_PKG_ERRORS" >&5
 
-	as_fn_error "Package requirements (gudev-1.0 >= 151) were not met:
+	as_fn_error "Package requirements (gudev-1.0 >= 145) were not met:
 
 $GUDEV_PKG_ERRORS
 
diff -Naur gtk-v4l-0.3/configure.ac gtk-v4l-0.3.udev/configure.ac
--- gtk-v4l-0.3/configure.ac	2010-06-02 11:00:13.000000000 +0530
+++ gtk-v4l-0.3.udev/configure.ac	2010-06-03 12:20:28.189289503 +0530
@@ -19,9 +19,10 @@
 GTK_REQUIRED=2.14
 PKG_CHECK_MODULES([GTK],[gtk+-2.0 >= $GTK_REQUIRED glib-2.0])
 PKG_CHECK_MODULES([V4L], [libv4l2 >= 0.6])
-PKG_CHECK_MODULES([GUDEV],[gudev-1.0 >= 151])
+PKG_CHECK_MODULES([GUDEV],[gudev-1.0 >= 145])
 
 AC_SUBST([GTK_CFLAGS])
+
 AC_SUBST([GTK_LIBS])
 
 AC_SUBST([V4L_CFLAGS])
diff -Naur gtk-v4l-0.3/src/gtk-v4l-device-list.c gtk-v4l-0.3.udev/src/gtk-v4l-device-list.c
--- gtk-v4l-0.3/src/gtk-v4l-device-list.c	2010-05-28 12:45:19.000000000 +0530
+++ gtk-v4l-0.3.udev/src/gtk-v4l-device-list.c	2010-06-03 12:34:50.996041565 +0530
@@ -19,11 +19,13 @@
  *
  *
  */
+#define G_UDEV_API_IS_SUBJECT_TO_CHANGE 1
 
 #include <string.h>
 #include <gudev/gudev.h>
 #include "gtk-v4l-device-list.h"
 
+
 #define GTK_V4L_DEVICE_LIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_V4L_TYPE_DEVICE_LIST, Gtkv4lDeviceListPrivate))
 
 enum


Index: gtk-v4l.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-v4l/F-12/gtk-v4l.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gtk-v4l.spec	3 Jun 2010 05:27:26 -0000	1.2
+++ gtk-v4l.spec	3 Jun 2010 07:14:07 -0000	1.3
@@ -6,11 +6,12 @@ Group:		Applications/Multimedia
 License:	GPLv2
 URL:		http://fedorahosted.org/gtk-v4l
 Source0:	https://fedorahosted.org/releases/g/t/%{name}/%{name}-%{version}.tar.gz
+Patch0:		gtk-v4l-udev.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	scrollkeeper
 BuildRequires:	libv4l-devel >= 0.6
 BuildRequires:	gtk2-devel >= 2.18
-BuildRequires:	libgudev1-devel >= 151
+BuildRequires:	libgudev1-devel >= 145
 
 
 %description
@@ -18,7 +19,7 @@ gtk-v4l is a Video4Linux Web camera cont
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .udev
 
 %build
 %configure