rpms/xorg-x11-drv-v4l/F-7 v4l-0.1.1-ioctl-fix.patch, NONE, 1.1 xorg-x11-drv-v4l.spec, 1.13, 1.14

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-v4l/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24324

Modified Files:
	xorg-x11-drv-v4l.spec 
Added Files:
	v4l-0.1.1-ioctl-fix.patch 
Log Message:
* Tue Aug 28 2007 Adam Jackson <ajax at redhat.com> 0.1.1-8
- Fix ioctl argument on LP64 machines. (#250070)


v4l-0.1.1-ioctl-fix.patch:

--- NEW FILE v4l-0.1.1-ioctl-fix.patch ---
diff -Nrbu xf86-video-v4l-0.1.1/src/v4l.c xf86-video-v4l-0.1.1-OK/src/v4l.c
--- xf86-video-v4l-0.1.1/src/v4l.c	2006-04-08 05:51:30.000000000 +0400
+++ xf86-video-v4l-0.1.1-OK/src/v4l.c	2007-07-27 17:19:50.000000000 +0400
@@ -593,7 +593,8 @@
 	    if (-1 == ioctl(V4L_FD,VIDIOCSAUDIO,&pPPriv->audio))
 		perror("ioctl VIDIOCSAUDIO");
     } else if (attribute == xvFreq) {
-	if (-1 == ioctl(V4L_FD,VIDIOCSFREQ,&value))
+	unsigned long freq = value;
+	if (-1 == ioctl(V4L_FD,VIDIOCSFREQ,&freq))
 	    perror("ioctl VIDIOCSFREQ");
     } else if (0 != pPPriv->yuv_format &&
 	       pPPriv->myfmt->setAttribute) {
@@ -645,7 +646,9 @@
 	    ret = BadValue;
 	}
     } else if (attribute == xvFreq) {
-	ioctl(V4L_FD,VIDIOCGFREQ,value);
+	unsigned long freq;
+	ioctl(V4L_FD,VIDIOCGFREQ,&freq);
+	*value = freq;
     } else if (0 != pPPriv->yuv_format &&
 	       pPPriv->myfmt->getAttribute) {
 	/* not mine -> pass to yuv scaler driver */


Index: xorg-x11-drv-v4l.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-v4l/F-7/xorg-x11-drv-v4l.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-drv-v4l.spec	16 Feb 2007 21:53:29 -0000	1.13
+++ xorg-x11-drv-v4l.spec	28 Aug 2007 17:20:24 -0000	1.14
@@ -2,32 +2,30 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-%define cvsdate xxxxxxx
-
 Summary:   Xorg X11 v4l video driver
 Name:      xorg-x11-drv-v4l
 Version:   0.1.1
-Release:   5%{?dist}
+Release:   8%{?dist}
 URL:       http://www.x.org
-License:   MIT/X11
+License:   MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Patch0:    v4l-0.1.1-ioctl-fix.patch
 
 ExcludeArch: s390 s390x
 
-BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
-BuildRequires: xorg-x11-proto-devel
+BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
 
-Requires:  xorg-x11-server-Xorg >= 1.0.99.901
+Requires:  xorg-x11-server-Xorg >= 1.3.0.0-6
 
 %description 
 X.Org X11 v4l video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p1 -b .ioctl
 
 %build
 %configure --disable-static
@@ -47,13 +45,19 @@
 
 %files
 %defattr(-,root,root,-)
-%dir %{moduledir}
-%dir %{driverdir}
 %{driverdir}/v4l_drv.so
-#%dir %{_mandir}/man4x
 %{_mandir}/man4/v4l.4*
 
 %changelog
+* Tue Aug 28 2007 Adam Jackson <ajax at redhat.com> 0.1.1-8
+- Fix ioctl argument on LP64 machines. (#250070)
+
+* Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 0.1.1-7
+- Rebuild for ppc toolchain bug
+
+* Mon Jun 18 2007 Adam Jackson <ajax at redhat.com> 0.1.1-6
+- Update Requires and BuildRequires.  Disown the module directories.
+
 * Fri Feb 16 2007 Adam Jackson <ajax at redhat.com> 0.1.1-5
 - ExclusiveArch -> ExcludeArch