rpms/xawtv/devel xawtv-3.95-open.patch,NONE,1.1 xawtv.spec,1.8,1.9

[Dmitry Butskoy (buc)]

Author: buc

Update of /cvs/extras/rpms/xawtv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15623

Modified Files:
	xawtv.spec 
Added Files:
	xawtv-3.95-open.patch 
Log Message:


xawtv-3.95-open.patch:

--- NEW FILE xawtv-3.95-open.patch ---
diff -Nrbu xawtv-3.95/console/webcam.c xawtv-3.95-OK/console/webcam.c
--- xawtv-3.95/console/webcam.c	2005-09-30 14:07:58.000000000 +0400
+++ xawtv-3.95-OK/console/webcam.c	2007-08-30 16:46:12.000000000 +0400
@@ -813,7 +813,7 @@
     tmpdir = (NULL != getenv("TMPDIR")) ? getenv("TMPDIR") : "/tmp";
     list_for_each(item,&connections) {
 	s = list_entry(item, struct xfer_state, list);
-	s->ops->open(s);
+	(s->ops->open)(s);
     }
 
     /* print config */
diff -Nrbu xawtv-3.95/libng/grab-ng.c xawtv-3.95-OK/libng/grab-ng.c
--- xawtv-3.95/libng/grab-ng.c	2003-03-28 15:19:28.000000000 +0300
+++ xawtv-3.95-OK/libng/grab-ng.c	2007-08-30 16:49:19.000000000 +0400
@@ -572,7 +572,7 @@
 	    continue;
 	if (ng_debug)
 	    fprintf(stderr,"vid-open: trying: %s... \n", drv->name);
-	if (NULL != (*handle = drv->open(device)))
+	if (NULL != (*handle = (drv->open)(device)))
 	    break;
 	if (ng_debug)
 	    fprintf(stderr,"vid-open: failed: %s\n",drv->name);
@@ -603,7 +603,7 @@
 	    continue;
 	if (ng_debug)
 	    fprintf(stderr,"dsp-open: trying: %s... \n", drv->name);
-	if (NULL != (*handle = drv->open(device,fmt,record)))
+	if (NULL != (*handle = (drv->open)(device,fmt,record)))
 	    break;
 	if (ng_debug)
 	    fprintf(stderr,"dsp-open: failed: %s\n", drv->name);
@@ -628,7 +628,7 @@
         drv = list_entry(item, struct ng_mix_driver, list);
 	if (ng_debug)
 	    fprintf(stderr,"mix-init: trying: %s... \n", drv->name);
-	if (NULL != (handle = drv->open(device))) {
+	if (NULL != (handle = (drv->open)(device))) {
 	    if (NULL != (attrs = drv->volctl(handle,channel)))
 		break;
 	    drv->close(handle);


Index: xawtv.spec
===================================================================
RCS file: /cvs/extras/rpms/xawtv/devel/xawtv.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xawtv.spec	28 Aug 2007 21:49:40 -0000	1.8
+++ xawtv.spec	30 Aug 2007 13:04:26 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: TV applications for video4linux compliant devices
 Name: xawtv
 Version: 3.95
-Release: 6%{?dist}
+Release: 7%{?dist}
 Group: Applications/Multimedia
 License: GPLv2+
 URL: http://bytesex.org/xawtv/
@@ -15,6 +15,7 @@
 Patch3: xawtv-3.95-font.patch
 Patch4: xawtv-3.95-region.patch
 Patch5: xawtv-3.95-pagesize.patch
+Patch6: xawtv-3.95-open.patch
 
 BuildRequires: mesa-libGL-devel, libXaw-devel, libXext-devel
 BuildRequires: libFS-devel, libXft-devel, libXinerama-devel
@@ -46,6 +47,7 @@
 %patch3 -p1 -b .font
 %patch4 -p1 -b .region
 %patch5 -p1 -b .pagesize
+%patch6 -p1 -b .open
 
 sed -i -e 's,/usr/X11R6/lib/X11,%{_datadir}/X11,g' configure.ac
 sed -i -e 's,/usr/X11R6/include/X11,%{_includedir}/X11,g' Makefile.in
@@ -137,6 +139,9 @@
 
 
 %changelog
+* Thu Aug 30 2007 Dmitry Butskoy <Dmitry at Butskoy.name> - 3.95-7
+- add patch for "open(2) call now is a macro" issue (#265081). FTW :|
+
 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 3.95-6
 - Rebuild for selinux ppc32 issue.